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.105 by root, Mon Jan 17 00:59:23 2005 UTC vs.
Revision 1.125 by root, Wed Dec 21 19:50:16 2005 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",
… …
181 "MULTIPLE", 186 "MULTIPLE",
182 "TARGETS", 187 "TARGETS",
183 "TIMESTAMP", 188 "TIMESTAMP",
184 "VT_SELECTION", 189 "VT_SELECTION",
185 "INCR", 190 "INCR",
191 "WM_PROTOCOLS",
186 "WM_DELETE_WINDOW", 192 "WM_DELETE_WINDOW",
187 "CLIPBOARD", 193 "CLIPBOARD",
188#if ENABLE_FRILLS 194#if ENABLE_FRILLS
195 "_MOTIF_WM_HINTS",
196#endif
197#if ENABLE_EWMH
189 "_NET_WM_PID", 198 "_NET_WM_PID",
190 "_MOTIF_WM_HINTS",
191 "_NET_WM_NAME", 199 "_NET_WM_NAME",
192 "_NET_WM_ICON_NAME", 200 "_NET_WM_ICON_NAME",
201 "_NET_WM_PING",
193#endif 202#endif
194#if USE_XIM 203#if USE_XIM
195 "WM_LOCALE_NAME", 204 "WM_LOCALE_NAME",
196#endif 205#endif
197#ifdef TRANSPARENT 206#ifdef TRANSPARENT
… …
200#endif 209#endif
201#ifdef OFFIX_DND 210#ifdef OFFIX_DND
202 "DndProtocol", 211 "DndProtocol",
203 "DndSelection", 212 "DndSelection",
204#endif 213#endif
214#if ENABLE_XEMBED
215 "_XEMBED",
216 "_XEMBED_INFO",
217#endif
205 }; 218 };
206 219
207bool 220bool
208rxvt_term::init_vars () 221rxvt_term::init_vars ()
209{ 222{
210 sw_term.start (SIGTERM);
211
212 pix_colors_focused = new rxvt_color [TOTAL_COLORS]; 223 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
213#ifdef OFF_FOCUS_FADING 224#ifdef OFF_FOCUS_FADING
214 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; 225 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
215#endif 226#endif
216 pix_colors = pix_colors_focused; 227 pix_colors = pix_colors_focused;
217 228
218 if (pix_colors == NULL) 229 if (pix_colors == NULL)
219 return false; 230 return false;
220 231
221#if defined(XPM_BACKGROUND) || defined(TRANSPARENT) 232#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
222 TermWin.pixmap = None; 233 pixmap = None;
223#endif 234#endif
224 235
225 MEvent.time = CurrentTime; 236 MEvent.time = CurrentTime;
226 MEvent.button = AnyButton; 237 MEvent.button = AnyButton;
227 options = DEFAULT_OPTIONS; 238 options = DEFAULT_OPTIONS;
228 want_refresh = 1; 239 want_refresh = 1;
229 cmd_pid = -1;
230 pty.pty = pty.tty = -1;
231 priv_modes = SavedModes = PrivMode_Default; 240 priv_modes = SavedModes = PrivMode_Default;
232 TermWin.focus = 0; 241 focus = 0;
233 TermWin.ncol = 80; 242 ncol = 80;
234 TermWin.nrow = 24; 243 nrow = 24;
235 TermWin.int_bwidth = INTERNALBORDERWIDTH; 244 int_bwidth = INTERNALBORDERWIDTH;
236 TermWin.ext_bwidth = EXTERNALBORDERWIDTH; 245 ext_bwidth = EXTERNALBORDERWIDTH;
237 TermWin.lineSpace = LINESPACE; 246 lineSpace = LINESPACE;
238 TermWin.saveLines = SAVELINES; 247 saveLines = SAVELINES;
239 numpix_colors = TOTAL_COLORS; 248 numpix_colors = TOTAL_COLORS;
240 249
241 refresh_limit = 1; 250 refresh_limit = 1;
242 refresh_type = SLOW_REFRESH; 251 refresh_type = SLOW_REFRESH;
243 prev_nrow = prev_ncol = 0; 252 prev_nrow = prev_ncol = 0;
… …
252 last_bot = last_state = -1; 261 last_bot = last_state = -1;
253 262
254#ifdef MENUBAR 263#ifdef MENUBAR
255 menu_readonly = 1; 264 menu_readonly = 1;
256# if ! (MENUBAR_MAX > 1) 265# if ! (MENUBAR_MAX > 1)
257 CurrentBar = & (BarList); 266 CurrentBar = &BarList;
258# endif /* (MENUBAR_MAX > 1) */ 267# endif /* (MENUBAR_MAX > 1) */
259#endif 268#endif
260 269
261 return true; 270 return true;
262} 271}
… …
336 */ 345 */
337 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 346 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
338 rs[Rs_display_name] = ":0"; 347 rs[Rs_display_name] = ":0";
339 348
340 get_options (r_argc, r_argv); 349 get_options (r_argc, r_argv);
350
351 if (!(display = displays.get (rs[Rs_display_name])))
352 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
353
354 extract_resources ();
341 free (r_argv); 355 free (r_argv);
342
343#ifdef LOCAL_X_IS_UNIX
344 if (rs[Rs_display_name][0] == ':')
345 {
346 val = rxvt_malloc (5 + strlen (rs[Rs_display_name]));
347 strcpy (val, "unix");
348 strcat (val, rs[Rs_display_name]);
349 display = displays.get (val);
350 free (val);
351 }
352#endif
353
354 if (!display
355 && ! (display = displays.get (rs[Rs_display_name])))
356 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
357
358 extract_resources (display->display, rs[Rs_name]);
359 356
360 /* 357 /*
361 * set any defaults not already set 358 * set any defaults not already set
362 */ 359 */
363 if (cmd_argv && cmd_argv[0]) 360 if (cmd_argv && cmd_argv[0])
… …
374 if (!rs[Rs_iconName]) 371 if (!rs[Rs_iconName])
375 rs[Rs_iconName] = rs[Rs_name]; 372 rs[Rs_iconName] = rs[Rs_name];
376 } 373 }
377 374
378 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 375 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
379 TermWin.saveLines = BOUND_POSITIVE_INT16 (i); 376 saveLines = min (i, std::numeric_limits<int16_t>::max ());
380 377
381#if ENABLE_FRILLS 378#if ENABLE_FRILLS
382 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)
383 TermWin.int_bwidth = min (i, 100); /* arbitrary limit */ 380 int_bwidth = min (i, std::numeric_limits<int16_t>::max ());
381
384 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)
385 TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */ 383 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
384
386 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 385 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
387 TermWin.lineSpace = min (i, 100); /* arbitrary limit */ 386 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
388#endif 387#endif
389 388
390#ifdef POINTER_BLANK 389#ifdef POINTER_BLANK
391 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 390 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
392 pointerBlankDelay = i; 391 pointerBlankDelay = i;
393 else 392 else
394 pointerBlankDelay = 2; 393 pointerBlankDelay = 2;
395#endif 394#endif
396 395
397 /* no point having a scrollbar without having any scrollback! */ 396 /* no point having a scrollbar without having any scrollback! */
398 if (!TermWin.saveLines) 397 if (!saveLines)
399 options &= ~Opt_scrollBar; 398 options &= ~Opt_scrollBar;
400 399
401#ifdef PRINTPIPE 400#ifdef PRINTPIPE
402 if (!rs[Rs_print_pipe]) 401 if (!rs[Rs_print_pipe])
403 rs[Rs_print_pipe] = PRINTPIPE; 402 rs[Rs_print_pipe] = PRINTPIPE;
… …
463 rs[Rs_color + i] = def_colorName[i]; 462 rs[Rs_color + i] = def_colorName[i];
464 463
465#ifndef XTERM_REVERSE_VIDEO 464#ifndef XTERM_REVERSE_VIDEO
466 /* this is how we implement reverseVideo */ 465 /* this is how we implement reverseVideo */
467 if (options & Opt_reverseVideo) 466 if (options & Opt_reverseVideo)
468 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]);
469#endif 468#endif
470 469
471 /* convenient aliases for setting fg/bg to colors */ 470 /* convenient aliases for setting fg/bg to colors */
472 color_aliases (Color_fg); 471 color_aliases (Color_fg);
473 color_aliases (Color_bg); 472 color_aliases (Color_bg);
… …
523 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 522 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char));
524 523
525 sprintf (env_display, "DISPLAY=%s", val); 524 sprintf (env_display, "DISPLAY=%s", val);
526 525
527 /* avoiding the math library: 526 /* avoiding the math library:
528 * i = (int) (ceil (log10 ((unsigned int)TermWin.parent[0]))) */ 527 * i = (int) (ceil (log10 ((unsigned int)parent[0]))) */
529 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++)
530 ; 529 ;
531 MAX_IT (i, 1); 530 max_it (i, 1);
532 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char)); 531 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char));
533 532
534 sprintf (env_windowid, "WINDOWID=%u", 533 sprintf (env_windowid, "WINDOWID=%u",
535 (unsigned int)TermWin.parent[0]); 534 (unsigned int)parent[0]);
536 535
537 /* add entries to the environment: 536 /* add entries to the environment:
538 * @ DISPLAY: in case we started with -display 537 * @ DISPLAY: in case we started with -display
539 * @ WINDOWID: X window id number of the window 538 * @ WINDOWID: X window id number of the window
540 * @ COLORTERM: terminal sub-name and also indicates its color 539 * @ COLORTERM: terminal sub-name and also indicates its color
… …
672 if (scrollbar_visible ()) 671 if (scrollbar_visible ())
673 { 672 {
674 priv_modes |= PrivMode_scrollBar; 673 priv_modes |= PrivMode_scrollBar;
675 SavedModes |= PrivMode_scrollBar; 674 SavedModes |= PrivMode_scrollBar;
676 } 675 }
676
677 if (menubar_visible ()) 677 if (menubar_visible ())
678 { 678 {
679 priv_modes |= PrivMode_menuBar; 679 priv_modes |= PrivMode_menuBar;
680 SavedModes |= PrivMode_menuBar; 680 SavedModes |= PrivMode_menuBar;
681 } 681 }
… …
741 } 741 }
742 } 742 }
743 } 743 }
744 744
745 pix_colors[i] = xcol; 745 pix_colors[i] = xcol;
746 SET_PIXCOLOR (i);
747 }
748
746#ifdef OFF_FOCUS_FADING 749#ifdef OFF_FOCUS_FADING
747 if (rs[Rs_fade]) 750 if (rs[Rs_fade])
751 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)
748 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]);
749#endif 753#endif
750 SET_PIXCOLOR (i);
751 }
752 754
753 if (display->depth <= 2) 755 if (display->depth <= 2)
754 { 756 {
755 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];
756 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];
… …
764 * from the fvwm window manager. 766 * from the fvwm window manager.
765 */ 767 */
766#ifdef KEEP_SCROLLCOLOR 768#ifdef KEEP_SCROLLCOLOR
767 769
768 if (display->depth <= 2) 770 if (display->depth <= 2)
771 {
769 { /* Monochrome */ 772 /* Monochrome */
770 pix_colors[Color_scroll] = pix_colors[Color_fg]; 773 pix_colors[Color_scroll] = pix_colors[Color_fg];
771 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 774 pix_colors[Color_topShadow] = pix_colors[Color_bg];
772 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 775 pix_colors[Color_bottomShadow] = pix_colors[Color_bg];
773 } 776 }
774 else 777 else
… …
829 * Use resource ``modifier'' to override the Meta modifier 832 * Use resource ``modifier'' to override the Meta modifier
830 */ 833 */
831void 834void
832rxvt_term::get_ourmods () 835rxvt_term::get_ourmods ()
833{ 836{
834 int i, j, k; 837 int i, j, k;
835 int requestedmeta, realmeta, realalt; 838 int requestedmeta, realmeta, realalt;
836 const char *cm, *rsmod; 839 const char *cm, *rsmod;
837 XModifierKeymap *map; 840 XModifierKeymap *map;
838 KeyCode *kc; 841 KeyCode *kc;
839 const unsigned int modmasks[] = 842 const unsigned int modmasks[] =
840 { 843 {
841 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask 844 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask
842 }; 845 };
843 846
… …
925#endif 928#endif
926 XGCValues gcvalue; 929 XGCValues gcvalue;
927 long vt_emask; 930 long vt_emask;
928 XSetWindowAttributes attributes; 931 XSetWindowAttributes attributes;
929 XWindowAttributes gattr; 932 XWindowAttributes gattr;
933 Window top, parent;
934 dDisp;
930 935
931#ifdef USING_W11LIB 936#ifdef USING_W11LIB
932 /* enable W11 callbacks */ 937 /* enable W11 callbacks */
933 W11AddEventHandler (display->display, rxvt_W11_process_x_event); 938 W11AddEventHandler (disp, rxvt_W11_process_x_event);
934#endif 939#endif
935 940
936 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 941 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
937 XInternAtoms (display->display, (char **)xa_names, NUM_XA, False, xa); 942 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa);
938 943
939 if (options & Opt_transparent) 944 if (options & Opt_transparent)
940 { 945 {
941 XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr); 946 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);
942 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 947 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
943 } 948 }
944 949
945#if ENABLE_FRILLS 950#if ENABLE_FRILLS
946 if (options & Opt_borderLess) 951 if (options & Opt_borderLess)
947 { 952 {
948 prop = XInternAtom(display->display, "_MOTIF_WM_INFO", True); 953 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True);
949 954
950 if (prop == None) 955 if (prop == None)
951 { 956 {
952 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 957 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
953#ifdef PREFER_24BIT 958#ifdef PREFER_24BIT
… …
960 mwmhints.flags = MWM_HINTS_DECORATIONS; 965 mwmhints.flags = MWM_HINTS_DECORATIONS;
961 mwmhints.decorations = 0; 966 mwmhints.decorations = 0;
962 } 967 }
963 } 968 }
964 else 969 else
965 {
966 mwmhints.flags = 0; 970 mwmhints.flags = 0;
967 }
968#endif 971#endif
969 972
970 /* grab colors before netscape does */ 973 /* grab colors before netscape does */
971 Get_Colours (); 974 Get_Colours ();
972 975
973 if (!set_fonts ()) 976 if (!set_fonts ())
974 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");
975 978
979 parent = DefaultRootWindow (disp);
980
981#if ENABLE_XEMBED
982 if (rs[Rs_embed])
983 {
984 XWindowAttributes wattr;
985
986 parent = strtol (rs[Rs_embed], 0, 0);
987
988 if (!XGetWindowAttributes (disp, parent, &wattr))
989 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
990
991 window_calc (wattr.width, wattr.height);
992 }
993#endif
994
976 window_calc (0, 0); 995 window_calc (0, 0);
977 old_width = szHint.width;
978 old_height = szHint.height;
979 996
980 /* sub-window placement & size in rxvt_resize_subwindows () */ 997 /* sub-window placement & size in rxvt_resize_subwindows () */
981
982#ifdef PREFER_24BIT 998#ifdef PREFER_24BIT
983 attributes.background_pixel = pix_colors_focused[Color_border]; 999 attributes.background_pixel = pix_colors_focused[Color_border];
984 attributes.border_pixel = pix_colors_focused[Color_border]; 1000 attributes.border_pixel = pix_colors_focused[Color_border];
985 attributes.colormap = display->cmap; 1001 attributes.colormap = display->cmap;
986 TermWin.parent[0] = XCreateWindow (display->display, DefaultRootWindow (display->display), 1002 top = XCreateWindow (disp, parent,
987 szHint.x, szHint.y, 1003 szHint.x, szHint.y,
988 szHint.width, szHint.height, 1004 szHint.width, szHint.height,
989 TermWin.ext_bwidth, 1005 ext_bwidth,
990 display->depth, InputOutput, 1006 display->depth, InputOutput,
991 display->visual, 1007 display->visual,
992 CWColormap | CWBackPixel | CWBorderPixel, &attributes); 1008 CWColormap | CWBackPixel | CWBorderPixel, &attributes);
993#else 1009#else
994 TermWin.parent[0] = XCreateSimpleWindow (display->display, DefaultRootWindow (display->display), 1010 top = XCreateSimpleWindow (disp, parent,
995 szHint.x, szHint.y, 1011 szHint.x, szHint.y,
996 szHint.width, szHint.height, 1012 szHint.width, szHint.height,
997 TermWin.ext_bwidth, 1013 ext_bwidth,
998 pix_colors_focused[Color_border], 1014 pix_colors_focused[Color_border],
999 pix_colors_focused[Color_border]); 1015 pix_colors_focused[Color_border]);
1000#endif 1016#endif
1017
1018 this->parent[0] = top;
1019
1020 old_width = szHint.width;
1021 old_height = szHint.height;
1001 1022
1002 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1023 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1003 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1024 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1004 1025
1005 classHint.res_name = (char *)rs[Rs_name]; 1026 classHint.res_name = (char *)rs[Rs_name];
1006 classHint.res_class = (char *)RESCLASS; 1027 classHint.res_class = (char *)RESCLASS;
1007 1028
1008 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1029 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1009 wmHint.input = True; 1030 wmHint.input = True;
1010 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState; 1031 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState;
1011 wmHint.window_group = TermWin.parent[0]; 1032 wmHint.window_group = top;
1012 1033
1013 XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL, 1034 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,
1014 (char **)argv, argc, &szHint, &wmHint, &classHint); 1035 &szHint, &wmHint, &classHint);
1015 1036
1016 /* Enable delete window protocol */ 1037 Atom protocols[] = {
1017 XSetWMProtocols (display->display, TermWin.parent[0], 1038 xa[XA_WM_DELETE_WINDOW],
1018 &xa[XA_WMDELETEWINDOW], 1); 1039#if ENABLE_EWMH
1040 xa[XA_NET_WM_PING],
1041#endif
1042 };
1019 1043
1020#if ENABLE_FRILLS 1044 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1045
1046#if ENABLE_EWMH
1021 long pid = getpid (); 1047 long pid = getpid ();
1022 1048
1023 XChangeProperty (display->display, TermWin.parent[0], 1049 XChangeProperty (disp, top,
1024 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 1050 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1025 PropModeReplace, (unsigned char *)&pid, 1); 1051 PropModeReplace, (unsigned char *)&pid, 1);
1026#endif
1027 1052
1028 XSelectInput (display->display, TermWin.parent[0], 1053 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1054#endif
1055
1056 XSelectInput (disp, top,
1029 KeyPressMask 1057 KeyPressMask
1030#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1058#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1031 | KeyReleaseMask 1059 | KeyReleaseMask
1032#endif 1060#endif
1033 | FocusChangeMask | VisibilityChangeMask 1061 | FocusChangeMask | VisibilityChangeMask
1034 | ExposureMask
1035 | StructureNotifyMask); 1062 | ExposureMask | StructureNotifyMask);
1063
1036 termwin_ev.start (display, TermWin.parent[0]); 1064 termwin_ev.start (display, top);
1037 1065
1038#if ENABLE_FRILLS 1066#if ENABLE_FRILLS
1039 if (mwmhints.flags) 1067 if (mwmhints.flags)
1040 XChangeProperty (display->display, TermWin.parent[0], xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1068 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1041 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1069 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1042#endif 1070#endif
1043 1071
1044 /* vt cursor: Black-on-White is standard, but this is more popular */ 1072 /* vt cursor: Black-on-White is standard, but this is more popular */
1045 TermWin_cursor = XCreateFontCursor (display->display, XC_xterm); 1073 TermWin_cursor = XCreateFontCursor (disp, XC_xterm);
1046 1074
1047#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1075#if defined(HAVE_SCROLLBARS) || defined(MENUBAR)
1048 /* cursor (menuBar/scrollBar): Black-on-White */ 1076 /* cursor (menuBar/scrollBar): Black-on-White */
1049 leftptr_cursor = XCreateFontCursor (display->display, XC_left_ptr); 1077 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);
1050#endif 1078#endif
1051 1079
1052 /* the vt window */ 1080 /* the vt window */
1053 TermWin.vt = XCreateSimpleWindow (display->display, TermWin.parent[0], 1081 vt = XCreateSimpleWindow (disp, top,
1054 window_vt_x, 1082 window_vt_x,
1055 window_vt_y, 1083 window_vt_y,
1056 TermWin_TotalWidth (), 1084 TermWin_TotalWidth (),
1057 TermWin_TotalHeight (), 1085 TermWin_TotalHeight (),
1058 0, 1086 0,
1059 pix_colors_focused[Color_fg], 1087 pix_colors_focused[Color_fg],
1060 pix_colors_focused[Color_bg]); 1088 pix_colors_focused[Color_bg]);
1061#ifdef DEBUG_X 1089#ifdef DEBUG_X
1062 XStoreName (display->display, TermWin.vt, "vt window"); 1090 XStoreName (disp, vt, "vt window");
1063#endif 1091#endif
1064 1092
1065 attributes.bit_gravity = NorthWestGravity; 1093 attributes.bit_gravity = NorthWestGravity;
1066 XChangeWindowAttributes (display->display, TermWin.vt, CWBitGravity, &attributes); 1094 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes);
1067 1095
1068 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1096 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1069
1070 pointer_unblank ();
1071 1097
1072#ifdef POINTER_BLANK 1098#ifdef POINTER_BLANK
1073 if (options & Opt_pointerBlank) 1099 if (options & Opt_pointerBlank)
1074 vt_emask |= PointerMotionMask; 1100 vt_emask |= PointerMotionMask;
1075 else 1101 else
1076#endif 1102#endif
1077 vt_emask |= Button1MotionMask | Button3MotionMask; 1103 vt_emask |= Button1MotionMask | Button3MotionMask;
1078 1104
1079 XSelectInput (display->display, TermWin.vt, vt_emask); 1105 XSelectInput (disp, vt, vt_emask);
1080 vt_ev.start (display, TermWin.vt); 1106 vt_ev.start (display, vt);
1081 1107
1082#if defined(MENUBAR) && (MENUBAR_MAX > 1) 1108#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1083 if (menuBar_height ()) 1109 if (menuBar_height ())
1084 { 1110 {
1085 menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0], 1111 menuBar.win = XCreateSimpleWindow (disp, top,
1086 window_vt_x, 0, 1112 window_vt_x, 0,
1087 TermWin_TotalWidth (), 1113 TermWin_TotalWidth (),
1088 menuBar_TotalHeight (), 1114 menuBar_TotalHeight (),
1089 0, 1115 0,
1090 pix_colors_focused[Color_fg], 1116 pix_colors_focused[Color_fg],
1091 pix_colors_focused[Color_scroll]); 1117 pix_colors_focused[Color_scroll]);
1092 1118
1093#ifdef DEBUG_X 1119#ifdef DEBUG_X
1094 XStoreName (display->display, menuBar.win, "menubar"); 1120 XStoreName (disp, menuBar.win, "menubar");
1095#endif 1121#endif
1096 1122
1097 menuBar.drawable = new rxvt_drawable (display, menuBar.win); 1123 menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1098 1124
1099 XDefineCursor (display->display, menuBar.win, 1125 XDefineCursor (disp, menuBar.win,
1100 XCreateFontCursor (display->display, XC_left_ptr)); 1126 XCreateFontCursor (disp, XC_left_ptr));
1101 1127
1102 XSelectInput (display->display, menuBar.win, 1128 XSelectInput (disp, menuBar.win,
1103 (ExposureMask | ButtonPressMask | ButtonReleaseMask 1129 (ExposureMask | ButtonPressMask | ButtonReleaseMask | Button1MotionMask));
1104 | Button1MotionMask));
1105 menubar_ev.start (display, menuBar.win); 1130 menubar_ev.start (display, menuBar.win);
1106 } 1131 }
1107#endif 1132#endif
1108 1133
1109#ifdef XPM_BACKGROUND 1134#ifdef XPM_BACKGROUND
… …
1125 1150
1126 /* graphics context for the vt window */ 1151 /* graphics context for the vt window */
1127 gcvalue.foreground = pix_colors[Color_fg]; 1152 gcvalue.foreground = pix_colors[Color_fg];
1128 gcvalue.background = pix_colors[Color_bg]; 1153 gcvalue.background = pix_colors[Color_bg];
1129 gcvalue.graphics_exposures = 1; 1154 gcvalue.graphics_exposures = 1;
1130 TermWin.gc = XCreateGC (display->display, TermWin.vt, 1155 gc = XCreateGC (disp, vt,
1131 GCForeground | GCBackground | GCGraphicsExposures, 1156 GCForeground | GCBackground | GCGraphicsExposures,
1132 &gcvalue); 1157 &gcvalue);
1133 1158
1134 TermWin.drawable = new rxvt_drawable (display, TermWin.vt); 1159 drawable = new rxvt_drawable (display, vt);
1135 1160
1136#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1161#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1137 gcvalue.foreground = pix_colors[Color_topShadow]; 1162 gcvalue.foreground = pix_colors[Color_topShadow];
1138 topShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1163 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1139 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1164 gcvalue.foreground = pix_colors[Color_bottomShadow];
1140 botShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1165 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1141 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1166 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
1142 scrollbarGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1167 scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1143#endif 1168#endif
1144 1169
1145#ifdef OFF_FOCUS_FADING 1170#ifdef OFF_FOCUS_FADING
1146 // initially we are in unfocused state 1171 // initially we are in unfocused state
1147 if (rs[Rs_fade]) 1172 if (rs[Rs_fade])
1148 pix_colors = pix_colors_unfocused; 1173 pix_colors = pix_colors_unfocused;
1149#endif 1174#endif
1150 1175
1176 pointer_unblank ();
1151 scr_recolour (); 1177 scr_recolour ();
1178
1179#if ENABLE_XEMBED
1180 if (rs[Rs_embed])
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 }
1187#endif
1152} 1188}
1153 1189
1154/* ------------------------------------------------------------------------- * 1190/* ------------------------------------------------------------------------- *
1155 * GET TTY CURRENT STATE * 1191 * GET TTY CURRENT STATE *
1156 * ------------------------------------------------------------------------- */ 1192 * ------------------------------------------------------------------------- */
… …
1170 tio->c_cc[VKILL] = CKILL; 1206 tio->c_cc[VKILL] = CKILL;
1171 tio->c_cc[VSTART] = CSTART; 1207 tio->c_cc[VSTART] = CSTART;
1172 tio->c_cc[VSTOP] = CSTOP; 1208 tio->c_cc[VSTOP] = CSTOP;
1173 tio->c_cc[VSUSP] = CSUSP; 1209 tio->c_cc[VSUSP] = CSUSP;
1174# ifdef VDSUSP 1210# ifdef VDSUSP
1175
1176 tio->c_cc[VDSUSP] = CDSUSP; 1211 tio->c_cc[VDSUSP] = CDSUSP;
1177# endif 1212# endif
1178# ifdef VREPRINT 1213# ifdef VREPRINT
1179
1180 tio->c_cc[VREPRINT] = CRPRNT; 1214 tio->c_cc[VREPRINT] = CRPRNT;
1181# endif 1215# endif
1182# ifdef VDISCRD 1216# ifdef VDISCRD
1183
1184 tio->c_cc[VDISCRD] = CFLUSH; 1217 tio->c_cc[VDISCRD] = CFLUSH;
1185# endif 1218# endif
1186# ifdef VWERSE 1219# ifdef VWERSE
1187
1188 tio->c_cc[VWERSE] = CWERASE; 1220 tio->c_cc[VWERSE] = CWERASE;
1189# endif 1221# endif
1190# ifdef VLNEXT 1222# ifdef VLNEXT
1191
1192 tio->c_cc[VLNEXT] = CLNEXT; 1223 tio->c_cc[VLNEXT] = CLNEXT;
1193# endif 1224# endif
1194
1195 } 1225 }
1226
1196 tio->c_cc[VEOF] = CEOF; 1227 tio->c_cc[VEOF] = CEOF;
1197 tio->c_cc[VEOL] = VDISABLE; 1228 tio->c_cc[VEOL] = VDISABLE;
1198# ifdef VEOL2 1229# ifdef VEOL2
1199
1200 tio->c_cc[VEOL2] = VDISABLE; 1230 tio->c_cc[VEOL2] = VDISABLE;
1201# endif 1231# endif
1202# ifdef VSWTC 1232# ifdef VSWTC
1203
1204 tio->c_cc[VSWTC] = VDISABLE; 1233 tio->c_cc[VSWTC] = VDISABLE;
1205# endif 1234# endif
1206# ifdef VSWTCH 1235# ifdef VSWTCH
1207
1208 tio->c_cc[VSWTCH] = VDISABLE; 1236 tio->c_cc[VSWTCH] = VDISABLE;
1209# endif 1237# endif
1210# if VMIN != VEOF 1238# if VMIN != VEOF
1211
1212 tio->c_cc[VMIN] = 1; 1239 tio->c_cc[VMIN] = 1;
1213# endif 1240# endif
1214# if VTIME != VEOL 1241# if VTIME != VEOL
1215
1216 tio->c_cc[VTIME] = 0; 1242 tio->c_cc[VTIME] = 0;
1217# endif 1243# endif
1218 1244
1219 if (erase != -1) 1245 if (erase != -1)
1220 tio->c_cc[VERASE] = (char)erase; 1246 tio->c_cc[VERASE] = (char)erase;
… …
1248 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0) 1274 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1249 { 1275 {
1250 tio->sg.sg_erase = CERASE; /* ^H */ 1276 tio->sg.sg_erase = CERASE; /* ^H */
1251 tio->sg.sg_kill = CKILL; /* ^U */ 1277 tio->sg.sg_kill = CKILL; /* ^U */
1252 } 1278 }
1279
1253 if (erase != -1) 1280 if (erase != -1)
1254 tio->sg.sg_erase = (char)erase; 1281 tio->sg.sg_erase = (char)erase;
1255 1282
1256 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP); 1283 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1257 1284
… …
1263 tio->tc.t_startc = CSTART; /* ^Q */ 1290 tio->tc.t_startc = CSTART; /* ^Q */
1264 tio->tc.t_stopc = CSTOP; /* ^S */ 1291 tio->tc.t_stopc = CSTOP; /* ^S */
1265 tio->tc.t_eofc = CEOF; /* ^D */ 1292 tio->tc.t_eofc = CEOF; /* ^D */
1266 tio->tc.t_brkc = -1; 1293 tio->tc.t_brkc = -1;
1267 } 1294 }
1295
1268 /* get local special chars */ 1296 /* get local special chars */
1269 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0) 1297 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1270 { 1298 {
1271 tio->lc.t_suspc = CSUSP; /* ^Z */ 1299 tio->lc.t_suspc = CSUSP; /* ^Z */
1272 tio->lc.t_dsuspc = CDSUSP; /* ^Y */ 1300 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
… …
1276 tio->lc.t_lnextc = CLNEXT; /* ^V */ 1304 tio->lc.t_lnextc = CLNEXT; /* ^V */
1277 } 1305 }
1278 /* get line discipline */ 1306 /* get line discipline */
1279 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line)); 1307 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1280# ifdef NTTYDISC 1308# ifdef NTTYDISC
1281
1282 tio->line = NTTYDISC; 1309 tio->line = NTTYDISC;
1283# endif /* NTTYDISC */ 1310# endif /* NTTYDISC */
1284 1311
1285 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL); 1312 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1286#endif /* HAVE_TERMIOS_H */ 1313#endif /* HAVE_TERMIOS_H */
… …
1309 FOO (IGNCR, "IGNCR"); 1336 FOO (IGNCR, "IGNCR");
1310 FOO (ICRNL, "ICRNL"); 1337 FOO (ICRNL, "ICRNL");
1311 FOO (IXON, "IXON"); 1338 FOO (IXON, "IXON");
1312 FOO (IXOFF, "IXOFF"); 1339 FOO (IXOFF, "IXOFF");
1313# ifdef IUCLC 1340# ifdef IUCLC
1314
1315 FOO (IUCLC, "IUCLC"); 1341 FOO (IUCLC, "IUCLC");
1316# endif 1342# endif
1317# ifdef IXANY 1343# ifdef IXANY
1318
1319 FOO (IXANY, "IXANY"); 1344 FOO (IXANY, "IXANY");
1320# endif 1345# endif
1321# ifdef IMAXBEL 1346# ifdef IMAXBEL
1322
1323 FOO (IMAXBEL, "IMAXBEL"); 1347 FOO (IMAXBEL, "IMAXBEL");
1324# endif 1348# endif
1325 1349
1326 fprintf (stderr, "\n"); 1350 fprintf (stderr, "\n");
1327 1351
… …
1334 FOO (VERASE, "VERASE"); 1358 FOO (VERASE, "VERASE");
1335 FOO (VKILL, "VKILL"); 1359 FOO (VKILL, "VKILL");
1336 FOO (VEOF, "VEOF"); 1360 FOO (VEOF, "VEOF");
1337 FOO (VEOL, "VEOL"); 1361 FOO (VEOL, "VEOL");
1338# ifdef VEOL2 1362# ifdef VEOL2
1339
1340 FOO (VEOL2, "VEOL2"); 1363 FOO (VEOL2, "VEOL2");
1341# endif 1364# endif
1342# ifdef VSWTC 1365# ifdef VSWTC
1343
1344 FOO (VSWTC, "VSWTC"); 1366 FOO (VSWTC, "VSWTC");
1345# endif 1367# endif
1346# ifdef VSWTCH 1368# ifdef VSWTCH
1347
1348 FOO (VSWTCH, "VSWTCH"); 1369 FOO (VSWTCH, "VSWTCH");
1349# endif 1370# endif
1350
1351 FOO (VSTART, "VSTART"); 1371 FOO (VSTART, "VSTART");
1352 FOO (VSTOP, "VSTOP"); 1372 FOO (VSTOP, "VSTOP");
1353 FOO (VSUSP, "VSUSP"); 1373 FOO (VSUSP, "VSUSP");
1354# ifdef VDSUSP 1374# ifdef VDSUSP
1355
1356 FOO (VDSUSP, "VDSUSP"); 1375 FOO (VDSUSP, "VDSUSP");
1357# endif 1376# endif
1358# ifdef VREPRINT 1377# ifdef VREPRINT
1359
1360 FOO (VREPRINT, "VREPRINT"); 1378 FOO (VREPRINT, "VREPRINT");
1361# endif 1379# endif
1362# ifdef VDISCRD 1380# ifdef VDISCRD
1363
1364 FOO (VDISCRD, "VDISCRD"); 1381 FOO (VDISCRD, "VDISCRD");
1365# endif 1382# endif
1366# ifdef VWERSE 1383# ifdef VWERSE
1367
1368 FOO (VWERSE, "VWERSE"); 1384 FOO (VWERSE, "VWERSE");
1369# endif 1385# endif
1370# ifdef VLNEXT 1386# ifdef VLNEXT
1371
1372 FOO (VLNEXT, "VLNEXT"); 1387 FOO (VLNEXT, "VLNEXT");
1373# endif 1388# endif
1374 1389
1375 fprintf (stderr, "\n"); 1390 fprintf (stderr, "\n");
1376# undef FOO 1391# undef FOO
… …
1385 * the slave. 1400 * the slave.
1386 */ 1401 */
1387void 1402void
1388rxvt_term::run_command (const char *const *argv) 1403rxvt_term::run_command (const char *const *argv)
1389{ 1404{
1405#if ENABLE_FRILLS
1406 if (rs[Rs_pty_fd])
1407 {
1408 pty.pty = atoi (rs[Rs_pty_fd]);
1409 fcntl (pty.pty, F_SETFL, O_NONBLOCK);
1410 }
1411 else
1412#endif
1390 if (!pty.get ()) 1413 if (!pty.get ())
1391 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1414 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1392 1415
1393 pty.set_utf8_mode (enc_utf8); 1416 pty.set_utf8_mode (enc_utf8);
1394 1417
1395 /* set initial window size */ 1418 /* set initial window size */
1396 tt_winch (); 1419 tt_winch ();
… …
1406#endif 1429#endif
1407 er = -1; 1430 er = -1;
1408 1431
1409 rxvt_get_ttymode (&tio, er); 1432 rxvt_get_ttymode (&tio, er);
1410 1433
1411 sw_chld.start (SIGCHLD); 1434#if ENABLE_FRILLS
1435 if (rs[Rs_pty_fd])
1436 return;
1437#endif
1412 1438
1413#ifndef __QNX__ 1439#ifndef __QNX__
1414 /* spin off the command interpreter */ 1440 /* spin off the command interpreter */
1415 switch (cmd_pid = fork ()) 1441 switch (cmd_pid = fork ())
1416 { 1442 {
1417 case -1: 1443 case -1:
1444 {
1445 cmd_pid = 0;
1418 rxvt_fatal ("can't fork, aborting.\n"); 1446 rxvt_fatal ("can't fork, aborting.\n");
1447 }
1419 case 0: 1448 case 0:
1420 init_env (); 1449 init_env ();
1421 1450
1422 if (!pty.make_controlling_tty ()) 1451 if (!pty.make_controlling_tty ())
1423 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); 1452 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);

Diff Legend

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