--- rxvt-unicode/src/init.C 2004/12/15 00:12:58 1.97 +++ rxvt-unicode/src/init.C 2005/02/04 11:41:23 1.108 @@ -33,9 +33,10 @@ #include "../config.h" /* NECESSARY */ #include "rxvt.h" /* NECESSARY */ +#include "rxvtutil.h" #include "init.h" -#include +#include const char *const def_colorName[] = { @@ -157,6 +158,9 @@ NULL, /* Color_UL */ NULL, /* Color_RV */ #endif /* ! NO_BOLD_UNDERLINE_REVERSE */ +#if ENABLE_FRILLS + NULL, // Color_underline +#endif #ifdef OPTION_HC NULL, #endif @@ -192,7 +196,7 @@ #endif #ifdef TRANSPARENT "_XROOTPMAP_ID", - "_XSETROOT_ID", + "ESETROOT_PMAP_ID", #endif #ifdef OFFIX_DND "DndProtocol", @@ -204,6 +208,7 @@ rxvt_term::init_vars () { sw_term.start (SIGTERM); + sw_int.start (SIGINT); pix_colors_focused = new rxvt_color [TOTAL_COLORS]; #ifdef OFF_FOCUS_FADING @@ -250,7 +255,7 @@ #ifdef MENUBAR menu_readonly = 1; # if ! (MENUBAR_MAX > 1) - CurrentBar = & (BarList); + CurrentBar = &BarList; # endif /* (MENUBAR_MAX > 1) */ #endif @@ -334,7 +339,6 @@ rs[Rs_display_name] = ":0"; get_options (r_argc, r_argv); - free (r_argv); #ifdef LOCAL_X_IS_UNIX if (rs[Rs_display_name][0] == ':') @@ -351,7 +355,8 @@ && ! (display = displays.get (rs[Rs_display_name]))) rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); - extract_resources (display->display, rs[Rs_name]); + extract_resources (); + free (r_argv); /* * set any defaults not already set @@ -379,9 +384,6 @@ TermWin.int_bwidth = min (i, 100); /* arbitrary limit */ if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */ -#endif - -#ifndef NO_LINESPACE if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) TermWin.lineSpace = min (i, 100); /* arbitrary limit */ #endif @@ -603,16 +605,17 @@ mbstate.reset (); #endif -#if 0 #if HAVE_NL_LANGINFO char *codeset = strdup (nl_langinfo (CODESET)); - enc_utf8 = !strcasecmp (codeset, "UTF-8") - || !strcasecmp (codeset, "UTF8"); + // /^UTF.?8/i + enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') + && (codeset[1] == 'T' || codeset[1] == 't') + && (codeset[2] == 'F' || codeset[2] == 'f') + && (codeset[3] == '8' || codeset[4] == '8'); free (codeset); #else enc_utf8 = 0; #endif -#endif } void @@ -829,11 +832,11 @@ void rxvt_term::get_ourmods () { - int i, j, k; - int requestedmeta, realmeta, realalt; - const char *cm, *rsmod; + int i, j, k; + int requestedmeta, realmeta, realalt; + const char *cm, *rsmod; XModifierKeymap *map; - KeyCode *kc; + KeyCode *kc; const unsigned int modmasks[] = { Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask @@ -841,53 +844,71 @@ requestedmeta = realmeta = realalt = 0; rsmod = rs[Rs_modifier]; + if (rsmod && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) requestedmeta = rsmod[3] - '0'; map = XGetModifierMapping (display->display); kc = map->modifiermap; + for (i = 1; i < 6; i++) { k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ + for (j = map->max_keypermod; j--; k++) { if (kc[k] == 0) break; + switch (XKeycodeToKeysym (display->display, kc[k], 0)) { case XK_Num_Lock: ModNumLockMask = modmasks[i - 1]; - /* FALLTHROUGH */ - default: - continue; /* for (;;) */ + continue; + + case XK_ISO_Level3_Shift: + ModLevel3Mask = modmasks[i - 1]; + continue; + case XK_Meta_L: case XK_Meta_R: cm = "meta"; realmeta = i; break; + case XK_Alt_L: case XK_Alt_R: cm = "alt"; realalt = i; break; + case XK_Super_L: case XK_Super_R: cm = "super"; break; + case XK_Hyper_L: case XK_Hyper_R: cm = "hyper"; break; + + default: + continue; } + if (rsmod && strncasecmp (rsmod, cm, strlen (cm)) == 0) requestedmeta = i; } } + XFreeModifiermap (map); - i = (requestedmeta ? requestedmeta - : (realmeta ? realmeta - : (realalt ? realalt : 0))); + + i = requestedmeta ? requestedmeta + : realmeta ? realmeta + : realalt ? realalt + : 0; + if (i) ModMetaMask = modmasks[i - 1]; } @@ -907,25 +928,26 @@ long vt_emask; XSetWindowAttributes attributes; XWindowAttributes gattr; + dDisp; #ifdef USING_W11LIB /* enable W11 callbacks */ - W11AddEventHandler (display->display, rxvt_W11_process_x_event); + W11AddEventHandler (disp, rxvt_W11_process_x_event); #endif assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); - XInternAtoms (display->display, (char **)xa_names, NUM_XA, False, xa); + XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa); if (options & Opt_transparent) { - XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr); + XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr); display->depth = gattr.depth; // doh //TODO, per-term not per-display? } #if ENABLE_FRILLS if (options & Opt_borderLess) { - prop = XInternAtom(display->display, "_MOTIF_WM_INFO", True); + prop = XInternAtom(disp, "_MOTIF_WM_INFO", True); if (prop == None) { @@ -963,7 +985,7 @@ attributes.background_pixel = pix_colors_focused[Color_border]; attributes.border_pixel = pix_colors_focused[Color_border]; attributes.colormap = display->cmap; - TermWin.parent[0] = XCreateWindow (display->display, DefaultRootWindow (display->display), + TermWin.parent[0] = XCreateWindow (disp, DefaultRootWindow (disp), szHint.x, szHint.y, szHint.width, szHint.height, TermWin.ext_bwidth, @@ -971,7 +993,7 @@ display->visual, CWColormap | CWBackPixel | CWBorderPixel, &attributes); #else - TermWin.parent[0] = XCreateSimpleWindow (display->display, DefaultRootWindow (display->display), + TermWin.parent[0] = XCreateSimpleWindow (disp, DefaultRootWindow (disp), szHint.x, szHint.y, szHint.width, szHint.height, TermWin.ext_bwidth, @@ -990,22 +1012,22 @@ wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState; wmHint.window_group = TermWin.parent[0]; - XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL, + XSetWMProperties (disp, TermWin.parent[0], NULL, NULL, (char **)argv, argc, &szHint, &wmHint, &classHint); /* Enable delete window protocol */ - XSetWMProtocols (display->display, TermWin.parent[0], + XSetWMProtocols (disp, TermWin.parent[0], &xa[XA_WMDELETEWINDOW], 1); #if ENABLE_FRILLS long pid = getpid (); - XChangeProperty (display->display, TermWin.parent[0], + XChangeProperty (disp, TermWin.parent[0], xa[XA_NET_WM_PID], XA_CARDINAL, 32, PropModeReplace, (unsigned char *)&pid, 1); #endif - XSelectInput (display->display, TermWin.parent[0], + XSelectInput (disp, TermWin.parent[0], KeyPressMask #if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 | KeyReleaseMask @@ -1017,46 +1039,33 @@ #if ENABLE_FRILLS if (mwmhints.flags) - XChangeProperty (display->display, TermWin.parent[0], xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, + XChangeProperty (disp, TermWin.parent[0], xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); #endif /* vt cursor: Black-on-White is standard, but this is more popular */ - TermWin_cursor = XCreateFontCursor (display->display, XC_xterm); + TermWin_cursor = XCreateFontCursor (disp, XC_xterm); #if defined(HAVE_SCROLLBARS) || defined(MENUBAR) /* cursor (menuBar/scrollBar): Black-on-White */ - leftptr_cursor = XCreateFontCursor (display->display, XC_left_ptr); -#endif - -#ifdef POINTER_BLANK - { - XColor blackcolour; - blackcolour.red = 0; - blackcolour.green = 0; - blackcolour.blue = 0; - Font f = XLoadFont (display->display, "fixed"); - blank_cursor = XCreateGlyphCursor (display->display, f, f, ' ', ' ', - &blackcolour, &blackcolour); - XUnloadFont (display->display, f); - } + leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); #endif /* the vt window */ - TermWin.vt = XCreateSimpleWindow (display->display, TermWin.parent[0], - window_vt_x, - window_vt_y, - TermWin_TotalWidth (), - TermWin_TotalHeight (), - 0, - pix_colors_focused[Color_fg], - pix_colors_focused[Color_bg]); + TermWin.vt = XCreateSimpleWindow (disp, TermWin.parent[0], + window_vt_x, + window_vt_y, + TermWin_TotalWidth (), + TermWin_TotalHeight (), + 0, + pix_colors_focused[Color_fg], + pix_colors_focused[Color_bg]); #ifdef DEBUG_X - XStoreName (display->display, TermWin.vt, "vt window"); + XStoreName (disp, TermWin.vt, "vt window"); #endif attributes.bit_gravity = NorthWestGravity; - XChangeWindowAttributes (display->display, TermWin.vt, CWBitGravity, &attributes); + XChangeWindowAttributes (disp, TermWin.vt, CWBitGravity, &attributes); vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; @@ -1069,13 +1078,13 @@ #endif vt_emask |= Button1MotionMask | Button3MotionMask; - XSelectInput (display->display, TermWin.vt, vt_emask); + XSelectInput (disp, TermWin.vt, vt_emask); vt_ev.start (display, TermWin.vt); #if defined(MENUBAR) && (MENUBAR_MAX > 1) if (menuBar_height ()) { - menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0], + menuBar.win = XCreateSimpleWindow (disp, TermWin.parent[0], window_vt_x, 0, TermWin_TotalWidth (), menuBar_TotalHeight (), @@ -1084,17 +1093,16 @@ pix_colors_focused[Color_scroll]); #ifdef DEBUG_X - XStoreName (display->display, menuBar.win, "menubar"); + XStoreName (disp, menuBar.win, "menubar"); #endif menuBar.drawable = new rxvt_drawable (display, menuBar.win); - XDefineCursor (display->display, menuBar.win, - XCreateFontCursor (display->display, XC_left_ptr)); + XDefineCursor (disp, menuBar.win, + XCreateFontCursor (disp, XC_left_ptr)); - XSelectInput (display->display, menuBar.win, - (ExposureMask | ButtonPressMask | ButtonReleaseMask - | Button1MotionMask)); + XSelectInput (disp, menuBar.win, + (ExposureMask | ButtonPressMask | ButtonReleaseMask | Button1MotionMask)); menubar_ev.start (display, menuBar.win); } #endif @@ -1120,7 +1128,7 @@ gcvalue.foreground = pix_colors[Color_fg]; gcvalue.background = pix_colors[Color_bg]; gcvalue.graphics_exposures = 1; - TermWin.gc = XCreateGC (display->display, TermWin.vt, + TermWin.gc = XCreateGC (disp, TermWin.vt, GCForeground | GCBackground | GCGraphicsExposures, &gcvalue); @@ -1128,11 +1136,11 @@ #if defined(MENUBAR) || defined(RXVT_SCROLLBAR) gcvalue.foreground = pix_colors[Color_topShadow]; - topShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); + topShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue); gcvalue.foreground = pix_colors[Color_bottomShadow]; - botShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); + botShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue); gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; - scrollbarGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); + scrollbarGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue); #endif #ifdef OFF_FOCUS_FADING @@ -1380,11 +1388,16 @@ void rxvt_term::run_command (const char *const *argv) { - int er; - if (!pty.get ()) rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); + pty.set_utf8_mode (enc_utf8); + + /* set initial window size */ + tt_winch (); + + int er; + #ifndef NO_BACKSPACE_KEY if (key_backspace[0] && !key_backspace[1]) er = key_backspace[0]; @@ -1396,9 +1409,6 @@ rxvt_get_ttymode (&tio, er); - /* set initial window size */ - tt_winch (); - sw_chld.start (SIGCHLD); #ifndef __QNX__