--- rxvt-unicode/src/main.C 2008/02/19 13:01:32 1.308 +++ rxvt-unicode/src/main.C 2010/07/21 11:02:14 1.329 @@ -37,6 +37,7 @@ #include +#include #include #include @@ -103,7 +104,7 @@ cc = (*this)[cc->c1]; } - // check to see wether this combination already exists otherwise + // check to see whether this combination already exists otherwise for (cc = v.end (); cc-- > v.begin (); ) { if (cc->c1 == c1 && cc->c2 == c2) @@ -229,10 +230,17 @@ #ifdef HAVE_BG_PIXMAP bgPixmap.destroy (); #endif +#ifdef HAVE_AFTERIMAGE + if (asv) + destroy_asvisual (asv, 0); + if (asimman) + destroy_image_manager (asimman, 0); +#endif if (display) { selection_clear (); + selection_clear (true); #ifdef USE_XIM im_destroy (); @@ -267,6 +275,7 @@ free (allocated [i]); free (selection.text); + free (selection.clip_text); // TODO: manage env vars in child only(!) free (env_display); free (env_term); @@ -384,33 +393,33 @@ 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); + 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); + (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); + mesg, BUFSIZ); rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); } #endif @@ -472,6 +481,9 @@ void rxvt_init () { + assert (("fontMask must not overlap other RS masks", + 0 == (RS_fontMask & (RS_Sel | RS_baseattrMask | RS_customMask | RS_bgMask | RS_fgMask)))); + ptytty::init (); if (!ev_default_loop (0)) @@ -485,9 +497,6 @@ 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); @@ -524,13 +533,19 @@ if (flags & WidthValue) { - ncol = clamp (w, 0, std::numeric_limits::max ()); + if (!w) + rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n"); + + ncol = clamp (w, 1, std::numeric_limits::max ()); szHint.flags |= USSize; } if (flags & HeightValue) { - nrow = clamp (h, 0, std::numeric_limits::max ()); + if (!h) + rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n"); + + nrow = clamp (h, 1, std::numeric_limits::max ()); szHint.flags |= USSize; } @@ -615,7 +630,7 @@ if (recalc_y) szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; - ncol = width / fwidth; + ncol = width / fwidth; nrow = height / fheight; } @@ -636,7 +651,7 @@ ws.ws_row = nrow; ws.ws_xpixel = width; ws.ws_ypixel = height; - (void)ioctl (pty->pty, TIOCSWINSZ, &ws); + ioctl (pty->pty, TIOCSWINSZ, &ws); #if 0 // TIOCSWINSZ is supposed to do this automatically and correctly @@ -676,8 +691,9 @@ delete fontset[0]; fontset[0] = fs; - prop = (*fs)[1]->properties (); + prop = (*fs)[rxvt_fontset::firstFont]->properties (); prop.height += lineSpace; + prop.width += letterSpace; fs->set_prop (prop, false); @@ -737,6 +753,18 @@ } 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[0], &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); @@ -756,7 +784,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 @@ -765,7 +793,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 @@ -901,8 +929,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[0], &szHint); + szHint.flags |= PBaseSize | PResizeInc; + } if (!ignoreparent) { @@ -952,6 +987,9 @@ #endif } + if (set_hint) + XSetWMNormalHints (dpy, parent[0], &szHint); + fix_screen = ncol != prev_ncol || nrow != prev_nrow; if (fix_screen || newwidth != old_width || newheight != old_height) @@ -967,16 +1005,11 @@ if (bgPixmap.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) @@ -1057,18 +1090,17 @@ bool rxvt_term::IMisRunning () { - 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); @@ -1145,7 +1177,7 @@ if (text) { - void *str; + wchar_t *str; if (!text->encoding_is_wchar && text->string.multi_byte) { @@ -1153,14 +1185,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,