--- rxvt-unicode/src/main.C 2010/12/07 19:53:20 1.339 +++ rxvt-unicode/src/main.C 2011/08/19 16:01:37 1.360 @@ -13,7 +13,7 @@ * Copyright (c) 1997,1998 Oezguer Kesim * Copyright (c) 1998-2001 Geoff Wing * - extensive modifications - * Copyright (c) 2003-2010 Marc Lehmann + * Copyright (c) 2003-2010 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 @@ -98,7 +98,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) { @@ -107,11 +107,9 @@ } // check to see whether 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 ()); - } + 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) @@ -119,7 +117,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; } @@ -191,7 +189,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); @@ -230,13 +227,7 @@ delete fontset[0]; #ifdef HAVE_BG_PIXMAP - bgPixmap.destroy (); -#endif -#ifdef HAVE_AFTERIMAGE - if (asv) - destroy_asvisual (asv, 0); - if (asimman) - destroy_image_manager (asimman, 0); + bg_destroy (); #endif if (display) @@ -252,8 +243,8 @@ 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)) @@ -283,7 +274,8 @@ free (env_term); free (locale); free (v_buffer); - free (incr_buf); + + delete selection_req; delete envv; delete argv; @@ -329,7 +321,6 @@ #if ENABLE_TRANSPARENCY || ENABLE_PERL rootwin_ev.stop (display); #endif - incr_ev.stop (); termwin_ev.stop (display); vt_ev.stop (display); } @@ -396,7 +387,7 @@ char buffer[BUFSIZ]; char mesg[BUFSIZ]; char number[32]; - char *mtype = "XlibMessage"; + const char mtype[] = "XlibMessage"; XGetErrorText(dpy, event->error_code, buffer, BUFSIZ); XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ); rxvt_warn ("An X Error occurred, trying to continue after report.\n"); @@ -717,6 +708,15 @@ 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. + width = ncol * fwidth; + height = nrow * fheight; } /*----------------------------------------------------------------------*/ @@ -746,13 +746,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 () { @@ -819,7 +813,7 @@ #endif } - if (parent[0]) + if (parent) { resize_all_windows (0, 0, 0); scr_remap_chars (); @@ -832,7 +826,7 @@ 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)); } @@ -844,7 +838,7 @@ if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0) { - XSetTextProperty (dpy, parent[0], &ct, prop); + XSetTextProperty (dpy, parent, &ct, prop); XFree (ct.value); } } @@ -855,7 +849,7 @@ 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)); @@ -960,21 +954,20 @@ { unsigned int i; const char *xpmb = ""; - char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; + char fstr[] = "default"; + char bstr[] = "default"; - 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)); + sprintf (bstr, "%d", i - Color_Black); #ifdef BG_IMAGE_FROM_FILE xpmb = "default;"; #endif @@ -1020,7 +1013,7 @@ if (set_hint) { szHint.flags &= ~(PBaseSize | PResizeInc); - XSetWMNormalHints (dpy, parent[0], &szHint); + XSetWMNormalHints (dpy, parent, &szHint); szHint.flags |= PBaseSize | PResizeInc; } @@ -1036,9 +1029,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 @@ -1065,15 +1058,15 @@ 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[0], &szHint); + XSetWMNormalHints (dpy, parent, &szHint); fix_screen = ncol != prev_ncol || nrow != prev_nrow; @@ -1087,7 +1080,7 @@ width, height); #ifdef HAVE_BG_PIXMAP - if (bgPixmap.window_size_sensitive ()) + if (bg_window_size_sensitive ()) update_background (); #endif } @@ -1095,14 +1088,8 @@ if (fix_screen || old_height == 0) scr_reset (); -#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 (); + im_set_position (); #endif } @@ -1173,7 +1160,7 @@ /* Checking whether input method is running. */ bool -rxvt_term::IMisRunning () +rxvt_term::im_is_running () { Atom atom; Window win; @@ -1192,14 +1179,14 @@ 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; @@ -1315,7 +1302,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; @@ -1325,9 +1312,6 @@ const char *p; char **s; XIMStyles *xim_styles; -#ifdef ENABLE_XIM_ONTHESPOT - XIMCallback xcb[4]; -#endif set_environ (envv); @@ -1358,7 +1342,7 @@ if (!p) continue; - s = rxvt_splitcommastring (p); + s = rxvt_strsplit (',', p); for (i = found = 0; !found && s[i]; i++) { @@ -1380,7 +1364,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; @@ -1388,7 +1372,7 @@ } - rxvt_freecommastring (s); + rxvt_free_strsplit (s); } foundpet: @@ -1477,6 +1461,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; @@ -1501,7 +1487,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, @@ -1524,7 +1510,7 @@ vt_select_input (); #endif - IMSetPosition (); + im_set_position (); return true; } @@ -1554,7 +1540,7 @@ { bool found = false; - s = rxvt_splitcommastring (p); + s = rxvt_strsplit (',', p); for (i = 0; s[i]; i++) { @@ -1562,7 +1548,7 @@ { strcpy (buf, "@im="); strncat (buf, s[i], IMBUFSIZ - 5); - if (IM_get_IC (buf)) + if (im_get_ic (buf)) { found = true; break; @@ -1570,18 +1556,18 @@ } } - 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: @@ -1592,7 +1578,7 @@ } void -rxvt_term::IMSetPosition () +rxvt_term::im_set_position () { XRectangle preedit_rect, status_rect, *needed_rect; XVaNestedList preedit_attr, status_attr; @@ -1600,7 +1586,7 @@ if (!Input_Context || !focus || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) - || !IMisRunning ()) + || !im_is_running ()) return; if (input_style & XIMPreeditPosition) @@ -1640,27 +1626,29 @@ rxvt_term::get_window_origin (int &x, int &y) { Window cr; - XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); + XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr); } Pixmap -rxvt_term::get_pixmap_property (int prop_id) +rxvt_term::get_pixmap_property (Atom property) { - 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; - } + Pixmap pixmap = None; + + int aformat; + unsigned long nitems, bytes_after; + Atom atype; + unsigned char *prop; + int result = XGetWindowProperty (dpy, display->root, property, + 0L, 1L, False, XA_PIXMAP, &atype, &aformat, + &nitems, &bytes_after, &prop); + if (result == Success) + { + if (atype == XA_PIXMAP) + pixmap = *(Pixmap *)prop; + XFree (prop); + } - return None; + return pixmap; } #ifdef HAVE_BG_PIXMAP @@ -1671,12 +1659,12 @@ if (update_background_ev.is_active ()) return; - bgPixmap.invalidate (); + bg_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); } @@ -1687,7 +1675,7 @@ make_current (); update_background_ev.stop (); - bgPixmap.render (); + bg_render (); refresh_check (); }