--- rxvt-unicode/src/main.C 2011/01/08 10:37:21 1.346 +++ rxvt-unicode/src/main.C 2011/07/09 13:14:47 1.357 @@ -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 @@ -189,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); @@ -228,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) @@ -250,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)) @@ -281,7 +274,8 @@ free (env_term); free (locale); free (v_buffer); - free (incr_buf); + + delete selection_req; delete envv; delete argv; @@ -327,7 +321,6 @@ #if ENABLE_TRANSPARENCY || ENABLE_PERL rootwin_ev.stop (display); #endif - incr_ev.stop (); termwin_ev.stop (display); vt_ev.stop (display); } @@ -744,13 +737,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 () { @@ -817,7 +804,7 @@ #endif } - if (parent[0]) + if (parent) { resize_all_windows (0, 0, 0); scr_remap_chars (); @@ -830,7 +817,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)); } @@ -842,7 +829,7 @@ if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0) { - XSetTextProperty (dpy, parent[0], &ct, prop); + XSetTextProperty (dpy, parent, &ct, prop); XFree (ct.value); } } @@ -853,7 +840,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)); @@ -1017,7 +1004,7 @@ if (set_hint) { szHint.flags &= ~(PBaseSize | PResizeInc); - XSetWMNormalHints (dpy, parent[0], &szHint); + XSetWMNormalHints (dpy, parent, &szHint); szHint.flags |= PBaseSize | PResizeInc; } @@ -1033,9 +1020,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 @@ -1062,15 +1049,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; @@ -1084,7 +1071,7 @@ width, height); #ifdef HAVE_BG_PIXMAP - if (bgPixmap.window_size_sensitive ()) + if (bg_window_size_sensitive ()) update_background (); #endif } @@ -1092,12 +1079,6 @@ 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 (); #endif @@ -1189,10 +1170,10 @@ win = XGetSelectionOwner (dpy, atom); if (win != None) - return True; + return true; } - return False; + return false; } void @@ -1322,9 +1303,6 @@ const char *p; char **s; XIMStyles *xim_styles; -#ifdef ENABLE_XIM_ONTHESPOT - XIMCallback xcb[4]; -#endif set_environ (envv); @@ -1355,7 +1333,7 @@ if (!p) continue; - s = rxvt_splitcommastring (p); + s = rxvt_strsplit (',', p); for (i = found = 0; !found && s[i]; i++) { @@ -1377,7 +1355,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; @@ -1385,7 +1363,7 @@ } - rxvt_freecommastring (s); + rxvt_free_strsplit (s); } foundpet: @@ -1474,6 +1452,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; @@ -1498,7 +1478,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, @@ -1551,7 +1531,7 @@ { bool found = false; - s = rxvt_splitcommastring (p); + s = rxvt_strsplit (',', p); for (i = 0; s[i]; i++) { @@ -1567,7 +1547,7 @@ } } - rxvt_freecommastring (s); + rxvt_free_strsplit (s); if (found) goto done; @@ -1637,7 +1617,7 @@ 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 @@ -1670,12 +1650,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); } @@ -1686,7 +1666,7 @@ make_current (); update_background_ev.stop (); - bgPixmap.render (); + bg_render (); refresh_check (); }