--- rxvt-unicode/src/main.C 2006/01/17 16:22:41 1.187 +++ rxvt-unicode/src/main.C 2006/02/11 02:28:19 1.219 @@ -50,10 +50,13 @@ vector rxvt_term::termlist; +// used to tell global functions which terminal instance is "active" +rxvt_t rxvt_current_term; + static char curlocale[128], savelocale[128]; bool -rxvt_set_locale (const char *locale) +rxvt_set_locale (const char *locale) NOTHROW { if (!locale || !strncmp (locale, curlocale, 128)) return false; @@ -64,14 +67,14 @@ } void -rxvt_push_locale (const char *locale) +rxvt_push_locale (const char *locale) NOTHROW { strcpy (savelocale, curlocale); rxvt_set_locale (locale); } void -rxvt_pop_locale () +rxvt_pop_locale () NOTHROW { rxvt_set_locale (savelocale); } @@ -169,8 +172,12 @@ #ifdef USE_XIM im_ev (this, &rxvt_term::im_cb), #endif +#ifndef NO_BELL + bell_ev (this, &rxvt_term::bell_cb), +#endif termwin_ev (this, &rxvt_term::x_cb), vt_ev (this, &rxvt_term::x_cb), + child_ev (this, &rxvt_term::child_cb), check_ev (this, &rxvt_term::check_cb), flush_ev (this, &rxvt_term::flush_cb), destroy_ev (this, &rxvt_term::destroy_cb), @@ -183,9 +190,6 @@ #ifdef KEYSYM_RESOURCE keyboard = new keyboard_manager; - - if (!keyboard) - rxvt_fatal ("out of memory, aborting.\n"); #endif } @@ -201,8 +205,6 @@ rxvt_term::~rxvt_term () { - HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); - termlist.erase (find (termlist.begin (), termlist.end(), this)); emergency_cleanup (); @@ -216,46 +218,54 @@ 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 (dpy, xscrollbarGC); + if (ShadowGC) XFreeGC (dpy, ShadowGC); #endif #ifdef PLAIN_SCROLLBAR - if (pscrollbarGC) XFreeGC (disp, pscrollbarGC); + if (pscrollbarGC) XFreeGC (dpy, 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 (dpy, blackGC); + if (whiteGC) XFreeGC (dpy, whiteGC); + if (grayGC) XFreeGC (dpy, grayGC); + if (darkGC) XFreeGC (dpy, darkGC); + if (stippleGC) XFreeGC (dpy, stippleGC); + if (dimple) XFreePixmap (dpy, dimple); + if (upArrow) XFreePixmap (dpy, upArrow); + if (downArrow) XFreePixmap (dpy, downArrow); + if (upArrowHi) XFreePixmap (dpy, upArrowHi); + if (downArrowHi) XFreePixmap (dpy, downArrowHi); #endif #ifdef RXVT_SCROLLBAR - if (topShadowGC) XFreeGC (disp, topShadowGC); - if (botShadowGC) XFreeGC (disp, botShadowGC); - if (scrollbarGC) XFreeGC (disp, scrollbarGC); + if (topShadowGC) XFreeGC (dpy, topShadowGC); + if (botShadowGC) XFreeGC (dpy, botShadowGC); + if (scrollbarGC) XFreeGC (dpy, scrollbarGC); #endif - if (gc) XFreeGC (disp, gc); + if (gc) XFreeGC (dpy, gc); delete drawable; // destroy all windows if (parent[0]) - XDestroyWindow (disp, parent[0]); + XDestroyWindow (dpy, parent[0]); + + for (int i = 0; i < TOTAL_COLORS; i++) + if (ISSET_PIXCOLOR (i)) + { + pix_colors_focused [i].free (this); +#if OFF_FOCUS_FADING + pix_colors_unfocused [i].free (this); +#endif + } + + clear (); } - // TODO: free pixcolours, colours should become part of rxvt_display delete pix_colors_focused; #if OFF_FOCUS_FADING delete pix_colors_unfocused; @@ -271,10 +281,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); @@ -287,9 +295,12 @@ #endif } +// child has exited, usually destroys void -rxvt_term::child_exit () +rxvt_term::child_cb (child_watcher &w, int status) { + HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); + cmd_pid = 0; if (!OPTION (Opt_hold)) @@ -302,6 +313,8 @@ if (destroy_ev.active) return; + HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); + #if ENABLE_OVERLAY scr_overlay_off (); #endif @@ -365,7 +378,7 @@ (*t)->emergency_cleanup (); } -#if ENABLE_FRILLS +#if !ENABLE_MINIMAL static void print_x_error (Display *dpy, XErrorEvent *event) { @@ -423,10 +436,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 } @@ -444,8 +457,10 @@ /*----------------------------------------------------------------------*/ bool -rxvt_term::init (int argc, const char *const *argv) +rxvt_term::init (int argc, const char *const *argv, stringvec *envv) { + this->envv = envv; + SET_R (this); set_locale (""); set_environ (envv); // few things in X do not call setlocale :( @@ -466,31 +481,16 @@ scrollBar.setIdle (); /* set existence for size calculations */ #endif -#if ENABLE_PERL - if (!rs[Rs_perl_ext_1]) - rs[Rs_perl_ext_1] = "default"; - - if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1]) - || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2]) - || (rs[Rs_perl_eval] && *rs[Rs_perl_eval])) - { - rxvt_perl.init (this); - HOOK_INVOKE ((this, HOOK_INIT, DT_END)); - } -#endif - - pty = rxvt_new_ptytty (); + pty = ptytty::create (); create_windows (argc, argv); - dDisp; - init_xlocale (); scr_reset (); // initialize screen #if 0 - XSynchronize (disp, True); + XSynchronize (dpy, True); #endif #ifdef HAVE_SCROLLBARS @@ -500,15 +500,12 @@ #ifdef TRANSPARENT if (OPTION (Opt_transparent)) { - XSelectInput (disp, display->root, PropertyChangeMask); + XSelectInput (dpy, display->root, PropertyChangeMask); check_our_parents (); rootwin_ev.start (display, display->root); } #endif - XMapWindow (disp, vt); - XMapWindow (disp, parent[0]); - set_colorfgbg (); init_command (cmd_argv); @@ -522,44 +519,39 @@ HOOK_INVOKE ((this, HOOK_START, DT_END)); +#if ENABLE_XEMBED + if (rs[Rs_embed]) + { + long info[2] = { 0, XEMBED_MAPPED }; + + XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], + 32, PropModeReplace, (unsigned char *)&info, 2); + } +#endif + + XMapWindow (dpy, vt); + XMapWindow (dpy, parent[0]); + return true; } static struct sig_handlers { - sig_watcher sw_chld, sw_term, sw_int; + sig_watcher sw_term, sw_int; - void sig_chld (sig_watcher &w) - { - // we are being called for every SIGCHLD, find the corresponding term - int pid; - - while ((pid = waitpid (-1, NULL, WNOHANG)) > 0) - for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) - if (pid == (*t)->cmd_pid) - { - (*t)->child_exit (); - break; - } - } - /* * Catch a fatal signal and tidy up before quitting */ void sig_term (sig_watcher &w) { -#ifdef DEBUG_CMD - rxvt_warn ("caught signal %d, exiting.\n", w.signum); -#endif rxvt_emergency_cleanup (); signal (w.signum, SIG_DFL); kill (getpid (), w.signum); } sig_handlers () - : sw_chld (this, &sig_handlers::sig_chld), - sw_term (this, &sig_handlers::sig_term), + : sw_term (this, &sig_handlers::sig_term), sw_int (this, &sig_handlers::sig_term) { } @@ -570,44 +562,13 @@ void rxvt_init () { - uid_t uid = getuid (); - gid_t gid = getgid (); - - // before doing anything else, check for setuid/setgid operation, - // start the helper process and drop privileges - if (uid != geteuid () - || 1 //D - || gid != getegid ()) - { -#if PTYTTY_HELPER - rxvt_ptytty_server (); -#else - rxvt_warn ("running setuid/setgid without pty helper compiled in, continuing unprivileged.\n"); -#endif - - // drop privileges -#if HAVE_SETRESUID - setresgid (gid, gid, gid); - setresuid (uid, uid, uid); -#elif HAVE_SETREUID - setregid (gid, gid); - setreuid (uid, uid); -#elif HAVE_SETUID - setgid (gid); - setuid (uid); -#endif - - if (uid != geteuid () - || gid != getegid ()) - rxvt_fatal ("unable to drop privileges, aborting.\n"); - } + ptytty::init (); rxvt_environ = environ; signal (SIGHUP, SIG_IGN); signal (SIGPIPE, SIG_IGN); - sig_handlers.sw_chld.start (SIGCHLD); sig_handlers.sw_term.start (SIGTERM); sig_handlers.sw_int.start (SIGINT); @@ -646,7 +607,7 @@ return p; } -void * +void * rxvt_realloc (void *ptr, size_t size) { void *p = realloc (ptr, size); @@ -669,10 +630,6 @@ int x, y, sb_w, flags; unsigned int w, h; unsigned int max_width, max_height; - dDisp; - - D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", - ncol, nrow, szHint.width, szHint.height)); szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; szHint.win_gravity = NorthWestGravity; @@ -744,13 +701,14 @@ { sb_w = scrollbar_TotalWidth (); szHint.base_width += sb_w; + if (!OPTION (Opt_scrollBar_right)) window_vt_x += sb_w; } - szHint.width_inc = fwidth; + szHint.width_inc = fwidth; szHint.height_inc = fheight; - szHint.min_width = szHint.base_width + szHint.width_inc; + szHint.min_width = szHint.base_width + szHint.width_inc; szHint.min_height = szHint.base_height + szHint.height_inc; if (newwidth && newwidth - szHint.base_width < max_width) @@ -779,16 +737,13 @@ window_sb_x = szHint.width - sb_w; if (recalc_x) - szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; + szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; + if (recalc_y) - szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; + szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; ncol = width / fwidth; nrow = height / fheight; - D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", - ncol, nrow, szHint.width, - szHint.height)); - return; } /*----------------------------------------------------------------------*/ @@ -898,7 +853,7 @@ void rxvt_term::set_string_property (Atom prop, const char *str, int len) { - XChangeProperty (display->display, parent[0], + XChangeProperty (dpy, parent[0], prop, XA_STRING, 8, PropModeReplace, (const unsigned char *)str, len >= 0 ? len : strlen (str)); } @@ -908,7 +863,7 @@ wchar_t *ws = rxvt_mbstowcs (str, len); char *s = rxvt_wcstoutf8 (ws); - XChangeProperty (display->display, parent[0], + XChangeProperty (dpy, parent[0], prop, xa[XA_UTF8_STRING], 8, PropModeReplace, (const unsigned char *)s, strlen (s)); @@ -943,10 +898,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)) { @@ -956,41 +915,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; */ @@ -998,7 +940,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. */ @@ -1014,17 +960,17 @@ void rxvt_term::recolour_cursor () { - XColor xcol[2]; + XColor fg, bg; + + (ISSET_PIXCOLOR (Color_pointer_fg) + ? pix_colors_focused[Color_pointer_fg] + : pix_colors_focused[Color_fg]).get (fg); - xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) - ? pix_colors_focused[Color_pointer_fg] - : pix_colors_focused[Color_fg]; - xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) - ? pix_colors_focused[Color_pointer_bg] - : pix_colors_focused[Color_bg]; + (ISSET_PIXCOLOR (Color_pointer_bg) + ? pix_colors_focused[Color_pointer_bg] + : pix_colors_focused[Color_bg]).get (bg); - XQueryColors (display->display, display->cmap, xcol, 2); - XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1); + XRecolorCursor (dpy, TermWin_cursor, &fg, &bg); } /*----------------------------------------------------------------------*/ @@ -1038,7 +984,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++) @@ -1063,16 +1008,20 @@ /*----------------------------------------------------------------------*/ -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; +} + +void +rxvt_term::alias_color (int dst, int src) +{ + pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]); } /* -------------------------------------------------------------------- * @@ -1082,11 +1031,13 @@ rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) { int fix_screen; - int old_width = szHint.width, old_height = szHint.height; - dDisp; + int old_width = szHint.width; + int old_height = szHint.height; window_calc (newwidth, newheight); - XSetWMNormalHints (disp, parent[0], &szHint); + + if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END))) + XSetWMNormalHints (dpy, parent[0], &szHint); if (!ignoreparent) { @@ -1100,9 +1051,9 @@ unsigned int unused_w1, unused_h1, unused_b1, unused_d1; Window unused_cr; - XTranslateCoordinates (disp, parent[0], display->root, + XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &unused_cr); - XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, + XGetGeometry (dpy, 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 @@ -1114,9 +1065,9 @@ y -= y1; } - x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; - y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; - dx = old_width - szHint.width; + x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2; + y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2; + dx = old_width - szHint.width; dy = old_height - szHint.height; /* Check position of the center of the window */ @@ -1129,10 +1080,10 @@ else if (y == y1) /* exact center */ dy /= 2; - XMoveResizeWindow (disp, parent[0], x + dx, y + dy, + XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, szHint.width, szHint.height); #else - XResizeWindow (disp, parent[0], szHint.width, szHint.height); + XResizeWindow (dpy, parent[0], szHint.width, szHint.height); #endif } @@ -1142,13 +1093,13 @@ { if (scrollBar.state) { - XMoveResizeWindow (disp, scrollBar.win, + XMoveResizeWindow (dpy, scrollBar.win, window_sb_x, 0, scrollbar_TotalWidth (), szHint.height); resize_scrollbar (); } - XMoveResizeWindow (disp, vt, + XMoveResizeWindow (dpy, vt, window_vt_x, window_vt_y, width, height); @@ -1159,30 +1110,10 @@ } if (fix_screen || old_height == 0) - { - int curr_screen = -1; - int old_ncol = prev_ncol; - - /* scr_reset only works on the primary screen */ - if (old_height) /* this is not the first time through */ - { - unsigned int ocol = ncol; - ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this - curr_screen = scr_change_screen (PRIMARY); - ncol = ocol; - } + scr_reset (); - scr_reset (); - - if (curr_screen >= 0) /* this is not the first time through */ - { - scr_change_screen (curr_screen); - selection_check (old_ncol != ncol ? 4 : 0); - } - } - - old_width = szHint.width; - old_height = szHint.height; + // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version + //scr_touch (false); #ifdef XPM_BACKGROUND if (pixmap) @@ -1205,7 +1136,7 @@ if (newwidth == 0 || newheight == 0) { - XGetWindowAttributes (display->display, display->root, &wattr); + XGetWindowAttributes (dpy, display->root, &wattr); if (newwidth == 0) newwidth = wattr.width - szHint.base_width; @@ -1229,8 +1160,8 @@ void rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) { - fg = pix_colors[Color_fg]; - bg = pix_colors[Color_bg]; + fg = pix_colors [Color_fg]; + bg = pix_colors [Color_bg]; } void @@ -1277,8 +1208,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 (dpy, server, False); + win = XGetSelectionOwner (dpy, atom); if (win != None) return True; @@ -1295,7 +1226,7 @@ if (!Input_Context || !focus - || !(input_style & XIMPreeditPosition)) + || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks))) return; im_set_position (nspot); @@ -1325,6 +1256,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 @@ -1340,13 +1345,15 @@ const char *p; char **s; XIMStyles *xim_styles; +#ifdef ENABLE_XIM_ONTHESPOT + XIMCallback xcb[4]; +#endif set_environ (envv); if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) return false; - D_MAIN ((stderr, "rxvt_IM_get_IC ()")); input_method = display->get_xim (locale, modifiers); if (input_method == NULL) return false; @@ -1376,13 +1383,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]) @@ -1430,7 +1443,7 @@ fheight + 1, fheight - 1, fheight - 2, fheight + 2); - fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, + fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat, &missing_charset_list, &missing_charset_count, &def_string); if (missing_charset_list) @@ -1481,6 +1494,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, @@ -1493,7 +1529,7 @@ if (preedit_attr) XFree (preedit_attr); if (status_attr) XFree (status_attr); - if (fs) XFreeFontSet (display->display, fs); + if (fs) XFreeFontSet (dpy, fs); if (Input_Context == NULL) { @@ -1502,10 +1538,15 @@ 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 (); - D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection")); return true; } @@ -1521,7 +1562,6 @@ im_destroy (); - D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()")); if (Input_Context) return; @@ -1604,7 +1644,4 @@ } #endif /* USE_XIM */ -/*----------------------------------------------------------------------*/ -rxvt_t rxvt_current_term; - /*----------------------- end-of-file (C source) -----------------------*/