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

Diff Legend

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