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.139 by root, Wed Jan 11 03:13:26 2006 UTC vs.
Revision 1.211 by ayin, Sun Sep 9 10:14:40 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>
… …
43const char *const def_colorName[] = 43const char *const def_colorName[] =
44 { 44 {
45 COLOR_FOREGROUND, 45 COLOR_FOREGROUND,
46 COLOR_BACKGROUND, 46 COLOR_BACKGROUND,
47 /* low-intensity colors */ 47 /* low-intensity colors */
48 "Black", /* 0: black (#000000) */ 48 "rgb:00/00/00", // 0: black (Black)
49 "Red3", /* 1: red (#CD0000) */ 49 "rgb:cd/00/00", // 1: red (Red3)
50 "Green3", /* 2: green (#00CD00) */ 50 "rgb:00/cd/00", // 2: green (Green3)
51 "Yellow3", /* 3: yellow (#CDCD00) */ 51 "rgb:cd/cd/00", // 3: yellow (Yellow3)
52 "Blue3", /* 4: blue (#0000CD) */ 52 "rgb:00/00/cd", // 4: blue (Blue3)
53 "Magenta3", /* 5: magenta (#CD00CD) */ 53 "rgb:cd/00/cd", // 5: magenta (Magenta3)
54 "Cyan3", /* 6: cyan (#00CDCD) */ 54 "rgb:00/cd/cd", // 6: cyan (Cyan3)
55# ifdef XTERM_COLORS 55# ifdef XTERM_COLORS
56 "Grey90", /* 7: white (#E5E5E5) */ 56 "rgb:e5/e5/e5", // 7: white (Grey90)
57# else 57# else
58 "AntiqueWhite", /* 7: white (#FAEBD7) */ 58 "rgb:fa/eb/d7", // 7: white (AntiqueWhite)
59# endif 59# endif
60 /* high-intensity colors */ 60 /* high-intensity colors */
61# ifdef XTERM_COLORS 61# ifdef XTERM_COLORS
62 "Grey30", /* 8: bright black (#4D4D4D) */ 62 "rgb:4d/4d/4d", // 8: bright black (Grey30)
63# else 63# else
64 "Grey25", /* 8: bright black (#404040) */ 64 "rgb:40/40/40", // 8: bright black (Grey25)
65# endif 65# endif
66 "Red", /* 1/9: bright red (#FF0000) */ 66 "rgb:ff/00/00", // 1/9: bright red (Reed)
67 "Green", /* 2/10: bright green (#00FF00) */ 67 "rgb:00/ff/00", // 2/10: bright green (Green)
68 "Yellow", /* 3/11: bright yellow (#FFFF00) */ 68 "rgb:ff/ff/00", // 3/11: bright yellow (Yellow)
69 "Blue", /* 4/12: bright blue (#0000FF) */ 69 "rgb:00/00/ff", // 4/12: bright blue (Blue)
70 "Magenta", /* 5/13: bright magenta (#FF00FF) */ 70 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta)
71 "Cyan", /* 6/14: bright cyan (#00FFFF) */ 71 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan)
72 "White", /* 7/15: bright white (#FFFFFF) */ 72 "rgb:ff/ff/ff", // 7/15: bright white (White)
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
… …
305/*----------------------------------------------------------------------*/ 265/*----------------------------------------------------------------------*/
306const char ** 266const char **
307rxvt_term::init_resources (int argc, const char *const *argv) 267rxvt_term::init_resources (int argc, const char *const *argv)
308{ 268{
309 int i, r_argc; 269 int i, r_argc;
310 char *val;
311 const char **cmd_argv, **r_argv; 270 const char **cmd_argv, **r_argv;
312 271
313 /* 272 /*
314 * Look for -exec option. Find => split and make cmd_argv[] of command args 273 * Look for -e option. Find => split and make cmd_argv[] of command args
315 */ 274 */
316 for (r_argc = 0; r_argc < argc; r_argc++) 275 for (r_argc = 0; r_argc < argc; r_argc++)
317 if (!strcmp (argv[r_argc], "-e") || !strcmp (argv[r_argc], "-exec")) 276 if (!strcmp (argv[r_argc], "-e"))
318 break; 277 break;
319 278
320 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 279 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
321 280
322 for (i = 0; i < r_argc; i++) 281 for (i = 0; i < r_argc; i++)
… …
334 cmd_argv[i] = (const char *)argv[i + r_argc + 1]; 293 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
335 294
336 cmd_argv[i] = NULL; 295 cmd_argv[i] = NULL;
337 } 296 }
338 297
339 rs[Rs_name] = rxvt_r_basename (argv[0]); 298 rs[Rs_name] = rxvt_basename (argv[0]);
340 299
341 /* 300 /*
342 * Open display, get options/resources and create the window 301 * Open display, get options/resources and create the window
343 */ 302 */
344 {
345 TEMP_ENV;
346 303
347 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 304 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
348 rs[Rs_display_name] = ":0"; 305 rs[Rs_display_name] = ":0";
349 306
350 get_options (r_argc, r_argv); 307 get_options (r_argc, r_argv);
351 308
352 if (!(display = displays.get (rs[Rs_display_name]))) 309 if (!(display = displays.get (rs[Rs_display_name])))
353 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 310 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
354 311
312 // using a local pointer decreases code size a lot
313 xa = display->xa;
314
315 set (display);
355 extract_resources (); 316 extract_resources ();
356 }
357 317
318#if XFT
319 if (rs[Rs_depth])
320 select_visual (strtol (rs[Rs_depth], 0, 0));
321#endif
322
323#ifdef HAVE_AFTERIMAGE
324 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
325#endif
358 free (r_argv); 326 free (r_argv);
327
328 for (int i = NUM_RESOURCES; i--; )
329 if (rs [i] == resval_undef)
330 rs [i] = 0;
331
332#if ENABLE_PERL
333 if (!rs[Rs_perl_ext_1])
334 rs[Rs_perl_ext_1] = "default";
335
336 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
337 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
338 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
339 {
340 rxvt_perl.init (this);
341 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
342 }
343#endif
359 344
360 /* 345 /*
361 * set any defaults not already set 346 * set any defaults not already set
362 */ 347 */
363 if (cmd_argv && cmd_argv[0]) 348 if (cmd_argv && cmd_argv[0])
364 { 349 {
365 if (!rs[Rs_title]) 350 if (!rs[Rs_title])
366 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); 351 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
367 if (!rs[Rs_iconName]) 352 if (!rs[Rs_iconName])
368 rs[Rs_iconName] = rs[Rs_title]; 353 rs[Rs_iconName] = rs[Rs_title];
369 } 354 }
370 else 355 else
371 { 356 {
… …
409 rs[Rs_cutchars] = CUTCHARS; 394 rs[Rs_cutchars] = CUTCHARS;
410 395
411#ifndef NO_BACKSPACE_KEY 396#ifndef NO_BACKSPACE_KEY
412 if (!rs[Rs_backspace_key]) 397 if (!rs[Rs_backspace_key])
413# ifdef DEFAULT_BACKSPACE 398# ifdef DEFAULT_BACKSPACE
414 key_backspace = DEFAULT_BACKSPACE; 399 rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
415# else 400# else
416 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 401 rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
417# endif 402# endif
418 else
419 {
420 val = strdup (rs[Rs_backspace_key]);
421 rxvt_Str_trim (val);
422 rxvt_Str_escaped (val);
423 key_backspace = val;
424 }
425#endif 403#endif
426 404
427#ifndef NO_DELETE_KEY 405#ifndef NO_DELETE_KEY
428 if (!rs[Rs_delete_key]) 406 if (!rs[Rs_delete_key])
429# ifdef DEFAULT_DELETE 407# ifdef DEFAULT_DELETE
430 key_delete = DEFAULT_DELETE; 408 rs[Rs_delete_key] = DEFAULT_DELETE;
431# else 409# else
432 key_delete = "\033[3~"; 410 rs[Rs_delete_key] = "\033[3~";
433# endif
434 else
435 {
436 val = strdup (rs[Rs_delete_key]);
437 rxvt_Str_trim (val);
438 rxvt_Str_escaped (val);
439 key_delete = val;
440 }
441#endif 411# endif
442 if (rs[Rs_answerbackstring]) 412#endif
443 {
444 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
445 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
446 }
447 413
448#ifdef HAVE_SCROLLBARS 414#ifdef HAVE_SCROLLBARS
449 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 415 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
450#endif 416#endif
451 417
452#ifdef XTERM_REVERSE_VIDEO 418#ifdef XTERM_REVERSE_VIDEO
453 /* this is how xterm implements reverseVideo */ 419 /* this is how xterm implements reverseVideo */
454 if (OPTION (Opt_reverseVideo)) 420 if (option (Opt_reverseVideo))
455 { 421 {
456 if (!rs[Rs_color + Color_fg]) 422 if (!rs[Rs_color + Color_fg])
457 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 423 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
424
458 if (!rs[Rs_color + Color_bg]) 425 if (!rs[Rs_color + Color_bg])
459 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 426 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
460 } 427 }
461#endif 428#endif
462 429
… …
464 if (!rs[Rs_color + i]) 431 if (!rs[Rs_color + i])
465 rs[Rs_color + i] = def_colorName[i]; 432 rs[Rs_color + i] = def_colorName[i];
466 433
467#ifndef XTERM_REVERSE_VIDEO 434#ifndef XTERM_REVERSE_VIDEO
468 /* this is how we implement reverseVideo */ 435 /* this is how we implement reverseVideo */
469 if (OPTION (Opt_reverseVideo)) 436 if (option (Opt_reverseVideo))
470 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); 437 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
471#endif 438#endif
472 439
473 /* convenient aliases for setting fg/bg to colors */ 440 /* convenient aliases for setting fg/bg to colors */
474 color_aliases (Color_fg); 441 color_aliases (Color_fg);
… …
495/*----------------------------------------------------------------------*/ 462/*----------------------------------------------------------------------*/
496void 463void
497rxvt_term::init_env () 464rxvt_term::init_env ()
498{ 465{
499 int i; 466 int i;
500 unsigned int u;
501 char *val; 467 char *val;
502 468
503#ifdef DISPLAY_IS_IP 469#ifdef DISPLAY_IS_IP
504 /* Fixup display_name for export over pty to any interested terminal 470 /* Fixup display_name for export over pty to any interested terminal
505 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 471 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
… …
514 val = rxvt_network_display (rs[Rs_display_name]); 480 val = rxvt_network_display (rs[Rs_display_name]);
515 rs[Rs_display_name] = (const char *)val; 481 rs[Rs_display_name] = (const char *)val;
516 482
517 if (val == NULL) 483 if (val == NULL)
518#endif /* DISPLAY_IS_IP */ 484#endif /* DISPLAY_IS_IP */
519 val = XDisplayString (display->display); 485 val = XDisplayString (dpy);
520 486
521 if (rs[Rs_display_name] == NULL) 487 if (rs[Rs_display_name] == NULL)
522 rs[Rs_display_name] = val; /* use broken `:0' value */ 488 rs[Rs_display_name] = val; /* use broken `:0' value */
523 489
524 i = strlen (val); 490 i = strlen (val);
525 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 491 env_display = (char *)rxvt_malloc (i + 9);
526 492
527 sprintf (env_display, "DISPLAY=%s", val); 493 sprintf (env_display, "DISPLAY=%s", val);
528 494
529 /* avoiding the math library: 495 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
530 * i = (int) (ceil (log10 ((unsigned int)parent[0]))) */
531 for (i = 0, u = (unsigned int)parent[0]; u; u /= 10, i++)
532 ;
533 max_it (i, 1);
534 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char));
535
536 sprintf (env_windowid, "WINDOWID=%u",
537 (unsigned int)parent[0]);
538 496
539 /* add entries to the environment: 497 /* add entries to the environment:
540 * @ DISPLAY: in case we started with -display 498 * @ DISPLAY: in case we started with -display
541 * @ WINDOWID: X window id number of the window 499 * @ WINDOWID: X window id number of the window
542 * @ COLORTERM: terminal sub-name and also indicates its color 500 * @ COLORTERM: terminal sub-name and also indicates its color
… …
544 * @ TERMINFO: path to terminfo directory 502 * @ TERMINFO: path to terminfo directory
545 * @ COLORFGBG: fg;bg color codes 503 * @ COLORFGBG: fg;bg color codes
546 */ 504 */
547 putenv (env_display); 505 putenv (env_display);
548 putenv (env_windowid); 506 putenv (env_windowid);
507
549 if (env_colorfgbg) 508 if (env_colorfgbg)
550 putenv (env_colorfgbg); 509 putenv (env_colorfgbg);
551 510
552#ifdef RXVT_TERMINFO 511#ifdef RXVT_TERMINFO
553 putenv ("TERMINFO=" RXVT_TERMINFO); 512 putenv ("TERMINFO=" RXVT_TERMINFO);
554#endif 513#endif
555 514
556 if (display->depth <= 2) 515 if (depth <= 2)
557 putenv ("COLORTERM=" COLORTERMENV "-mono"); 516 putenv ("COLORTERM=" COLORTERMENV "-mono");
558 else 517 else
559 putenv ("COLORTERM=" COLORTERMENVFULL); 518 putenv ("COLORTERM=" COLORTERMENVFULL);
560 519
561 if (rs[Rs_term_name] != NULL) 520 if (rs[Rs_term_name] != NULL)
562 { 521 {
563 env_term = (char *)rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) * sizeof (char)); 522 env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
564 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 523 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
565 putenv (env_term); 524 putenv (env_term);
566 } 525 }
567 else 526 else
568 putenv ("TERM=" TERMENV); 527 putenv ("TERM=" TERMENV);
… …
581 * This should support all European type languages. 540 * This should support all European type languages.
582 */ 541 */
583void 542void
584rxvt_term::set_locale (const char *locale) 543rxvt_term::set_locale (const char *locale)
585{ 544{
586 TEMP_ENV; 545 set_environ (envv);
587 546
588#if HAVE_XSETLOCALE || HAVE_SETLOCALE 547#if HAVE_XSETLOCALE || HAVE_SETLOCALE
589 free (this->locale); 548 free (this->locale);
590 this->locale = setlocale (LC_CTYPE, locale); 549 this->locale = setlocale (LC_CTYPE, locale);
591 550
… …
622} 581}
623 582
624void 583void
625rxvt_term::init_xlocale () 584rxvt_term::init_xlocale ()
626{ 585{
627 TEMP_ENV; 586 set_environ (envv);
628 587
629#ifdef USE_XIM 588#ifdef USE_XIM
630 if (!locale) 589 if (!locale)
631 rxvt_warn ("setting locale failed, working without locale support.\n"); 590 rxvt_warn ("setting locale failed, working without locale support.\n");
632 else 591 else
… …
655 * Initialize the command connection. 614 * Initialize the command connection.
656 * This should be called after the X server connection is established. 615 * This should be called after the X server connection is established.
657 */ 616 */
658 617
659#ifdef META8_OPTION 618#ifdef META8_OPTION
660 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC; 619 meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
661#endif 620#endif
662 621
663 get_ourmods (); 622 get_ourmods ();
664 623
665 if (!OPTION (Opt_scrollTtyOutput)) 624 if (!option (Opt_scrollTtyOutput))
666 priv_modes |= PrivMode_TtyOutputInh; 625 priv_modes |= PrivMode_TtyOutputInh;
667 if (OPTION (Opt_scrollTtyKeypress)) 626 if (option (Opt_scrollTtyKeypress))
668 priv_modes |= PrivMode_Keypress; 627 priv_modes |= PrivMode_Keypress;
669 if (!OPTION (Opt_jumpScroll)) 628 if (!option (Opt_jumpScroll))
670 priv_modes |= PrivMode_smoothScroll; 629 priv_modes |= PrivMode_smoothScroll;
671 630
672#ifndef NO_BACKSPACE_KEY 631#ifndef NO_BACKSPACE_KEY
673 if (strcmp (key_backspace, "DEC") == 0) 632 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
674 priv_modes |= PrivMode_HaveBackSpace; 633 priv_modes |= PrivMode_HaveBackSpace;
675#endif 634#endif
676 635
677 /* add value for scrollBar */ 636 /* add value for scrollBar */
678 if (scrollbar_visible ()) 637 if (scrollBar.state)
679 { 638 {
680 priv_modes |= PrivMode_scrollBar; 639 priv_modes |= PrivMode_scrollBar;
681 SavedModes |= PrivMode_scrollBar; 640 SavedModes |= PrivMode_scrollBar;
682 }
683
684 if (menubar_visible ())
685 {
686 priv_modes |= PrivMode_menuBar;
687 SavedModes |= PrivMode_menuBar;
688 } 641 }
689 642
690 run_command (argv); 643 run_command (argv);
691} 644}
692 645
… …
698 651
699#ifdef OFF_FOCUS_FADING 652#ifdef OFF_FOCUS_FADING
700 pix_colors = pix_colors_focused; 653 pix_colors = pix_colors_focused;
701#endif 654#endif
702 655
703 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++) 656 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
704 { 657 {
658 const char *name = rs[Rs_color + i];
659
660 if (!name)
661 continue;
662
705 rxvt_color xcol; 663 rxvt_color xcol;
706 664
707 if (!rs[Rs_color + i]) 665 if (!set_color (xcol, name))
708 continue;
709
710 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
711 { 666 {
712#ifndef XTERM_REVERSE_VIDEO 667#ifndef XTERM_REVERSE_VIDEO
713 if (i < 2 && OPTION (Opt_reverseVideo)) 668 if (i < 2 && option (Opt_reverseVideo))
714 rs[Rs_color + i] = def_colorName[!i]; 669 name = def_colorName [1 - i];
715 else 670 else
716#endif 671#endif
717 rs[Rs_color + i] = def_colorName[i]; 672 name = def_colorName [i];
718 673
719 if (!rs[Rs_color + i]) 674 if (!name)
720 continue; 675 continue;
721 676
722 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 677 if (!set_color (xcol, name))
723 { 678 {
724 switch (i) 679 switch (i)
725 { 680 {
726 case Color_fg: 681 case Color_fg:
727 case Color_bg: 682 case Color_bg:
728 /* fatal: need bg/fg color */
729 rxvt_fatal ("unable to get foreground/background colour, aborting.\n"); 683 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
730 /* NOTREACHED */ 684 name = "";
731 break; 685 break;
732#ifndef NO_CURSORCOLOR 686#ifndef NO_CURSORCOLOR
733 case Color_cursor2: 687 case Color_cursor2:
734 xcol = pix_colors[Color_fg]; 688#endif
735 break;
736#endif /* ! NO_CURSORCOLOR */
737 case Color_pointer_fg: 689 case Color_pointer_fg:
738 xcol = pix_colors[Color_fg]; 690 name = rs[Rs_color + Color_fg];
691 xcol.set (this, name);
739 break; 692 break;
740 default: 693 default:
741 xcol = pix_colors[Color_bg]; /* None */ 694 name = rs[Rs_color + Color_bg];
695 xcol.set (this, name);
742 break; 696 break;
743 } 697 }
744 } 698 }
745 } 699 }
746 700
747 pix_colors[i] = xcol; 701 pix_colors[i] = xcol;
748 SET_PIXCOLOR (i); 702 rs[Rs_color + i] = name;
749 }
750
751#ifdef OFF_FOCUS_FADING
752 if (rs[Rs_fade])
753 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)
754 pix_colors_unfocused[i] = pix_colors_focused[i].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
755#endif
756
757 if (display->depth <= 2)
758 { 703 }
704
705 if (depth <= 2)
706 {
759 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 707 if (!rs[Rs_color + Color_pointer_fg]) alias_color (Color_pointer_fg, Color_fg);
760 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg]; 708 if (!rs[Rs_color + Color_pointer_bg]) alias_color (Color_pointer_bg, Color_bg);
761 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg]; 709 if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
762 } 710 }
763 711
764 /* 712 /*
765 * get scrollBar/menuBar shadow colors 713 * get scrollBar shadow colors
766 * 714 *
767 * The calculations of topShadow/bottomShadow values are adapted 715 * The calculations of topShadow/bottomShadow values are adapted
768 * from the fvwm window manager. 716 * from the fvwm window manager.
769 */ 717 */
770#ifdef KEEP_SCROLLCOLOR 718#ifdef KEEP_SCROLLCOLOR
771
772 if (display->depth <= 2) 719 if (depth <= 2)
773 { 720 {
774 /* Monochrome */ 721 /* Monochrome */
775 pix_colors[Color_scroll] = pix_colors[Color_fg]; 722 alias_color (Color_scroll, Color_fg);
776 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 723 alias_color (Color_topShadow, Color_bg);
777 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 724 alias_color (Color_bottomShadow, Color_bg);
778 } 725 }
779 else 726 else
780 { 727 {
781 rxvt_color xcol[2]; 728 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
782 /* xcol[0] == white
783 * xcol[1] == top shadow
784 * xcol[2] == bot shadow */
785 729
786 xcol[1] = pix_colors[Color_scroll]; 730 rgba cscroll;
787 xcol[0].set (display, 65535, 65535, 65535); 731 pix_colors [Color_scroll].get (cscroll);
788
789 unsigned short pr1, pg1, pb1, pr0, pg0, pb0;
790
791 xcol[0].get (display, pr0, pg0, pb0);
792 xcol[1].get (display, pr1, pg1, pb1);
793
794 pix_colors[Color_bottomShadow] = xcol[1].fade (display, 50);
795 732
796 /* topShadowColor */ 733 /* topShadowColor */
797 if (!xcol[1].set (display, 734 if (!pix_colors[Color_topShadow].set (this,
798 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 735 rgba (
799 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 736 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
800 min (pb0, max (pb0 / 5, pb1) * 7 / 5))) 737 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
801 xcol[1] = pix_colors[Color_White]; 738 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
802 739 cscroll.a)
803 pix_colors[Color_topShadow] = xcol[1]; 740 ))
741 alias_color (Color_topShadow, Color_White);
804 } 742 }
805#endif /* KEEP_SCROLLCOLOR */ 743#endif /* KEEP_SCROLLCOLOR */
744
745#ifdef OFF_FOCUS_FADING
746 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
747 update_fade_color (i);
748#endif
806} 749}
807 750
808/*----------------------------------------------------------------------*/ 751/*----------------------------------------------------------------------*/
809/* color aliases, fg/bg bright-bold */ 752/* color aliases, fg/bg bright-bold */
810void 753void
… …
849 792
850 if (rsmod 793 if (rsmod
851 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 794 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
852 requestedmeta = rsmod[3] - '0'; 795 requestedmeta = rsmod[3] - '0';
853 796
854 map = XGetModifierMapping (display->display); 797 map = XGetModifierMapping (dpy);
855 kc = map->modifiermap; 798 kc = map->modifiermap;
856 799
857 for (i = 1; i < 6; i++) 800 for (i = 1; i < 6; i++)
858 { 801 {
859 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 802 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
… …
861 for (j = map->max_keypermod; j--; k++) 804 for (j = map->max_keypermod; j--; k++)
862 { 805 {
863 if (kc[k] == 0) 806 if (kc[k] == 0)
864 break; 807 break;
865 808
866 switch (XKeycodeToKeysym (display->display, kc[k], 0)) 809 switch (XKeycodeToKeysym (dpy, kc[k], 0))
867 { 810 {
868 case XK_Num_Lock: 811 case XK_Num_Lock:
869 ModNumLockMask = modmasks[i - 1]; 812 ModNumLockMask = modmasks[i - 1];
870 continue; 813 continue;
871 814
… …
921rxvt_term::create_windows (int argc, const char *const *argv) 864rxvt_term::create_windows (int argc, const char *const *argv)
922{ 865{
923 XClassHint classHint; 866 XClassHint classHint;
924 XWMHints wmHint; 867 XWMHints wmHint;
925#if ENABLE_FRILLS 868#if ENABLE_FRILLS
926 Atom prop = None;
927 MWMHints mwmhints; 869 MWMHints mwmhints = { };
928#endif 870#endif
929 XGCValues gcvalue; 871 XGCValues gcvalue;
930 long vt_emask;
931 XSetWindowAttributes attributes; 872 XSetWindowAttributes attributes;
932 XWindowAttributes gattr;
933 Window top, parent; 873 Window top, parent;
934 dDisp;
935 874
936#ifdef USING_W11LIB 875 dLocal (Display *, dpy);
937 /* enable W11 callbacks */
938 W11AddEventHandler (disp, rxvt_W11_process_x_event);
939#endif
940 876
941 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 877 /* grab colors before netscape does */
942 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa); 878 Get_Colours ();
943 879
944 if (OPTION (Opt_transparent)) 880 if (!set_fonts ())
945 { 881 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
946 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr); 882
947 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 883 parent = display->root;
948 } 884
885 attributes.override_redirect = !!option (Opt_override_redirect);
949 886
950#if ENABLE_FRILLS 887#if ENABLE_FRILLS
951 if (OPTION (Opt_borderLess)) 888 if (option (Opt_borderLess))
952 { 889 {
953 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True); 890 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
954
955 if (prop == None)
956 { 891 {
957 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 892 // rxvt_warn("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");
958#ifdef PREFER_24BIT
959 attributes.override_redirect = TRUE; 893 attributes.override_redirect = true;
960#endif
961 mwmhints.flags = 0;
962 } 894 }
963 else 895 else
964 { 896 {
965 mwmhints.flags = MWM_HINTS_DECORATIONS; 897 mwmhints.flags = MWM_HINTS_DECORATIONS;
966 mwmhints.decorations = 0;
967 } 898 }
968 } 899 }
969 else
970 mwmhints.flags = 0;
971#endif 900#endif
972
973 /* grab colors before netscape does */
974 Get_Colours ();
975
976 if (!set_fonts ())
977 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
978
979 parent = DefaultRootWindow (disp);
980 901
981#if ENABLE_XEMBED 902#if ENABLE_XEMBED
982 if (rs[Rs_embed]) 903 if (rs[Rs_embed])
983 { 904 {
984 XWindowAttributes wattr; 905 XWindowAttributes wattr;
985 906
986 parent = strtol (rs[Rs_embed], 0, 0); 907 parent = strtol (rs[Rs_embed], 0, 0);
987 908
988 if (!XGetWindowAttributes (disp, parent, &wattr)) 909 if (!XGetWindowAttributes (dpy, parent, &wattr))
989 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 910 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
990 911
991 window_calc (wattr.width, wattr.height); 912 window_calc (wattr.width, wattr.height);
992 } 913 }
993#endif 914#endif
994 915
995 window_calc (0, 0); 916 window_calc (0, 0);
996 917
997 /* sub-window placement & size in rxvt_resize_subwindows () */ 918 /* sub-window placement & size in rxvt_resize_subwindows () */
998#ifdef PREFER_24BIT
999 attributes.background_pixel = pix_colors_focused[Color_border]; 919 attributes.background_pixel = pix_colors_focused [Color_border];
1000 attributes.border_pixel = pix_colors_focused[Color_border]; 920 attributes.border_pixel = pix_colors_focused [Color_border];
1001 attributes.colormap = display->cmap; 921 attributes.colormap = cmap;
922
1002 top = XCreateWindow (disp, parent, 923 top = XCreateWindow (dpy, parent,
1003 szHint.x, szHint.y, 924 szHint.x, szHint.y,
1004 szHint.width, szHint.height, 925 szHint.width, szHint.height,
1005 ext_bwidth, 926 ext_bwidth,
1006 display->depth, InputOutput, 927 depth, InputOutput, visual,
1007 display->visual,
1008 CWColormap | CWBackPixel | CWBorderPixel, &attributes); 928 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1009#else 929 &attributes);
1010 top = XCreateSimpleWindow (disp, parent,
1011 szHint.x, szHint.y,
1012 szHint.width, szHint.height,
1013 ext_bwidth,
1014 pix_colors_focused[Color_border],
1015 pix_colors_focused[Color_border]);
1016#endif
1017 930
1018 this->parent[0] = top; 931 this->parent[0] = top;
1019 932
1020 old_width = szHint.width; 933 old_width = szHint.width;
1021 old_height = szHint.height; 934 old_height = szHint.height;
1022 935
1023 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 936 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1024 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 937 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1025 938
1026 classHint.res_name = (char *)rs[Rs_name]; 939 classHint.res_name = (char *)rs[Rs_name];
1027 classHint.res_class = (char *)RESCLASS; 940 classHint.res_class = (char *)RESCLASS;
1028 941
1029 wmHint.flags = InputHint | StateHint | WindowGroupHint; 942 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1030 wmHint.input = True; 943 wmHint.input = True;
1031 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 944 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
1032 wmHint.window_group = top; 945 wmHint.window_group = top;
1033 946
1034 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc, 947 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1035 &szHint, &wmHint, &classHint); 948 &szHint, &wmHint, &classHint);
949
950#if ENABLE_FRILLS
951 if (mwmhints.flags)
952 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
953 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
954#endif
1036 955
1037 Atom protocols[] = { 956 Atom protocols[] = {
1038 xa[XA_WM_DELETE_WINDOW], 957 xa[XA_WM_DELETE_WINDOW],
1039#if ENABLE_EWMH 958#if ENABLE_EWMH
1040 xa[XA_NET_WM_PING], 959 xa[XA_NET_WM_PING],
1041#endif 960#endif
1042 }; 961 };
1043 962
1044 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 963 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1045 964
1046#if ENABLE_FRILLS 965#if ENABLE_FRILLS
1047 if (rs[Rs_transient_for]) 966 if (rs[Rs_transient_for])
1048 XSetTransientForHint (disp, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 967 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1049#endif 968#endif
1050 969
1051#if ENABLE_EWMH 970#if ENABLE_EWMH
1052 long pid = getpid (); 971 long pid = getpid ();
1053 972
1054 XChangeProperty (disp, top, 973 XChangeProperty (dpy, top,
1055 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 974 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1056 PropModeReplace, (unsigned char *)&pid, 1); 975 PropModeReplace, (unsigned char *)&pid, 1);
1057 976
1058 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default 977 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1059#endif 978#endif
1060 979
1061 XSelectInput (disp, top, 980 XSelectInput (dpy, top,
1062 KeyPressMask 981 KeyPressMask
1063#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 982#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1064 | KeyReleaseMask 983 | KeyReleaseMask
1065#endif 984#endif
1066 | FocusChangeMask | VisibilityChangeMask 985 | FocusChangeMask | VisibilityChangeMask
1067 | ExposureMask | StructureNotifyMask); 986 | ExposureMask | StructureNotifyMask);
1068 987
1069 termwin_ev.start (display, top); 988 termwin_ev.start (display, top);
1070 989
1071#if ENABLE_FRILLS
1072 if (mwmhints.flags)
1073 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1074 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1075#endif
1076
1077 /* vt cursor: Black-on-White is standard, but this is more popular */ 990 /* vt cursor: Black-on-White is standard, but this is more popular */
1078 TermWin_cursor = XCreateFontCursor (disp, XC_xterm); 991 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1079 992
1080#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 993#ifdef HAVE_SCROLLBARS
1081 /* cursor (menuBar/scrollBar): Black-on-White */ 994 /* cursor scrollBar: Black-on-White */
1082 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 995 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1083#endif 996#endif
1084 997
1085 /* the vt window */ 998 /* the vt window */
1086 vt = XCreateSimpleWindow (disp, top, 999 vt = XCreateSimpleWindow (dpy, top,
1087 window_vt_x,
1088 window_vt_y, 1000 window_vt_x, window_vt_y,
1089 width,
1090 height, 1001 width, height,
1091 0, 1002 0,
1092 pix_colors_focused[Color_fg], 1003 pix_colors_focused[Color_fg],
1093 pix_colors_focused[Color_bg]); 1004 pix_colors_focused[Color_bg]);
1094#ifdef DEBUG_X
1095 XStoreName (disp, vt, "vt window");
1096#endif
1097 1005
1098 attributes.bit_gravity = NorthWestGravity; 1006 attributes.bit_gravity = NorthWestGravity;
1099 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes); 1007 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1100 1008
1101 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1009 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1102 1010
1103 if (OPTION (Opt_pointerBlank) 1011 if (option (Opt_pointerBlank))
1104#ifdef ENABLE_PERL
1105 || perl.self
1106#endif
1107 )
1108 vt_emask |= PointerMotionMask; 1012 vt_emask |= PointerMotionMask;
1109 else 1013 else
1110 vt_emask |= Button1MotionMask | Button3MotionMask; 1014 vt_emask |= Button1MotionMask | Button3MotionMask;
1111 1015
1112 XSelectInput (disp, vt, vt_emask); 1016 vt_select_input ();
1017
1113 vt_ev.start (display, vt); 1018 vt_ev.start (display, vt);
1114 1019
1115#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1116 if (menuBar_height ())
1117 {
1118 menuBar.win = XCreateSimpleWindow (disp, top,
1119 window_vt_x, 0,
1120 width,
1121 menuBar_TotalHeight (),
1122 0,
1123 pix_colors_focused[Color_fg],
1124 pix_colors_focused[Color_scroll]);
1125
1126#ifdef DEBUG_X
1127 XStoreName (disp, menuBar.win, "menubar");
1128#endif
1129
1130 menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1131
1132 XDefineCursor (disp, menuBar.win,
1133 XCreateFontCursor (disp, XC_left_ptr));
1134
1135 XSelectInput (disp, menuBar.win,
1136 (ExposureMask | ButtonPressMask | ButtonReleaseMask | Button1MotionMask));
1137 menubar_ev.start (display, menuBar.win);
1138 }
1139#endif
1140
1141#ifdef XPM_BACKGROUND
1142 if (rs[Rs_backgroundPixmap] != NULL
1143 && ! OPTION (Opt_transparent))
1144 {
1145 const char *p = rs[Rs_backgroundPixmap];
1146
1147 if ((p = strchr (p, ';')) != NULL)
1148 {
1149 p++;
1150 scale_pixmap (p);
1151 }
1152
1153 set_bgPixmap (rs[Rs_backgroundPixmap]);
1154 scr_touch (true);
1155 }
1156#endif
1157
1158 /* graphics context for the vt window */ 1020 /* graphics context for the vt window */
1159 gcvalue.foreground = pix_colors[Color_fg]; 1021 gcvalue.foreground = pix_colors[Color_fg];
1160 gcvalue.background = pix_colors[Color_bg]; 1022 gcvalue.background = pix_colors[Color_bg];
1161 gcvalue.graphics_exposures = 1; 1023 gcvalue.graphics_exposures = 0;
1024
1162 gc = XCreateGC (disp, vt, 1025 gc = XCreateGC (dpy, vt,
1163 GCForeground | GCBackground | GCGraphicsExposures, 1026 GCForeground | GCBackground | GCGraphicsExposures,
1164 &gcvalue); 1027 &gcvalue);
1165 1028
1166 drawable = new rxvt_drawable (display, vt); 1029 drawable = new rxvt_drawable (this, vt);
1167 1030
1168#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1031#ifdef RXVT_SCROLLBAR
1169 gcvalue.foreground = pix_colors[Color_topShadow]; 1032 gcvalue.foreground = pix_colors[Color_topShadow];
1170 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1033 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1171 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1034 gcvalue.foreground = pix_colors[Color_bottomShadow];
1172 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1035 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1173 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1036 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1174 scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1037 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1175#endif 1038#endif
1176 1039
1177#ifdef OFF_FOCUS_FADING 1040#ifdef OFF_FOCUS_FADING
1178 // initially we are in unfocused state 1041 // initially we are in unfocused state
1179 if (rs[Rs_fade]) 1042 if (rs[Rs_fade])
1180 pix_colors = pix_colors_unfocused; 1043 pix_colors = pix_colors_unfocused;
1181#endif 1044#endif
1182 1045
1183 pointer_unblank (); 1046 pointer_unblank ();
1184 scr_recolour (); 1047 scr_recolour ();
1185
1186#if ENABLE_XEMBED
1187 if (rs[Rs_embed])
1188 {
1189 long info[2] = { 0, XEMBED_MAPPED };
1190
1191 XChangeProperty (disp, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
1192 32, PropModeReplace, (unsigned char *)&info, 2);
1193 }
1194#endif
1195} 1048}
1196 1049
1197/* ------------------------------------------------------------------------- * 1050/* ------------------------------------------------------------------------- *
1198 * GET TTY CURRENT STATE * 1051 * GET TTY CURRENT STATE *
1199 * ------------------------------------------------------------------------- */ 1052 * ------------------------------------------------------------------------- */
1200void 1053void
1201rxvt_get_ttymode (ttymode_t *tio, int erase) 1054rxvt_get_ttymode (ttymode_t *tio, int erase)
1202{ 1055{
1203#ifdef HAVE_TERMIOS_H
1204 /* 1056 /*
1205 * standard System V termios interface 1057 * standard System V termios interface
1206 */ 1058 */
1207 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1059 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1208 { 1060 {
… …
1275 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO 1127 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1276# if defined (ECHOCTL) && defined (ECHOKE) 1128# if defined (ECHOCTL) && defined (ECHOKE)
1277 | ECHOCTL | ECHOKE 1129 | ECHOCTL | ECHOKE
1278# endif 1130# endif
1279 | ECHOE | ECHOK); 1131 | ECHOE | ECHOK);
1280# else /* HAVE_TERMIOS_H */
1281
1282 /*
1283 * sgtty interface
1284 */
1285
1286 /* get parameters -- gtty */
1287 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1288 {
1289 tio->sg.sg_erase = CERASE; /* ^H */
1290 tio->sg.sg_kill = CKILL; /* ^U */
1291 }
1292
1293 if (erase != -1)
1294 tio->sg.sg_erase = (char)erase;
1295
1296 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1297
1298 /* get special characters */
1299 if (ioctl (STDIN_FILENO, TIOCGETC, & (tio->tc)) < 0)
1300 {
1301 tio->tc.t_intrc = CINTR; /* ^C */
1302 tio->tc.t_quitc = CQUIT; /* ^\ */
1303 tio->tc.t_startc = CSTART; /* ^Q */
1304 tio->tc.t_stopc = CSTOP; /* ^S */
1305 tio->tc.t_eofc = CEOF; /* ^D */
1306 tio->tc.t_brkc = -1;
1307 }
1308
1309 /* get local special chars */
1310 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1311 {
1312 tio->lc.t_suspc = CSUSP; /* ^Z */
1313 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
1314 tio->lc.t_rprntc = CRPRNT; /* ^R */
1315 tio->lc.t_flushc = CFLUSH; /* ^O */
1316 tio->lc.t_werasc = CWERASE; /* ^W */
1317 tio->lc.t_lnextc = CLNEXT; /* ^V */
1318 }
1319 /* get line discipline */
1320 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1321# ifdef NTTYDISC
1322 tio->line = NTTYDISC;
1323# endif /* NTTYDISC */
1324
1325 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1326#endif /* HAVE_TERMIOS_H */
1327 1132
1328 /* 1133 /*
1329 * Debugging 1134 * Debugging
1330 */ 1135 */
1331#ifdef DEBUG_TTYMODE 1136#ifdef DEBUG_TTYMODE
… …
1413 * the slave. 1218 * the slave.
1414 */ 1219 */
1415void 1220void
1416rxvt_term::run_command (const char *const *argv) 1221rxvt_term::run_command (const char *const *argv)
1417{ 1222{
1418 TEMP_ENV; // not very temporary...
1419
1420#if ENABLE_FRILLS 1223#if ENABLE_FRILLS
1421 if (rs[Rs_pty_fd]) 1224 if (rs[Rs_pty_fd])
1422 { 1225 {
1423 pty.pty = atoi (rs[Rs_pty_fd]); 1226 pty->pty = atoi (rs[Rs_pty_fd]);
1424 1227
1425 if (pty.pty >= 0) 1228 if (pty->pty >= 0)
1426 { 1229 {
1427 if (getfd_hook) 1230 if (getfd_hook)
1428 pty.pty = (*getfd_hook) (pty.pty); 1231 pty->pty = (*getfd_hook) (pty->pty);
1429 1232
1430 if (pty.pty < 0 || fcntl (pty.pty, F_SETFL, O_NONBLOCK)) 1233 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK))
1431 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1234 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1432 } 1235 }
1433 } 1236 }
1434 else 1237 else
1435#endif 1238#endif
1436 if (!pty.get ()) 1239 if (!pty->get ())
1437 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1240 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1438 1241
1242 int er;
1243
1244#ifndef NO_BACKSPACE_KEY
1245 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1246 er = rs[Rs_backspace_key][0];
1247 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1248 er = '\177'; /* the initial state anyway */
1249 else
1250#endif
1251 er = -1;
1252
1253 rxvt_get_ttymode (&tio, er);
1254 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */
1439 pty.set_utf8_mode (enc_utf8); 1255 pty->set_utf8_mode (enc_utf8);
1440 1256
1441 /* set initial window size */ 1257 /* set initial window size */
1442 tt_winch (); 1258 tt_winch ();
1443
1444 int er;
1445
1446#ifndef NO_BACKSPACE_KEY
1447 if (key_backspace[0] && !key_backspace[1])
1448 er = key_backspace[0];
1449 else if (strcmp (key_backspace, "DEC") == 0)
1450 er = '\177'; /* the initial state anyway */
1451 else
1452#endif
1453 er = -1;
1454
1455 rxvt_get_ttymode (&tio, er);
1456 1259
1457#if ENABLE_FRILLS 1260#if ENABLE_FRILLS
1458 if (rs[Rs_pty_fd]) 1261 if (rs[Rs_pty_fd])
1459 return; 1262 return;
1460#endif 1263#endif
1461 1264
1462#ifndef __QNX__
1463 /* spin off the command interpreter */ 1265 /* spin off the command interpreter */
1464 switch (cmd_pid = fork ()) 1266 switch (cmd_pid = fork ())
1465 { 1267 {
1466 case -1: 1268 case -1:
1467 { 1269 {
… …
1469 rxvt_fatal ("can't fork, aborting.\n"); 1271 rxvt_fatal ("can't fork, aborting.\n");
1470 } 1272 }
1471 case 0: 1273 case 0:
1472 init_env (); 1274 init_env ();
1473 1275
1474 if (!pty.make_controlling_tty ()) 1276 if (!pty->make_controlling_tty ())
1475 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); 1277 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1476 else 1278 else
1477 { 1279 {
1478 /* Reopen stdin, stdout and stderr over the tty file descriptor */ 1280 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1479 dup2 (pty.tty, STDIN_FILENO); 1281 dup2 (pty->tty, STDIN_FILENO);
1480 dup2 (pty.tty, STDOUT_FILENO); 1282 dup2 (pty->tty, STDOUT_FILENO);
1481 dup2 (pty.tty, STDERR_FILENO); 1283 dup2 (pty->tty, STDERR_FILENO);
1482 1284
1483 // close all our file handles that we do no longer need 1285 // close all our file handles that we do no longer need
1484 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++) 1286 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
1485 { 1287 {
1486 if ((*t)->pty.pty > 2) close ((*t)->pty.pty); 1288 if ((*t)->pty->pty > 2) close ((*t)->pty->pty);
1487 if ((*t)->pty.tty > 2) close ((*t)->pty.tty); 1289 if ((*t)->pty->tty > 2) close ((*t)->pty->tty);
1488 } 1290 }
1489 1291
1490 run_child (argv); 1292 run_child (argv);
1491 fprintf (stderr, "%s: unable to exec child.", RESNAME); 1293 fprintf (stderr, "%s: unable to exec child.", RESNAME);
1492 } 1294 }
1493 1295
1494 _exit (EXIT_FAILURE); 1296 _exit (EXIT_FAILURE);
1495 1297
1496 default: 1298 default:
1497 { 1299 if (!option (Opt_utmpInhibit))
1498#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1300 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1499 int fdstdin;
1500 1301
1501 fdstdin = dup (STDIN_FILENO); 1302 pty->close_tty ();
1502 dup2 (pty.tty, STDIN_FILENO);
1503#endif
1504 1303
1505#ifdef UTMP_SUPPORT 1304 child_ev.start (cmd_pid);
1506 privileged_utmp (SAVE);
1507#endif
1508 1305
1509#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1306 HOOK_INVOKE ((this, HOOK_CHILD_START, DT_INT, cmd_pid, DT_END));
1510
1511 dup2 (fdstdin, STDIN_FILENO);
1512 close (fdstdin);
1513#endif
1514 }
1515
1516 pty.close_tty (); /* keep STDERR_FILENO, pty.pty, display->fd () open */
1517 break; 1307 break;
1518 } 1308 }
1519#else /* __QNX__ uses qnxspawn () */
1520 fchmod (pty.tty, 0622);
1521 fcntl (pty.tty, F_SETFD, FD_CLOEXEC);
1522 fcntl (pty.pty, F_SETFD, FD_CLOEXEC);
1523
1524 if (run_child (argv) == -1)
1525 exit (EXIT_FAILURE);
1526#endif
1527} 1309}
1528 1310
1529/* ------------------------------------------------------------------------- * 1311/* ------------------------------------------------------------------------- *
1530 * CHILD PROCESS OPERATIONS * 1312 * CHILD PROCESS OPERATIONS *
1531 * ------------------------------------------------------------------------- */ 1313 * ------------------------------------------------------------------------- */
… …
1536int 1318int
1537rxvt_term::run_child (const char *const *argv) 1319rxvt_term::run_child (const char *const *argv)
1538{ 1320{
1539 char *login; 1321 char *login;
1540 1322
1541 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1542
1543 if (OPTION (Opt_console)) 1323 if (option (Opt_console))
1544 { /* be virtual console, fail silently */ 1324 { /* be virtual console, fail silently */
1545#ifdef TIOCCONS 1325#ifdef TIOCCONS
1546 unsigned int on = 1; 1326 unsigned int on = 1;
1547 1327
1548 ioctl (STDIN_FILENO, TIOCCONS, &on); 1328 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1575 // unblock signals (signals are blocked by iom.C 1355 // unblock signals (signals are blocked by iom.C
1576 sigset_t ss; 1356 sigset_t ss;
1577 sigemptyset (&ss); 1357 sigemptyset (&ss);
1578 sigprocmask (SIG_SETMASK, &ss, 0); 1358 sigprocmask (SIG_SETMASK, &ss, 0);
1579 1359
1580#ifndef __QNX__
1581 /* command interpreter path */ 1360 /* command interpreter path */
1582 if (argv != NULL) 1361 if (argv != NULL)
1583 { 1362 {
1584# ifdef DEBUG_CMD 1363# ifdef DEBUG_CMD
1585 int i; 1364 int i;
… …
1596 const char *argv0, *shell; 1375 const char *argv0, *shell;
1597 1376
1598 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1377 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1599 shell = "/bin/sh"; 1378 shell = "/bin/sh";
1600 1379
1601 argv0 = (const char *)rxvt_r_basename (shell); 1380 argv0 = (const char *)rxvt_basename (shell);
1602 1381
1603 if (OPTION (Opt_loginShell)) 1382 if (option (Opt_loginShell))
1604 { 1383 {
1605 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1384 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1606 1385
1607 login[0] = '-'; 1386 login[0] = '-';
1608 strcpy (&login[1], argv0); 1387 strcpy (&login[1], argv0);
1609 argv0 = login; 1388 argv0 = login;
1610 } 1389 }
1611 1390
1612 execlp (shell, argv0, NULL); 1391 execlp (shell, argv0, NULL);
1613 /* no error message: STDERR is closed! */ 1392 /* no error message: STDERR is closed! */
1614 } 1393 }
1615 1394
1616#else /* __QNX__ uses qnxspawn () */
1617
1618 char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 };
1619 char *command = NULL, fullcommand[_MAX_PATH];
1620 char **arg_v, *arg_a[2] = { NULL, NULL };
1621
1622 if (argv != NULL)
1623 {
1624 if (access (argv[0], X_OK) == -1)
1625 {
1626 if (strchr (argv[0], '/') == NULL)
1627 {
1628 searchenv (argv[0], "PATH", fullcommand);
1629
1630 if (fullcommand[0] != '\0')
1631 command = fullcommand;
1632 }
1633
1634 if (access (command, X_OK) == -1)
1635 return -1;
1636 }
1637 else
1638 command = argv[0];
1639
1640 arg_v = argv;
1641 }
1642 else
1643 {
1644 if ((command = getenv ("SHELL")) == NULL || *command == '\0')
1645 command = "/bin/sh";
1646
1647 arg_a[0] = my_basename (command);
1648
1649 if (OPTION (Opt_loginShell))
1650 {
1651 login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char));
1652
1653 login[0] = '-';
1654 strcpy (&login[1], arg_a[0]);
1655 arg_a[0] = login;
1656 }
1657
1658 arg_v = arg_a;
1659 }
1660
1661 iov_a[0] = iov_a[1] = iov_a[2] = pty.tty;
1662 cmd_pid = qnx_spawn (0, 0, 0, -1, -1,
1663 _SPAWN_SETSID | _SPAWN_TCSETPGRP,
1664 command, arg_v, environ, iov_a, 0);
1665 if (login)
1666 free (login);
1667
1668 pty.close_tty ();
1669 return pty.pty;
1670#endif
1671
1672 return -1; 1395 return -1;
1673} 1396}
1674 1397
1675/*----------------------- end-of-file (C source) -----------------------*/ 1398/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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