--- rxvt-unicode/src/command.C 2006/01/24 19:40:12 1.283 +++ rxvt-unicode/src/command.C 2006/01/31 00:25:16 1.295 @@ -229,9 +229,16 @@ ch = 0xfffd; # endif scr_overlay_set (11, y, ch, r); - scr_overlay_set (12, y, NOCHAR, r); + + if (WCWIDTH (ch) >= 2) + scr_overlay_set (12, y, NOCHAR, r); } +// { +// char buf[4+4+3+1]; +// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y); +// scr_overlay_set (0, 0, buf); +// } scr_overlay_set (0, len , attr); scr_overlay_set (0, len + 1, fname); @@ -1166,7 +1173,7 @@ void rxvt_term::pointer_unblank () { - XDefineCursor (display->display, vt, TermWin_cursor); + XDefineCursor (xdisp, vt, TermWin_cursor); recolour_cursor (); #ifdef POINTER_BLANK @@ -1184,8 +1191,8 @@ if (!OPTION (Opt_pointerBlank)) return; - XDefineCursor (display->display, vt, display->blank_cursor); - XFlush (display->display); + XDefineCursor (xdisp, vt, display->blank_cursor); + XFlush (xdisp); hidden_pointer = 1; } @@ -1268,23 +1275,13 @@ (32 + y + 1)); } -#ifdef USING_W11LIB -void -rxvt_W11_process_x_event (XEvent *ev) -{ - rxvt_t *r = rxvt_get_r (); - - x_cb (*ev); -} -#endif - /*{{{ process an X event */ void rxvt_term::x_cb (XEvent &ev) { make_current (); - dDisp; + dLocal (Display *, xdisp); if (ev.xany.window == vt && SHOULD_INVOKE (HOOK_X_EVENT) @@ -1404,7 +1401,7 @@ } #if ENABLE_EWMH else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) - XSendEvent (disp, ev.xclient.window = display->root, + XSendEvent (xdisp, ev.xclient.window = display->root, False, SubstructureRedirectMask | SubstructureNotifyMask, &ev); #endif @@ -1462,7 +1459,7 @@ case ConfigureNotify: if (ev.xconfigure.window == parent[0]) { - while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) + while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev)) ; if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) @@ -1530,11 +1527,11 @@ do scr_expose (ev.xexpose.x, ev.xexpose.y, ev.xexpose.width, ev.xexpose.height, False); - while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); + while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev)); ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; - while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) + while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev)) scr_expose (ev.xexpose.x, ev.xexpose.y, ev.xexpose.width, ev.xexpose.height, False); @@ -1544,9 +1541,9 @@ { XEvent unused_event; - while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) + while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event)) ; - while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) + while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event)) ; if (isScrollbarWindow (ev.xany.window)) @@ -1557,7 +1554,7 @@ #ifdef TRANSPARENT if (am_transparent && ev.xany.window == parent[0]) - XClearWindow (disp, ev.xany.window); + XClearWindow (xdisp, ev.xany.window); #endif } break; @@ -1577,10 +1574,10 @@ ; // nop else if (ev.xbutton.state & (Button1Mask | Button3Mask)) { - while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) + while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev)) ; - XQueryPointer (disp, vt, + XQueryPointer (xdisp, vt, &unused_root, &unused_child, &unused_root_x, &unused_root_y, &ev.xbutton.x, &ev.xbutton.y, @@ -1654,11 +1651,11 @@ } else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) { - while (XCheckTypedWindowEvent (disp, scrollBar.win, + while (XCheckTypedWindowEvent (xdisp, scrollBar.win, MotionNotify, &ev)) ; - XQueryPointer (disp, scrollBar.win, + XQueryPointer (xdisp, scrollBar.win, &unused_root, &unused_child, &unused_root_x, &unused_root_y, &ev.xbutton.x, &ev.xbutton.y, @@ -1708,7 +1705,6 @@ if (!focus) { focus = 1; - want_refresh = 1; HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); @@ -1727,6 +1723,7 @@ if (rs[Rs_fade]) { pix_colors = pix_colors_focused; + want_refresh = 1; scr_recolour (); } #endif @@ -1739,7 +1736,6 @@ if (focus) { focus = 0; - want_refresh = 1; HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); @@ -1765,6 +1761,7 @@ if (rs[Rs_fade]) { pix_colors = pix_colors_unfocused; + want_refresh = 1; scr_recolour (); } #endif @@ -2183,7 +2180,7 @@ typedef uint32_t RUINT32T; -void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm) +void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm) { int sh_r, sh_g, sh_b; RUINT32T mask_r, mask_g, mask_b; @@ -2192,7 +2189,7 @@ unsigned int upper_lim_r, upper_lim_g, upper_lim_b; int i; - Visual *visual = display->visual; + Visual *visual = term->visual; if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; @@ -2423,24 +2420,23 @@ Window root, oldp, *list; Pixmap rootpixmap = None; XWindowAttributes wattr, wrootattr; - dDisp; pchanged = 0; if (!OPTION (Opt_transparent)) return pchanged; /* Don't try any more */ - XGetWindowAttributes (disp, display->root, &wrootattr); + XGetWindowAttributes (xdisp, display->root, &wrootattr); rootdepth = wrootattr.depth; - XGetWindowAttributes (disp, parent[0], &wattr); + XGetWindowAttributes (xdisp, parent[0], &wattr); if (rootdepth != wattr.depth) { if (am_transparent) { pchanged = 1; - XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); + XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]); am_transparent = am_pixmap_trans = 0; } @@ -2448,7 +2444,7 @@ } /* Get all X ops out of the queue so that our information is up-to-date. */ - XSync (disp, False); + XSync (xdisp, False); /* * Make the frame window set by the window manager have @@ -2456,13 +2452,13 @@ * windows for each client, so we have to take care about that. */ i = (xa[XA_XROOTPMAP_ID] - && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID], + && XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID], 0L, 1L, False, XA_PIXMAP, &atype, &aformat, &nitems, &bytes_after, &prop) == Success); if (!i || prop == NULL) i = (xa[XA_ESETROOT_PMAP_ID] - && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID], + && XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID], 0L, 1L, False, XA_PIXMAP, &atype, &aformat, &nitems, &bytes_after, &prop) == Success); @@ -2491,7 +2487,7 @@ GC gc; XGCValues gcvalue; - XTranslateCoordinates (disp, parent[0], display->root, + XTranslateCoordinates (xdisp, parent[0], display->root, 0, 0, &sx, &sy, &cr); nw = (unsigned int)szHint.width; nh = (unsigned int)szHint.height; @@ -2514,9 +2510,9 @@ min_it (nw, (unsigned int) (wrootattr.width - sx)); min_it (nh, (unsigned int) (wrootattr.height - sy)); - XSync (disp, False); + XSync (xdisp, False); allowedxerror = -1; - image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); + image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); /* XXX: handle BadMatch - usually because we're outside the pixmap */ /* XXX: may need a delay here? */ @@ -2529,7 +2525,7 @@ pchanged = 1; if (pixmap != None) { - XFreePixmap (disp, pixmap); + XFreePixmap (xdisp, pixmap); pixmap = None; } } @@ -2539,29 +2535,28 @@ else { if (pixmap != None) - XFreePixmap (disp, pixmap); + XFreePixmap (xdisp, pixmap); #if TINTING if (ISSET_PIXCOLOR (Color_tint)) { - unsigned short rm, gm, bm; int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; - pix_colors_focused[Color_tint].get (display, rm, gm, bm); + rxvt_rgba c; + pix_colors_focused [Color_tint].get (this, c); - ShadeXImage (display, image, shade, rm, gm, bm); + ShadeXImage (this, image, shade, c.r, c.g, c.b); } #endif - pixmap = XCreatePixmap (disp, vt, - szHint.width, szHint.height, image->depth); - gc = XCreateGC (disp, vt, 0UL, &gcvalue); - XPutImage (disp, pixmap, gc, image, 0, 0, + pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth); + gc = XCreateGC (xdisp, vt, 0UL, &gcvalue); + XPutImage (xdisp, pixmap, gc, image, 0, 0, nx, ny, image->width, image->height); - XFreeGC (disp, gc); + XFreeGC (xdisp, gc); XDestroyImage (image); - XSetWindowBackgroundPixmap (disp, parent[0], pixmap); - XClearWindow (disp, parent[0]); + XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap); + XClearWindow (xdisp, parent[0]); if (!am_transparent || !am_pixmap_trans) pchanged = 1; @@ -2571,7 +2566,7 @@ } if (am_pixmap_trans) - XSetWindowBackgroundPixmap (disp, vt, ParentRelative); + XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative); else { unsigned int n; @@ -2581,7 +2576,7 @@ for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) { oldp = parent[i]; - XQueryTree (disp, parent[i - 1], &root, + XQueryTree (xdisp, parent[i - 1], &root, &parent[i], &list, &n); XFree (list); @@ -2603,7 +2598,7 @@ { for (; n < (unsigned int)i; n++) { - XGetWindowAttributes (disp, parent[n], &wattr); + XGetWindowAttributes (xdisp, parent[n], &wattr); if (wattr.depth != rootdepth || wattr.c_class == InputOnly) { n = (int) (sizeof (parent) / sizeof (Window)) + 1; @@ -2614,8 +2609,8 @@ if (n > (int) (sizeof (parent) / sizeof (parent[0]))) { - XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]); - XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); + XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]); + XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]); am_transparent = 0; /* XXX: also turn off Opt_transparent? */ } @@ -2623,11 +2618,11 @@ { for (n = 0; n < (unsigned int)i; n++) { - XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative); - XClearWindow (disp, parent[n]); + XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative); + XClearWindow (xdisp, parent[n]); } - XSetWindowBackgroundPixmap (disp, vt, ParentRelative); + XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative); am_transparent = 1; } @@ -2637,7 +2632,7 @@ if (scrollBar.win) { - XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); + XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative); scrollBar.setIdle (); scrollbar_show (0); } @@ -3098,7 +3093,7 @@ case '+': scr_charset_set (3, (unsigned int)cmd_getc ()); break; -#if ENABLE_FRILLS +#if !ENABLE_MINIMAL case '6': scr_backindex (); break; @@ -3109,7 +3104,7 @@ case '8': scr_cursor (RESTORE); break; -#if ENABLE_FRILLS +#if !ENABLE_MINIMAL case '9': scr_forwardindex (); break; @@ -3292,13 +3287,13 @@ if (ch == CSI_DA) /* secondary device attributes */ { // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, - // 'U' for rxvt-unicode <= 7.2, and Mm85 (e.g. 7385 for 7.3) for later versions. + // 'U' for rxvt-unicode != 7.[34] (where it was broken). // // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify // that we do not support xterm mouse reporting (should be 95 when we do). // - tt_printf ("\033[>%c%c85;94;0c", VERSION[0], VERSION[1]); + tt_printf ("\033[>%d;94;0c", 'U'); } break; case '?': @@ -3512,7 +3507,7 @@ scr_cursor (RESTORE); break; -#if ENABLE_FRILLS +#if !ENABLE_MINIMAL case CSI_74: process_window_ops (arg, nargs); break; @@ -3529,7 +3524,7 @@ } /*}}} */ -#if ENABLE_FRILLS +#if !ENABLE_MINIMAL /* ARGSUSED */ void rxvt_term::process_window_ops (const int *args, unsigned int nargs) @@ -3537,7 +3532,8 @@ int x, y; XWindowAttributes wattr; Window wdummy; - dDisp; + + dLocal (Display *, xdisp); if (nargs == 0) return; @@ -3548,22 +3544,22 @@ * commands */ case 1: /* deiconify window */ - XMapWindow (disp, parent[0]); + XMapWindow (xdisp, parent[0]); break; case 2: /* iconify window */ - XIconifyWindow (disp, parent[0], display->screen); + XIconifyWindow (xdisp, parent[0], display->screen); break; case 3: /* set position (pixels) */ - XMoveWindow (disp, parent[0], args[1], args[2]); + XMoveWindow (xdisp, parent[0], args[1], args[2]); break; case 4: /* set size (pixels) */ set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); break; case 5: /* raise window */ - XRaiseWindow (disp, parent[0]); + XRaiseWindow (xdisp, parent[0]); break; case 6: /* lower window */ - XLowerWindow (disp, parent[0]); + XLowerWindow (xdisp, parent[0]); break; case 7: /* refresh window */ scr_touch (true); @@ -3585,18 +3581,18 @@ * reports - some output format copied from XTerm */ case 11: /* report window state */ - XGetWindowAttributes (disp, parent[0], &wattr); + XGetWindowAttributes (xdisp, parent[0], &wattr); tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); break; case 13: /* report window position */ - XGetWindowAttributes (disp, parent[0], &wattr); - XTranslateCoordinates (disp, parent[0], wattr.root, + XGetWindowAttributes (xdisp, parent[0], &wattr); + XTranslateCoordinates (xdisp, parent[0], wattr.root, -wattr.border_width, -wattr.border_width, &x, &y, &wdummy); tt_printf ("\033[3;%d;%dt", x, y); break; case 14: /* report window size (pixels) */ - XGetWindowAttributes (disp, parent[0], &wattr); + XGetWindowAttributes (xdisp, parent[0], &wattr); tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); break; case 18: /* report text area size (chars) */ @@ -3608,7 +3604,7 @@ case 20: /* report icon label */ { char *s; - XGetIconName (disp, parent[0], &s); + XGetIconName (xdisp, parent[0], &s); tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ XFree (s); } @@ -3616,7 +3612,7 @@ case 21: /* report window title */ { char *s; - XFetchName (disp, parent[0], &s); + XFetchName (xdisp, parent[0], &s); tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ XFree (s); } @@ -3727,9 +3723,15 @@ { if (str[0] == '?' && !str[1]) { - unsigned short r, g, b; - pix_colors_focused[color].get (display, r, g, b); - tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); + rxvt_rgba c; + pix_colors_focused[color].get (this, c); + +#if XFT + if (c.a != rxvt_rgba::MAX_CC) + tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp); + else +#endif + tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp); } else set_window_color (color, str); @@ -3745,7 +3747,8 @@ char *buf, *name; bool query = str[0] == '?' && !str[1]; int saveop = op; - dDisp; + + dLocal (Display *, xdisp); assert (str != NULL); switch (op) @@ -3771,7 +3774,7 @@ const char *str = ""; if (prop - && XGetWindowProperty (disp, parent[0], + && XGetWindowProperty (xdisp, parent[0], prop, 0, 1<<16, 0, AnyPropertyType, &actual_type, &actual_format, &nitems, &bytes_after, &value) == Success @@ -3779,7 +3782,7 @@ && actual_format == 8) str = (const char *)(value); - tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); + tt_printf ("\033]%d;%s%c", op, str, resp); XFree (value); } @@ -3793,7 +3796,7 @@ set_utf8_property (display->atom (str), eq + 1); } else - XDeleteProperty (disp, parent[0], + XDeleteProperty (xdisp, parent[0], display->atom (str)); } break; @@ -3813,36 +3816,29 @@ if ((buf = strchr (name, ';')) != NULL) *buf++ = '\0'; - if (name[0] == '?' && !name[1]) - { - unsigned short r, g, b; - pix_colors_focused[color].get (display, r, g, b); - tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); - } - else - set_window_color (color, name); + process_color_seq (op, color, name, resp); } break; case XTerm_Color00: - process_color_seq (XTerm_Color00, Color_fg, str, resp); + process_color_seq (op, Color_fg, str, resp); break; case XTerm_Color01: - process_color_seq (XTerm_Color01, Color_bg, str, resp); + process_color_seq (op, Color_bg, str, resp); break; #ifndef NO_CURSORCOLOR case XTerm_Color_cursor: - process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); + process_color_seq (op, Color_cursor, str, resp); break; #endif case XTerm_Color_pointer_fg: - process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); + process_color_seq (op, Color_pointer_fg, str, resp); break; case XTerm_Color_pointer_bg: - process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); + process_color_seq (op, Color_pointer_bg, str, resp); break; #ifndef NO_BOLD_UNDERLINE_REVERSE case XTerm_Color_RV: - process_color_seq (XTerm_Color_RV, Color_RV, str, resp); + process_color_seq (op, Color_RV, str, resp); break; case Rxvt_Color_BD: case URxvt_Color_BD: @@ -3853,12 +3849,12 @@ process_color_seq (op, Color_UL, str, resp); break; case URxvt_Color_IT: - process_color_seq (URxvt_Color_IT, Color_IT, str, resp); + process_color_seq (op, Color_IT, str, resp); break; #endif #if TRANSPARENT && TINTING case URxvt_Color_tint: - process_color_seq (URxvt_Color_tint, Color_tint, str, resp); + process_color_seq (op, Color_tint, str, resp); check_our_parents (); if (am_transparent) want_full_refresh = want_refresh = 1; @@ -3942,10 +3938,18 @@ } break; -#if ENABLE_FRILLS + case URxvt_version: + if (query) + tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c", + op, + rs[Rs_name], VERSION[0], VERSION[2], + resp); + break; + +#if !ENABLE_MINIMAL case URxvt_locale: if (query) - tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); + tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp); else { set_locale (str); @@ -4316,7 +4320,7 @@ //case 50: // not variable spacing -#if ENABLE_FRILLS +#if !ENABLE_MINIMAL case 90: case 91: /* set bright fg color */ case 92: