--- rxvt-unicode/src/command.C 2004/07/26 18:01:19 1.97 +++ rxvt-unicode/src/command.C 2004/08/13 22:38:57 1.131 @@ -59,6 +59,113 @@ // exception thrown when the command parser runs out of input data class out_of_input { } out_of_input; +#ifndef NO_FRILLS + +#define ISO_14755_KEYCODE_VALID 0x80000000UL +#define ISO_14755_ACTIVE 0x40000000UL +#define ISO_14755_ESCAPE_NEXT 0x20000000UL + +static unsigned short iso14755_symtab[] = { + // keysym, unicode + XK_Left, 0x2190, + XK_KP_Left, 0x2190, + XK_Up, 0x2191, + XK_KP_Up, 0x2191, + XK_Right, 0x2192, + XK_KP_Right, 0x2192, + XK_Down, 0x2193, + XK_KP_Down, 0x2193, + XK_Linefeed, 0x21b4, + XK_Return, 0x21b5, + XK_KP_Enter, 0x21b5, + + XK_Prior, 0x21de, + XK_Next, 0x21df, + XK_Tab, 0x21e5, + XK_ISO_Left_Tab, 0x21e6, + XK_Shift_L, 0x21e7, + XK_Shift_R, 0x21e7, + + XK_Shift_Lock, 0x21eb, + XK_ISO_Lock, 0x21eb, + XK_ISO_Lock, 0x21eb, + XK_Caps_Lock, 0x21ec, + XK_Num_Lock, 0x21ed, + XK_ISO_Level3_Shift, 0x21ee, + XK_ISO_Level3_Lock, 0x21ef, + XK_ISO_Group_Lock, 0x21f0, + XK_Home, 0x21f1, + XK_End, 0x21f2, + + XK_Execute, 0x2318, + XK_Begin, 0x2320, + XK_Delete, 0x2326, + XK_Clear, 0x2327, + XK_BackSpace, 0x232b, + XK_Insert, 0x2380, + XK_Control_L, 0x2388, + XK_Control_R, 0x2388, + XK_Pause, 0x2389, + XK_Break, 0x238a, + XK_Escape, 0x238b, + XK_Undo, 0x238c, + XK_Print, 0x2399, + + XK_space, 0x2423, + XK_KP_Space, 0x2422, + 0, +}; + +void +rxvt_term::commit_iso14755 () +{ + wchar_t ch[2]; + + ch[0] = iso14755buf & 0x1fffffffUL; // actually, unicode needs a 0x1fffff mask + ch[1] = 0; + + if (iso14755buf & ISO_14755_KEYCODE_VALID) + { + char mb[16]; + int len; + + // allow verbatim 0-bytes and control-bytes to be entered + if (ch[0] >= 0x20) + len = wcstombs (mb, ch, 16); + else + { + mb[0] = ch[0]; + len = 1; + } + + if (len > 0) + tt_write ((unsigned char *)mb, len); + else + scr_bell (); + } + + iso14755buf = 0; +} + +int +rxvt_term::hex_keyval (XKeyEvent &ev) +{ + // check wether this event corresponds to a hex digit + // if the modifiers had not been pressed. + for (int index = 0; index < 8; index++) + { + KeySym k = XLookupKeysym (&ev, index); + + if (k >= XK_KP_0 && k <= XK_KP_9) return k - XK_KP_0; + else if (k >= XK_0 && k <= XK_9) return k - XK_0; + else if (k >= XK_a && k <= XK_f) return k - XK_a + 10; + else if (k >= XK_A && k <= XK_F) return k - XK_A + 10; + } + + return -1; +} +#endif + /*{{{ Convert the keypress event into a string */ void rxvt_term::lookup_key (XKeyEvent &ev) @@ -153,11 +260,10 @@ { #ifdef UNSHIFTED_SCROLLKEYS if (!ctrl && !meta) - { #else if (IS_SCROLL_MOD) - { #endif + { int lnsppg; #ifdef PAGING_CONTEXT_LINES @@ -224,6 +330,7 @@ case XK_Insert: /* Shift+Insert = paste mouse selection */ selection_request (ev.time, 0, 0); return; +#if TODO // TODO /* rxvt extras */ case XK_KP_Add: /* Shift+KP_Add = bigger font */ change_font (FONT_UP); @@ -231,9 +338,36 @@ case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ change_font (FONT_DN); return; +#endif } } } + +#ifndef NO_FRILLS + // ISO 14755 support + if (shft && ctrl) + { + int hv; + + if (keysym == XK_space || keysym == XK_KP_Space + || keysym == XK_Return || keysym == XK_KP_Enter) + { + commit_iso14755 (); + return; + } + else if ((hv = hex_keyval (ev)) >= 0) + { + iso14755buf = (iso14755buf << 4) | hv | ISO_14755_KEYCODE_VALID; + return; + } + else + iso14755buf = 0; + } + else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) + || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) + iso14755buf |= ISO_14755_ACTIVE; +#endif + #ifdef PRINTPIPE if (keysym == XK_Print) { @@ -308,7 +442,7 @@ break; #ifdef XK_KP_Left - case XK_KP_Up: /* \033Ox or standard */ + case XK_KP_Up: /* \033Ox or standard */ case XK_KP_Down: /* \033Or or standard */ case XK_KP_Right: /* \033Ov or standard */ case XK_KP_Left: /* \033Ot or standard */ @@ -663,7 +797,6 @@ want_full_refresh = 0; scr_clear (); scr_touch (false); - want_refresh = 1; } #endif @@ -677,6 +810,8 @@ } display->flush (); + + flush_ev.stop (); } void @@ -685,6 +820,20 @@ SET_R (this); SET_LOCALE (locale); + display->flush (); + + if (want_refresh && !flush_ev.active) + flush_ev.start (NOW + 0.01); +} + +void +rxvt_term::flush_cb (time_watcher &w) +{ + SET_R (this); + SET_LOCALE (locale); + + refresh_limit = 1; + refresh_count = 0; flush (); } @@ -798,19 +947,21 @@ break; } -#ifdef POINTER_BLANK void rxvt_term::pointer_unblank () { XDefineCursor (display->display, TermWin.vt, TermWin_cursor); recolour_cursor (); +#ifdef POINTER_BLANK hidden_pointer = 0; if (Options & Opt_pointerBlank) pointer_ev.start (NOW + pointerBlankDelay); +#endif } +#ifdef POINTER_BLANK void rxvt_term::pointer_blank () { @@ -1010,25 +1161,64 @@ switch (ev.type) { case KeyPress: - lookup_key (ev.xkey); + if (!(iso14755buf & ISO_14755_ESCAPE_NEXT)) + lookup_key (ev.xkey); + break; -#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) case KeyRelease: { +#if (defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)) || !defined (NO_FRILLS) + KeySym ks; + + ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ +#endif + +#ifndef NO_FRILLS + // ISO 14755 support + if (iso14755buf) + if (iso14755buf & ISO_14755_ESCAPE_NEXT) + { + // iso14755 part 5.2 handling: release time + // first: controls + if ((ev.xkey.state & ControlMask) + && ((ks >= 0x40 && ks <= 0x5f) + || (ks >= 0x61 && ks <= 0x7f))) + { + iso14755buf = ISO_14755_KEYCODE_VALID | 0x2400 | (ks & 0x1f); + commit_iso14755 (); + return; // case-break; + } + + for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) + if (i[0] == ks) + { + iso14755buf = ISO_14755_KEYCODE_VALID | i[1]; + commit_iso14755 (); + return; // case-break; + } + + iso14755buf = 0; + scr_bell (); + break; + } + else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask)) + { + if (iso14755buf & ISO_14755_KEYCODE_VALID) + commit_iso14755 (); + else if (iso14755buf & ISO_14755_ACTIVE) + iso14755buf = ISO_14755_ESCAPE_NEXT; // iso14755 part 5.2: remember empty begin/end pair + } +#endif + +#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) if (!(ev.xkey.state & ControlMask)) slip_wheel_ev.stop (); - else - { - KeySym ks; - - ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0); - if (ks == XK_Control_L || ks == XK_Control_R) - mouse_slip_wheel_speed = 0; - } + else if (ks == XK_Control_L || ks == XK_Control_R) + mouse_slip_wheel_speed = 0; +#endif break; } -#endif case ButtonPress: button_press (ev.xbutton); @@ -1074,7 +1264,7 @@ break; case MappingNotify: - XRefreshKeyboardMapping (& (ev.xmapping)); + XRefreshKeyboardMapping (&ev.xmapping); break; /* @@ -1115,6 +1305,15 @@ if (Options & Opt_cursorBlink) cursor_blink_ev.start (NOW + BLINK_INTERVAL); #endif +#ifdef OFF_FOCUS_FADING + if (rs[Rs_fade]) + { + PixColors = PixColorsFocused; + set_colorfgbg (); + scr_clear (); + scr_touch (true); + } +#endif } break; @@ -1133,6 +1332,15 @@ cursor_blink_ev.stop (); hidden_cursor = 0; #endif +#ifdef OFF_FOCUS_FADING + if (rs[Rs_fade]) + { + PixColors = PixColorsUnFocused; + set_colorfgbg (); + scr_clear (); + scr_touch (true); + } +#endif } break; @@ -1151,27 +1359,26 @@ while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); if (szHint.width != width || szHint.height != height) - { - D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height)); - resize_all_windows (width, height, 1); - } -#ifdef DEBUG_SIZE - else - { - D_SIZE ((stderr, "Size: Not resizing")); - } -#endif + resize_all_windows (width, height, 1); + #ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ if (Options & Opt_transparent) { check_our_parents (); if (am_transparent) - want_full_refresh = 1; + want_refresh = want_full_refresh = 1; } #endif } break; + case PropertyNotify: + if (ev.xproperty.atom == xa[XA_VT_SELECTION] + && ev.xproperty.state == PropertyNewValue) + selection_property (ev.xproperty.window, ev.xproperty.atom); + + break; + case SelectionClear: selection_clear (); break; @@ -1210,17 +1417,18 @@ case Expose: if (ev.xany.window == TermWin.vt) { -#ifdef NO_SLOW_LINK_SUPPORT - scr_expose (ev.xexpose.x, ev.xexpose.y, - ev.xexpose.width, ev.xexpose.height, False); -#else - // I don't understand this, so I changed it :) - scr_expose (ev.xexpose.x, ev.xexpose.y, - ev.xexpose.width, ev.xexpose.height, False); - //scr_expose (ev.xexpose.x, 0, - // ev.xexpose.width, TermWin.height, False); -#endif - want_refresh = 1; + do + scr_expose (ev.xexpose.x, ev.xexpose.y, + ev.xexpose.width, ev.xexpose.height, False); + while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)); + + ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; + + while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)) + scr_expose (ev.xexpose.x, ev.xexpose.y, + ev.xexpose.width, ev.xexpose.height, False); + + scr_refresh (refresh_type); } else { @@ -1240,6 +1448,11 @@ if (menubar_visible () && isMenuBarWindow (ev.xany.window)) menubar_expose (); #endif + +#ifdef TRANSPARENT + if (am_transparent && ev.xany.window == TermWin.parent[0]) + XClearWindow (display->display, ev.xany.window); +#endif } break; @@ -1349,6 +1562,7 @@ } } +#if TRANSPARENT void rxvt_term::rootwin_cb (XEvent &ev) { @@ -1358,34 +1572,24 @@ switch (ev.type) { case PropertyNotify: - if (ev.xproperty.atom == xa[XA_VT_SELECTION]) - { - if (ev.xproperty.state == PropertyNewValue) - selection_property (ev.xproperty.window, ev.xproperty.atom); - break; - } -#ifdef TRANSPARENT - else - { - /* - * if user used some Esetroot compatible prog to set the root bg, - * use the property to determine the pixmap. We use it later on. - */ - if (xa[XA_XROOTPMAPID] == 0) - xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False); + /* + * if user used some Esetroot compatible prog to set the root bg, + * use the property to determine the pixmap. We use it later on. + */ + if (xa[XA_XROOTPMAPID] == 0) + xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False); - if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) - return; - } + if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) + return; /* FALLTHROUGH */ case ReparentNotify: if ((Options & Opt_transparent) && check_our_parents () && am_transparent) - want_full_refresh = 1; + want_refresh = want_full_refresh = 1; break; -#endif } } +#endif void rxvt_term::button_press (XButtonEvent &ev) @@ -1573,11 +1777,12 @@ csrO = scrollBar.bot - scrollBar.top; break; } + if (scrollBar.style == R_SB_XTERM || scrollbar_above_slider (ev.y) || scrollbar_below_slider (ev.y)) - scr_move_to ( scrollbar_position (ev.y) - csrO, - scrollbar_size ()); + scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); + scrollBar.setMotion (); break; @@ -1611,6 +1816,7 @@ * scrollbar_position (ev.y) / scrollbar_size ())); } + break; } } @@ -1710,26 +1916,35 @@ if (ev.state & ControlMask) { mouse_slip_wheel_speed += v ? -1 : 1; - slip_wheel_ev.start (NOW + SCROLLBAR_CONTINUOUS_DELAY); + if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; + if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow; + + if (slip_wheel_ev.at < NOW) + slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; + + slip_wheel_ev.start (); } + else + { # endif # ifdef JUMP_MOUSE_WHEEL - scr_page (v, i); - scr_refresh (SMOOTH_REFRESH); - scrollbar_show (1); -# else - while (i--) - { - scr_page (v, 1); + scr_page (v, i); scr_refresh (SMOOTH_REFRESH); scrollbar_show (1); - } +# else + while (i--) + { + scr_page (v, 1); + scr_refresh (SMOOTH_REFRESH); + scrollbar_show (1); + } # endif - +# ifdef MOUSE_SLIP_WHEELING + } +#endif } break; #endif - } } #ifdef MENUBAR @@ -1740,238 +1955,234 @@ #ifdef TRANSPARENT #if TINTING -/* shading taken from eterm-0.9.2 */ -/* RGB 15 */ +/* taken from aterm-0.4.2 */ + +typedef uint32_t RUINT32T; -static void -shade_ximage_15(void *data, int bpl, int w, int h, int rm, int gm, int bm) +void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm) { - unsigned char *ptr; - int x, y; + int sh_r, sh_g, sh_b; + RUINT32T mask_r, mask_g, mask_b; + RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; + unsigned int lower_lim_r, lower_lim_g, lower_lim_b; + unsigned int upper_lim_r, upper_lim_g, upper_lim_b; + int i; - ptr = (unsigned char *)data + (w * sizeof(uint16_t)); - if ((rm <= 256) && (gm <= 256) && (bm <= 256)) { - /* No saturation */ - for (y = h; --y >= 0;) { - for (x = -w; x < 0; x++) { - int r, g, b; - - b = ((uint16_t *) ptr)[x]; - r = (b & 0x7c00) * rm; - g = (b & 0x3e0) * gm; - b = (b & 0x1f) * bm; - ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00) - | ((g >> 8) & 0x3e0) - | ((b >> 8) & 0x1f); - } - ptr += bpl; - } - } else { - for (y = h; --y >= 0;) { - for (x = -w; x < 0; x++) { - int r, g, b; - - b = ((uint16_t *) ptr)[x]; - r = (b & 0x7c00) * rm; - g = (b & 0x3e0) * gm; - b = (b & 0x1f) * bm; - r |= (!(r >> 15) - 1); - g |= (!(g >> 10) - 1); - b |= (!(b >> 5) - 1); - ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00) - | ((g >> 8) & 0x3e0) - | ((b >> 8) & 0x1f); - } - ptr += bpl; - } - } -} - -/* RGB 16 */ -static void -shade_ximage_16(void *data, int bpl, int w, int h, int rm, int gm, int bm) -{ - unsigned char *ptr; - int x, y; - - ptr = (unsigned char *)data + (w * sizeof(uint16_t)); - if ((rm <= 256) && (gm <= 256) && (bm <= 256)) { - /* No saturation */ - for (y = h; --y >= 0;) { - for (x = -w; x < 0; x++) { - int r, g, b; - - b = ((uint16_t *) ptr)[x]; - r = (b & 0xf800) * rm; - g = (b & 0x7e0) * gm; - b = (b & 0x1f) * bm; - ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800) - | ((g >> 8) & 0x7e0) - | ((b >> 8) & 0x1f); - } - ptr += bpl; - } - } else { - for (y = h; --y >= 0;) { - for (x = -w; x < 0; x++) { - int r, g, b; - - b = ((uint16_t *) ptr)[x]; - r = (b & 0xf800) * rm; - g = (b & 0x7e0) * gm; - b = (b & 0x1f) * bm; - r |= (!(r >> 16) - 1); - g |= (!(g >> 11) - 1); - b |= (!(b >> 5) - 1); - ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800) - | ((g >> 8) & 0x7e0) - | ((b >> 8) & 0x1f); - } - ptr += bpl; - } - } -} - -/* RGB 24 */ -static void -shade_ximage_24(void *data, int bpl, int w, int h, int rm, int gm, int bm) -{ - unsigned char *ptr; - int x, y; - - ptr = (unsigned char *)data + (w * 3); - if ((rm <= 256) && (gm <= 256) && (bm <= 256)) { - /* No saturation */ - for (y = h; --y >= 0;) { - for (x = -(w * 3); x < 0; x += 3) { - int r, g, b; - - if (byteorder.big_endian()) { - r = (ptr[x + 0] * rm) >> 8; - g = (ptr[x + 1] * gm) >> 8; - b = (ptr[x + 2] * bm) >> 8; - ptr[x + 0] = r; - ptr[x + 1] = g; - ptr[x + 2] = b; - } else { - r = (ptr[x + 2] * rm) >> 8; - g = (ptr[x + 1] * gm) >> 8; - b = (ptr[x + 0] * bm) >> 8; - ptr[x + 2] = r; - ptr[x + 1] = g; - ptr[x + 0] = b; - } - } - ptr += bpl; - } - } else { - for (y = h; --y >= 0;) { - for (x = -(w * 3); x < 0; x += 3) { - int r, g, b; - - if (byteorder.big_endian()) { - r = (ptr[x + 0] * rm) >> 8; - g = (ptr[x + 1] * gm) >> 8; - b = (ptr[x + 2] * bm) >> 8; - - r |= (!(r >> 8) - 1); - g |= (!(g >> 8) - 1); - b |= (!(b >> 8) - 1); - - ptr[x + 0] = r; - ptr[x + 1] = g; - ptr[x + 2] = b; - } else { - r = (ptr[x + 2] * rm) >> 8; - g = (ptr[x + 1] * gm) >> 8; - b = (ptr[x + 0] * bm) >> 8; - - r |= (!(r >> 8) - 1); - g |= (!(g >> 8) - 1); - b |= (!(b >> 8) - 1); - - ptr[x + 2] = r; - ptr[x + 1] = g; - ptr[x + 0] = b; - } - } - ptr += bpl; - } - } -} - -/* RGB 32 */ -static void -shade_ximage_32(void *data, int bpl, int w, int h, int rm, int gm, int bm) -{ - unsigned char *ptr; - int x, y; - - ptr = (unsigned char *)data + (w * 4); - if ((rm <= 256) && (gm <= 256) && (bm <= 256)) { - /* No saturation */ - for (y = h; --y >= 0;) { - if (byteorder.big_endian()) { - for (x = -(w * 4); x < 0; x += 4) { - int r, g, b; - - r = (ptr[x + 1] * rm) >> 8; - g = (ptr[x + 2] * gm) >> 8; - b = (ptr[x + 3] * bm) >> 8; - ptr[x + 1] = r; - ptr[x + 2] = g; - ptr[x + 3] = b; - } - } else { - for (x = -(w * 4); x < 0; x += 4) { - int r, g, b; - - r = (ptr[x + 2] * rm) >> 8; - g = (ptr[x + 1] * gm) >> 8; - b = (ptr[x + 0] * bm) >> 8; - ptr[x + 2] = r; - ptr[x + 1] = g; - ptr[x + 0] = b; - } - } - ptr += bpl; - } - } else { - for (y = h; --y >= 0;) { - for (x = -(w * 4); x < 0; x += 4) { - int r, g, b; - - if (byteorder.big_endian()) { - r = (ptr[x + 1] * rm) >> 8; - g = (ptr[x + 2] * gm) >> 8; - b = (ptr[x + 3] * bm) >> 8; - - r |= (!(r >> 8) - 1); - g |= (!(g >> 8) - 1); - b |= (!(b >> 8) - 1); - - ptr[x + 1] = r; - ptr[x + 2] = g; - ptr[x + 3] = b; - } else { - r = (ptr[x + 2] * rm) >> 8; - g = (ptr[x + 1] * gm) >> 8; - b = (ptr[x + 0] * bm) >> 8; - - r |= (!(r >> 8) - 1); - g |= (!(g >> 8) - 1); - b |= (!(b >> 8) - 1); - - ptr[x + 2] = r; - ptr[x + 1] = g; - ptr[x + 0] = b; - } - } - ptr += bpl; + Visual* visual = display->visual; + + if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; + + /* for convenience */ + mask_r = visual->red_mask; + mask_g = visual->green_mask; + mask_b = visual->blue_mask; + + /* boring lookup table pre-initialization */ + switch (srcImage->bits_per_pixel) { + case 15: + if ((mask_r != 0x7c00) || + (mask_g != 0x03e0) || + (mask_b != 0x001f)) + return; + lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32)); + lookup_r = lookup; + lookup_g = lookup+32; + lookup_b = lookup+32+32; + sh_r = 10; + sh_g = 5; + sh_b = 0; + break; + case 16: + if ((mask_r != 0xf800) || + (mask_g != 0x07e0) || + (mask_b != 0x001f)) + return; + lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32)); + lookup_r = lookup; + lookup_g = lookup+32; + lookup_b = lookup+32+64; + sh_r = 11; + sh_g = 5; + sh_b = 0; + break; + case 24: + if ((mask_r != 0xff0000) || + (mask_g != 0x00ff00) || + (mask_b != 0x0000ff)) + return; + lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256)); + lookup_r = lookup; + lookup_g = lookup+256; + lookup_b = lookup+256+256; + sh_r = 16; + sh_g = 8; + sh_b = 0; + break; + case 32: + if ((mask_r != 0xff0000) || + (mask_g != 0x00ff00) || + (mask_b != 0x0000ff)) + return; + lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256)); + lookup_r = lookup; + lookup_g = lookup+256; + lookup_b = lookup+256+256; + sh_r = 16; + sh_g = 8; + sh_b = 0; + break; + default: + return; /* we do not support this color depth */ + } + + /* prepare limits for color transformation (each channel is handled separately) */ + if (shade < 0) { + shade = -shade; + if (shade < 0) shade = 0; + if (shade > 100) shade = 100; + + lower_lim_r = 65535-rm; + lower_lim_g = 65535-gm; + lower_lim_b = 65535-bm; + + lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100); + lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100); + lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100); + + upper_lim_r = upper_lim_g = upper_lim_b = 65535; + } else { + if (shade < 0) shade = 0; + if (shade > 100) shade = 100; + + lower_lim_r = lower_lim_g = lower_lim_b = 0; + + upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100); + upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100); + upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100); + } + + /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */ + if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 )) + { + unsigned int tmp; + + tmp = lower_lim_r; + lower_lim_r = lower_lim_b; + lower_lim_b = tmp; + + tmp = upper_lim_r; + upper_lim_r = upper_lim_b; + upper_lim_b = tmp; + } + + /* fill our lookup tables */ + for (i = 0; i <= mask_r>>sh_r; i++) + { + RUINT32T tmp; + tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r)); + tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r); + lookup_r[i] = (tmp/65535)<>sh_g; i++) + { + RUINT32T tmp; + tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g)); + tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g); + lookup_g[i] = (tmp/65535)<>sh_b; i++) + { + RUINT32T tmp; + tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b)); + tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b); + lookup_b[i] = (tmp/65535)<bits_per_pixel) + { + case 15: + { + unsigned short *p1, *pf, *p, *pl; + p1 = (unsigned short *) srcImage->data; + pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line); + while (p1 < pf) + { + p = p1; + pl = p1 + srcImage->width; + for (; p < pl; p++) + { + *p = lookup_r[(*p & 0x7c00)>>10] | + lookup_g[(*p & 0x03e0)>> 5] | + lookup_b[(*p & 0x001f)]; } + p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line); + } + break; } -} + case 16: + { + unsigned short *p1, *pf, *p, *pl; + p1 = (unsigned short *) srcImage->data; + pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line); + while (p1 < pf) + { + p = p1; + pl = p1 + srcImage->width; + for (; p < pl; p++) + { + *p = lookup_r[(*p & 0xf800)>>11] | + lookup_g[(*p & 0x07e0)>> 5] | + lookup_b[(*p & 0x001f)]; + } + p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line); + } + break; + } + case 24: + { + unsigned char *p1, *pf, *p, *pl; + p1 = (unsigned char *) srcImage->data; + pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line); + while (p1 < pf) + { + p = p1; + pl = p1 + srcImage->width * 3; + for (; p < pl; p += 3) + { + p[0] = lookup_r[(p[0] & 0xff0000)>>16]; + p[1] = lookup_r[(p[1] & 0x00ff00)>> 8]; + p[2] = lookup_r[(p[2] & 0x0000ff)]; + } + p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line); + } + break; + } + case 32: + { + RUINT32T *p1, *pf, *p, *pl; + p1 = (RUINT32T *) srcImage->data; + pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line); + while (p1 < pf) + { + p = p1; + pl = p1 + srcImage->width; + for (; p < pl; p++) + { + *p = lookup_r[(*p & 0xff0000)>>16] | + lookup_g[(*p & 0x00ff00)>> 8] | + lookup_b[(*p & 0x0000ff)] | + (*p & ~0xffffff); + } + p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line); + } + break; + } + } + + free (lookup); +} #endif /* @@ -2004,7 +2215,7 @@ if (am_transparent) { pchanged = 1; - XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]); + XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]); am_transparent = am_pixmap_trans = 0; } @@ -2030,7 +2241,11 @@ 0L, 1L, False, XA_PIXMAP, &atype, &aformat, &nitems, &bytes_after, &prop) == Success); - if (!i || prop == NULL) + if (!i || prop == NULL +#if TINTING + || !rs[Rs_color + Color_tint] +#endif + ) have_pixmap = 0; else { @@ -2102,20 +2317,12 @@ #if TINTING if (ISSET_PIXCOLOR (Color_tint)) { - unsigned short shade, rm, gm, bm; - - PixColors[Color_tint].get (display, rm, gm, bm); + unsigned short rm, gm, bm; + int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; - rm >>= 8; gm >>= 8; bm >>= 8; // not 100% correct, but... + PixColorsFocused[Color_tint].get (display, rm, gm, bm); - /* Determine bitshift and bitmask values */ - switch (image->bits_per_pixel) - { - case 15: shade_ximage_15 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break; - case 16: shade_ximage_16 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break; - case 24: shade_ximage_24 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break; - case 32: shade_ximage_32 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break; - } + ShadeXImage (display, image, shade, rm, gm, bm); } #endif @@ -2126,8 +2333,8 @@ nx, ny, image->width, image->height); XFreeGC (display->display, gc); XDestroyImage (image); - XSetWindowBackgroundPixmap (display->display, TermWin.vt, - TermWin.pixmap); + XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap); + XClearWindow (display->display, TermWin.parent[0]); if (!am_transparent || !am_pixmap_trans) pchanged = 1; @@ -2182,8 +2389,8 @@ if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) { D_X ((stderr, "InheritPixmap Turning off")); - XSetWindowBackground (display->display, TermWin.parent[0], PixColors[Color_fg]); - XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]); + XSetWindowBackground (display->display, TermWin.parent[0], PixColorsFocused[Color_fg]); + XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]); am_transparent = 0; /* XXX: also turn off Opt_transparent? */ } @@ -2196,7 +2403,10 @@ #endif D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1)); for (n = 0; n < (unsigned int)i; n++) - XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); + { + XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); + XClearWindow (display->display, TermWin.parent[n]); + } XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); am_transparent = 1; @@ -2206,6 +2416,15 @@ TermWin.parent[i] = None; } + // this is experimental + if (scrollBar.win) + { + XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative); + XClearWindow (display->display, scrollBar.win); + scrollBar.setIdle (); + scrollbar_show (0); + } + return pchanged; } #endif @@ -2238,13 +2457,8 @@ int nlines = 0; unicode_t *str = buf; - *str++ = ch; - for (;;) { - seq_begin = cmdbuf_ptr; - ch = next_char (); - if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) break; @@ -2255,16 +2469,15 @@ nlines++; refresh_count++; - if (! (Options & Opt_jumpScroll) - || (refresh_count >= (refresh_limit * (TermWin.nrow - 1)))) + if (!(Options & Opt_jumpScroll) + || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) { refreshnow = true; - flag = true; ch = NOCHAR; break; } - // scr_add_lines only works for nlines < TermWin.nrow - 1. + // scr_add_lines only works for nlines <= TermWin.nrow - 1. if (nlines >= TermWin.nrow - 1) { scr_add_lines (buf, nlines, str - buf); @@ -2278,6 +2491,9 @@ ch = NOCHAR; break; } + + seq_begin = cmdbuf_ptr; + ch = next_char (); } scr_add_lines (buf, nlines, str - buf); @@ -2287,16 +2503,16 @@ * What the heck I'll cheat and only refresh less than every page-full. * the number of pages between refreshes is refresh_limit, which * is incremented here because we must be doing flat-out scrolling. - * - * refreshing should be correct for small scrolls, because of the - * time-out */ if (refreshnow) { if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) refresh_limit++; else - scr_refresh (refresh_type); + { + flag = true; + scr_refresh (refresh_type); + } } } @@ -3131,20 +3347,20 @@ tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); break; case 20: /* report icon label */ - if (Options & Opt_insecure) - { - char *s; - XGetIconName (display->display, TermWin.parent[0], &s); - tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ - } + { + char *s; + XGetIconName (display->display, TermWin.parent[0], &s); + tt_printf ("\033]L%-.250s\234", (Options & Opt_insecure) && s ? s : ""); /* 8bit ST */ + XFree (s); + } break; case 21: /* report window title */ - if (Options & Opt_insecure) - { - char *s; - XFetchName (display->display, TermWin.parent[0], &s); - tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ - } + { + char *s; + XFetchName (display->display, TermWin.parent[0], &s); + tt_printf ("\033]l%-.250s\234", (Options & Opt_insecure) && s ? s : ""); /* 8bit ST */ + XFree (s); + } break; } } @@ -3251,12 +3467,9 @@ { if (str[0] == '?' && !str[1]) { - if (Options & Opt_insecure) - { - unsigned short r, g, b; - PixColors[color].get (display, r, g, b); - tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); - } + unsigned short r, g, b; + PixColorsFocused[color].get (display, r, g, b); + tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); } else set_window_color (color, str); @@ -3366,12 +3579,9 @@ if (name[0] == '?' && !name[1]) { - if (Options & Opt_insecure) - { - unsigned short r, g, b; - PixColors[color + minCOLOR].get (display, r, g, b); - tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); - } + unsigned short r, g, b; + PixColorsFocused[color + minCOLOR].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 + minCOLOR, name); @@ -3445,14 +3655,10 @@ case XTerm_font: if (query) - { - if (Options & Opt_insecure) - tt_printf ("\33]%d;%-.250s%c", XTerm_font, - TermWin.fontset->fontdesc - ? TermWin.fontset->fontdesc - : "", - resp); - } + tt_printf ("\33]%d;%-.250s%c", XTerm_font, + (Options & Opt_insecure) && TermWin.fontset->fontdesc + ? TermWin.fontset->fontdesc : "", + resp); else change_font (str); break; @@ -3460,10 +3666,7 @@ #ifndef NO_FRILLS case XTerm_locale: if (query) - { - if (Options & Opt_insecure) - tt_printf ("\33]%d;%-.250s%c", XTerm_locale, locale, resp); - } + tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (Options & Opt_insecure) ? locale : "", resp); else { set_locale (str); @@ -3474,12 +3677,13 @@ break; case XTerm_findfont: - if (Options & Opt_insecure) - { - int fid = TermWin.fontset->find_font (atoi (str)); - tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont, - fid, (*TermWin.fontset)[fid]->name, resp); - } + { + int fid = TermWin.fontset->find_font (atoi (str)); + tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont, + fid, + (Options & Opt_insecure) ? (*TermWin.fontset)[fid]->name : "", + resp); + } break; #endif @@ -3752,10 +3956,12 @@ case 1: rendset = 1, rendstyle = RS_Bold; break; + //case 2: // faint or second colour case 4: rendset = 1, rendstyle = RS_Uline; break; - case 5: + case 5: // slowly blinking + case 6: // rapidly blinking rendset = 1, rendstyle = RS_Blink; break; //case 6: // scoansi light background @@ -3765,15 +3971,20 @@ case 8: // invisible. NYI break; - //case 10: // scoansi acs off - //case 11: // scoansi acs on - //case 12: // scoansi acs on, |0x80 - case 21: // disable bold, blink and invis (some terminals use this) - rendset = 0, rendstyle = RS_Bold | RS_Blink; + //case 9: // crossed out + //case 10: // scoansi acs off, primary font + //case 11: // scoansi acs on, first alt font + //case 12: // scoansi acs on, |0x80, second alt font + //... + //case 19: // ninth alt font + //case 20: // gothic + case 21: // disable bold, faint + rendset = 0, rendstyle = RS_Bold; break; case 22: rendset = 0, rendstyle = RS_Bold; break; + //case 23: disable italic case 24: rendset = 0, rendstyle = RS_Uline; break; @@ -3783,9 +3994,8 @@ case 27: rendset = 0, rendstyle = RS_RVid; break; - case 28: - // visible. NYI - break; + //case 28: // visible. NYI + //case 29: // not crossed-out } if (rendset != -1)