--- rxvt-unicode/src/main.C 2008/02/27 01:05:55 1.310 +++ rxvt-unicode/src/main.C 2014/12/13 11:58:23 1.395 @@ -13,11 +13,11 @@ * Copyright (c) 1997,1998 Oezguer Kesim * Copyright (c) 1998-2001 Geoff Wing * - extensive modifications - * Copyright (c) 2003-2008 Marc Lehmann + * Copyright (c) 2003-2014 Marc Lehmann * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -32,13 +32,15 @@ #include "../config.h" /* NECESSARY */ #include "rxvt.h" /* NECESSARY */ +#include "init.h" #include "keyboard.h" #include "rxvtperl.h" #include -#include -#include +#include +#include +#include #include @@ -46,11 +48,10 @@ # define X_LOCALE # include #else -# ifdef HAVE_SETLOCALE -# include -# endif +# include #endif +struct termios rxvt_term::def_tio; vector rxvt_term::termlist; // used to tell global functions which terminal instance is "active" @@ -95,7 +96,7 @@ compose_char *cc; // break compose chains, as stupid readline really likes to duplicate - // composing characters for some reason near the end of a line. + // composing characters for some reason, near the end of a line. cc = (*this)[c1]; while (cc) { @@ -103,12 +104,10 @@ cc = (*this)[cc->c1]; } - // check to see wether this combination already exists otherwise - for (cc = v.end (); cc-- > v.begin (); ) - { - if (cc->c1 == c1 && cc->c2 == c2) - return COMPOSE_LO + (cc - v.begin ()); - } + // check to see whether this combination already exists otherwise + for (cc = v.begin (); cc < v.end (); cc++) + if (cc->c1 == c1 && cc->c2 == c2) + return COMPOSE_LO + (cc - v.begin ()); // allocate a new combination if (v.size () == COMPOSE_HI - COMPOSE_LO + 1) @@ -116,7 +115,7 @@ static int seen; if (!seen++) - fprintf (stderr, "too many unrepresentable composite characters, try --enable-unicode3\n"); + rxvt_warn ("too many unrepresentable composite characters, try --enable-unicode3\n"); return REPLACEMENT_CHAR; } @@ -171,11 +170,11 @@ #if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) slip_wheel_ev.set (this); #endif -#if ENABLE_TRANSPARENCY || ENABLE_PERL +#if BG_IMAGE_FROM_ROOT || ENABLE_PERL rootwin_ev.set (this), #endif scrollbar_ev.set (this), -#ifdef USE_XIM +#if USE_XIM im_ev.set (this), #endif #ifdef POINTER_BLANK @@ -188,7 +187,6 @@ flush_ev.set (this); destroy_ev.set (this); pty_ev.set (this); - incr_ev.set (this); termwin_ev.set (this); vt_ev.set (this); @@ -227,30 +225,39 @@ delete fontset[0]; #ifdef HAVE_BG_PIXMAP - bgPixmap.destroy (); + bg_destroy (); +#endif + +#if HAVE_IMG + delete bg_img; #endif if (display) { selection_clear (); + selection_clear (true); -#ifdef USE_XIM +#if USE_XIM im_destroy (); #endif scrollBar.destroy (); - if (gc) XFreeGC (dpy, gc); + + if (gc) + XFreeGC (dpy, gc); delete drawable; + // destroy all windows - if (parent[0]) - XDestroyWindow (dpy, parent[0]); + if (parent) + XDestroyWindow (dpy, parent); 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); + if (rs[Rs_fade]) + pix_colors_unfocused [i].free (this); #endif } @@ -267,12 +274,16 @@ free (allocated [i]); free (selection.text); - // TODO: manage env vars in child only(!) - free (env_display); - free (env_term); + free (selection.clip_text); free (locale); free (v_buffer); - free (incr_buf); + + delete selection_req; + + if (env && memcmp (env, envv->begin (), envv->size () * sizeof (char *))) + rxvt_warn ("env has been modified, probably as a result of a lib calling setenv.\n"); + + delete env; delete envv; delete argv; @@ -283,6 +294,8 @@ #ifndef NO_RESOURCES XrmDestroyDatabase (option_db); #endif + + SET_R ((rxvt_term *)0); } // child has exited, usually destroys @@ -315,10 +328,9 @@ im_ev.stop (display); #endif scrollbar_ev.stop (display); -#if ENABLE_TRANSPARENCY || ENABLE_PERL +#if BG_IMAGE_FROM_ROOT || ENABLE_PERL rootwin_ev.stop (display); #endif - incr_ev.stop (); termwin_ev.stop (display); vt_ev.stop (display); } @@ -352,10 +364,21 @@ delete this; } +void +rxvt_term::set_option (uint8_t opt, bool set) NOTHROW +{ + if (!opt) + return; + + uint8_t mask = 1 << (opt & 7); + uint8_t &val = options [opt >> 3]; + + val = val & ~mask | (set ? mask : 0); +} + /*----------------------------------------------------------------------*/ /* * Exit gracefully, clearing the utmp entry and restoring tty attributes - * TODO: if debugging, this should free up any known resources if we can */ static XErrorHandler old_xerror_handler; @@ -367,58 +390,108 @@ } #if !ENABLE_MINIMAL -static void +static void ecb_cold print_x_error (Display *dpy, XErrorEvent *event) { - char buffer[BUFSIZ]; - char mesg[BUFSIZ]; - char number[32]; - char *mtype = "XlibMessage"; - XGetErrorText(dpy, event->error_code, buffer, BUFSIZ); - XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ); - rxvt_warn ("An X Error occured, trying to continue after report.\n"); - rxvt_warn ("%s: %s\n", mesg, buffer); - XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); - rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); - sprintf(number, "%d", event->request_code); - XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); - rxvt_warn ("(which is %s)\n", buffer); - if (event->request_code >= 128) { - XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", - mesg, BUFSIZ); - rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); - } - if ((event->error_code == BadWindow) || - (event->error_code == BadPixmap) || - (event->error_code == BadCursor) || - (event->error_code == BadFont) || - (event->error_code == BadDrawable) || - (event->error_code == BadColor) || - (event->error_code == BadGC) || - (event->error_code == BadIDChoice) || - (event->error_code == BadValue) || - (event->error_code == BadAtom)) { - if (event->error_code == BadValue) - XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", - mesg, BUFSIZ); - else if (event->error_code == BadAtom) - XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", - mesg, BUFSIZ); - else - XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", - mesg, BUFSIZ); - rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); - } - XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", - mesg, BUFSIZ); - rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); + char buffer[BUFSIZ]; + char mesg[BUFSIZ]; + char number[32]; + + rxvt_warn ("An X Error occurred, trying to continue after report.\n"); + + XGetErrorDatabaseText (dpy, "XlibMessage", "ErrorSerial", "Error Serial #%d", mesg, BUFSIZ); + snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->serial); + + XGetErrorText (dpy, event->error_code, buffer, BUFSIZ); + XGetErrorDatabaseText (dpy, "XlibMessage", "XError", "X Error", mesg, BUFSIZ); + rxvt_warn ("+ %s: %s\n", mesg, buffer); + + XGetErrorDatabaseText (dpy, "XlibMessage", "MajorCode", "Request Major code %d", mesg, BUFSIZ); + snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->request_code); + + if (event->request_code >= 128) + { +#if 0 + /* XListExtensions and probably query extensions hangs when there are multiple queues errors */ + int nexts; + char **exts = XListExtensions (dpy, &nexts); + + while (nexts) + { + char *extname = exts [nexts - 1]; + int major, first_event, first_error; + + if (XQueryExtension (dpy, extname, &major, &first_event, &first_error) && major == event->request_code) + { + XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ); + rxvt_warn ("+ (which is extension %s minor code %d)\n", extname, event->minor_code); + + snprintf (buffer, BUFSIZ, "%s.%d", extname, event->minor_code); + XGetErrorDatabaseText (dpy, "XRequest", buffer, "an unregistered minor code", buffer, BUFSIZ); + rxvt_warn ("+ (which is %s)\n", buffer); + + break; + } + + printf ("nextss %d %s\n", nexts, extname);//D + --nexts; + ++exts; + } +#else + int nexts = 0; + char **exts = 0; +#endif + + if (!nexts) + { + rxvt_warn ("+ (which is an unknown extension)\n", buffer); + + XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ); + snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->minor_code); + +#if 0 + sprintf (number, "RENDER.%d", event->minor_code); + XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ); + rxvt_warn ("+ (which is %s)\n", buffer); +#endif + } + + XFreeExtensionList (exts); + } + else + { + sprintf (number, "%d", event->request_code); + XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ); + rxvt_warn ("+ (which is %s)\n", buffer); + } + + if (event->error_code == BadWindow + || event->error_code == BadPixmap + || event->error_code == BadCursor + || event->error_code == BadFont + || event->error_code == BadDrawable + || event->error_code == BadColor + || event->error_code == BadGC + || event->error_code == BadIDChoice + || event->error_code == BadValue + || event->error_code == BadAtom) + { + if (event->error_code == BadValue) + XGetErrorDatabaseText (dpy, "XlibMessage", "Value", "Value 0x%x", mesg, BUFSIZ); + else if (event->error_code == BadAtom) + XGetErrorDatabaseText (dpy, "XlibMessage", "AtomID", "AtomID 0x%x", mesg, BUFSIZ); + else + XGetErrorDatabaseText (dpy, "XlibMessage", "ResourceID", "ResourceID 0x%x", mesg, BUFSIZ); + + snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->resourceid); + } } #endif -int +int ecb_cold rxvt_xerror_handler (Display *display, XErrorEvent *event) { - if (GET_R->allowedxerror == -1) + if (GET_R && GET_R->allowedxerror == -1) GET_R->allowedxerror = event->error_code; else { @@ -434,7 +507,7 @@ return 0; } -int +int ecb_cold rxvt_xioerror_handler (Display *display) { rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n", @@ -467,14 +540,88 @@ kill (getpid (), w.signum); } +static void +rxvt_get_ttymode (struct termios *tio) +{ + if (tcgetattr (STDIN_FILENO, tio) < 0) + memset (tio, 0, sizeof (struct termios)); + + for (int i = 0; i < NCCS; i++) + tio->c_cc[i] = VDISABLE; + + tio->c_cc[VINTR] = CINTR; + tio->c_cc[VQUIT] = CQUIT; + tio->c_cc[VERASE] = CERASE; +#ifdef VERASE2 + tio->c_cc[VERASE2] = CERASE2; +#endif + tio->c_cc[VKILL] = CKILL; + tio->c_cc[VEOF] = CEOF; + tio->c_cc[VSTART] = CSTART; + tio->c_cc[VSTOP] = CSTOP; + tio->c_cc[VSUSP] = CSUSP; +# ifdef VDSUSP + tio->c_cc[VDSUSP] = CDSUSP; +# endif +# ifdef VREPRINT + tio->c_cc[VREPRINT] = CRPRNT; +# endif +# ifdef VDISCRD + tio->c_cc[VDISCRD] = CFLUSH; +# endif +# ifdef VWERSE + tio->c_cc[VWERSE] = CWERASE; +# endif +# ifdef VLNEXT + tio->c_cc[VLNEXT] = CLNEXT; +# endif +# ifdef VSTATUS + tio->c_cc[VSTATUS] = CSTATUS; +# endif + +# if VMIN != VEOF + tio->c_cc[VMIN] = 1; +# endif +# if VTIME != VEOL + tio->c_cc[VTIME] = 0; +# endif + + /* input modes */ + tio->c_iflag = (BRKINT | IGNPAR | ICRNL +# ifdef IMAXBEL + | IMAXBEL +# endif + | IXON); + + /* output modes */ + tio->c_oflag = (OPOST | ONLCR); + + /* control modes */ + tio->c_cflag = (CS8 | CREAD); + + /* local modes */ + tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO +# if defined (ECHOCTL) && defined (ECHOKE) + | ECHOCTL | ECHOKE +# endif + | ECHOE | ECHOK); +} + char **rxvt_environ; // startup environment void rxvt_init () { - ptytty::init (); + assert (("fontMask must not overlap other RS masks", + 0 == (RS_fontMask & (RS_Sel | RS_baseattrMask | RS_customMask | RS_bgMask | RS_fgMask)))); + + rxvt_get_ttymode (&rxvt_term::def_tio); - if (!ev_default_loop (0)) + // get rid of stdin/stdout as we don't need them, to free resources + dup2 (STDERR_FILENO, STDIN_FILENO); + dup2 (STDERR_FILENO, STDOUT_FILENO); + + if (!ev_default_loop ()) rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n"); rxvt_environ = environ; @@ -485,14 +632,15 @@ sig_handlers.sw_term.start (SIGTERM); ev_unref (); sig_handlers.sw_int.start (SIGINT); ev_unref (); - /* need to trap SIGURG for SVR4 (Unixware) rlogin */ - /* signal (SIGURG, SIG_DFL); */ - old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); // TODO: handle this with exceptions and tolerate the memory loss XSetIOErrorHandler (rxvt_xioerror_handler); XrmInitialize (); + +#if HAVE_PIXBUF + g_type_init (); +#endif } /*----------------------------------------------------------------------*/ @@ -621,8 +769,17 @@ if (recalc_y) szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; - ncol = width / fwidth; + ncol = width / fwidth; nrow = height / fheight; + + // When the size of the vt window is not a multiple of the cell + // size, i.e., when the wm does not honour our size hints, there are + // extra areas not covered by the terminal screen. Such gaps, when a + // bg pixmap is set, would have to be cleared manually to properly + // refresh the background. We take the simpler route and shrink the + // vt window so as to avoid creating gaps. + vt_width = ncol * fwidth; + vt_height = nrow * fheight; } /*----------------------------------------------------------------------*/ @@ -640,9 +797,9 @@ ws.ws_col = ncol; ws.ws_row = nrow; - ws.ws_xpixel = width; - ws.ws_ypixel = height; - (void)ioctl (pty->pty, TIOCSWINSZ, &ws); + ws.ws_xpixel = vt_width; + ws.ws_ypixel = vt_height; + ioctl (pty->pty, TIOCSWINSZ, &ws); #if 0 // TIOCSWINSZ is supposed to do this automatically and correctly @@ -652,13 +809,7 @@ } /*----------------------------------------------------------------------*/ -/* set_fonts () - load and set the various fonts - * - * init = 1 - initialize - * - * fontname == FONT_UP - switch to bigger font - * fontname == FONT_DN - switch to smaller font - */ +/* load and set the various fonts */ bool rxvt_term::set_fonts () { @@ -682,13 +833,13 @@ delete fontset[0]; fontset[0] = fs; - prop = (*fs)[1]->properties (); - prop.height += lineSpace; + prop = (*fs)[rxvt_fontset::firstFont]->properties (); + prop.width = max (prop.width + letterSpace, 1); fs->set_prop (prop, false); fwidth = prop.width; - fheight = prop.height; + fheight = prop.height + lineSpace; fbase = prop.ascent; for (int style = 1; style < 4; style++) @@ -724,7 +875,7 @@ #endif } - if (parent[0]) + if (parent) { resize_all_windows (0, 0, 0); scr_remap_chars (); @@ -737,18 +888,30 @@ void rxvt_term::set_string_property (Atom prop, const char *str, int len) { - XChangeProperty (dpy, parent[0], + XChangeProperty (dpy, parent, prop, XA_STRING, 8, PropModeReplace, (const unsigned char *)str, len >= 0 ? len : strlen (str)); } void +rxvt_term::set_mbstring_property (Atom prop, const char *str, int len) +{ + XTextProperty ct; + + if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0) + { + XSetTextProperty (dpy, parent, &ct, prop); + XFree (ct.value); + } +} + +void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) { wchar_t *ws = rxvt_mbstowcs (str, len); char *s = rxvt_wcstoutf8 (ws); - XChangeProperty (dpy, parent[0], + XChangeProperty (dpy, parent, prop, xa[XA_UTF8_STRING], 8, PropModeReplace, (const unsigned char *)s, strlen (s)); @@ -762,7 +925,7 @@ void rxvt_term::set_title (const char *str) { - set_string_property (XA_WM_NAME, str); + set_mbstring_property (XA_WM_NAME, str); #if ENABLE_EWMH set_utf8_property (xa[XA_NET_WM_NAME], str); #endif @@ -771,7 +934,7 @@ void rxvt_term::set_icon_name (const char *str) { - set_string_property (XA_WM_ICON_NAME, str); + set_mbstring_property (XA_WM_ICON_NAME, str); #if ENABLE_EWMH set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); #endif @@ -848,33 +1011,35 @@ /* * find if fg/bg matches any of the normal (low-intensity) colors */ -void -rxvt_term::set_colorfgbg () +char * +rxvt_term::get_colorfgbg () { unsigned int i; const char *xpmb = ""; - char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; + char fstr[] = "default"; + char bstr[] = "default"; + char *env_colorfgbg; - strcpy (fstr, "default"); - strcpy (bstr, "default"); for (i = Color_Black; i <= Color_White; i++) if (pix_colors[Color_fg] == pix_colors[i]) { - sprintf (fstr, "%d", (i - Color_Black)); + sprintf (fstr, "%d", i - Color_Black); break; } for (i = Color_Black; i <= Color_White; i++) if (pix_colors[Color_bg] == pix_colors[i]) { - sprintf (bstr, "%d", (i - Color_Black)); -#ifdef BG_IMAGE_FROM_FILE + sprintf (bstr, "%d", i - Color_Black); +#if BG_IMAGE_FROM_FILE xpmb = "default;"; #endif break; } + env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg")); sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); + return env_colorfgbg; } /*----------------------------------------------------------------------*/ @@ -907,8 +1072,15 @@ window_calc (newwidth, newheight); - if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END))) - XSetWMNormalHints (dpy, parent[0], &szHint); + bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)); + + // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow + if (set_hint) + { + szHint.flags &= ~(PBaseSize | PResizeInc); + XSetWMNormalHints (dpy, parent, &szHint); + szHint.flags |= PBaseSize | PResizeInc; + } if (!ignoreparent) { @@ -922,9 +1094,9 @@ unsigned int unused_w1, unused_h1, unused_b1, unused_d1; Window unused_cr; - XTranslateCoordinates (dpy, parent[0], display->root, + XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &unused_cr); - XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1, + XGetGeometry (dpy, parent, &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 @@ -951,13 +1123,16 @@ else if (y == y1) /* exact center */ dy /= 2; - XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, + XMoveResizeWindow (dpy, parent, x + dx, y + dy, szHint.width, szHint.height); #else - XResizeWindow (dpy, parent[0], szHint.width, szHint.height); + XResizeWindow (dpy, parent, szHint.width, szHint.height); #endif } + if (set_hint) + XSetWMNormalHints (dpy, parent, &szHint); + fix_screen = ncol != prev_ncol || nrow != prev_nrow; if (fix_screen || newwidth != old_width || newheight != old_height) @@ -967,30 +1142,21 @@ XMoveResizeWindow (dpy, vt, window_vt_x, window_vt_y, - width, height); + vt_width, vt_height); + + HOOK_INVOKE ((this, HOOK_SIZE_CHANGE, DT_INT, newwidth, DT_INT, newheight, DT_END)); #ifdef HAVE_BG_PIXMAP - if (bgPixmap.window_size_sensitive ()) + if (bg_window_size_sensitive ()) update_background (); #endif - - scr_clear (); } if (fix_screen || old_height == 0) scr_reset (); - // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version - //scr_touch (false); - -#ifdef HAVE_BG_PIXMAP -// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ? -// if (bgPixmap.pixmap) -// scr_touch (false); -#endif - -#ifdef USE_XIM - IMSetPosition (); +#if USE_XIM + im_set_position (); #endif } @@ -1013,7 +1179,7 @@ newheight = wattr.height - szHint.base_height; } - if (newwidth != width || newheight != height) + if (newwidth != vt_width || newheight != vt_height) { newwidth += szHint.base_width; newheight += szHint.base_height; @@ -1024,7 +1190,7 @@ /* -------------------------------------------------------------------- * * - X INPUT METHOD ROUTINES - * * -------------------------------------------------------------------- */ -#ifdef USE_XIM +#if USE_XIM void rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) @@ -1061,34 +1227,33 @@ /* Checking whether input method is running. */ bool -rxvt_term::IMisRunning () +rxvt_term::im_is_running () { - char *p; Atom atom; Window win; char server[IMBUFSIZ]; /* get current locale modifier */ - if ((p = XSetLocaleModifiers (NULL)) != NULL) + if (char *p = XSetLocaleModifiers (0)) { strcpy (server, "@server="); - strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ + strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */ - if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ + if (p = strchr (server + 1, '@')) /* first one only */ *p = '\0'; atom = XInternAtom (dpy, server, False); win = XGetSelectionOwner (dpy, atom); if (win != None) - return True; + return true; } - return False; + return false; } void -rxvt_term::IMSendSpot () +rxvt_term::im_send_spot () { XPoint nspot; XVaNestedList preedit_attr; @@ -1151,7 +1316,7 @@ if (text) { - void *str; + wchar_t *str; if (!text->encoding_is_wchar && text->string.multi_byte) { @@ -1159,14 +1324,14 @@ 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); + str = rxvt_temp_buf (text->length + 1); + mbstowcs (str, text->string.multi_byte, text->length + 1); if (term->rs[Rs_imLocale]) SET_LOCALE (term->locale); } else - str = (void *)text->string.wide_char; + str = text->string.wide_char; HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, DT_INT, call_data->caret, @@ -1204,7 +1369,7 @@ * open a suitable preedit type */ bool -rxvt_term::IM_get_IC (const char *modifiers) +rxvt_term::im_get_ic (const char *modifiers) { int i, j, found; XIM xim; @@ -1214,13 +1379,10 @@ const char *p; char **s; XIMStyles *xim_styles; -#ifdef ENABLE_XIM_ONTHESPOT - XIMCallback xcb[4]; -#endif - set_environ (envv); + set_environ (env); - if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) + if (!((p = XSetLocaleModifiers (modifiers)) && *p)) return false; input_method = display->get_xim (locale, modifiers); @@ -1247,7 +1409,7 @@ if (!p) continue; - s = rxvt_splitcommastring (p); + s = rxvt_strsplit (',', p); for (i = found = 0; !found && s[i]; i++) { @@ -1269,7 +1431,7 @@ for (j = 0; j < xim_styles->count_styles; j++) if (input_style == xim_styles->supported_styles[j]) { - rxvt_freecommastring (s); + rxvt_free_strsplit (s); found = 1; goto foundpet; @@ -1277,7 +1439,7 @@ } - rxvt_freecommastring (s); + rxvt_free_strsplit (s); } foundpet: @@ -1366,6 +1528,8 @@ #if ENABLE_XIM_ONTHESPOT else if (input_style & XIMPreeditCallbacks) { + XIMCallback xcb[4]; + im_set_position (spot); xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; @@ -1390,7 +1554,7 @@ Input_Context = XCreateIC (xim, XNInputStyle, input_style, XNClientWindow, vt, - XNFocusWindow, parent[0], + XNFocusWindow, parent, preedit_attr ? XNPreeditAttributes : NULL, preedit_attr, status_attr ? XNStatusAttributes : NULL, @@ -1413,7 +1577,7 @@ vt_select_input (); #endif - IMSetPosition (); + im_set_position (); return true; } @@ -1433,17 +1597,15 @@ if (Input_Context) return; -#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) if (rs[Rs_imLocale]) SET_LOCALE (rs[Rs_imLocale]); -#endif p = rs[Rs_inputMethod]; if (p && *p) { bool found = false; - s = rxvt_splitcommastring (p); + s = rxvt_strsplit (',', p); for (i = 0; s[i]; i++) { @@ -1451,7 +1613,7 @@ { strcpy (buf, "@im="); strncat (buf, s[i], IMBUFSIZ - 5); - if (IM_get_IC (buf)) + if (im_get_ic (buf)) { found = true; break; @@ -1459,29 +1621,27 @@ } } - rxvt_freecommastring (s); + rxvt_free_strsplit (s); if (found) goto done; } /* try with XMODIFIERS env. var. */ - if (IM_get_IC ("")) + if (im_get_ic ("")) goto done; /* try with no modifiers base IF the user didn't specify an IM */ - if (IM_get_IC ("@im=none")) + if (im_get_ic ("@im=none")) goto done; done: -#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) if (rs[Rs_imLocale]) SET_LOCALE (locale); -#endif } void -rxvt_term::IMSetPosition () +rxvt_term::im_set_position () { XRectangle preedit_rect, status_rect, *needed_rect; XVaNestedList preedit_attr, status_attr; @@ -1489,7 +1649,7 @@ if (!Input_Context || !focus || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) - || !IMisRunning ()) + || !im_is_running ()) return; if (input_style & XIMPreeditPosition) @@ -1529,40 +1689,10 @@ rxvt_term::get_window_origin (int &x, int &y) { Window cr; - XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); -/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/ -} - -Pixmap -rxvt_term::get_pixmap_property (int prop_id) -{ - if (prop_id > 0 && prop_id < NUM_XA) - if (xa[prop_id]) - { - int aformat; - unsigned long nitems, bytes_after; - Atom atype; - unsigned char *prop = NULL; - int result = XGetWindowProperty (dpy, display->root, xa[prop_id], - 0L, 1L, False, XA_PIXMAP, &atype, &aformat, - &nitems, &bytes_after, &prop); - if (result == Success && prop && atype == XA_PIXMAP) - return *(Pixmap *)prop; - } - - return None; + XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr); } #ifdef HAVE_BG_PIXMAP -# if TRACE_PIXMAPS -# undef update_background -void -rxvt_term::trace_update_background (const char *file, int line) -{ - fprintf (stderr, "%s:%d:update_background()\n", file, line); - update_background (); -} -# endif void rxvt_term::update_background () @@ -1570,12 +1700,10 @@ if (update_background_ev.is_active ()) return; - bgPixmap.invalidate (); - - ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since); + ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since); if (to_wait <= 0.) - bgPixmap.render (); + bg_render (); else update_background_ev.start (to_wait); } @@ -1586,7 +1714,7 @@ make_current (); update_background_ev.stop (); - bgPixmap.render (); + bg_render (); refresh_check (); }