--- rxvt-unicode/src/main.C 2006/01/24 19:40:12 1.199 +++ rxvt-unicode/src/main.C 2006/01/31 19:53:30 1.214 @@ -218,43 +218,43 @@ if (display) { - dDisp; - selection_clear (); #ifdef USE_XIM im_destroy (); #endif #ifdef XTERM_SCROLLBAR - if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); - if (ShadowGC) XFreeGC (disp, ShadowGC); + if (xscrollbarGC) XFreeGC (xdisp, xscrollbarGC); + if (ShadowGC) XFreeGC (xdisp, ShadowGC); #endif #ifdef PLAIN_SCROLLBAR - if (pscrollbarGC) XFreeGC (disp, pscrollbarGC); + if (pscrollbarGC) XFreeGC (xdisp, pscrollbarGC); #endif #ifdef NEXT_SCROLLBAR - if (blackGC) XFreeGC (disp, blackGC); - if (whiteGC) XFreeGC (disp, whiteGC); - if (grayGC) XFreeGC (disp, grayGC); - if (darkGC) XFreeGC (disp, darkGC); - if (stippleGC) XFreeGC (disp, stippleGC); - if (dimple) XFreePixmap (disp, dimple); - if (upArrow) XFreePixmap (disp, upArrow); - if (downArrow) XFreePixmap (disp, downArrow); - if (upArrowHi) XFreePixmap (disp, upArrowHi); - if (downArrowHi) XFreePixmap (disp, downArrowHi); + if (blackGC) XFreeGC (xdisp, blackGC); + if (whiteGC) XFreeGC (xdisp, whiteGC); + if (grayGC) XFreeGC (xdisp, grayGC); + if (darkGC) XFreeGC (xdisp, darkGC); + if (stippleGC) XFreeGC (xdisp, stippleGC); + if (dimple) XFreePixmap (xdisp, dimple); + if (upArrow) XFreePixmap (xdisp, upArrow); + if (downArrow) XFreePixmap (xdisp, downArrow); + if (upArrowHi) XFreePixmap (xdisp, upArrowHi); + if (downArrowHi) XFreePixmap (xdisp, downArrowHi); #endif #ifdef RXVT_SCROLLBAR - if (topShadowGC) XFreeGC (disp, topShadowGC); - if (botShadowGC) XFreeGC (disp, botShadowGC); - if (scrollbarGC) XFreeGC (disp, scrollbarGC); + if (topShadowGC) XFreeGC (xdisp, topShadowGC); + if (botShadowGC) XFreeGC (xdisp, botShadowGC); + if (scrollbarGC) XFreeGC (xdisp, scrollbarGC); #endif - if (gc) XFreeGC (disp, gc); + if (gc) XFreeGC (xdisp, gc); delete drawable; // destroy all windows if (parent[0]) - XDestroyWindow (disp, parent[0]); + XDestroyWindow (xdisp, parent[0]); + + clear (); } // TODO: free pixcolours, colours should become part of rxvt_display @@ -273,10 +273,8 @@ free (selection.text); // TODO: manage env vars in child only(!) - free (env_windowid); free (env_display); free (env_term); - free (env_colorfgbg); free (locale); free (v_buffer); free (incr_buf); @@ -307,8 +305,7 @@ if (destroy_ev.active) return; - if (HOOK_INVOKE ((this, HOOK_DESTROY, DT_END))) - return; + HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); #if ENABLE_OVERLAY scr_overlay_off (); @@ -373,7 +370,7 @@ (*t)->emergency_cleanup (); } -#if ENABLE_FRILLS +#if !ENABLE_MINIMAL static void print_x_error (Display *dpy, XErrorEvent *event) { @@ -431,10 +428,10 @@ { // GET_R is most likely not the terminal which caused the error, // so just output the error and continue -#if ENABLE_FRILLS - print_x_error (display, event); -#else +#if ENABLE_MINIMAL old_xerror_handler (display, event); +#else + print_x_error (display, event); #endif } @@ -480,14 +477,12 @@ create_windows (argc, argv); - dDisp; - init_xlocale (); scr_reset (); // initialize screen #if 0 - XSynchronize (disp, True); + XSynchronize (xdisp, True); #endif #ifdef HAVE_SCROLLBARS @@ -497,7 +492,7 @@ #ifdef TRANSPARENT if (OPTION (Opt_transparent)) { - XSelectInput (disp, display->root, PropertyChangeMask); + XSelectInput (xdisp, display->root, PropertyChangeMask); check_our_parents (); rootwin_ev.start (display, display->root); } @@ -516,8 +511,18 @@ HOOK_INVOKE ((this, HOOK_START, DT_END)); - XMapWindow (disp, vt); - XMapWindow (disp, parent[0]); +#if ENABLE_XEMBED + if (rs[Rs_embed]) + { + long info[2] = { 0, XEMBED_MAPPED }; + + XChangeProperty (xdisp, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], + 32, PropModeReplace, (unsigned char *)&info, 2); + } +#endif + + XMapWindow (xdisp, vt); + XMapWindow (xdisp, parent[0]); return true; } @@ -617,7 +622,6 @@ int x, y, sb_w, flags; unsigned int w, h; unsigned int max_width, max_height; - dDisp; szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; szHint.win_gravity = NorthWestGravity; @@ -689,6 +693,7 @@ { sb_w = scrollbar_TotalWidth (); szHint.base_width += sb_w; + if (!OPTION (Opt_scrollBar_right)) window_vt_x += sb_w; } @@ -724,9 +729,10 @@ window_sb_x = szHint.width - sb_w; if (recalc_x) - szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; + szHint.x += DisplayWidth (xdisp, display->screen) - szHint.width - 2 * ext_bwidth; + if (recalc_y) - szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; + szHint.y += DisplayHeight (xdisp, display->screen) - szHint.height - 2 * ext_bwidth; ncol = width / fwidth; nrow = height / fheight; @@ -839,7 +845,7 @@ void rxvt_term::set_string_property (Atom prop, const char *str, int len) { - XChangeProperty (display->display, parent[0], + XChangeProperty (xdisp, parent[0], prop, XA_STRING, 8, PropModeReplace, (const unsigned char *)str, len >= 0 ? len : strlen (str)); } @@ -849,7 +855,7 @@ wchar_t *ws = rxvt_mbstowcs (str, len); char *s = rxvt_wcstoutf8 (ws); - XChangeProperty (display->display, parent[0], + XChangeProperty (xdisp, parent[0], prop, xa[XA_UTF8_STRING], 8, PropModeReplace, (const unsigned char *)s, strlen (s)); @@ -884,10 +890,14 @@ { rxvt_color xcol; int i; - + if (color == NULL || *color == '\0') return; + color = strdup (color); + allocated.push_back ((void *)color); + rs[Rs_color + idx] = color; + /* handle color aliases */ if (isdigit (*color)) { @@ -897,41 +907,24 @@ { /* bright colors */ i -= 8; pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; - SET_PIXCOLOR (idx); goto done; } if (i >= 0 && i <= 7) { /* normal colors */ pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; - SET_PIXCOLOR (idx); goto done; } } - if (!rXParseAllocColor (&xcol, color)) - return; - - /* XStoreColor (display->display, display->cmap, XColor*); */ + set_color (xcol, color); /* * FIXME: should free colors here, but no idea how to do it so instead, * so just keep gobbling up the colormap */ -# if 0 - for (i = Color_Black; i <= Color_White; i++) - if (pix_colors[idx] == pix_colors[i]) - break; - if (i > Color_White) - { - /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */ - XFreeColors (display->display, display->cmap, (pix_colors + idx), 1, - DisplayPlanes (display->display, display->screen)); - } -# endif pix_colors_focused[idx] = xcol; - SET_PIXCOLOR (idx); /* XSetWindowAttributes attr; */ /* Cursor cursor; */ @@ -939,7 +932,11 @@ #if OFF_FOCUS_FADING if (rs[Rs_fade]) - pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]); + { + rgba c; + pix_colors [Color_fade].get (c); + pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); + } #endif /*TODO: handle Color_BD, scrollbar background, etc. */ @@ -964,8 +961,8 @@ ? pix_colors_focused[Color_pointer_bg] : pix_colors_focused[Color_bg]; - XQueryColors (display->display, display->cmap, xcol, 2); - XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1); + XQueryColors (xdisp, cmap, xcol, 2); + XRecolorCursor (xdisp, TermWin_cursor, xcol + 0, xcol + 1); } /*----------------------------------------------------------------------*/ @@ -979,7 +976,6 @@ const char *xpmb = "\0"; char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; - env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1); strcpy (fstr, "default"); strcpy (bstr, "default"); for (i = Color_Black; i <= Color_White; i++) @@ -1004,16 +1000,14 @@ /*----------------------------------------------------------------------*/ -int -rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) +bool +rxvt_term::set_color (rxvt_color &color, const char *name) { - if (!screen_in_out->set (display, colour)) - { - rxvt_warn ("can't get colour '%s', continuing without.\n", colour); - return false; - } + if (color.set (this, name)) + return true; - return true; + rxvt_warn ("can't get colour '%s', continuing without.\n", name); + return false; } /* -------------------------------------------------------------------- * @@ -1025,10 +1019,9 @@ int fix_screen; int old_width = szHint.width; int old_height = szHint.height; - dDisp; window_calc (newwidth, newheight); - XSetWMNormalHints (disp, parent[0], &szHint); + XSetWMNormalHints (xdisp, parent[0], &szHint); if (!ignoreparent) { @@ -1042,9 +1035,9 @@ unsigned int unused_w1, unused_h1, unused_b1, unused_d1; Window unused_cr; - XTranslateCoordinates (disp, parent[0], display->root, + XTranslateCoordinates (xdisp, parent[0], display->root, 0, 0, &x, &y, &unused_cr); - XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, + XGetGeometry (xdisp, parent[0], &unused_cr, &x1, &y1, &unused_w1, &unused_h1, &unused_b1, &unused_d1); /* * if display->root isn't the parent window, a WM will probably have offset @@ -1056,8 +1049,8 @@ y -= y1; } - x1 = (DisplayWidth (disp, display->screen) - old_width ) / 2; - y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; + x1 = (DisplayWidth (xdisp, display->screen) - old_width ) / 2; + y1 = (DisplayHeight (xdisp, display->screen) - old_height) / 2; dx = old_width - szHint.width; dy = old_height - szHint.height; @@ -1071,10 +1064,10 @@ else if (y == y1) /* exact center */ dy /= 2; - XMoveResizeWindow (disp, parent[0], x + dx, y + dy, + XMoveResizeWindow (xdisp, parent[0], x + dx, y + dy, szHint.width, szHint.height); #else - XResizeWindow (disp, parent[0], szHint.width, szHint.height); + XResizeWindow (xdisp, parent[0], szHint.width, szHint.height); #endif } @@ -1084,13 +1077,13 @@ { if (scrollBar.state) { - XMoveResizeWindow (disp, scrollBar.win, + XMoveResizeWindow (xdisp, scrollBar.win, window_sb_x, 0, scrollbar_TotalWidth (), szHint.height); resize_scrollbar (); } - XMoveResizeWindow (disp, vt, + XMoveResizeWindow (xdisp, vt, window_vt_x, window_vt_y, width, height); @@ -1124,7 +1117,7 @@ if (newwidth == 0 || newheight == 0) { - XGetWindowAttributes (display->display, display->root, &wattr); + XGetWindowAttributes (xdisp, display->root, &wattr); if (newwidth == 0) newwidth = wattr.width - szHint.base_width; @@ -1196,8 +1189,8 @@ if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ *p = '\0'; - atom = XInternAtom (display->display, server, False); - win = XGetSelectionOwner (display->display, atom); + atom = XInternAtom (xdisp, server, False); + win = XGetSelectionOwner (xdisp, atom); if (win != None) return True; @@ -1214,7 +1207,7 @@ if (!Input_Context || !focus - || !(input_style & XIMPreeditPosition)) + || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks))) return; im_set_position (nspot); @@ -1244,6 +1237,80 @@ Input_Context = 0; } +#ifdef ENABLE_XIM_ONTHESPOT + +static void +xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data) +{ + ((rxvt_term *)client_data)->make_current (); + HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END)); +} + +static void +xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data) +{ + ((rxvt_term *)client_data)->make_current (); + HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END)); +} + +static void +xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data) +{ + rxvt_term *term = (rxvt_term *)client_data; + XIMText *text = call_data->text; + + term->make_current (); + + if (text) + { + void *str; + + if (!text->encoding_is_wchar && text->string.multi_byte) + { + // of course, X makes it ugly again + if (term->rs[Rs_imLocale]) + SET_LOCALE (term->rs[Rs_imLocale]); + + str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); + mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); + + if (term->rs[Rs_imLocale]) + SET_LOCALE (term->locale); + } + else + str = (void *)text->string.wide_char; + + HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, + DT_INT, call_data->caret, + DT_INT, call_data->chg_first, + DT_INT, call_data->chg_length, + DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0, + DT_WCS_LEN, str, str ? (int)text->length : 0, + DT_END)); + } + else + HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, + DT_INT, call_data->caret, + DT_INT, call_data->chg_first, + DT_INT, call_data->chg_length, + DT_END)); +} + +#if 0 +static void +xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data) +{ + ((rxvt_term *)client_data)->make_current (); + HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET, + DT_INT, call_data->position, + DT_INT, call_data->direction, + DT_INT, call_data->style, + DT_END)); +} +#endif + +#endif + /* * Try to open a XIM with the current modifiers, then see if we can * open a suitable preedit type @@ -1259,6 +1326,9 @@ const char *p; char **s; XIMStyles *xim_styles; +#ifdef ENABLE_XIM_ONTHESPOT + XIMCallback xcb[4]; +#endif set_environ (envv); @@ -1294,13 +1364,19 @@ for (i = found = 0; !found && s[i]; i++) { if (!strcmp (s[i], "OverTheSpot")) - input_style = (XIMPreeditPosition | XIMStatusNothing); + input_style = XIMPreeditPosition | XIMStatusNothing; else if (!strcmp (s[i], "OffTheSpot")) - input_style = (XIMPreeditArea | XIMStatusArea); + input_style = XIMPreeditArea | XIMStatusArea; else if (!strcmp (s[i], "Root")) - input_style = (XIMPreeditNothing | XIMStatusNothing); + input_style = XIMPreeditNothing | XIMStatusNothing; else if (!strcmp (s[i], "None")) - input_style = (XIMPreeditNone | XIMStatusNone); + input_style = XIMPreeditNone | XIMStatusNone; +#ifdef ENABLE_XIM_ONTHESPOT + else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot")) + input_style = XIMPreeditCallbacks | XIMStatusNothing; +#endif + else + input_style = XIMPreeditNothing | XIMStatusNothing; for (j = 0; j < xim_styles->count_styles; j++) if (input_style == xim_styles->supported_styles[j]) @@ -1348,7 +1424,7 @@ fheight + 1, fheight - 1, fheight - 2, fheight + 2); - fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, + fs = XCreateFontSet (xdisp, rs[Rs_imFont] ? rs[Rs_imFont] : pat, &missing_charset_list, &missing_charset_count, &def_string); if (missing_charset_list) @@ -1399,6 +1475,29 @@ XNFontSet, fs, NULL); } +#if ENABLE_XIM_ONTHESPOT + else if (input_style & XIMPreeditCallbacks) + { + im_set_position (spot); + + xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; + xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done; + xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw; +# if 0 + xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret; +# endif + + preedit_attr = XVaCreateNestedList (0, + XNSpotLocation, &spot, + XNPreeditStartCallback, &xcb[0], + XNPreeditDoneCallback , &xcb[1], + XNPreeditDrawCallback , &xcb[2], +# if 0 + XNPreeditCaretCallback, &xcb[3], +# endif + NULL); + } +#endif Input_Context = XCreateIC (xim, XNInputStyle, input_style, @@ -1411,7 +1510,7 @@ if (preedit_attr) XFree (preedit_attr); if (status_attr) XFree (status_attr); - if (fs) XFreeFontSet (display->display, fs); + if (fs) XFreeFontSet (xdisp, fs); if (Input_Context == NULL) { @@ -1420,8 +1519,11 @@ return false; } +#if 0 + // unfortunately, only the focus window is used by XIM, hard to fix if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) vt_select_input (); +#endif if (input_style & XIMPreeditArea) IMSetStatusPosition ();