--- rxvt-unicode/src/init.C 2004/12/11 23:01:36 1.96 +++ rxvt-unicode/src/init.C 2005/01/17 00:59:23 1.105 @@ -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 @@ -169,7 +173,7 @@ #endif }; -const char *const xa_names[NUM_XA] = +const char *const xa_names[] = { "TEXT", "COMPOUND_TEXT", @@ -180,14 +184,24 @@ "VT_SELECTION", "INCR", "WM_DELETE_WINDOW", + "CLIPBOARD", +#if ENABLE_FRILLS + "_NET_WM_PID", + "_MOTIF_WM_HINTS", + "_NET_WM_NAME", + "_NET_WM_ICON_NAME", +#endif +#if USE_XIM + "WM_LOCALE_NAME", +#endif #ifdef TRANSPARENT "_XROOTPMAP_ID", + "ESETROOT_PMAP_ID", #endif #ifdef OFFIX_DND "DndProtocol", "DndSelection", #endif - "CLIPBOARD" }; bool @@ -369,9 +383,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 @@ -593,16 +604,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 @@ -613,7 +625,7 @@ rxvt_warn ("setting locale failed, working without locale support.\n"); else { - set_string_property (display->atom ("WM_LOCALE_NAME"), locale); + set_string_property (xa[XA_WM_LOCALE_NAME], locale); if (!XSupportsLocale ()) { @@ -831,53 +843,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]; } @@ -898,14 +928,14 @@ XSetWindowAttributes attributes; XWindowAttributes gattr; - for (int i = 0; i < NUM_XA; i++) - xa[i] = XInternAtom (display->display, xa_names[i], False); - #ifdef USING_W11LIB /* enable W11 callbacks */ W11AddEventHandler (display->display, rxvt_W11_process_x_event); #endif + assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); + XInternAtoms (display->display, (char **)xa_names, NUM_XA, False, xa); + if (options & Opt_transparent) { XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr); @@ -991,7 +1021,7 @@ long pid = getpid (); XChangeProperty (display->display, TermWin.parent[0], - display->atom ("_NET_WM_PID"), XA_CARDINAL, 32, + xa[XA_NET_WM_PID], XA_CARDINAL, 32, PropModeReplace, (unsigned char *)&pid, 1); #endif @@ -1007,11 +1037,8 @@ #if ENABLE_FRILLS if (mwmhints.flags) - { - prop = XInternAtom (display->display, "_MOTIF_WM_HINTS", False); - XChangeProperty (display->display, TermWin.parent[0], prop, prop, 32, - PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); - } + XChangeProperty (display->display, 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 */ @@ -1022,19 +1049,6 @@ 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); - } -#endif - /* the vt window */ TermWin.vt = XCreateSimpleWindow (display->display, TermWin.parent[0], window_vt_x, @@ -1373,11 +1387,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]; @@ -1389,9 +1408,6 @@ rxvt_get_ttymode (&tio, er); - /* set initial window size */ - tt_winch (); - sw_chld.start (SIGCHLD); #ifndef __QNX__