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.113 by root, Sat Feb 19 04:16:49 2005 UTC vs.
Revision 1.129 by root, Mon Jan 2 22:23:26 2006 UTC

… …
33 33
34#include "../config.h" /* NECESSARY */ 34#include "../config.h" /* NECESSARY */
35#include "rxvt.h" /* NECESSARY */ 35#include "rxvt.h" /* NECESSARY */
36#include "rxvtutil.h" 36#include "rxvtutil.h"
37#include "init.h" 37#include "init.h"
38
39#include <limits>
38 40
39#include <csignal> 41#include <csignal>
40 42
41const char *const def_colorName[] = 43const char *const def_colorName[] =
42 { 44 {
… …
169 COLOR_SCROLLTROUGH, 171 COLOR_SCROLLTROUGH,
170#endif /* KEEP_SCROLLCOLOR */ 172#endif /* KEEP_SCROLLCOLOR */
171#if TINTING 173#if TINTING
172 NULL, 174 NULL,
173#endif 175#endif
176#if OFF_FOCUS_FADING
177 "black",
178#endif
174 }; 179 };
175 180
176const char *const xa_names[] = 181const char *const xa_names[] =
177 { 182 {
178 "TEXT", 183 "TEXT",
… …
185 "INCR", 190 "INCR",
186 "WM_PROTOCOLS", 191 "WM_PROTOCOLS",
187 "WM_DELETE_WINDOW", 192 "WM_DELETE_WINDOW",
188 "CLIPBOARD", 193 "CLIPBOARD",
189#if ENABLE_FRILLS 194#if ENABLE_FRILLS
195 "_MOTIF_WM_HINTS",
196#endif
197#if ENABLE_EWMH
190 "_NET_WM_PID", 198 "_NET_WM_PID",
191 "_MOTIF_WM_HINTS",
192 "_NET_WM_NAME", 199 "_NET_WM_NAME",
193 "_NET_WM_ICON_NAME", 200 "_NET_WM_ICON_NAME",
201 "_NET_WM_PING",
194#endif 202#endif
195#if USE_XIM 203#if USE_XIM
196 "WM_LOCALE_NAME", 204 "WM_LOCALE_NAME",
197#endif 205#endif
198#ifdef TRANSPARENT 206#ifdef TRANSPARENT
… …
203 "DndProtocol", 211 "DndProtocol",
204 "DndSelection", 212 "DndSelection",
205#endif 213#endif
206#if ENABLE_XEMBED 214#if ENABLE_XEMBED
207 "_XEMBED", 215 "_XEMBED",
216 "_XEMBED_INFO",
208#endif 217#endif
209 }; 218 };
210 219
211bool 220bool
212rxvt_term::init_vars () 221rxvt_term::init_vars ()
213{ 222{
214 sw_term.start (SIGTERM);
215 sw_int.start (SIGINT);
216
217 pix_colors_focused = new rxvt_color [TOTAL_COLORS]; 223 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
218#ifdef OFF_FOCUS_FADING 224#ifdef OFF_FOCUS_FADING
219 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; 225 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
220#endif 226#endif
221 pix_colors = pix_colors_focused; 227 pix_colors = pix_colors_focused;
222 228
223 if (pix_colors == NULL) 229 if (pix_colors == NULL)
224 return false; 230 return false;
225 231
226#if defined(XPM_BACKGROUND) || defined(TRANSPARENT) 232#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
227 TermWin.pixmap = None; 233 pixmap = None;
228#endif 234#endif
229 235
230 MEvent.time = CurrentTime; 236 MEvent.time = CurrentTime;
231 MEvent.button = AnyButton; 237 MEvent.button = AnyButton;
232 options = DEFAULT_OPTIONS; 238 options = DEFAULT_OPTIONS;
233 want_refresh = 1; 239 want_refresh = 1;
234 priv_modes = SavedModes = PrivMode_Default; 240 priv_modes = SavedModes = PrivMode_Default;
235 TermWin.focus = 0; 241 focus = 0;
236 TermWin.ncol = 80; 242 ncol = 80;
237 TermWin.nrow = 24; 243 nrow = 24;
238 TermWin.int_bwidth = INTERNALBORDERWIDTH; 244 int_bwidth = INTERNALBORDERWIDTH;
239 TermWin.ext_bwidth = EXTERNALBORDERWIDTH; 245 ext_bwidth = EXTERNALBORDERWIDTH;
240 TermWin.lineSpace = LINESPACE; 246 lineSpace = LINESPACE;
241 TermWin.saveLines = SAVELINES; 247 saveLines = SAVELINES;
242 numpix_colors = TOTAL_COLORS; 248 numpix_colors = TOTAL_COLORS;
243 249
244 refresh_limit = 1; 250 refresh_limit = 1;
245 refresh_type = SLOW_REFRESH; 251 refresh_type = SLOW_REFRESH;
246 prev_nrow = prev_ncol = 0; 252 prev_nrow = prev_ncol = 0;
… …
340 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 346 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
341 rs[Rs_display_name] = ":0"; 347 rs[Rs_display_name] = ":0";
342 348
343 get_options (r_argc, r_argv); 349 get_options (r_argc, r_argv);
344 350
345#ifdef LOCAL_X_IS_UNIX
346 if (rs[Rs_display_name][0] == ':')
347 {
348 val = rxvt_malloc (5 + strlen (rs[Rs_display_name]));
349 strcpy (val, "unix");
350 strcat (val, rs[Rs_display_name]);
351 display = displays.get (val);
352 free (val);
353 }
354#endif
355
356 if (!display
357 && ! (display = displays.get (rs[Rs_display_name]))) 351 if (!(display = displays.get (rs[Rs_display_name])))
358 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 352 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
359 353
360 extract_resources (); 354 extract_resources ();
361 free (r_argv); 355 free (r_argv);
362 356
… …
377 if (!rs[Rs_iconName]) 371 if (!rs[Rs_iconName])
378 rs[Rs_iconName] = rs[Rs_name]; 372 rs[Rs_iconName] = rs[Rs_name];
379 } 373 }
380 374
381 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 375 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
382 TermWin.saveLines = BOUND_POSITIVE_INT16 (i); 376 saveLines = min (i, MAX_SAVELINES);
383 377
384#if ENABLE_FRILLS 378#if ENABLE_FRILLS
385 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0) 379 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0)
386 TermWin.int_bwidth = min (i, 100); /* arbitrary limit */ 380 int_bwidth = min (i, std::numeric_limits<int16_t>::max ());
381
387 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) 382 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
388 TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */ 383 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
384
389 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 385 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
390 TermWin.lineSpace = min (i, 100); /* arbitrary limit */ 386 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
391#endif 387#endif
392 388
393#ifdef POINTER_BLANK 389#ifdef POINTER_BLANK
394 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 390 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
395 pointerBlankDelay = i; 391 pointerBlankDelay = i;
396 else 392 else
397 pointerBlankDelay = 2; 393 pointerBlankDelay = 2;
398#endif 394#endif
399 395
400 /* no point having a scrollbar without having any scrollback! */ 396 /* no point having a scrollbar without having any scrollback! */
401 if (!TermWin.saveLines) 397 if (!saveLines)
402 options &= ~Opt_scrollBar; 398 CLR_OPTION (Opt_scrollBar);
403 399
404#ifdef PRINTPIPE 400#ifdef PRINTPIPE
405 if (!rs[Rs_print_pipe]) 401 if (!rs[Rs_print_pipe])
406 rs[Rs_print_pipe] = PRINTPIPE; 402 rs[Rs_print_pipe] = PRINTPIPE;
407#endif 403#endif
… …
450 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 446 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
451#endif 447#endif
452 448
453#ifdef XTERM_REVERSE_VIDEO 449#ifdef XTERM_REVERSE_VIDEO
454 /* this is how xterm implements reverseVideo */ 450 /* this is how xterm implements reverseVideo */
455 if (options & Opt_reverseVideo) 451 if (OPTION (Opt_reverseVideo))
456 { 452 {
457 if (!rs[Rs_color + Color_fg]) 453 if (!rs[Rs_color + Color_fg])
458 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 454 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
459 if (!rs[Rs_color + Color_bg]) 455 if (!rs[Rs_color + Color_bg])
460 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 456 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
… …
465 if (!rs[Rs_color + i]) 461 if (!rs[Rs_color + i])
466 rs[Rs_color + i] = def_colorName[i]; 462 rs[Rs_color + i] = def_colorName[i];
467 463
468#ifndef XTERM_REVERSE_VIDEO 464#ifndef XTERM_REVERSE_VIDEO
469 /* this is how we implement reverseVideo */ 465 /* this is how we implement reverseVideo */
470 if (options & Opt_reverseVideo) 466 if (OPTION (Opt_reverseVideo))
471 SWAP_IT (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg], const char *); 467 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
472#endif 468#endif
473 469
474 /* convenient aliases for setting fg/bg to colors */ 470 /* convenient aliases for setting fg/bg to colors */
475 color_aliases (Color_fg); 471 color_aliases (Color_fg);
476 color_aliases (Color_bg); 472 color_aliases (Color_bg);
… …
526 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 522 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char));
527 523
528 sprintf (env_display, "DISPLAY=%s", val); 524 sprintf (env_display, "DISPLAY=%s", val);
529 525
530 /* avoiding the math library: 526 /* avoiding the math library:
531 * i = (int) (ceil (log10 ((unsigned int)TermWin.parent[0]))) */ 527 * i = (int) (ceil (log10 ((unsigned int)parent[0]))) */
532 for (i = 0, u = (unsigned int)TermWin.parent[0]; u; u /= 10, i++) 528 for (i = 0, u = (unsigned int)parent[0]; u; u /= 10, i++)
533 ; 529 ;
534 MAX_IT (i, 1); 530 max_it (i, 1);
535 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char)); 531 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char));
536 532
537 sprintf (env_windowid, "WINDOWID=%u", 533 sprintf (env_windowid, "WINDOWID=%u",
538 (unsigned int)TermWin.parent[0]); 534 (unsigned int)parent[0]);
539 535
540 /* add entries to the environment: 536 /* add entries to the environment:
541 * @ DISPLAY: in case we started with -display 537 * @ DISPLAY: in case we started with -display
542 * @ WINDOWID: X window id number of the window 538 * @ WINDOWID: X window id number of the window
543 * @ COLORTERM: terminal sub-name and also indicates its color 539 * @ COLORTERM: terminal sub-name and also indicates its color
… …
652 * Initialize the command connection. 648 * Initialize the command connection.
653 * This should be called after the X server connection is established. 649 * This should be called after the X server connection is established.
654 */ 650 */
655 651
656#ifdef META8_OPTION 652#ifdef META8_OPTION
657 meta_char = (options & Opt_meta8 ? 0x80 : C0_ESC); 653 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC;
658#endif 654#endif
659 655
660 get_ourmods (); 656 get_ourmods ();
661 657
662 if (!(options & Opt_scrollTtyOutput)) 658 if (!OPTION (Opt_scrollTtyOutput))
663 priv_modes |= PrivMode_TtyOutputInh; 659 priv_modes |= PrivMode_TtyOutputInh;
664 if (options & Opt_scrollTtyKeypress) 660 if (OPTION (Opt_scrollTtyKeypress))
665 priv_modes |= PrivMode_Keypress; 661 priv_modes |= PrivMode_Keypress;
666 if (!(options & Opt_jumpScroll)) 662 if (!OPTION (Opt_jumpScroll))
667 priv_modes |= PrivMode_smoothScroll; 663 priv_modes |= PrivMode_smoothScroll;
668 664
669#ifndef NO_BACKSPACE_KEY 665#ifndef NO_BACKSPACE_KEY
670 if (strcmp (key_backspace, "DEC") == 0) 666 if (strcmp (key_backspace, "DEC") == 0)
671 priv_modes |= PrivMode_HaveBackSpace; 667 priv_modes |= PrivMode_HaveBackSpace;
… …
683 priv_modes |= PrivMode_menuBar; 679 priv_modes |= PrivMode_menuBar;
684 SavedModes |= PrivMode_menuBar; 680 SavedModes |= PrivMode_menuBar;
685 } 681 }
686 682
687#ifdef CURSOR_BLINK 683#ifdef CURSOR_BLINK
688 if (options & Opt_cursorBlink) 684 if (OPTION (Opt_cursorBlink))
689 (void)gettimeofday (&lastcursorchange, NULL); 685 (void)gettimeofday (&lastcursorchange, NULL);
690#endif 686#endif
691 687
692 run_command (argv); 688 run_command (argv);
693} 689}
… …
710 continue; 706 continue;
711 707
712 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 708 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
713 { 709 {
714#ifndef XTERM_REVERSE_VIDEO 710#ifndef XTERM_REVERSE_VIDEO
715 if (i < 2 && (options & Opt_reverseVideo)) 711 if (i < 2 && OPTION (Opt_reverseVideo))
716 rs[Rs_color + i] = def_colorName[!i]; 712 rs[Rs_color + i] = def_colorName[!i];
717 else 713 else
718#endif 714#endif
719 rs[Rs_color + i] = def_colorName[i]; 715 rs[Rs_color + i] = def_colorName[i];
720 716
… …
745 } 741 }
746 } 742 }
747 } 743 }
748 744
749 pix_colors[i] = xcol; 745 pix_colors[i] = xcol;
746 SET_PIXCOLOR (i);
747 }
748
750#ifdef OFF_FOCUS_FADING 749#ifdef OFF_FOCUS_FADING
751 if (rs[Rs_fade]) 750 if (rs[Rs_fade])
751 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)
752 pix_colors_unfocused[i] = xcol.fade (display, atoi (rs[Rs_fade])); 752 pix_colors_unfocused[i] = pix_colors_focused[i].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
753#endif 753#endif
754 SET_PIXCOLOR (i);
755 }
756 754
757 if (display->depth <= 2) 755 if (display->depth <= 2)
758 { 756 {
759 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 757 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg];
760 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg]; 758 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg];
… …
768 * from the fvwm window manager. 766 * from the fvwm window manager.
769 */ 767 */
770#ifdef KEEP_SCROLLCOLOR 768#ifdef KEEP_SCROLLCOLOR
771 769
772 if (display->depth <= 2) 770 if (display->depth <= 2)
771 {
773 { /* Monochrome */ 772 /* Monochrome */
774 pix_colors[Color_scroll] = pix_colors[Color_fg]; 773 pix_colors[Color_scroll] = pix_colors[Color_fg];
775 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 774 pix_colors[Color_topShadow] = pix_colors[Color_bg];
776 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 775 pix_colors[Color_bottomShadow] = pix_colors[Color_bg];
777 } 776 }
778 else 777 else
… …
929#endif 928#endif
930 XGCValues gcvalue; 929 XGCValues gcvalue;
931 long vt_emask; 930 long vt_emask;
932 XSetWindowAttributes attributes; 931 XSetWindowAttributes attributes;
933 XWindowAttributes gattr; 932 XWindowAttributes gattr;
934 Window top; 933 Window top, parent;
935 dDisp; 934 dDisp;
936 935
937#ifdef USING_W11LIB 936#ifdef USING_W11LIB
938 /* enable W11 callbacks */ 937 /* enable W11 callbacks */
939 W11AddEventHandler (disp, rxvt_W11_process_x_event); 938 W11AddEventHandler (disp, rxvt_W11_process_x_event);
940#endif 939#endif
941 940
942 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 941 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
943 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa); 942 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa);
944 943
945 if (options & Opt_transparent) 944 if (OPTION (Opt_transparent))
946 { 945 {
947 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr); 946 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);
948 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 947 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
949 } 948 }
950 949
951#if ENABLE_FRILLS 950#if ENABLE_FRILLS
952 if (options & Opt_borderLess) 951 if (OPTION (Opt_borderLess))
953 { 952 {
954 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True); 953 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True);
955 954
956 if (prop == None) 955 if (prop == None)
957 { 956 {
… …
966 mwmhints.flags = MWM_HINTS_DECORATIONS; 965 mwmhints.flags = MWM_HINTS_DECORATIONS;
967 mwmhints.decorations = 0; 966 mwmhints.decorations = 0;
968 } 967 }
969 } 968 }
970 else 969 else
971 {
972 mwmhints.flags = 0; 970 mwmhints.flags = 0;
973 }
974#endif 971#endif
975 972
976 /* grab colors before netscape does */ 973 /* grab colors before netscape does */
977 Get_Colours (); 974 Get_Colours ();
978 975
979 if (!set_fonts ()) 976 if (!set_fonts ())
980 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 977 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
981 978
979 parent = DefaultRootWindow (disp);
980
982#if ENABLE_XEMBED 981#if ENABLE_XEMBED
983 if (rs[Rs_embed]) 982 if (rs[Rs_embed])
984 { 983 {
985 XWindowAttributes wattr; 984 XWindowAttributes wattr;
986 985
987 top = strtol (rs[Rs_embed], 0, 0); 986 parent = strtol (rs[Rs_embed], 0, 0);
988 987
989 if (!XGetWindowAttributes (disp, top, &wattr)) 988 if (!XGetWindowAttributes (disp, parent, &wattr))
990 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 989 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
991 990
992 window_calc (wattr.width, wattr.height); 991 window_calc (wattr.width, wattr.height);
992 }
993#endif
993 994
994#if 0 995 window_calc (0, 0);
995 if (wattr.map_state == IsViewable) 996
996 { 997 /* sub-window placement & size in rxvt_resize_subwindows () */
997 TermWin.mapped = 1; 998#ifdef PREFER_24BIT
998 refresh_type = FAST_REFRESH; 999 attributes.background_pixel = pix_colors_focused[Color_border];
999 XClearWindow (disp, top); 1000 attributes.border_pixel = pix_colors_focused[Color_border];
1000 // TODO: make XMapNotify-event-code a function and call it 1001 attributes.colormap = display->cmap;
1001 // TODO: how can I detect visibility without unmap/map? 1002 top = XCreateWindow (disp, parent,
1002 // TODO: focusin etc. 1003 szHint.x, szHint.y,
1003 } 1004 szHint.width, szHint.height,
1005 ext_bwidth,
1006 display->depth, InputOutput,
1007 display->visual,
1008 CWColormap | CWBackPixel | CWBorderPixel, &attributes);
1004#else 1009#else
1005 // it's easiest just to unmap/map to get all state correctly set-up 1010 top = XCreateSimpleWindow (disp, parent,
1006 XUnmapWindow (disp, top);
1007#endif
1008 }
1009 else
1010#endif
1011 {
1012 window_calc (0, 0);
1013
1014 /* sub-window placement & size in rxvt_resize_subwindows () */
1015#ifdef PREFER_24BIT
1016 attributes.background_pixel = pix_colors_focused[Color_border];
1017 attributes.border_pixel = pix_colors_focused[Color_border];
1018 attributes.colormap = display->cmap;
1019 top = XCreateWindow (disp, DefaultRootWindow (disp),
1020 szHint.x, szHint.y, 1011 szHint.x, szHint.y,
1021 szHint.width, szHint.height, 1012 szHint.width, szHint.height,
1022 TermWin.ext_bwidth, 1013 ext_bwidth,
1023 display->depth, InputOutput,
1024 display->visual,
1025 CWColormap | CWBackPixel | CWBorderPixel, &attributes);
1026#else
1027 top = XCreateSimpleWindow (disp, DefaultRootWindow (disp),
1028 szHint.x, szHint.y,
1029 szHint.width, szHint.height,
1030 TermWin.ext_bwidth,
1031 pix_colors_focused[Color_border], 1014 pix_colors_focused[Color_border],
1032 pix_colors_focused[Color_border]); 1015 pix_colors_focused[Color_border]);
1033#endif 1016#endif
1034 }
1035 1017
1036 TermWin.parent[0] = top; 1018 this->parent[0] = top;
1037 1019
1038 old_width = szHint.width; 1020 old_width = szHint.width;
1039 old_height = szHint.height; 1021 old_height = szHint.height;
1040 1022
1041 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1023 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
… …
1044 classHint.res_name = (char *)rs[Rs_name]; 1026 classHint.res_name = (char *)rs[Rs_name];
1045 classHint.res_class = (char *)RESCLASS; 1027 classHint.res_class = (char *)RESCLASS;
1046 1028
1047 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1029 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1048 wmHint.input = True; 1030 wmHint.input = True;
1049 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState; 1031 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;
1050 wmHint.window_group = top; 1032 wmHint.window_group = top;
1051 1033
1052 XSetWMProperties (disp, top, NULL, NULL, 1034 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,
1053 (char **)argv, argc, &szHint, &wmHint, &classHint); 1035 &szHint, &wmHint, &classHint);
1054 1036
1055 /* Enable delete window protocol */ 1037 Atom protocols[] = {
1056 XSetWMProtocols (disp, top, &xa[XA_WM_DELETE_WINDOW], 1); 1038 xa[XA_WM_DELETE_WINDOW],
1039#if ENABLE_EWMH
1040 xa[XA_NET_WM_PING],
1041#endif
1042 };
1057 1043
1058#if ENABLE_FRILLS 1044 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1045
1046#if ENABLE_EWMH
1059 long pid = getpid (); 1047 long pid = getpid ();
1060 1048
1061 XChangeProperty (disp, top, 1049 XChangeProperty (disp, top,
1062 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 1050 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1063 PropModeReplace, (unsigned char *)&pid, 1); 1051 PropModeReplace, (unsigned char *)&pid, 1);
1052
1053 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1064#endif 1054#endif
1065 1055
1066 XSelectInput (disp, top, 1056 XSelectInput (disp, top,
1067 KeyPressMask 1057 KeyPressMask
1068#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1058#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
… …
1086 /* cursor (menuBar/scrollBar): Black-on-White */ 1076 /* cursor (menuBar/scrollBar): Black-on-White */
1087 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 1077 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);
1088#endif 1078#endif
1089 1079
1090 /* the vt window */ 1080 /* the vt window */
1091 TermWin.vt = XCreateSimpleWindow (disp, top, 1081 vt = XCreateSimpleWindow (disp, top,
1092 window_vt_x, 1082 window_vt_x,
1093 window_vt_y, 1083 window_vt_y,
1094 TermWin_TotalWidth (), 1084 TermWin_TotalWidth (),
1095 TermWin_TotalHeight (), 1085 TermWin_TotalHeight (),
1096 0, 1086 0,
1097 pix_colors_focused[Color_fg], 1087 pix_colors_focused[Color_fg],
1098 pix_colors_focused[Color_bg]); 1088 pix_colors_focused[Color_bg]);
1099#ifdef DEBUG_X 1089#ifdef DEBUG_X
1100 XStoreName (disp, TermWin.vt, "vt window"); 1090 XStoreName (disp, vt, "vt window");
1101#endif 1091#endif
1102 1092
1103 attributes.bit_gravity = NorthWestGravity; 1093 attributes.bit_gravity = NorthWestGravity;
1104 XChangeWindowAttributes (disp, TermWin.vt, CWBitGravity, &attributes); 1094 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes);
1105 1095
1106 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1096 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1107 1097
1108#ifdef POINTER_BLANK 1098#ifdef POINTER_BLANK
1109 if (options & Opt_pointerBlank) 1099 if (OPTION (Opt_pointerBlank))
1110 vt_emask |= PointerMotionMask; 1100 vt_emask |= PointerMotionMask;
1111 else 1101 else
1112#endif 1102#endif
1113 vt_emask |= Button1MotionMask | Button3MotionMask; 1103 vt_emask |= Button1MotionMask | Button3MotionMask;
1114 1104
1115 XSelectInput (disp, TermWin.vt, vt_emask); 1105 XSelectInput (disp, vt, vt_emask);
1116 vt_ev.start (display, TermWin.vt); 1106 vt_ev.start (display, vt);
1117 1107
1118#if defined(MENUBAR) && (MENUBAR_MAX > 1) 1108#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1119 if (menuBar_height ()) 1109 if (menuBar_height ())
1120 { 1110 {
1121 menuBar.win = XCreateSimpleWindow (disp, top, 1111 menuBar.win = XCreateSimpleWindow (disp, top,
… …
1141 } 1131 }
1142#endif 1132#endif
1143 1133
1144#ifdef XPM_BACKGROUND 1134#ifdef XPM_BACKGROUND
1145 if (rs[Rs_backgroundPixmap] != NULL 1135 if (rs[Rs_backgroundPixmap] != NULL
1146 && ! (options & Opt_transparent)) 1136 && ! OPTION (Opt_transparent))
1147 { 1137 {
1148 const char *p = rs[Rs_backgroundPixmap]; 1138 const char *p = rs[Rs_backgroundPixmap];
1149 1139
1150 if ((p = strchr (p, ';')) != NULL) 1140 if ((p = strchr (p, ';')) != NULL)
1151 { 1141 {
… …
1160 1150
1161 /* graphics context for the vt window */ 1151 /* graphics context for the vt window */
1162 gcvalue.foreground = pix_colors[Color_fg]; 1152 gcvalue.foreground = pix_colors[Color_fg];
1163 gcvalue.background = pix_colors[Color_bg]; 1153 gcvalue.background = pix_colors[Color_bg];
1164 gcvalue.graphics_exposures = 1; 1154 gcvalue.graphics_exposures = 1;
1165 TermWin.gc = XCreateGC (disp, TermWin.vt, 1155 gc = XCreateGC (disp, vt,
1166 GCForeground | GCBackground | GCGraphicsExposures, 1156 GCForeground | GCBackground | GCGraphicsExposures,
1167 &gcvalue); 1157 &gcvalue);
1168 1158
1169 TermWin.drawable = new rxvt_drawable (display, TermWin.vt); 1159 drawable = new rxvt_drawable (display, vt);
1170 1160
1171#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1161#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1172 gcvalue.foreground = pix_colors[Color_topShadow]; 1162 gcvalue.foreground = pix_colors[Color_topShadow];
1173 topShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue); 1163 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1174 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1164 gcvalue.foreground = pix_colors[Color_bottomShadow];
1175 botShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue); 1165 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1176 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1166 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
1177 scrollbarGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue); 1167 scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1178#endif 1168#endif
1179 1169
1180#ifdef OFF_FOCUS_FADING 1170#ifdef OFF_FOCUS_FADING
1181 // initially we are in unfocused state 1171 // initially we are in unfocused state
1182 if (rs[Rs_fade]) 1172 if (rs[Rs_fade])
… …
1185 1175
1186 pointer_unblank (); 1176 pointer_unblank ();
1187 scr_recolour (); 1177 scr_recolour ();
1188 1178
1189#if ENABLE_XEMBED 1179#if ENABLE_XEMBED
1190 // why this is necessary, I don't know, race condition?? 1180 if (rs[Rs_embed])
1191 XMoveWindow (disp, TermWin.vt, window_vt_x, window_vt_y); 1181 {
1182 long info[2] = { 0, XEMBED_MAPPED };
1183
1184 XChangeProperty (disp, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
1185 32, PropModeReplace, (unsigned char *)&info, 2);
1186 }
1192#endif 1187#endif
1193} 1188}
1194 1189
1195/* ------------------------------------------------------------------------- * 1190/* ------------------------------------------------------------------------- *
1196 * GET TTY CURRENT STATE * 1191 * GET TTY CURRENT STATE *
… …
1202 /* 1197 /*
1203 * standard System V termios interface 1198 * standard System V termios interface
1204 */ 1199 */
1205 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1200 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1206 { 1201 {
1207 /* return error - use system defaults */ 1202 // return error - use system defaults,
1203 // where possible, and zero elsewhere
1204 memset (tio, 0, sizeof (ttymode_t));
1205
1208 tio->c_cc[VINTR] = CINTR; 1206 tio->c_cc[VINTR] = CINTR;
1209 tio->c_cc[VQUIT] = CQUIT; 1207 tio->c_cc[VQUIT] = CQUIT;
1210 tio->c_cc[VERASE] = CERASE; 1208 tio->c_cc[VERASE] = CERASE;
1209#ifdef VERASE2
1210 tio->c_cc[VERASE2] = CERASE2;
1211#endif
1211 tio->c_cc[VKILL] = CKILL; 1212 tio->c_cc[VKILL] = CKILL;
1212 tio->c_cc[VSTART] = CSTART; 1213 tio->c_cc[VSTART] = CSTART;
1213 tio->c_cc[VSTOP] = CSTOP; 1214 tio->c_cc[VSTOP] = CSTOP;
1214 tio->c_cc[VSUSP] = CSUSP; 1215 tio->c_cc[VSUSP] = CSUSP;
1215# ifdef VDSUSP 1216# ifdef VDSUSP
1216
1217 tio->c_cc[VDSUSP] = CDSUSP; 1217 tio->c_cc[VDSUSP] = CDSUSP;
1218# endif 1218# endif
1219# ifdef VREPRINT 1219# ifdef VREPRINT
1220
1221 tio->c_cc[VREPRINT] = CRPRNT; 1220 tio->c_cc[VREPRINT] = CRPRNT;
1222# endif 1221# endif
1223# ifdef VDISCRD 1222# ifdef VDISCRD
1224
1225 tio->c_cc[VDISCRD] = CFLUSH; 1223 tio->c_cc[VDISCRD] = CFLUSH;
1226# endif 1224# endif
1227# ifdef VWERSE 1225# ifdef VWERSE
1228
1229 tio->c_cc[VWERSE] = CWERASE; 1226 tio->c_cc[VWERSE] = CWERASE;
1230# endif 1227# endif
1231# ifdef VLNEXT 1228# ifdef VLNEXT
1232
1233 tio->c_cc[VLNEXT] = CLNEXT; 1229 tio->c_cc[VLNEXT] = CLNEXT;
1234# endif 1230# endif
1235
1236 } 1231 }
1232
1237 tio->c_cc[VEOF] = CEOF; 1233 tio->c_cc[VEOF] = CEOF;
1238 tio->c_cc[VEOL] = VDISABLE; 1234 tio->c_cc[VEOL] = VDISABLE;
1239# ifdef VEOL2 1235# ifdef VEOL2
1240
1241 tio->c_cc[VEOL2] = VDISABLE; 1236 tio->c_cc[VEOL2] = VDISABLE;
1242# endif 1237# endif
1243# ifdef VSWTC 1238# ifdef VSWTC
1244
1245 tio->c_cc[VSWTC] = VDISABLE; 1239 tio->c_cc[VSWTC] = VDISABLE;
1246# endif 1240# endif
1247# ifdef VSWTCH 1241# ifdef VSWTCH
1248
1249 tio->c_cc[VSWTCH] = VDISABLE; 1242 tio->c_cc[VSWTCH] = VDISABLE;
1250# endif 1243# endif
1251# if VMIN != VEOF 1244# if VMIN != VEOF
1252
1253 tio->c_cc[VMIN] = 1; 1245 tio->c_cc[VMIN] = 1;
1254# endif 1246# endif
1255# if VTIME != VEOL 1247# if VTIME != VEOL
1256
1257 tio->c_cc[VTIME] = 0; 1248 tio->c_cc[VTIME] = 0;
1258# endif 1249# endif
1259 1250
1260 if (erase != -1) 1251 if (erase != -1)
1261 tio->c_cc[VERASE] = (char)erase; 1252 tio->c_cc[VERASE] = (char)erase;
… …
1289 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0) 1280 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1290 { 1281 {
1291 tio->sg.sg_erase = CERASE; /* ^H */ 1282 tio->sg.sg_erase = CERASE; /* ^H */
1292 tio->sg.sg_kill = CKILL; /* ^U */ 1283 tio->sg.sg_kill = CKILL; /* ^U */
1293 } 1284 }
1285
1294 if (erase != -1) 1286 if (erase != -1)
1295 tio->sg.sg_erase = (char)erase; 1287 tio->sg.sg_erase = (char)erase;
1296 1288
1297 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP); 1289 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1298 1290
… …
1304 tio->tc.t_startc = CSTART; /* ^Q */ 1296 tio->tc.t_startc = CSTART; /* ^Q */
1305 tio->tc.t_stopc = CSTOP; /* ^S */ 1297 tio->tc.t_stopc = CSTOP; /* ^S */
1306 tio->tc.t_eofc = CEOF; /* ^D */ 1298 tio->tc.t_eofc = CEOF; /* ^D */
1307 tio->tc.t_brkc = -1; 1299 tio->tc.t_brkc = -1;
1308 } 1300 }
1301
1309 /* get local special chars */ 1302 /* get local special chars */
1310 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0) 1303 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1311 { 1304 {
1312 tio->lc.t_suspc = CSUSP; /* ^Z */ 1305 tio->lc.t_suspc = CSUSP; /* ^Z */
1313 tio->lc.t_dsuspc = CDSUSP; /* ^Y */ 1306 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
… …
1317 tio->lc.t_lnextc = CLNEXT; /* ^V */ 1310 tio->lc.t_lnextc = CLNEXT; /* ^V */
1318 } 1311 }
1319 /* get line discipline */ 1312 /* get line discipline */
1320 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line)); 1313 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1321# ifdef NTTYDISC 1314# ifdef NTTYDISC
1322
1323 tio->line = NTTYDISC; 1315 tio->line = NTTYDISC;
1324# endif /* NTTYDISC */ 1316# endif /* NTTYDISC */
1325 1317
1326 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL); 1318 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1327#endif /* HAVE_TERMIOS_H */ 1319#endif /* HAVE_TERMIOS_H */
… …
1350 FOO (IGNCR, "IGNCR"); 1342 FOO (IGNCR, "IGNCR");
1351 FOO (ICRNL, "ICRNL"); 1343 FOO (ICRNL, "ICRNL");
1352 FOO (IXON, "IXON"); 1344 FOO (IXON, "IXON");
1353 FOO (IXOFF, "IXOFF"); 1345 FOO (IXOFF, "IXOFF");
1354# ifdef IUCLC 1346# ifdef IUCLC
1355
1356 FOO (IUCLC, "IUCLC"); 1347 FOO (IUCLC, "IUCLC");
1357# endif 1348# endif
1358# ifdef IXANY 1349# ifdef IXANY
1359
1360 FOO (IXANY, "IXANY"); 1350 FOO (IXANY, "IXANY");
1361# endif 1351# endif
1362# ifdef IMAXBEL 1352# ifdef IMAXBEL
1363
1364 FOO (IMAXBEL, "IMAXBEL"); 1353 FOO (IMAXBEL, "IMAXBEL");
1365# endif 1354# endif
1366 1355
1367 fprintf (stderr, "\n"); 1356 fprintf (stderr, "\n");
1368 1357
… …
1375 FOO (VERASE, "VERASE"); 1364 FOO (VERASE, "VERASE");
1376 FOO (VKILL, "VKILL"); 1365 FOO (VKILL, "VKILL");
1377 FOO (VEOF, "VEOF"); 1366 FOO (VEOF, "VEOF");
1378 FOO (VEOL, "VEOL"); 1367 FOO (VEOL, "VEOL");
1379# ifdef VEOL2 1368# ifdef VEOL2
1380
1381 FOO (VEOL2, "VEOL2"); 1369 FOO (VEOL2, "VEOL2");
1382# endif 1370# endif
1383# ifdef VSWTC 1371# ifdef VSWTC
1384
1385 FOO (VSWTC, "VSWTC"); 1372 FOO (VSWTC, "VSWTC");
1386# endif 1373# endif
1387# ifdef VSWTCH 1374# ifdef VSWTCH
1388
1389 FOO (VSWTCH, "VSWTCH"); 1375 FOO (VSWTCH, "VSWTCH");
1390# endif 1376# endif
1391
1392 FOO (VSTART, "VSTART"); 1377 FOO (VSTART, "VSTART");
1393 FOO (VSTOP, "VSTOP"); 1378 FOO (VSTOP, "VSTOP");
1394 FOO (VSUSP, "VSUSP"); 1379 FOO (VSUSP, "VSUSP");
1395# ifdef VDSUSP 1380# ifdef VDSUSP
1396
1397 FOO (VDSUSP, "VDSUSP"); 1381 FOO (VDSUSP, "VDSUSP");
1398# endif 1382# endif
1399# ifdef VREPRINT 1383# ifdef VREPRINT
1400
1401 FOO (VREPRINT, "VREPRINT"); 1384 FOO (VREPRINT, "VREPRINT");
1402# endif 1385# endif
1403# ifdef VDISCRD 1386# ifdef VDISCRD
1404
1405 FOO (VDISCRD, "VDISCRD"); 1387 FOO (VDISCRD, "VDISCRD");
1406# endif 1388# endif
1407# ifdef VWERSE 1389# ifdef VWERSE
1408
1409 FOO (VWERSE, "VWERSE"); 1390 FOO (VWERSE, "VWERSE");
1410# endif 1391# endif
1411# ifdef VLNEXT 1392# ifdef VLNEXT
1412
1413 FOO (VLNEXT, "VLNEXT"); 1393 FOO (VLNEXT, "VLNEXT");
1414# endif 1394# endif
1415 1395
1416 fprintf (stderr, "\n"); 1396 fprintf (stderr, "\n");
1417# undef FOO 1397# undef FOO
… …
1430{ 1410{
1431#if ENABLE_FRILLS 1411#if ENABLE_FRILLS
1432 if (rs[Rs_pty_fd]) 1412 if (rs[Rs_pty_fd])
1433 { 1413 {
1434 pty.pty = atoi (rs[Rs_pty_fd]); 1414 pty.pty = atoi (rs[Rs_pty_fd]);
1415
1416 if (getfd_hook)
1417 pty.pty = (*getfd_hook) (pty.pty);
1418
1435 fcntl (pty.pty, F_SETFL, O_NONBLOCK); 1419 if (pty.pty < 0 || fcntl (pty.pty, F_SETFL, O_NONBLOCK))
1420 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1436 } 1421 }
1437 else 1422 else
1438#endif 1423#endif
1439 if (!pty.get ()) 1424 if (!pty.get ())
1440 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1425 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
… …
1459 1444
1460#if ENABLE_FRILLS 1445#if ENABLE_FRILLS
1461 if (rs[Rs_pty_fd]) 1446 if (rs[Rs_pty_fd])
1462 return; 1447 return;
1463#endif 1448#endif
1464
1465 sw_chld.start (SIGCHLD);
1466 1449
1467#ifndef __QNX__ 1450#ifndef __QNX__
1468 /* spin off the command interpreter */ 1451 /* spin off the command interpreter */
1469 switch (cmd_pid = fork ()) 1452 switch (cmd_pid = fork ())
1470 { 1453 {
… …
1543{ 1526{
1544 char *login; 1527 char *login;
1545 1528
1546 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */ 1529 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1547 1530
1548 if (options & Opt_console) 1531 if (OPTION (Opt_console))
1549 { /* be virtual console, fail silently */ 1532 { /* be virtual console, fail silently */
1550#ifdef TIOCCONS 1533#ifdef TIOCCONS
1551 unsigned int on = 1; 1534 unsigned int on = 1;
1552 1535
1553 ioctl (STDIN_FILENO, TIOCCONS, &on); 1536 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1603 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1586 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1604 shell = "/bin/sh"; 1587 shell = "/bin/sh";
1605 1588
1606 argv0 = (const char *)rxvt_r_basename (shell); 1589 argv0 = (const char *)rxvt_r_basename (shell);
1607 1590
1608 if (options & Opt_loginShell) 1591 if (OPTION (Opt_loginShell))
1609 { 1592 {
1610 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1593 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char));
1611 1594
1612 login[0] = '-'; 1595 login[0] = '-';
1613 strcpy (&login[1], argv0); 1596 strcpy (&login[1], argv0);
… …
1648 if ((command = getenv ("SHELL")) == NULL || *command == '\0') 1631 if ((command = getenv ("SHELL")) == NULL || *command == '\0')
1649 command = "/bin/sh"; 1632 command = "/bin/sh";
1650 1633
1651 arg_a[0] = my_basename (command); 1634 arg_a[0] = my_basename (command);
1652 1635
1653 if (options & Opt_loginShell) 1636 if (OPTION (Opt_loginShell))
1654 { 1637 {
1655 login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char)); 1638 login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char));
1656 1639
1657 login[0] = '-'; 1640 login[0] = '-';
1658 strcpy (&login[1], arg_a[0]); 1641 strcpy (&login[1], arg_a[0]);

Diff Legend

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