--- rxvt-unicode/src/main.C 2006/02/01 21:15:33 1.216 +++ rxvt-unicode/src/main.C 2007/06/23 18:29:08 1.236 @@ -1,4 +1,4 @@ -/*--------------------------------*-C-*---------------------------------* +/*----------------------------------------------------------------------* * File: main.C *----------------------------------------------------------------------* * @@ -58,10 +58,15 @@ bool rxvt_set_locale (const char *locale) NOTHROW { - if (!locale || !strncmp (locale, curlocale, 128)) + int size = strlen (locale) + 1; + + if (size > sizeof (curlocale)) + rxvt_fatal ("locale string too long, aborting.\n"); + + if (!locale || !memcmp (locale, curlocale, size)) return false; - strncpy (curlocale, locale, 128); + memcpy (curlocale, locale, size); setlocale (LC_CTYPE, curlocale); return true; } @@ -145,9 +150,12 @@ rxvt_term::rxvt_term () : -#if TRANSPARENT +#if TRANSPARENT || ENABLE_PERL rootwin_ev (this, &rxvt_term::rootwin_cb), #endif +#if TRANSPARENT + check_our_parents_ev(this, &rxvt_term::check_our_parents_cb), +#endif #ifdef HAVE_SCROLLBARS scrollbar_ev (this, &rxvt_term::x_cb), #endif @@ -200,6 +208,7 @@ if (cmd_pid) kill (-cmd_pid, SIGHUP); + pty_ev.stop (); delete pty; pty = 0; } @@ -224,35 +233,35 @@ im_destroy (); #endif #ifdef XTERM_SCROLLBAR - if (xscrollbarGC) XFreeGC (xdisp, xscrollbarGC); - if (ShadowGC) XFreeGC (xdisp, ShadowGC); + if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC); + if (ShadowGC) XFreeGC (dpy, ShadowGC); #endif #ifdef PLAIN_SCROLLBAR - if (pscrollbarGC) XFreeGC (xdisp, pscrollbarGC); + if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC); #endif #ifdef NEXT_SCROLLBAR - if (blackGC) XFreeGC (xdisp, blackGC); - if (whiteGC) XFreeGC (xdisp, whiteGC); - if (grayGC) XFreeGC (xdisp, grayGC); - if (darkGC) XFreeGC (xdisp, darkGC); - if (stippleGC) XFreeGC (xdisp, stippleGC); - if (dimple) XFreePixmap (xdisp, dimple); - if (upArrow) XFreePixmap (xdisp, upArrow); - if (downArrow) XFreePixmap (xdisp, downArrow); - if (upArrowHi) XFreePixmap (xdisp, upArrowHi); - if (downArrowHi) XFreePixmap (xdisp, 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 (xdisp, topShadowGC); - if (botShadowGC) XFreeGC (xdisp, botShadowGC); - if (scrollbarGC) XFreeGC (xdisp, scrollbarGC); + if (topShadowGC) XFreeGC (dpy, topShadowGC); + if (botShadowGC) XFreeGC (dpy, botShadowGC); + if (scrollbarGC) XFreeGC (dpy, scrollbarGC); #endif - if (gc) XFreeGC (xdisp, gc); + if (gc) XFreeGC (dpy, gc); delete drawable; // destroy all windows if (parent[0]) - XDestroyWindow (xdisp, parent[0]); + XDestroyWindow (dpy, parent[0]); for (int i = 0; i < TOTAL_COLORS; i++) if (ISSET_PIXCOLOR (i)) @@ -266,9 +275,9 @@ clear (); } - delete pix_colors_focused; + delete [] pix_colors_focused; #if OFF_FOCUS_FADING - delete pix_colors_unfocused; + delete [] pix_colors_unfocused; #endif displays.put (display); @@ -303,7 +312,7 @@ cmd_pid = 0; - if (!OPTION (Opt_hold)) + if (!option (Opt_hold)) destroy (); } @@ -327,7 +336,7 @@ #if HAVE_SCROLLBARS scrollbar_ev.stop (display); #endif -#if TRANSPARENT +#if TRANSPARENT || ENABLE_PERL rootwin_ev.stop (display); #endif incr_ev.stop (); @@ -477,7 +486,7 @@ #endif #ifdef HAVE_SCROLLBARS - if (OPTION (Opt_scrollBar)) + if (option (Opt_scrollBar)) scrollBar.setIdle (); /* set existence for size calculations */ #endif @@ -490,21 +499,24 @@ scr_reset (); // initialize screen #if 0 - XSynchronize (xdisp, True); + XSynchronize (dpy, True); #endif #ifdef HAVE_SCROLLBARS - if (OPTION (Opt_scrollBar)) + if (option (Opt_scrollBar)) resize_scrollbar (); /* create and map scrollbar */ #endif #ifdef TRANSPARENT - if (OPTION (Opt_transparent)) + if (option (Opt_transparent)) { - XSelectInput (xdisp, display->root, PropertyChangeMask); + XSelectInput (dpy, display->root, PropertyChangeMask); check_our_parents (); rootwin_ev.start (display, display->root); } #endif +#if ENABLE_PERL + rootwin_ev.start (display, display->root); +#endif set_colorfgbg (); @@ -524,13 +536,13 @@ { long info[2] = { 0, XEMBED_MAPPED }; - XChangeProperty (xdisp, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], + XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], 32, PropModeReplace, (unsigned char *)&info, 2); } #endif - XMapWindow (xdisp, vt); - XMapWindow (xdisp, parent[0]); + XMapWindow (dpy, vt); + XMapWindow (dpy, parent[0]); return true; } @@ -620,7 +632,7 @@ /*----------------------------------------------------------------------*/ /* - * window size/position calculcations for XSizeHint and other storage. + * window size/position calculations for XSizeHint and other storage. * if width/height are non-zero then override calculated width/height */ void @@ -702,13 +714,13 @@ sb_w = scrollbar_TotalWidth (); szHint.base_width += sb_w; - if (!OPTION (Opt_scrollBar_right)) + 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) @@ -733,14 +745,14 @@ szHint.height = szHint.base_height + height; } - if (scrollBar.state && OPTION (Opt_scrollBar_right)) + if (scrollBar.state && option (Opt_scrollBar_right)) window_sb_x = szHint.width - sb_w; if (recalc_x) - szHint.x += DisplayWidth (xdisp, display->screen) - szHint.width - 2 * ext_bwidth; + szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; if (recalc_y) - szHint.y += DisplayHeight (xdisp, display->screen) - szHint.height - 2 * ext_bwidth; + szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; ncol = width / fwidth; nrow = height / fheight; @@ -805,7 +817,8 @@ prop = (*fs)[1]->properties (); prop.height += lineSpace; - fs->set_prop (prop); + + fs->set_prop (prop, false); fwidth = prop.width; fheight = prop.height; @@ -824,17 +837,20 @@ rxvt_fontprop prop2 = prop; if (res) - prop2.weight = prop2.slant = rxvt_fontprop::unset; + { + fs->populate (res); + fs->set_prop (prop2, false); + } else { - res = fontset[0]->fontdesc; + fs->populate (fontset[0]->fontdesc); if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; + + fs->set_prop (prop2, true); } - fs->populate (res); - fs->set_prop (prop2); } #else fontset[style] = fontset[0]; @@ -853,7 +869,7 @@ void rxvt_term::set_string_property (Atom prop, const char *str, int len) { - XChangeProperty (xdisp, parent[0], + XChangeProperty (dpy, parent[0], prop, XA_STRING, 8, PropModeReplace, (const unsigned char *)str, len >= 0 ? len : strlen (str)); } @@ -863,7 +879,7 @@ wchar_t *ws = rxvt_mbstowcs (str, len); char *s = rxvt_wcstoutf8 (ws); - XChangeProperty (xdisp, parent[0], + XChangeProperty (dpy, parent[0], prop, xa[XA_UTF8_STRING], 8, PropModeReplace, (const unsigned char *)s, strlen (s)); @@ -937,18 +953,9 @@ /* XSetWindowAttributes attr; */ /* Cursor cursor; */ done: - -#if OFF_FOCUS_FADING - if (rs[Rs_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. */ + update_fade_color (idx); recolour_cursor (); scr_recolour (); } @@ -970,7 +977,7 @@ ? pix_colors_focused[Color_pointer_bg] : pix_colors_focused[Color_bg]).get (bg); - XRecolorCursor (xdisp, TermWin_cursor, &fg, &bg); + XRecolorCursor (dpy, TermWin_cursor, &fg, &bg); } /*----------------------------------------------------------------------*/ @@ -1035,7 +1042,9 @@ int old_height = szHint.height; window_calc (newwidth, newheight); - XSetWMNormalHints (xdisp, 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) { @@ -1049,9 +1058,9 @@ unsigned int unused_w1, unused_h1, unused_b1, unused_d1; Window unused_cr; - XTranslateCoordinates (xdisp, parent[0], display->root, + XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &unused_cr); - XGetGeometry (xdisp, 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 @@ -1063,8 +1072,8 @@ y -= y1; } - x1 = (DisplayWidth (xdisp, display->screen) - old_width ) / 2; - y1 = (DisplayHeight (xdisp, display->screen) - old_height) / 2; + 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; @@ -1078,10 +1087,10 @@ else if (y == y1) /* exact center */ dy /= 2; - XMoveResizeWindow (xdisp, parent[0], x + dx, y + dy, + XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, szHint.width, szHint.height); #else - XResizeWindow (xdisp, parent[0], szHint.width, szHint.height); + XResizeWindow (dpy, parent[0], szHint.width, szHint.height); #endif } @@ -1091,13 +1100,13 @@ { if (scrollBar.state) { - XMoveResizeWindow (xdisp, scrollBar.win, + XMoveResizeWindow (dpy, scrollBar.win, window_sb_x, 0, scrollbar_TotalWidth (), szHint.height); resize_scrollbar (); } - XMoveResizeWindow (xdisp, vt, + XMoveResizeWindow (dpy, vt, window_vt_x, window_vt_y, width, height); @@ -1110,13 +1119,16 @@ 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 XPM_BACKGROUND if (pixmap) scr_touch (false); #endif #ifdef USE_XIM - IMSetStatusPosition (); + IMSetPosition (); #endif } @@ -1131,7 +1143,7 @@ if (newwidth == 0 || newheight == 0) { - XGetWindowAttributes (xdisp, display->root, &wattr); + XGetWindowAttributes (dpy, display->root, &wattr); if (newwidth == 0) newwidth = wattr.width - szHint.base_width; @@ -1203,8 +1215,8 @@ if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ *p = '\0'; - atom = XInternAtom (xdisp, server, False); - win = XGetSelectionOwner (xdisp, atom); + atom = XInternAtom (dpy, server, False); + win = XGetSelectionOwner (dpy, atom); if (win != None) return True; @@ -1438,7 +1450,7 @@ fheight + 1, fheight - 1, fheight - 2, fheight + 2); - fs = XCreateFontSet (xdisp, 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) @@ -1523,8 +1535,8 @@ status_attr, NULL); if (preedit_attr) XFree (preedit_attr); - if (status_attr) XFree (status_attr); - if (fs) XFreeFontSet (xdisp, fs); + if (status_attr) XFree (status_attr); + if (fs) XFreeFontSet (dpy, fs); if (Input_Context == NULL) { @@ -1539,8 +1551,7 @@ vt_select_input (); #endif - if (input_style & XIMPreeditArea) - IMSetStatusPosition (); + IMSetPosition (); return true; } @@ -1608,34 +1619,47 @@ } void -rxvt_term::IMSetStatusPosition () +rxvt_term::IMSetPosition () { XRectangle preedit_rect, status_rect, *needed_rect; XVaNestedList preedit_attr, status_attr; if (!Input_Context || !focus - || !(input_style & XIMPreeditArea) + || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) || !IMisRunning ()) return; - /* Getting the necessary width of preedit area */ - status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); - XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); - XFree (status_attr); - - im_set_preedit_area (preedit_rect, status_rect, *needed_rect); - XFree (needed_rect); - - preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); - status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); - - XSetICValues (Input_Context, - XNPreeditAttributes, preedit_attr, - XNStatusAttributes, status_attr, NULL); + if (input_style & XIMPreeditPosition) + { + im_set_size (preedit_rect); + preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); + + XSetICValues (Input_Context, + XNPreeditAttributes, preedit_attr, NULL); + } + else + { + /* Getting the necessary width of preedit area */ + status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); + XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); + XFree (status_attr); - XFree (preedit_attr); - XFree (status_attr); + im_set_preedit_area (preedit_rect, status_rect, *needed_rect); + XFree (needed_rect); + + preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); + status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); + + XSetICValues (Input_Context, + XNPreeditAttributes, preedit_attr, + XNStatusAttributes, status_attr, + NULL); + + XFree (status_attr); + } + + XFree (preedit_attr); } #endif /* USE_XIM */