--- rxvt-unicode/src/command.C 2004/02/01 20:12:53 1.37 +++ rxvt-unicode/src/command.C 2005/12/31 16:40:28 1.218 @@ -1,5 +1,5 @@ /*--------------------------------*-C-*---------------------------------* - * File: command.c + * File: command.C *----------------------------------------------------------------------* * * All portions of code are copyright by their respective author/s. @@ -27,6 +27,7 @@ * Copyright (c) 2001 Marius Gedminas * - Ctrl/Mod4+Tab works like Meta+Tab (options) * Copyright (c) 2003 Rob McMullen + * Copyright (c) 2003-2005 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 @@ -49,21 +50,260 @@ #include "version.h" #include "command.h" -#include +#ifdef KEYSYM_RESOURCE +# include "keyboard.h" +#endif + +#include /*----------------------------------------------------------------------*/ +#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) + +// exception thrown when the command parser runs out of input data +class out_of_input { } out_of_input; + +#if ENABLE_FRILLS || ISO_14755 + +#define ISO_14755_STARTED 0x80000000UL +#define ISO_14755_51 0x40000000UL // basic (section 5.1) +#define ISO_14755_52 0x20000000UL // keycap (section 5.2) +#define ISO_14755_54 0x10000000UL // code feedback (section 5.4) +#define ISO_14755_MASK 0x0fffffffUL + +#if ISO_14755 +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, + +#ifdef XK_KP_Begin + XK_KP_Prior, 0x21de, + XK_KP_Next, 0x21df, + XK_KP_Begin, 0x2320, + XK_KP_Insert, 0x2380, + XK_KP_Delete, 0x2326, + XK_KP_Space, 0x2422, +#endif + 0, +}; + +void +rxvt_term::iso14755_54 (int x, int y) +{ + x = Pixel2Col (x); + y = Pixel2Row (y); + + if (!IN_RANGE_EXC (x, 0, ncol) + || !IN_RANGE_EXC (y, 0, nrow)) + return; + + for (;;) + { + const line_t &l = ROW(y - view_start); + + text_t t = l.t[x]; + + if (t != NOCHAR || !x) + { + iso14755_51 (l.t[x], l.r[x], x, y); + iso14755buf = ISO_14755_54; + break; + } + + x--; + } +} +#endif + +void +rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y) +{ +#if ENABLE_OVERLAY + rxvt_fontset *fs = FONTSET (r); + rxvt_font *f = (*fs)[fs->find_font (ch)]; + wchar_t *chr, *alloc, ch2, *fname; + int len; + + fname = rxvt_utf8towcs (f->name); + +# if ENABLE_COMBINING + if (IS_COMPOSE (ch)) + { + len = rxvt_composite.expand (ch, 0); + alloc = chr = new wchar_t[len]; + rxvt_composite.expand (ch, chr); + } + else +# endif + { + ch2 = ch; + + alloc = 0; + chr = &ch2; + len = 1; + } + + char attr[80]; // plenty + + sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s", + (int)r, + fgcolor_of (r), bgcolor_of (r), + r & RS_Bold ? " bold" : "", + r & RS_Italic ? " italic" : "", + r & RS_Blink ? " blink" : "", + r & RS_RVid ? " rvid" : "", + r & RS_Uline ? " uline" : "", + r & RS_Careful ? " careful" : ""); + + int width = wcswidth (fname, wcslen (fname)); + + max_it (width, 8+5); // for char + hey + max_it (width, strlen (attr)); + + if (y >= 0) + { + y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; + x = 0; + } + + scr_overlay_new (x, y, width, len + 2); + + r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); + + for (int y = 0; y < len; y++) + { + char buf[9]; + + ch = *chr++; + + sprintf (buf, "%8x", ch); + scr_overlay_set (0, y, buf); + scr_overlay_set (9, y, '='); +# if !UNICODE3 + if (ch >= 0x10000) + ch = 0xfffd; +# endif + scr_overlay_set (11, y, ch, r); + scr_overlay_set (12, y, NOCHAR, r); + } + + scr_overlay_set (0, len , attr); + scr_overlay_set (0, len + 1, fname); + + free (fname); + +# if ENABLE_COMBINING + if (alloc) + delete [] alloc; +# endif +#endif +} + +void +rxvt_term::commit_iso14755 () +{ + wchar_t ch[2]; + + ch[0] = iso14755buf & ISO_14755_MASK; + ch[1] = 0; + + if (iso14755buf & ISO_14755_51) + { + 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) +rxvt_term::lookup_key (XKeyEvent &ev) { - int ctrl, meta, shft, len; - unsigned int newlen; - KeySym keysym; + int ctrl, meta, shft, len; + unsigned int newlen; + KeySym keysym; #ifdef DEBUG_CMD - static int debug_key = 1; /* accessible by a debugger only */ + static int debug_key = 1; /* accessible by a debugger only */ #endif - int valid_keysym; + int valid_keysym; unsigned char kbuf[KBUFSZ]; /* @@ -72,14 +312,14 @@ * * Always permit `shift' to override the current setting */ - shft = (ev->state & ShiftMask); - ctrl = (ev->state & ControlMask); - meta = (ev->state & ModMetaMask); + shft = ev.state & ShiftMask; + ctrl = ev.state & ControlMask; + meta = ev.state & ModMetaMask; - if (numlock_state || (ev->state & ModNumLockMask)) + if (numlock_state || (ev.state & ModNumLockMask)) { - numlock_state = (ev->state & ModNumLockMask); - PrivMode((!numlock_state), PrivMode_aplKP); + numlock_state = (ev.state & ModNumLockMask); + PrivMode ((!numlock_state), PrivMode_aplKP); } kbuf[0] = 0; @@ -89,13 +329,14 @@ { Status status_return; +#if 0 #ifdef X_HAVE_UTF8_STRING - if (enc_utf8 && 0) - len = Xutf8LookupString (Input_Context, ev, (char *)kbuf, + if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful + len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, KBUFSZ, &keysym, &status_return); else #endif - +#endif { wchar_t wkbuf[KBUFSZ + 1]; @@ -103,73 +344,66 @@ // at the point of XOpenIM, so temporarily switch locales if (rs[Rs_imLocale]) SET_LOCALE (rs[Rs_imLocale]); + // assume wchar_t == unicode or better - len = XwcLookupString (Input_Context, ev, wkbuf, + len = XwcLookupString (Input_Context, &ev, wkbuf, KBUFSZ, &keysym, &status_return); + if (rs[Rs_imLocale]) SET_LOCALE (locale); if (status_return == XLookupChars - || status_return == XLookupBoth) + || status_return == XLookupBoth) { - wkbuf[len] = 0; - len = wcstombs ((char *)kbuf, wkbuf, KBUFSZ); - if (len < 0) - len = 0; + /* make sure the user can type ctrl-@, i.e. NUL */ + if (len == 1 && *wkbuf == 0) + { + kbuf[0] = 0; + len = 1; + } + else + { + wkbuf[len] = 0; + len = wcstombs ((char *)kbuf, wkbuf, KBUFSZ); + if (len < 0) + len = 0; + } } else len = 0; } valid_keysym = status_return == XLookupKeySym - || status_return == XLookupBoth; + || status_return == XLookupBoth; } else #endif - { - len = XLookupString (ev, (char *)kbuf, KBUFSZ, &keysym, &compose); - valid_keysym = !len; + len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); + valid_keysym = keysym != NoSymbol; } if (valid_keysym) { - /* for some backwards compatibility */ -#if defined(HOTKEY_CTRL) || defined(HOTKEY_META) -# ifdef HOTKEY_CTRL - if (ctrl) -# else - if (meta) -# endif - { - if (keysym == ks_bigfont) - { - change_font (0, FONT_UP); - return; - } - else if (keysym == ks_smallfont) - { - change_font (0, FONT_DN); - return; - } - } +#ifdef KEYSYM_RESOURCE + if (keyboard->dispatch (this, keysym, ev.state)) + return; #endif - if (TermWin.saveLines) + if (saveLines) { #ifdef UNSHIFTED_SCROLLKEYS if (!ctrl && !meta) - { #else if (IS_SCROLL_MOD) - { #endif - int lnsppg; + { + int lnsppg; #ifdef PAGING_CONTEXT_LINES - lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; + lnsppg = nrow - PAGING_CONTEXT_LINES; #else - lnsppg = TermWin.nrow * 4 / 5; + lnsppg = nrow * 4 / 5; #endif if (keysym == XK_Prior) { @@ -212,7 +446,6 @@ } } #endif - } if (shft) @@ -223,24 +456,73 @@ keysym += (XK_F11 - XK_F1); shft = 0; /* turn off Shift */ } - else if (!ctrl && !meta && (PrivateModes & PrivMode_ShiftKeys)) + else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys)) { switch (keysym) { /* normal XTerm key bindings */ case XK_Insert: /* Shift+Insert = paste mouse selection */ - selection_request (ev->time, 0, 0); + selection_request (ev.time, 0, 0); return; +#if TODO /* rxvt extras */ case XK_KP_Add: /* Shift+KP_Add = bigger font */ - change_font (0, FONT_UP); + change_font (FONT_UP); return; case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ - change_font (0, FONT_DN); + change_font (FONT_DN); return; +#endif } } } + +#if ENABLE_FRILLS || ISO_14755 + // ISO 14755 support + if (shft && ctrl) + { + int hv; + + if (iso14755buf & ISO_14755_51 + && (keysym == XK_space || keysym == XK_KP_Space + || keysym == XK_Return || keysym == XK_KP_Enter)) + { + commit_iso14755 (); + iso14755buf = ISO_14755_51; +# if ISO_14755 + iso14755_51 (0); +# endif + return; + } + else if ((hv = hex_keyval (ev)) >= 0) + { + iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK) + | hv | ISO_14755_51; +# if ISO_14755 + iso14755_51 (iso14755buf & ISO_14755_MASK); +# endif + return; + } + else + { +# if ENABLE_OVERLAY + scr_overlay_off (); +# endif + iso14755buf = 0; + } + } + else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) + || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) + if (!(iso14755buf & ISO_14755_STARTED)) + { + iso14755buf |= ISO_14755_STARTED; +# if ENABLE_OVERLAY + scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); + scr_overlay_set (0, 0, "ISO 14755 mode"); +# endif + } +#endif + #ifdef PRINTPIPE if (keysym == XK_Print) { @@ -248,95 +530,43 @@ return; } #endif -#ifdef GREEK_SUPPORT - if (keysym == ks_greekmodeswith) - { - greek_mode = !greek_mode; - if (greek_mode) - { - xterm_seq (XTerm_title, - (greek_getmode() == GREEK_ELOT928 - ? "[Greek: iso]" : "[Greek: ibm]"), CHAR_ST); - greek_reset(); - } - else - xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST); - return; - } -#endif if (keysym >= 0xFF00 && keysym <= 0xFFFF) { -#ifdef KEYSYM_RESOURCE - if (!(shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL) - { - unsigned int l; - const unsigned char *kbuf0; - const unsigned char ch = C0_ESC; - - kbuf0 = (Keysym_map[keysym & 0xFF]); - l = (unsigned int)*kbuf0++; - - /* escape prefix */ - if (meta) -# ifdef META8_OPTION - if (meta_char == C0_ESC) -# endif - tt_write (&ch, 1); - tt_write (kbuf0, l); - return; - } - else -#endif - { newlen = 1; switch (keysym) { #ifndef NO_BACKSPACE_KEY case XK_BackSpace: - if (PrivateModes & PrivMode_HaveBackSpace) + if (priv_modes & PrivMode_HaveBackSpace) { - kbuf[0] = (!!(PrivateModes & PrivMode_BackSpace) + kbuf[0] = (!! (priv_modes & PrivMode_BackSpace) ^ !!ctrl) ? '\b' : '\177'; kbuf[1] = '\0'; } else - STRCPY(kbuf, key_backspace); -# ifdef MULTICHAR_SET - if ((Options & Opt_mc_hack) && screen.cur.col > 0) - { - int col, row; - - newlen = STRLEN(kbuf); - col = screen.cur.col - 1; - row = screen.cur.row + TermWin.saveLines; - if (IS_MULTI2(screen.rend[row][col])) - MEMMOVE(kbuf + newlen, kbuf, newlen + 1); - } -# endif + strcpy (kbuf, key_backspace); break; #endif #ifndef NO_DELETE_KEY - case XK_Delete: - STRCPY(kbuf, key_delete); -# ifdef MULTICHAR_SET - if (Options & Opt_mc_hack) +# ifdef XK_KP_Prior + case XK_KP_Delete: + /* allow shift to override */ + if ((priv_modes & PrivMode_aplKP) ? !shft : shft) { - int col, row; - - newlen = STRLEN(kbuf); - col = screen.cur.col; - row = screen.cur.row + TermWin.saveLines; - if (IS_MULTI1(screen.rend[row][col])) - MEMMOVE(kbuf + newlen, kbuf, newlen + 1); + strcpy (kbuf, "\033On"); + break; } + /* FALLTHROUGH */ # endif + case XK_Delete: + strcpy (kbuf, key_delete); break; #endif case XK_Tab: if (shft) - STRCPY(kbuf, "\033[Z"); + strcpy (kbuf, "\033[Z"); else { #ifdef CTRL_TAB_MAKES_META @@ -344,23 +574,22 @@ meta = 1; #endif #ifdef MOD4_TAB_MAKES_META - if (ev->state & Mod4Mask) + if (ev.state & Mod4Mask) meta = 1; #endif newlen = 0; } 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 */ - if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) + if ((priv_modes & PrivMode_aplKP) ? !shft : shft) { - STRCPY(kbuf, "\033OZ"); - kbuf[2] = ("txvr"[keysym - XK_KP_Left]); + strcpy (kbuf, "\033OZ"); + kbuf[2] = "txvr"[keysym - XK_KP_Left]; break; } else @@ -372,119 +601,88 @@ case XK_Down: /* "\033[B" */ case XK_Right: /* "\033[C" */ case XK_Left: /* "\033[D" */ - STRCPY(kbuf, "\033[Z"); - kbuf[2] = ("DACB"[keysym - XK_Left]); + strcpy (kbuf, "\033[Z"); + kbuf[2] = "DACB"[keysym - XK_Left]; /* do Shift first */ if (shft) - kbuf[2] = ("dacb"[keysym - XK_Left]); + kbuf[2] = "dacb"[keysym - XK_Left]; else if (ctrl) { kbuf[1] = 'O'; - kbuf[2] = ("dacb"[keysym - XK_Left]); + kbuf[2] = "dacb"[keysym - XK_Left]; } - else if (PrivateModes & PrivMode_aplCUR) + else if (priv_modes & PrivMode_aplCUR) kbuf[1] = 'O'; -#ifdef MULTICHAR_SET - //TODO: ?? - if (Options & Opt_mc_hack) - { - int col, row, m; - - col = screen.cur.col; - row = screen.cur.row + TermWin.saveLines; - m = 0; - if (keysym == XK_Right - && IS_MULTI1(screen.rend[row][col])) - m = 1; - else if (keysym == XK_Left) - { - if (col > 0) - { - if (IS_MULTI2(screen.rend[row][col - 1])) - m = 1; - } - else if (screen.cur.row > 0) - { - col = screen.tlen[--row]; - if (col == -1) - col = TermWin.ncol - 1; - else - col--; - if (col > 0 - && IS_MULTI2(screen.rend[row][col])) - m = 1; - } - } - if (m) - MEMMOVE(kbuf + 3, kbuf, 3 + 1); - } -#endif break; #ifndef UNSHIFTED_SCROLLKEYS # ifdef XK_KP_Prior case XK_KP_Prior: /* allow shift to override */ - if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) + if ((priv_modes & PrivMode_aplKP) ? !shft : shft) { - STRCPY(kbuf, "\033Oy"); + strcpy (kbuf, "\033Oy"); break; } /* FALLTHROUGH */ # endif case XK_Prior: - STRCPY(kbuf, "\033[5~"); + strcpy (kbuf, "\033[5~"); break; # ifdef XK_KP_Next case XK_KP_Next: /* allow shift to override */ - if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) + if ((priv_modes & PrivMode_aplKP) ? !shft : shft) { - STRCPY(kbuf, "\033Os"); + strcpy (kbuf, "\033Os"); break; } /* FALLTHROUGH */ # endif case XK_Next: - STRCPY(kbuf, "\033[6~"); + strcpy (kbuf, "\033[6~"); break; #endif case XK_KP_Enter: /* allow shift to override */ - if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) + if ((priv_modes & PrivMode_aplKP) ? !shft : shft) { - STRCPY(kbuf, "\033OM"); + strcpy (kbuf, "\033OM"); + break; + } + + /* FALLTHROUGH */ + + case XK_Return: + if (priv_modes & PrivMode_LFNL) + { + kbuf[0] = '\015'; + kbuf[1] = '\012'; + kbuf[2] = '\0'; } else { - kbuf[0] = '\r'; + kbuf[0] = '\015'; kbuf[1] = '\0'; } break; #ifdef XK_KP_Begin case XK_KP_Begin: - STRCPY(kbuf, "\033Ou"); - break; - - case XK_KP_Insert: - STRCPY(kbuf, "\033Op"); + strcpy (kbuf, "\033Ou"); break; - case XK_KP_Delete: - STRCPY(kbuf, "\033On"); - break; #endif case XK_KP_F1: /* "\033OP" */ case XK_KP_F2: /* "\033OQ" */ case XK_KP_F3: /* "\033OR" */ case XK_KP_F4: /* "\033OS" */ - STRCPY(kbuf, "\033OP"); + strcpy (kbuf, "\033OP"); kbuf[2] += (keysym - XK_KP_F1); break; case XK_KP_Multiply: /* "\033Oj" : "*" */ - case XK_KP_Add: /* "\033Ok" : "+" */ + case XK_KP_Add: /* "\033Ok" : "+" */ case XK_KP_Separator: /* "\033Ol" : "," */ case XK_KP_Subtract: /* "\033Om" : "-" */ case XK_KP_Decimal: /* "\033On" : "." */ @@ -500,9 +698,9 @@ case XK_KP_8: /* "\033Ox" : "8" */ case XK_KP_9: /* "\033Oy" : "9" */ /* allow shift to override */ - if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) + if ((priv_modes & PrivMode_aplKP) ? !shft : shft) { - STRCPY(kbuf, "\033Oj"); + strcpy (kbuf, "\033Oj"); kbuf[2] += (keysym - XK_KP_Multiply); } else @@ -513,80 +711,91 @@ break; case XK_Find: - STRCPY(kbuf, "\033[1~"); + strcpy (kbuf, "\033[1~"); break; + +#ifdef XK_KP_End + case XK_KP_Insert: + /* allow shift to override */ + if ((priv_modes & PrivMode_aplKP) ? !shft : shft) + { + strcpy (kbuf, "\033Op"); + break; + } + /* FALLTHROUGH */ +#endif case XK_Insert: - STRCPY(kbuf, "\033[2~"); + strcpy (kbuf, "\033[2~"); break; #ifdef DXK_Remove /* support for DEC remove like key */ case DXK_Remove: /* FALLTHROUGH */ #endif case XK_Execute: - STRCPY(kbuf, "\033[3~"); + strcpy (kbuf, "\033[3~"); break; case XK_Select: - STRCPY(kbuf, "\033[4~"); + strcpy (kbuf, "\033[4~"); break; #ifdef XK_KP_End case XK_KP_End: /* allow shift to override */ - if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) + if ((priv_modes & PrivMode_aplKP) ? !shft : shft) { - STRCPY(kbuf, "\033Oq"); + strcpy (kbuf, "\033Oq"); break; } /* FALLTHROUGH */ #endif case XK_End: - STRCPY(kbuf, KS_END); + strcpy (kbuf, KS_END); break; #ifdef XK_KP_Home case XK_KP_Home: /* allow shift to override */ - if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) + if ((priv_modes & PrivMode_aplKP) ? !shft : shft) { - STRCPY(kbuf, "\033Ow"); + strcpy (kbuf, "\033Ow"); break; } /* FALLTHROUGH */ #endif case XK_Home: - STRCPY(kbuf, KS_HOME); + strcpy (kbuf, KS_HOME); break; #define FKEY(n, fkey) \ - sprintf((char *)kbuf,"\033[%2d~", (int)((n) + (keysym - fkey))) + sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey))) case XK_F1: /* "\033[11~" */ case XK_F2: /* "\033[12~" */ case XK_F3: /* "\033[13~" */ case XK_F4: /* "\033[14~" */ case XK_F5: /* "\033[15~" */ - FKEY(11, XK_F1); + FKEY (11, XK_F1); break; case XK_F6: /* "\033[17~" */ case XK_F7: /* "\033[18~" */ case XK_F8: /* "\033[19~" */ case XK_F9: /* "\033[20~" */ case XK_F10: /* "\033[21~" */ - FKEY(17, XK_F6); + FKEY (17, XK_F6); break; case XK_F11: /* "\033[23~" */ case XK_F12: /* "\033[24~" */ case XK_F13: /* "\033[25~" */ case XK_F14: /* "\033[26~" */ - FKEY(23, XK_F11); + FKEY (23, XK_F11); break; case XK_F15: /* "\033[28~" */ case XK_F16: /* "\033[29~" */ - FKEY(28, XK_F15); + FKEY (28, XK_F15); break; case XK_Help: /* "\033[28~" */ - FKEY(28, XK_Help); + FKEY (28, XK_Help); break; case XK_Menu: /* "\033[29~" */ - FKEY(29, XK_Menu); + FKEY (29, XK_Menu); break; case XK_F17: /* "\033[31~" */ case XK_F18: /* "\033[32~" */ @@ -607,16 +816,18 @@ case XK_F33: /* "\033[47~" */ case XK_F34: /* "\033[48~" */ case XK_F35: /* "\033[49~" */ - FKEY(31, XK_F17); + FKEY (31, XK_F17); break; #undef FKEY default: newlen = 0; break; } + if (newlen) - len = STRLEN(kbuf); + len = strlen (kbuf); } + /* * Pass meta for all function keys, if 'meta' option set */ @@ -631,6 +842,11 @@ len = 1; kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ } + else if (keysym == XK_ISO_Left_Tab) + { + strcpy (kbuf, "\033[Z"); + len = 3; + } else { #ifdef META8_OPTION @@ -641,13 +857,10 @@ for (ch = kbuf; ch < kbuf + len; ch++) *ch |= 0x80; + meta = 0; } #endif -#ifdef GREEK_SUPPORT - if (greek_mode) - len = greek_xlat(kbuf, len); -#endif /* nil */ ; } } @@ -655,10 +868,10 @@ if (len <= 0) return; /* not mapped */ - if (Options & Opt_scrollTtyKeypress) - if (TermWin.view_start) + if (options & Opt_scrollTtyKeypress) + if (view_start) { - TermWin.view_start = 0; + view_start = 0; want_refresh = 1; } @@ -679,69 +892,74 @@ /* escape prefix */ if (meta #ifdef META8_OPTION - && (meta_char == C0_ESC) + && meta_char == C0_ESC #endif ) { const unsigned char ch = C0_ESC; - - tt_write(&ch, 1); - } -#ifdef DEBUG_CMD - if (debug_key) - { /* Display keyboard buffer contents */ - char *p; - int i; - - fprintf(stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len); - for (i = 0, p = kbuf; i < len; i++, p++) - fprintf(stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p); - fprintf(stderr, "'\n"); + tt_write (&ch, 1); } + +#if defined(DEBUG_CMD) + /* Display keyboard buffer contents */ + unsigned char *p; + int i; + + fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len); + for (i = 0, p = kbuf; i < len; i++, p++) + fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p); + fprintf (stderr, "'\n"); #endif /* DEBUG_CMD */ tt_write (kbuf, (unsigned int)len); } /*}}} */ -#if (MENUBAR_MAX) -/*{{{ rxvt_cmd_write(), rxvt_cmd_getc() */ +#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) +/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ /* attempt to `write' count to the input buffer */ unsigned int rxvt_term::cmd_write (const unsigned char *str, unsigned int count) { - unsigned int n, s; + unsigned int n, s; n = cmdbuf_ptr - cmdbuf_base; - s = cmdbuf_base + BUFSIZ - 1 - cmdbuf_endp; + s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; + if (n > 0 && s < count) { - MEMMOVE(cmdbuf_base, cmdbuf_ptr, - (unsigned int)(cmdbuf_endp - cmdbuf_ptr)); + memmove (cmdbuf_base, cmdbuf_ptr, + (unsigned int) (cmdbuf_endp - cmdbuf_ptr)); cmdbuf_ptr = cmdbuf_base; cmdbuf_endp -= n; s += n; } + if (count > s) { - rxvt_print_error("data loss: cmd_write too large"); + rxvt_warn ("data loss: cmd_write too large, continuing.\n"); count = s; } + for (; count--;) *cmdbuf_endp++ = *str++; + + cmd_parse (); + return 0; } -#endif /* MENUBAR_MAX */ +#endif void rxvt_term::flush () { + flush_ev.stop (); + #ifdef TRANSPARENT if (want_full_refresh) { want_full_refresh = 0; scr_clear (); scr_touch (false); - want_refresh = 1; } #endif @@ -752,10 +970,9 @@ #ifdef USE_XIM IMSendSpot (); #endif - } - XFlush (Xdisplay); + display->flush (); } void @@ -764,51 +981,21 @@ SET_R (this); SET_LOCALE (locale); - flush (); + display->flush (); + + if (want_refresh && !flush_ev.active) + flush_ev.start (NOW + 0.01); } void -rxvt_term::process_x_events () +rxvt_term::flush_cb (time_watcher &w) { - do - { - XEvent xev; - - XNextEvent (Xdisplay, &xev); - -#if defined(CURSOR_BLINK) - if ((Options & Opt_cursorBlink) && xev.type == KeyPress) - { - if (hidden_cursor) - { - hidden_cursor = 0; - want_refresh = 1; - } - - cursor_blink_ev.start (NOW + BLINK_INTERVAL); - } -#endif - -#if defined(POINTER_BLANK) - if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0) - { - if (xev.type == MotionNotify - || xev.type == ButtonPress - || xev.type == ButtonRelease) - if (hidden_pointer) - pointer_unblank (); - - if (xev.type == KeyPress && hidden_pointer == 0) - pointer_blank (); - } -#endif + SET_R (this); + SET_LOCALE (locale); -#ifdef USE_XIM - if (!XFilterEvent (&xev, xev.xany.window)) -#endif - process_x_event (&xev); - } - while (XPending (Xdisplay)); + refresh_limit = 1; + refresh_count = 0; + flush (); } #ifdef CURSOR_BLINK @@ -835,34 +1022,83 @@ } #endif +#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING void -rxvt_term::x_cb (io_watcher &w, short revents) +rxvt_term::cont_scroll_cb (time_watcher &w) { - SET_R (this); - SET_LOCALE (locale); + if ((scrollbar_isUp() || scrollbar_isDn()) && + scr_page (scrollbar_isUp() ? UP : DN, 1)) + { + refresh_type |= SMOOTH_REFRESH; + want_refresh = 1; + w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); + } +} +#endif - process_x_events (); +#ifdef SELECTION_SCROLLING +void +rxvt_term::sel_scroll_cb (time_watcher &w) +{ + if (scr_page (scroll_selection_dir, scroll_selection_lines)) + { + selection_extend (selection_save_x, selection_save_y, selection_save_state); + refresh_type |= SMOOTH_REFRESH; + want_refresh = 1; + w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); + } } +#endif + +#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) +void +rxvt_term::slip_wheel_cb (time_watcher &w) +{ + if (mouse_slip_wheel_speed == 0 + || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) + : scr_page (UP, mouse_slip_wheel_speed)) + { + if (view_start == nsaved || + view_start == 0) + mouse_slip_wheel_speed = 0; + + refresh_type |= SMOOTH_REFRESH; + want_refresh = 1; + w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); + } +} +#endif bool rxvt_term::pty_fill () { ssize_t n = cmdbuf_endp - cmdbuf_ptr; + if (CBUFSIZ == n) + { + rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); + n = 0; + } + memmove (cmdbuf_base, cmdbuf_ptr, n); cmdbuf_ptr = cmdbuf_base; cmdbuf_endp = cmdbuf_ptr + n; - n = read (cmd_fd, cmdbuf_endp, BUFSIZ - n); + n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); if (n > 0) { cmdbuf_endp += n; return true; } - else if (n < 0 && errno != EAGAIN) - destroy (); + else if ((n < 0 && errno != EAGAIN && errno != EINTR) || n == 0) + { + pty_ev.stop (); + if (!(options & Opt_hold)) + destroy (); + } + return false; } @@ -872,195 +1108,39 @@ SET_R (this); SET_LOCALE (locale); - if (revents & EVENT_WRITE) - tt_write (0, 0); - else if (revents & EVENT_READ) - { - bool flag = true; - - // loop, but don't allow a single term to monopolize us - // the number of loops is fully arbitrary, and thus wrong - while (flag && pty_fill ()) - { - if (!seen_input) - { - seen_input = 1; - /* once we know the shell is running, send the screen size. Again! */ - tt_winch (); - } - - uint32_t ch = NOCHAR; - - for (;;) - { - if (ch == NOCHAR) - ch = next_char (); - - if (ch == NOCHAR) // TODO: improve - break; - - if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r') - { - /* Read a text string from the input buffer */ - uint32_t buf[BUFSIZ]; - bool refreshnow = false; - int nlines = 0; - uint32_t *str = buf; - - *str++ = ch; - - for (;;) - { - ch = next_char (); - - if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r')) - break; - else - { - *str++ = ch; - - if (ch == '\n') - { - nlines++; - refresh_count++; - - if (!(Options & Opt_jumpScroll) - || (refresh_count >= (refresh_limit * (TermWin.nrow - 1)))) - { - refreshnow = true; - flag = false; - ch = NOCHAR; - break; - } - - // scr_add_lines only works for nlines < TermWin.nrow - 1. - if (nlines >= TermWin.nrow - 1) - { - scr_add_lines (buf, nlines, str - buf); - nlines = 0; - str = buf; - } - } - - if (str >= buf + BUFSIZ) - { - ch = NOCHAR; - break; - } - } - } - - scr_add_lines (buf, nlines, str - buf); - - /* - * If there have been a lot of new lines, then update the screen - * 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++; - - scr_refresh (refresh_type); - } - - } - else - { - switch (ch) - { - default: - process_nonprinting (ch); - break; - case C0_ESC: /* escape char */ - process_escape_seq (); - break; - /*case 0x9b: */ /* CSI */ - /* process_csi_seq (); */ - } - - ch = NOCHAR; - } - } - } - } -} - -// read the next character, currently handles UTF-8 -// will probably handle all sorts of other stuff in the future -uint32_t -rxvt_term::next_char () -{ - while (cmdbuf_ptr < cmdbuf_endp) - { - if (*cmdbuf_ptr < 0x80) // assume < 0x80 to be ascii ALWAYS (all shift-states etc.) uh-oh - return *cmdbuf_ptr++; - - wchar_t wc; - size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, &mbstate.mbs); - - if (len == (size_t)-2) - return NOCHAR; - - if (len == (size_t)-1) - return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through - - // assume wchar == unicode - cmdbuf_ptr += len; - return wc; - } - - return NOCHAR; -} + if (revents & EVENT_READ) + // loop, but don't allow a single term to monopolize us + while (pty_fill ()) + if (cmd_parse ()) + break; -/* rxvt_cmd_getc() - Return next input character */ -/* - * Return the next input character after first passing any keyboard input - * to the command. - */ -uint32_t -rxvt_term::cmd_getc () -{ - for (;;) - { - uint32_t c = next_char (); - if (c != NOCHAR) - return c; - - // incomplete sequences should occur rarely, still, a better solution - // would be preferred. either setjmp/longjmp or better design. - fcntl (cmd_fd, F_SETFL, 0); - pty_fill (); - fcntl (cmd_fd, F_SETFL, O_NONBLOCK); - } + if (revents & EVENT_WRITE) + pty_write (); } -#ifdef POINTER_BLANK void rxvt_term::pointer_unblank () { - XDefineCursor (Xdisplay, TermWin.vt, TermWin_cursor); + XDefineCursor (display->display, vt, TermWin_cursor); recolour_cursor (); +#ifdef POINTER_BLANK hidden_pointer = 0; - if (Options & Opt_pointerBlank) + if (options & Opt_pointerBlank) pointer_ev.start (NOW + pointerBlankDelay); +#endif } +#ifdef POINTER_BLANK void rxvt_term::pointer_blank () { - if (!(Options & Opt_pointerBlank)) + if (! (options & Opt_pointerBlank)) return; - XDefineCursor (Xdisplay, TermWin.vt, blank_cursor); - XFlush (Xdisplay); + XDefineCursor (display->display, vt, display->blank_cursor); + XFlush (display->display); hidden_pointer = 1; } @@ -1076,19 +1156,17 @@ #endif void -rxvt_term::mouse_report (const XButtonEvent *ev) +rxvt_term::mouse_report (XButtonEvent &ev) { - int button_number, key_state = 0; - int x, y; + int button_number, key_state = 0; + int x, y; - x = ev->x; - y = ev->y; + x = ev.x; + y = ev.y; pixel_position (&x, &y); if (MEvent.button == AnyButton) - { - button_number = 3; - } + button_number = 3; else { button_number = MEvent.button - Button1; @@ -1097,7 +1175,7 @@ button_number += (64 - 3); } - if (PrivateModes & PrivMode_MouseX10) + if (priv_modes & PrivMode_MouseX10) { /* * do not report ButtonRelease @@ -1122,165 +1200,221 @@ #ifdef MOUSE_REPORT_DOUBLECLICK key_state += ((MEvent.clicks > 1) ? 32 : 0); #endif - } -#ifdef DEBUG_MOUSEREPORT - fprintf(stderr, "Mouse ["); +#if DEBUG_MOUSEREPORT + fprintf (stderr, "Mouse ["); if (key_state & 16) - fputc('C', stderr); + fputc ('C', stderr); if (key_state & 4) - fputc('S', stderr); + fputc ('S', stderr); if (key_state & 8) - fputc('A', stderr); + fputc ('A', stderr); if (key_state & 32) - fputc('2', stderr); - fprintf(stderr, "]: <%d>, %d/%d\n", + fputc ('2', stderr); + fprintf (stderr, "]: <%d>, %d/%d\n", button_number, x + 1, y + 1); -#else - tt_printf("\033[M%c%c%c", +#endif + + tt_printf ("\033[M%c%c%c", (32 + button_number + key_state), (32 + x + 1), (32 + y + 1)); -#endif } #ifdef USING_W11LIB void -rxvt_W11_process_x_event(XEvent *ev) +rxvt_W11_process_x_event (XEvent *ev) { - rxvt_t *r = rxvt_get_r(); + rxvt_t *r = rxvt_get_r (); - process_x_event (ev); + x_cb (*ev); } #endif /*{{{ process an X event */ void -rxvt_term::process_x_event (XEvent *ev) +rxvt_term::x_cb (XEvent &ev) { - Window unused_root, unused_child; - int unused_root_x, unused_root_y; - unsigned int unused_mask; - -#ifdef DEBUG_X - const char *const eventnames[] = - { /* mason - this matches my system */ - "", - "", - "KeyPress", - "KeyRelease", - "ButtonPress", - "ButtonRelease", - "MotionNotify", - "EnterNotify", - "LeaveNotify", - "FocusIn", - "FocusOut", - "KeymapNotify", - "Expose", - "GraphicsExpose", - "NoExpose", - "VisibilityNotify", - "CreateNotify", - "DestroyNotify", - "UnmapNotify", - "MapNotify", - "MapRequest", - "ReparentNotify", - "ConfigureNotify", - "ConfigureRequest", - "GravityNotify", - "ResizeRequest", - "CirculateNotify", - "CirculateRequest", - "PropertyNotify", - "SelectionClear", - "SelectionRequest", - "SelectionNotify", - "ColormapNotify", - "ClientMessage", - "MappingNotify" - }; -#endif - -#ifdef DEBUG_X - struct timeval tp; - struct tm *ltt; - (void)gettimeofday(&tp, NULL); - ltt = localtime(&(tp.tv_sec)); - D_X((stderr, "Event: %-16s %-7s %08lx (%4d-%02d-%02d %02d:%02d:%02d.%.6ld) %s %lu", eventnames[ev->type], (ev->xany.window == TermWin.parent[0] ? "parent" : (ev->xany.window == TermWin.vt ? "vt" : (ev->xany.window == scrollBar.win ? "scroll" : (ev->xany.window == menuBar.win ? "menubar" : "UNKNOWN")))), (ev->xany.window == TermWin.parent[0] ? TermWin.parent[0] : (ev->xany.window == TermWin.vt ? TermWin.vt : (ev->xany.window == scrollBar.win ? scrollBar.win : (ev->xany.window == menuBar.win ? menuBar.win : 0)))), ltt->tm_year + 1900, ltt->tm_mon + 1, ltt->tm_mday, ltt->tm_hour, ltt->tm_min, ltt->tm_sec, tp.tv_usec, ev->xany.send_event ? "S" : " ", ev->xany.serial)); + dDisp; + + SET_R (this); + SET_LOCALE (locale); + +#if defined(CURSOR_BLINK) + if ((options & Opt_cursorBlink) && ev.type == KeyPress) + { + if (hidden_cursor) + { + hidden_cursor = 0; + want_refresh = 1; + } + + cursor_blink_ev.start (NOW + BLINK_INTERVAL); + } #endif - switch (ev->type) +#if defined(POINTER_BLANK) + if ((options & Opt_pointerBlank) && pointerBlankDelay > 0) + { + if (ev.type == MotionNotify + || ev.type == ButtonPress + || ev.type == ButtonRelease) + if (hidden_pointer) + pointer_unblank (); + + if (ev.type == KeyPress && hidden_pointer == 0) + pointer_blank (); + } +#endif + + Window unused_root, unused_child; + int unused_root_x, unused_root_y; + unsigned int unused_mask; + + switch (ev.type) { case KeyPress: - lookup_key ((XKeyEvent *)ev); +#if ISO_14755 + if (!(iso14755buf & ISO_14755_52)) +#endif + lookup_key (ev.xkey); + break; -#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) case KeyRelease: { - if (!(ev->xkey.state & ControlMask)) - mouse_slip_wheel_speed = 0; - else - { - KeySym ks; +#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 + KeySym ks; - ks = XKeycodeToKeysym(Xdisplay, ev->xkey.keycode, 0); - if (ks == XK_Control_L || ks == XK_Control_R) - mouse_slip_wheel_speed = 0; - } + ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ +#endif + +#if ENABLE_FRILLS || ISO_14755 + // ISO 14755 support + if (iso14755buf) + if (iso14755buf & ISO_14755_52) + { +# if ENABLE_OVERLAY + scr_overlay_off (); +# endif +# if ISO_14755 + // 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_51 | 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_51 | i[1]; + commit_iso14755 (); + return; // case-break; + } + + scr_bell (); +# endif + iso14755buf = 0; + break; + } + else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask)) + { +# if ENABLE_OVERLAY + scr_overlay_off (); +# endif + if (iso14755buf & ISO_14755_51) + commit_iso14755 (); +#if ISO_14755 + else if (iso14755buf & ISO_14755_STARTED) + { + iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair + + scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1); + scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE"); + } +# endif + else + iso14755buf = 0; + } +#endif + +#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) + if (!(ev.xkey.state & ControlMask)) + slip_wheel_ev.stop (); + else if (ks == XK_Control_L || ks == XK_Control_R) + mouse_slip_wheel_speed = 0; +#endif break; } -#endif case ButtonPress: - button_press ((XButtonEvent *)ev); + button_press (ev.xbutton); break; case ButtonRelease: - button_release ((XButtonEvent *)ev); + button_release (ev.xbutton); break; case ClientMessage: - if (ev->xclient.format == 32 - && (Atom)ev->xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) - destroy (); + if (ev.xclient.format == 32 + && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) + { + if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) + destroy (); +#if ENABLE_EWMH + else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) + XSendEvent (disp, ev.xclient.window = display->root, + False, SubstructureRedirectMask | SubstructureNotifyMask, + &ev); +#endif + } +#if ENABLE_XEMBED + else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED]) + { + if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN) + focus_in (); + else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) + focus_out (); + } +#endif #ifdef OFFIX_DND /* OffiX Dnd (drag 'n' drop) protocol */ - else if (ev->xclient.message_type == xa[XA_DNDPROTOCOL] - && (ev->xclient.data.l[0] == DndFile - || ev->xclient.data.l[0] == DndDir - || ev->xclient.data.l[0] == DndLink)) + else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] + && (ev.xclient.data.l[0] == DndFile + || ev.xclient.data.l[0] == DndDir + || ev.xclient.data.l[0] == DndLink)) { /* Get Dnd data */ - Atom ActualType; - int ActualFormat; - unsigned char *data; - unsigned long Size, RemainingBytes; - - XGetWindowProperty(Xdisplay, Xroot, - xa[XA_DNDSELECTION], - 0L, 1000000L, - False, AnyPropertyType, - &ActualType, &ActualFormat, - &Size, &RemainingBytes, - &data); - XChangeProperty(Xdisplay, Xroot, - XA_CUT_BUFFER0, XA_STRING, - 8, PropModeReplace, - data, STRLEN(data)); - selection_paste (Xroot, XA_CUT_BUFFER0, True); - XSetInputFocus(Xdisplay, Xroot, RevertToNone, CurrentTime); + Atom ActualType; + int ActualFormat; + unsigned char *data; + unsigned long Size, RemainingBytes; + + XGetWindowProperty (disp, display->root, + xa[XA_DNDSELECTION], + 0L, 1000000L, + False, AnyPropertyType, + &ActualType, &ActualFormat, + &Size, &RemainingBytes, + &data); + set_string_property (XA_CUT_BUFFER0, data); + XFree (data); + selection_paste (display->root, XA_CUT_BUFFER0, true); + XSetInputFocus (disp, display->root, RevertToNone, CurrentTime); } #endif /* OFFIX_DND */ break; case MappingNotify: - XRefreshKeyboardMapping(&(ev->xmapping)); + XRefreshKeyboardMapping (&ev.xmapping); break; /* @@ -1294,7 +1428,7 @@ * which ought to make things real slow! */ case VisibilityNotify: - switch (ev->xvisibility.state) + switch (ev.xvisibility.state) { case VisibilityUnobscured: refresh_type = FAST_REFRESH; @@ -1309,171 +1443,112 @@ break; case FocusIn: - if (!TermWin.focus) - { - TermWin.focus = 1; - want_refresh = 1; -#ifdef USE_XIM - if (Input_Context != NULL) - XSetICFocus(Input_Context); -#endif -#ifdef CURSOR_BLINK - if (Options & Opt_cursorBlink) - cursor_blink_ev.start (NOW + BLINK_INTERVAL); -#endif - - } + focus_in (); break; case FocusOut: - if (TermWin.focus) - { - TermWin.focus = 0; - want_refresh = 1; -#ifdef USE_XIM - if (Input_Context != NULL) - XUnsetICFocus(Input_Context); -#endif -#ifdef CURSOR_BLINK - if (Options & Opt_cursorBlink) - cursor_blink_ev.stop (); - hidden_cursor = 0; -#endif - - } + focus_out (); break; case ConfigureNotify: - if (ev->xconfigure.window == TermWin.parent[0]) + if (ev.xconfigure.window == parent[0]) { - int height, width; + while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) + ; - do - { /* Wrap lots of configures into one */ - width = ev->xconfigure.width; - height = ev->xconfigure.height; - D_SIZE((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); - } - while (XCheckTypedWindowEvent(Xdisplay, ev->xconfigure.window, - ConfigureNotify, ev)); - if (szHint.width != width || szHint.height != height) + if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) { - D_SIZE((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height)); - resize_all_windows (width, height, 1); + seen_resize = 1; + resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); } -#ifdef DEBUG_SIZE - else - { - D_SIZE((stderr, "Size: Not resizing")); - } -#endif + #ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ - if (Options & Opt_transparent) - { - check_our_parents (); - if (am_transparent) - want_full_refresh = 1; - } + if (options & Opt_transparent) + check_our_parents (); #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; case SelectionNotify: if (selection_wait == Sel_normal) - selection_paste (ev->xselection.requestor, - ev->xselection.property, True); + selection_paste (ev.xselection.requestor, ev.xselection.property, true); break; case SelectionRequest: - selection_send (&(ev->xselectionrequest)); + selection_send (ev.xselectionrequest); break; case UnmapNotify: - TermWin.mapped = 0; + mapped = 0; #ifdef TEXT_BLINK text_blink_ev.stop (); #endif break; case MapNotify: - TermWin.mapped = 1; + mapped = 1; #ifdef TEXT_BLINK text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); #endif break; - 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 - /* - * 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(Xdisplay, - "_XROOTPMAP_ID", False); - if (ev->xproperty.atom != xa[XA_XROOTPMAPID]) - break; - /* FALLTHROUGH */ case ReparentNotify: - if ((Options & Opt_transparent) && check_our_parents ()) - { - if (am_transparent) - want_full_refresh = 1; - } -#endif /* TRANSPARENT */ + rootwin_cb (ev); break; +#endif /* TRANSPARENT */ case GraphicsExpose: case Expose: - if (ev->xany.window == TermWin.vt) + if (ev.xany.window == vt) { -#ifdef NO_SLOW_LINK_SUPPORT - scr_expose (ev->xexpose.x, ev->xexpose.y, - ev->xexpose.width, ev->xexpose.height, False); -#else - // don't understand this, so commented it out - 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 (disp, vt, ev.xany.type, &ev)); + + ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; + + while (XCheckTypedWindowEvent (disp, 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 { - XEvent unused_xevent; + XEvent unused_event; - while (XCheckTypedWindowEvent(Xdisplay, ev->xany.window, - Expose, - &unused_xevent)) ; - while (XCheckTypedWindowEvent(Xdisplay, ev->xany.window, - GraphicsExpose, - &unused_xevent)) ; - if (isScrollbarWindow(ev->xany.window)) + while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) + ; + while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) + ; + + if (isScrollbarWindow (ev.xany.window)) { - scrollBar.setIdle(); + scrollBar.setIdle (); scrollbar_show (0); } #ifdef MENUBAR - if (menubar_visible () && isMenuBarWindow(ev->xany.window)) + if (menubar_visible () && isMenuBarWindow (ev.xany.window)) menubar_expose (); #endif -#ifdef RXVT_GRAPHICS - Gr_expose (ev->xany.window); -#endif +#ifdef TRANSPARENT + if (am_transparent && ev.xany.window == parent[0]) + XClearWindow (disp, ev.xany.window); +#endif } break; @@ -1483,98 +1558,107 @@ pointer_unblank (); #endif #if MENUBAR - if (isMenuBarWindow(ev->xany.window)) + if (isMenuBarWindow (ev.xany.window)) { - menubar_control (&(ev->xbutton)); + menubar_control (ev.xbutton); break; } #endif - if ((PrivateModes & PrivMode_mouse_report) && !(bypass_keystate)) + if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) break; - if (ev->xany.window == TermWin.vt) + if (ev.xany.window == vt) { - if ((ev->xbutton.state & (Button1Mask | Button3Mask))) + if (ev.xbutton.state & (Button1Mask | Button3Mask)) { - while (XCheckTypedWindowEvent(Xdisplay, TermWin.vt, - MotionNotify, ev)) ; - XQueryPointer(Xdisplay, TermWin.vt, - &unused_root, &unused_child, - &unused_root_x, &unused_root_y, - &(ev->xbutton.x), &(ev->xbutton.y), - &unused_mask); + while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) + ; + + XQueryPointer (disp, vt, + &unused_root, &unused_child, + &unused_root_x, &unused_root_y, + &ev.xbutton.x, &ev.xbutton.y, + &ev.xbutton.state); #ifdef MOUSE_THRESHOLD /* deal with a `jumpy' mouse */ - if ((ev->xmotion.time - MEvent.time) > MOUSE_THRESHOLD) + if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) { #endif - selection_extend ((ev->xbutton.x), (ev->xbutton.y), - (ev->xbutton.state & Button3Mask) ? 2 : 0); +#if ISO_14755 + // 5.4 + if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) + { + iso14755_54 (ev.xbutton.x, ev.xbutton.y); + break; + } +#endif + selection_extend (ev.xbutton.x, ev.xbutton.y, + ev.xbutton.state & Button3Mask ? 2 : 0); + #ifdef SELECTION_SCROLLING - if (ev->xbutton.y < TermWin.int_bwidth - || Pixel2Row(ev->xbutton.y) > (TermWin.nrow-1)) + if (ev.xbutton.y < int_bwidth + || Pixel2Row (ev.xbutton.y) > (nrow-1)) { int dist; - pending_scroll_selection=1; - /* don't clobber the current delay if we are * already in the middle of scrolling. */ - if (scroll_selection_delay<=0) - scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; + if (!sel_scroll_ev.active) + sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); /* save the event params so we can highlight * the selection in the pending-scroll loop */ - selection_save_x=ev->xbutton.x; - selection_save_y=ev->xbutton.y; - selection_save_state= - (ev->xbutton.state & Button3Mask) ? 2 : 0; + selection_save_x = ev.xbutton.x; + selection_save_y = ev.xbutton.y; + selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; /* calc number of lines to scroll */ - if (ev->xbutton.yxbutton.y; + dist = int_bwidth - ev.xbutton.y; } else { scroll_selection_dir = DN; - dist = ev->xbutton.y - - (TermWin.int_bwidth + TermWin.height); + dist = ev.xbutton.y - (int_bwidth + height); } - scroll_selection_lines=(Pixel2Height(dist)/ - SELECTION_SCROLL_LINE_SPEEDUP)+1; - MIN_IT(scroll_selection_lines, - SELECTION_SCROLL_MAX_LINES); + + scroll_selection_lines = Pixel2Height (dist) + / SELECTION_SCROLL_LINE_SPEEDUP + + 1; + min_it (scroll_selection_lines, + SELECTION_SCROLL_MAX_LINES); } else { /* we are within the text window, so we * shouldn't be scrolling */ - pending_scroll_selection = 0; + if (sel_scroll_ev.active) + sel_scroll_ev.stop(); } #endif #ifdef MOUSE_THRESHOLD - } #endif - } } - else if (isScrollbarWindow(ev->xany.window) && scrollbar_isMotion()) + else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) { - while (XCheckTypedWindowEvent(Xdisplay, scrollBar.win, - MotionNotify, ev)) ; - XQueryPointer(Xdisplay, scrollBar.win, + while (XCheckTypedWindowEvent (disp, scrollBar.win, + MotionNotify, &ev)) + ; + + XQueryPointer (disp, scrollBar.win, &unused_root, &unused_child, &unused_root_x, &unused_root_y, - &(ev->xbutton.x), &(ev->xbutton.y), + &ev.xbutton.x, &ev.xbutton.y, &unused_mask); - scr_move_to (scrollbar_position(ev->xbutton.y) - csrO, - scrollbar_size()); + scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, + scrollbar_size ()); scr_refresh (refresh_type); refresh_limit = 0; scrollbar_show (1); @@ -1584,106 +1668,208 @@ } void -rxvt_term::button_press (XButtonEvent *ev) +rxvt_term::focus_in () +{ + if (!focus) + { + focus = 1; + want_refresh = 1; +#if USE_XIM + if (Input_Context != NULL) + { + IMSetStatusPosition (); + XSetICFocus (Input_Context); + } +#endif +#if CURSOR_BLINK + if (options & Opt_cursorBlink) + cursor_blink_ev.start (NOW + BLINK_INTERVAL); +#endif +#if OFF_FOCUS_FADING + if (rs[Rs_fade]) + { + pix_colors = pix_colors_focused; + scr_recolour (); + } +#endif + } +} + +void +rxvt_term::focus_out () +{ + if (focus) + { + focus = 0; + want_refresh = 1; + +#if ENABLE_FRILLS || ISO_14755 + iso14755buf = 0; +#endif +#if ENABLE_OVERLAY + scr_overlay_off (); +#endif +#if USE_XIM + if (Input_Context != NULL) + XUnsetICFocus (Input_Context); +#endif +#if CURSOR_BLINK + if (options & Opt_cursorBlink) + cursor_blink_ev.stop (); + hidden_cursor = 0; +#endif +#if OFF_FOCUS_FADING + if (rs[Rs_fade]) + { + pix_colors = pix_colors_unfocused; + scr_recolour (); + } +#endif + } +} + +#if TRANSPARENT +void +rxvt_term::rootwin_cb (XEvent &ev) +{ + SET_R (this); + SET_LOCALE (locale); + + switch (ev.type) + { + case PropertyNotify: + /* + * 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 (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] + && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) + return; + + /* FALLTHROUGH */ + case ReparentNotify: + if ((options & Opt_transparent) && check_our_parents () && am_transparent) + want_refresh = want_full_refresh = 1; + break; + } +} +#endif + +void +rxvt_term::button_press (XButtonEvent &ev) { int reportmode = 0, clickintime; - bypass_keystate = ev->state & (ModMetaMask | ShiftMask); + bypass_keystate = ev.state & (ModMetaMask | ShiftMask); if (!bypass_keystate) - reportmode = !!(PrivateModes & PrivMode_mouse_report); + reportmode = !! (priv_modes & PrivMode_mouse_report); + /* * VT window processing of button press */ - if (ev->window == TermWin.vt) + if (ev.window == vt) { -#if RXVT_GRAPHICS - if (ev->subwindow != None) - rxvt_Gr_ButtonPress (ev->x, ev->y); - else +#if ISO_14755 + // 5.4 + if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) + { + iso14755_54 (ev.x, ev.y); + return; + } #endif + clickintime = ev.time - MEvent.time < MULTICLICK_TIME; + + if (reportmode) { - clickintime = ev->time - MEvent.time < MULTICLICK_TIME; - if (reportmode) - { - /* mouse report from vt window */ - /* save the xbutton state (for ButtonRelease) */ - MEvent.state = ev->state; + /* mouse report from vt window */ + /* save the xbutton state (for ButtonRelease) */ + MEvent.state = ev.state; #ifdef MOUSE_REPORT_DOUBLECLICK - if (ev->button == MEvent.button && clickintime) - { - /* same button, within alloted time */ - MEvent.clicks++; - if (MEvent.clicks > 1) - { - /* only report double clicks */ - MEvent.clicks = 2; - mouse_report (ev); - - /* don't report the release */ - MEvent.clicks = 0; - MEvent.button = AnyButton; - } - } - else + if (ev.button == MEvent.button && clickintime) + { + /* same button, within alloted time */ + MEvent.clicks++; + if (MEvent.clicks > 1) { - /* different button, or time expired */ - MEvent.clicks = 1; - MEvent.button = ev->button; + /* only report double clicks */ + MEvent.clicks = 2; mouse_report (ev); + + /* don't report the release */ + MEvent.clicks = 0; + MEvent.button = AnyButton; } -#else - MEvent.button = ev->button; + } + else + { + /* different button, or time expired */ + MEvent.clicks = 1; + MEvent.button = ev.button; mouse_report (ev); + } +#else + MEvent.button = ev.button; + mouse_report (ev); #endif /* MOUSE_REPORT_DOUBLECLICK */ - } - else + } + else + { + if (ev.button != MEvent.button) + MEvent.clicks = 0; + + switch (ev.button) { - if (ev->button != MEvent.button) - MEvent.clicks = 0; - switch (ev->button) - { - case Button1: - /* allow shift+left click to extend selection */ - if (ev->state & ShiftMask && !(PrivateModes & PrivMode_mouse_report)) - { - if (MEvent.button == Button1 && clickintime) - selection_rotate (ev->x, ev->y); - else - selection_extend (ev->x, ev->y, 1); - } + case Button1: + /* allow meta + click to select rectangular areas */ + /* should be done in screen.C */ +#if ENABLE_FRILLS + selection.rect = !!(ev.state & ModMetaMask); +#else + selection.rect = false; +#endif + + /* allow shift+left click to extend selection */ + if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) + { + if (MEvent.button == Button1 && clickintime) + selection_rotate (ev.x, ev.y); else - { - if (MEvent.button == Button1 && clickintime) - MEvent.clicks++; - else - MEvent.clicks = 1; + selection_extend (ev.x, ev.y, 1); + } + else + { + if (MEvent.button == Button1 && clickintime) + MEvent.clicks++; + else + MEvent.clicks = 1; - selection_click (MEvent.clicks, ev->x, ev->y); - } + selection_click (MEvent.clicks, ev.x, ev.y); + } - MEvent.button = Button1; - break; + MEvent.button = Button1; + break; - case Button3: - if (MEvent.button == Button3 && clickintime) - selection_rotate (ev->x, ev->y); - else - selection_extend (ev->x, ev->y, 1); - MEvent.button = Button3; - break; - } + case Button3: + if (MEvent.button == Button3 && clickintime) + selection_rotate (ev.x, ev.y); + else + selection_extend (ev.x, ev.y, 1); + + MEvent.button = Button3; + break; } - MEvent.time = ev->time; - return; } + + MEvent.time = ev.time; + return; } /* * Scrollbar window processing of button press */ - if (isScrollbarWindow(ev->window)) + if (isScrollbarWindow (ev.window)) { scrollBar.setIdle (); /* @@ -1705,26 +1891,26 @@ * click on scrollbar - send pageup/down */ if ((scrollBar.style == R_SB_NEXT - && scrollbarnext_upButton(ev->y)) + && scrollbarnext_upButton (ev.y)) || (scrollBar.style == R_SB_RXVT - && scrollbarrxvt_upButton(ev->y))) - tt_printf("\033[A"); + && scrollbarrxvt_upButton (ev.y))) + tt_printf ("\033[A"); else if ((scrollBar.style == R_SB_NEXT - && scrollbarnext_dnButton(ev->y)) + && scrollbarnext_dnButton (ev.y)) || (scrollBar.style == R_SB_RXVT - && scrollbarrxvt_dnButton(ev->y))) - tt_printf("\033[B"); + && scrollbarrxvt_dnButton (ev.y))) + tt_printf ("\033[B"); else - switch (ev->button) + switch (ev.button) { case Button2: - tt_printf("\014"); + tt_printf ("\014"); break; case Button1: - tt_printf("\033[6~"); + tt_printf ("\033[6~"); break; case Button3: - tt_printf("\033[5~"); + tt_printf ("\033[5~"); break; } } @@ -1736,22 +1922,22 @@ if (scrollBar.style == R_SB_NEXT) { - if (scrollbarnext_upButton(ev->y)) + if (scrollbarnext_upButton (ev.y)) upordown = -1; /* up */ - else if (scrollbarnext_dnButton(ev->y)) + else if (scrollbarnext_dnButton (ev.y)) upordown = 1; /* down */ } else if (scrollBar.style == R_SB_RXVT) { - if (scrollbarrxvt_upButton(ev->y)) + if (scrollbarrxvt_upButton (ev.y)) upordown = -1; /* up */ - else if (scrollbarrxvt_dnButton(ev->y)) + else if (scrollbarrxvt_dnButton (ev.y)) upordown = 1; /* down */ } if (upordown) { #ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING - scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; + cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); #endif if (scr_page (upordown < 0 ? UP : DN, 1)) { @@ -1762,7 +1948,7 @@ } } else - switch (ev->button) + switch (ev.button) { case Button2: switch (scrollbar_align) @@ -1777,44 +1963,46 @@ 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()); + || scrollbar_above_slider (ev.y) + || scrollbar_below_slider (ev.y)) + scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); + scrollBar.setMotion (); break; case Button1: if (scrollbar_align == R_SB_ALIGN_CENTRE) - csrO = ev->y - scrollBar.top; + csrO = ev.y - scrollBar.top; /* FALLTHROUGH */ case Button3: if (scrollBar.style != R_SB_XTERM) { - if (scrollbar_above_slider(ev->y)) + if (scrollbar_above_slider (ev.y)) # ifdef RXVT_SCROLL_FULL - scr_page (UP, TermWin.nrow - 1); + scr_page (UP, nrow - 1); # else - scr_page (UP, TermWin.nrow / 4); + scr_page (UP, nrow / 4); # endif - else if (scrollbar_below_slider(ev->y)) + else if (scrollbar_below_slider (ev.y)) # ifdef RXVT_SCROLL_FULL - scr_page (DN, TermWin.nrow - 1); + scr_page (DN, nrow - 1); # else - scr_page (DN, TermWin.nrow / 4); + scr_page (DN, nrow / 4); # endif else scrollBar.setMotion (); } else { - scr_page ((ev->button == Button1 ? DN : UP), - (TermWin.nrow - * scrollbar_position(ev->y) - / scrollbar_size())); + scr_page ((ev.button == Button1 ? DN : UP), + (nrow + * scrollbar_position (ev.y) + / scrollbar_size ())); } + break; } } @@ -1824,102 +2012,113 @@ /* * Menubar window processing of button press */ - if (isMenuBarWindow(ev->window)) + if (isMenuBarWindow (ev.window)) menubar_control (ev); #endif } void -rxvt_term::button_release (XButtonEvent *ev) +rxvt_term::button_release (XButtonEvent &ev) { - int reportmode = 0; + int reportmode = 0; csrO = 0; /* reset csr Offset */ if (!bypass_keystate) - reportmode = !!(PrivateModes & PrivMode_mouse_report); + reportmode = !! (priv_modes & PrivMode_mouse_report); - if (scrollbar_isUpDn()) + if (scrollbar_isUpDn ()) { scrollBar.setIdle (); scrollbar_show (0); #ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING refresh_type &= ~SMOOTH_REFRESH; #endif - } + #ifdef SELECTION_SCROLLING - pending_scroll_selection=0; + if (sel_scroll_ev.active) + sel_scroll_ev.stop(); #endif - if (ev->window == TermWin.vt) + + if (ev.window == vt) { -#ifdef RXVT_GRAPHICS - if (ev->subwindow != None) - rxvt_Gr_ButtonRelease(ev->x, ev->y); - else +#if ISO_14755 + // 5.4 + if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) + return; #endif - + if (reportmode) { - if (reportmode) - { - /* mouse report from vt window */ - /* don't report release of wheel "buttons" */ - if (ev->button >= 4) - return; + /* mouse report from vt window */ + /* don't report release of wheel "buttons" */ + if (ev.button >= 4) + return; #ifdef MOUSE_REPORT_DOUBLECLICK - /* only report the release of 'slow' single clicks */ - if (MEvent.button != AnyButton - && (ev->button != MEvent.button - || (ev->time - MEvent.time - > MULTICLICK_TIME / 2))) - { - MEvent.clicks = 0; - MEvent.button = AnyButton; - mouse_report (ev); - } -#else /* MOUSE_REPORT_DOUBLECLICK */ + /* only report the release of 'slow' single clicks */ + if (MEvent.button != AnyButton + && (ev.button != MEvent.button + || (ev.time - MEvent.time + > MULTICLICK_TIME / 2))) + { + MEvent.clicks = 0; MEvent.button = AnyButton; mouse_report (ev); -#endif /* MOUSE_REPORT_DOUBLECLICK */ - return; } - /* - * dumb hack to compensate for the failure of click-and-drag - * when overriding mouse reporting - */ - if (PrivateModes & PrivMode_mouse_report - && bypass_keystate - && ev->button == Button1 && MEvent.clicks <= 1) - selection_extend (ev->x, ev->y, 0); +#else /* MOUSE_REPORT_DOUBLECLICK */ + MEvent.button = AnyButton; + mouse_report (ev); +#endif /* MOUSE_REPORT_DOUBLECLICK */ + return; + } - switch (ev->button) - { - case Button1: - case Button3: - selection_make (ev->time); - break; - case Button2: - selection_request (ev->time, ev->x, ev->y); - break; + /* + * dumb hack to compensate for the failure of click-and-drag + * when overriding mouse reporting + */ + if (priv_modes & PrivMode_mouse_report + && bypass_keystate + && ev.button == Button1 && MEvent.clicks <= 1) + selection_extend (ev.x, ev.y, 0); + + switch (ev.button) + { + case Button1: + case Button3: + selection_make (ev.time); + break; + case Button2: + selection_request (ev.time, ev.x, ev.y); + break; #ifdef MOUSE_WHEEL - case Button4: - case Button5: - { - int i; - page_dirn v; + case Button4: + case Button5: + { + int i; + page_dirn v; + + v = ev.button == Button4 ? UP : DN; + + if (ev.state & ShiftMask) + i = 1; + else if (options & Opt_mouseWheelScrollPage) + i = nrow - 1; + else + i = 5; - v = (ev->button == Button4) ? UP : DN; - if (ev->state & ShiftMask) - i = 1; - else if ((Options & Opt_mouseWheelScrollPage)) - i = TermWin.nrow - 1; - else - i = 5; # ifdef MOUSE_SLIP_WHEELING - if (ev->state & ControlMask) - { - mouse_slip_wheel_speed += (v ? -1 : 1); - mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; - } + if (ev.state & ControlMask) + { + mouse_slip_wheel_speed += v ? -1 : 1; + if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; + if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +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); @@ -1933,22 +2132,252 @@ scrollbar_show (1); } # endif - +# ifdef MOUSE_SLIP_WHEELING } - break; #endif - } + break; +#endif } } #ifdef MENUBAR - else if (isMenuBarWindow(ev->window)) + else if (isMenuBarWindow (ev.window)) menubar_control (ev); #endif } - #ifdef TRANSPARENT +#if TINTING +/* taken from aterm-0.4.2 */ + +typedef uint32_t RUINT32T; + +void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm) +{ + 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; + + 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 + /* * Check our parents are still who we think they are. * Do transparency updates if required @@ -1956,215 +2385,457 @@ int rxvt_term::check_our_parents () { - int i, pchanged, aformat, have_pixmap, rootdepth; - unsigned long nitems, bytes_after; - Atom atype; - unsigned char *prop = NULL; - Window root, oldp, *list; - Pixmap rootpixmap = None; + int i, pchanged, aformat, have_pixmap, rootdepth; + unsigned long nitems, bytes_after; + Atom atype; + unsigned char *prop = NULL; + Window root, oldp, *list; + Pixmap rootpixmap = None; XWindowAttributes wattr, wrootattr; + dDisp; pchanged = 0; - if (!(Options & Opt_transparent)) + if (!(options & Opt_transparent)) return pchanged; /* Don't try any more */ - XGetWindowAttributes(Xdisplay, Xroot, &wrootattr); + XGetWindowAttributes (disp, display->root, &wrootattr); rootdepth = wrootattr.depth; - XGetWindowAttributes(Xdisplay, TermWin.parent[0], &wattr); + XGetWindowAttributes (disp, parent[0], &wattr); + if (rootdepth != wattr.depth) { if (am_transparent) { pchanged = 1; - XSetWindowBackground(Xdisplay, TermWin.vt, - PixColors[Color_bg]); + XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); am_transparent = am_pixmap_trans = 0; } + return pchanged; /* Don't try any more */ } /* Get all X ops out of the queue so that our information is up-to-date. */ - XSync(Xdisplay, False); + XSync (disp, False); /* * Make the frame window set by the window manager have * the root background. Some window managers put multiple nested frame * windows for each client, so we have to take care about that. */ - i = (xa[XA_XROOTPMAPID] != 0 - && (XGetWindowProperty(Xdisplay, Xroot, xa[XA_XROOTPMAPID], + i = (xa[XA_XROOTPMAP_ID] + && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID], 0L, 1L, False, XA_PIXMAP, &atype, &aformat, - &nitems, &bytes_after, &prop) == Success)); + &nitems, &bytes_after, &prop) == Success); + if (!i || prop == NULL) + i = (xa[XA_ESETROOT_PMAP_ID] + && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID], + 0L, 1L, False, XA_PIXMAP, &atype, &aformat, + &nitems, &bytes_after, &prop) == Success); + + if (!i || prop == NULL +#if TINTING + || !rs[Rs_color + Color_tint] +#endif + ) have_pixmap = 0; else { have_pixmap = 1; - rootpixmap = *((Pixmap *)prop); - XFree(prop); + rootpixmap = *(Pixmap *)prop; + XFree (prop); } + if (have_pixmap) { /* - * Copy Xroot pixmap transparency + * Copy display->root pixmap transparency */ - int sx, sy, nx, ny; - unsigned int nw, nh; - Window cr; - XImage *image; - GC gc; - XGCValues gcvalue; + int sx, sy, nx, ny; + unsigned int nw, nh; + Window cr; + XImage *image; + GC gc; + XGCValues gcvalue; - XTranslateCoordinates(Xdisplay, TermWin.parent[0], Xroot, - 0, 0, &sx, &sy, &cr); + XTranslateCoordinates (disp, parent[0], display->root, + 0, 0, &sx, &sy, &cr); nw = (unsigned int)szHint.width; nh = (unsigned int)szHint.height; nx = ny = 0; + if (sx < 0) { nw += sx; nx = -sx; sx = 0; } + if (sy < 0) { nh += sy; ny = -sy; sy = 0; } - MIN_IT(nw, (unsigned int)(wrootattr.width - sx)); - MIN_IT(nh, (unsigned int)(wrootattr.height - sy)); + + min_it (nw, (unsigned int) (wrootattr.width - sx)); + min_it (nh, (unsigned int) (wrootattr.height - sy)); + + XSync (disp, False); allowedxerror = -1; - image = XGetImage(Xdisplay, rootpixmap, sx, sy, nw, nh, AllPlanes, - ZPixmap); + image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); + /* XXX: handle BadMatch - usually because we're outside the pixmap */ /* XXX: may need a delay here? */ allowedxerror = 0; + if (image == NULL) { if (am_transparent && am_pixmap_trans) { pchanged = 1; - if (TermWin.pixmap != None) + if (pixmap != None) { - XFreePixmap(Xdisplay, TermWin.pixmap); - TermWin.pixmap = None; + XFreePixmap (disp, pixmap); + pixmap = None; } } + am_pixmap_trans = 0; } else { - if (TermWin.pixmap != None) - XFreePixmap(Xdisplay, TermWin.pixmap); - TermWin.pixmap = XCreatePixmap(Xdisplay, TermWin.vt, - (unsigned int)szHint.width, - (unsigned int)szHint.height, - (unsigned int)image->depth); - gc = XCreateGC(Xdisplay, TermWin.vt, 0UL, &gcvalue); - XPutImage(Xdisplay, TermWin.pixmap, gc, image, 0, 0, - nx, ny, (unsigned int)image->width, - (unsigned int)image->height); - XFreeGC(Xdisplay, gc); - XDestroyImage(image); - XSetWindowBackgroundPixmap(Xdisplay, TermWin.vt, - TermWin.pixmap); + if (pixmap != None) + XFreePixmap (disp, 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); + + ShadeXImage (display, image, shade, rm, gm, bm); + } +#endif + + pixmap = XCreatePixmap (disp, vt, + szHint.width, szHint.height, image->depth); + gc = XCreateGC (disp, vt, 0UL, &gcvalue); + XPutImage (disp, pixmap, gc, image, 0, 0, + nx, ny, image->width, image->height); + XFreeGC (disp, gc); + XDestroyImage (image); + XSetWindowBackgroundPixmap (disp, parent[0], pixmap); + XClearWindow (disp, parent[0]); + if (!am_transparent || !am_pixmap_trans) pchanged = 1; + am_transparent = am_pixmap_trans = 1; } } - if (!am_pixmap_trans) + + if (am_pixmap_trans) + XSetWindowBackgroundPixmap (disp, vt, ParentRelative); + else { - unsigned int n; + unsigned int n; /* * InheritPixmap transparency */ - D_X((stderr, "InheritPixmap Seeking to %08lx", Xroot)); - for (i = 1; i < (int)(sizeof(TermWin.parent) / sizeof(Window)); - i++) - { - oldp = TermWin.parent[i]; - XQueryTree(Xdisplay, TermWin.parent[i - 1], &root, - &TermWin.parent[i], &list, &n); - XFree(list); - D_X((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i])); - if (TermWin.parent[i] == Xroot) + for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) + { + oldp = parent[i]; + XQueryTree (disp, parent[i - 1], &root, + &parent[i], &list, &n); + XFree (list); + + if (parent[i] == display->root) { if (oldp != None) pchanged = 1; + break; } - if (oldp != TermWin.parent[i]) + + if (oldp != parent[i]) pchanged = 1; } + n = 0; + if (pchanged) { for (; n < (unsigned int)i; n++) { - XGetWindowAttributes(Xdisplay, TermWin.parent[n], &wattr); - D_X((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL")); + XGetWindowAttributes (disp, parent[n], &wattr); if (wattr.depth != rootdepth || wattr.c_class == InputOnly) { - n = (int)(sizeof(TermWin.parent) / sizeof(Window)) + 1; + n = (int) (sizeof (parent) / sizeof (Window)) + 1; break; } } } - if (n > (int)(sizeof(TermWin.parent) - / sizeof(TermWin.parent[0]))) + + if (n > (int) (sizeof (parent) / sizeof (parent[0]))) { - D_X((stderr, "InheritPixmap Turning off")); - XSetWindowBackground(Xdisplay, TermWin.parent[0], - PixColors[Color_fg]); - XSetWindowBackground(Xdisplay, TermWin.vt, - PixColors[Color_bg]); + XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]); + XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); am_transparent = 0; /* XXX: also turn off Opt_transparent? */ } else { +#if WAIT_FOR_WM /* wait (an arbitrary period) for the WM to do its thing * needed for fvwm2.2.2 (and before?) */ -# ifdef HAVE_NANOSLEEP - struct timespec rqt; - - rqt.tv_sec = 1; - rqt.tv_nsec = 0; - nanosleep(&rqt, NULL); -# else - sleep(1); -# endif - D_X((stderr, "InheritPixmap Turning on (%d parents)", i - 1)); + sleep (1); +#endif for (n = 0; n < (unsigned int)i; n++) - XSetWindowBackgroundPixmap(Xdisplay, TermWin.parent[n], - ParentRelative); - XSetWindowBackgroundPixmap(Xdisplay, TermWin.vt, - ParentRelative); + { + XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative); + XClearWindow (disp, parent[n]); + } + + XSetWindowBackgroundPixmap (disp, vt, ParentRelative); am_transparent = 1; } - for (; i < (int)(sizeof(TermWin.parent) / sizeof(Window)); i++) - TermWin.parent[i] = None; + + for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) + parent[i] = None; + } + + if (scrollBar.win) + { + XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); + scrollBar.setIdle (); + scrollbar_show (0); + } + + if (am_transparent) + { + want_refresh = want_full_refresh = 1; + if (am_pixmap_trans) + flush (); } + return pchanged; } #endif /*}}} */ +bool +rxvt_term::cmd_parse () +{ + bool flag = false; + unicode_t ch = NOCHAR; + unsigned char *seq_begin; // remember start of esc-sequence here + + for (;;) + { + if (ch == NOCHAR) + { + seq_begin = cmdbuf_ptr; + ch = next_char (); + } + + if (ch == NOCHAR) // TODO: improve + break; + + if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) + { + if (!seen_input) + { + seen_input = 1; + // many badly-written programs (e.g. jed) contain a race condition: + // they first read the screensize and then install a SIGWINCH handler. + // some window managers resize the window early, and these programs + // then sometimes get the size wrong. + // unfortunately other programs are even more buggy and dislike + // being sent SIGWINCH, so only do it when we were in fact being + // resized. + if (seen_resize && cmd_pid) + kill (-cmd_pid, SIGWINCH); + } + + /* Read a text string from the input buffer */ + unicode_t buf[UBUFSIZ]; + bool refreshnow = false; + int nlines = 0; + unicode_t *str = buf; + unicode_t *eol = str + min (ncol, UBUFSIZ); + + for (;;) + { + if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) + break; + + *str++ = ch; + + if (ch == C0_LF || str >= eol) + { + if (ch == C0_LF) + nlines++; + + refresh_count++; + + if (!(options & Opt_jumpScroll) + || (refresh_count >= refresh_limit * (nrow - 1))) + { + refreshnow = true; + ch = NOCHAR; + break; + } + + // scr_add_lines only works for nlines <= nrow - 1. + if (nlines >= nrow - 1) + { + scr_add_lines (buf, nlines, str - buf); + nlines = 0; + str = buf; + eol = str + min (ncol, UBUFSIZ); + } + + if (str >= eol) + { + if (eol >= buf + UBUFSIZ) + { + ch = NOCHAR; + break; + } + else + eol = min (eol + ncol, buf + UBUFSIZ); + } + + } + + seq_begin = cmdbuf_ptr; + ch = next_char (); + } + + scr_add_lines (buf, nlines, str - buf); + + /* + * If there have been a lot of new lines, then update the screen + * 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. + */ + if (refreshnow) + { + if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) + refresh_limit++; + else + { + flag = true; + scr_refresh (refresh_type); + } + } + + } + else + { + try + { + process_nonprinting (ch); + } + catch (const class out_of_input &o) + { + // we ran out of input, retry later + cmdbuf_ptr = seq_begin; + break; + } + + ch = NOCHAR; + } + } + + return flag; +} + +// read the next octet +unicode_t +rxvt_term::next_octet () +{ + return cmdbuf_ptr < cmdbuf_endp + ? *cmdbuf_ptr++ + : NOCHAR; +} + +// read the next character +unicode_t +rxvt_term::next_char () +{ + while (cmdbuf_ptr < cmdbuf_endp) + { + // assume 7-bit to be ascii ALWAYS + if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) + return *cmdbuf_ptr++; + + wchar_t wc; + size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); + + if (len == (size_t)-2) + { + // the mbstate stores incomplete sequences. didn't know this :/ + cmdbuf_ptr = cmdbuf_endp; + break; + } + + if (len == (size_t)-1) + return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through + + // assume wchar == unicode + cmdbuf_ptr += len; + return wc & UNICODE_MASK; + } + + return NOCHAR; +} + +/* rxvt_cmd_getc () - Return next input character */ +/* + * Return the next input character after first passing any keyboard input + * to the command. + */ +unicode_t +rxvt_term::cmd_getc () +{ + unicode_t c = next_char (); + + if (c == NOCHAR) + throw out_of_input; + + return c; +} + +unicode_t +rxvt_term::cmd_get8 () +{ + unicode_t c = next_octet (); + + if (c == NOCHAR) + throw out_of_input; + + return c; +} + /*{{{ print pipe */ /*----------------------------------------------------------------------*/ #ifdef PRINTPIPE FILE * rxvt_term::popen_printer () { - FILE *stream = popen(rs[Rs_print_pipe], "w"); + FILE *stream = popen (rs[Rs_print_pipe], "w"); if (stream == NULL) - rxvt_print_error("can't open printer pipe"); + rxvt_warn ("can't open printer pipe, not printing.\n"); + return stream; } @@ -2172,13 +2843,7 @@ rxvt_term::pclose_printer (FILE *stream) { fflush (stream); - /* pclose() reported not to work on SunOS 4.1.3 */ -# if defined (__sun__) /* TODO: RESOLVE THIS */ - /* pclose works provided SIGCHLD handler uses waitpid */ - return pclose (stream); /* return fclose (stream); */ -# else return pclose (stream); -# endif } /* @@ -2187,8 +2852,8 @@ void rxvt_term::process_print_pipe () { - int done; - FILE *fd; + int done; + FILE *fd; if ((fd = popen_printer ()) == NULL) return; @@ -2199,13 +2864,13 @@ */ for (done = 0; !done;) { - unsigned char buf[8]; - unsigned char ch; - unsigned int i, len; + unsigned char buf[8]; + unicode_t ch; + unsigned int i, len; if ((ch = cmd_getc ()) != C0_ESC) { - if (putc(ch, fd) == EOF) + if (putc (ch, fd) == EOF) break; /* done = 1 */ } else @@ -2226,14 +2891,16 @@ break; /* done = 1 */ } } + for (i = 0; i < len; i++) - if (putc(buf[i], fd) == EOF) + if (putc (buf[i], fd) == EOF) { done = 1; break; } } } + pclose_printer (fd); } #endif /* PRINTPIPE */ @@ -2242,27 +2909,29 @@ /* *INDENT-OFF* */ enum { C1_40 = 0x40, - C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, + C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, - C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC + C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, }; /* *INDENT-ON* */ /*{{{ process non-printing single characters */ void -rxvt_term::process_nonprinting (unsigned char ch) +rxvt_term::process_nonprinting (unicode_t ch) { switch (ch) { + case C0_ESC: + process_escape_seq (); + break; case C0_ENQ: /* terminal Status */ if (rs[Rs_answerbackstring]) - tt_write( - (const unsigned char *)rs[Rs_answerbackstring], - (unsigned int)STRLEN(rs[Rs_answerbackstring])); + tt_write ((const unsigned char *)rs[Rs_answerbackstring], + (unsigned int)strlen (rs[Rs_answerbackstring])); else - tt_write((unsigned char *)VT100_ANS, - (unsigned int)STRLEN(VT100_ANS)); + tt_write ((unsigned char *)VT100_ANS, + (unsigned int)strlen (VT100_ANS)); break; case C0_BEL: /* bell */ scr_bell (); @@ -2287,6 +2956,19 @@ case C0_SI: /* shift in - acs */ scr_charset_choose (0); break; + +#ifdef EIGHT_BIT_CONTROLS + // 8-bit controls + case 0x90: /* DCS */ + process_dcs_seq (); + break; + case 0x9b: /* CSI */ + process_csi_seq (); + break; + case 0x9d: /* CSI */ + process_osc_seq (); + break; +#endif } } /*}}} */ @@ -2294,7 +2976,7 @@ /*{{{ process VT52 escape sequences */ void -rxvt_term::process_escape_vt52 (unsigned char ch) +rxvt_term::process_escape_vt52 (unicode_t ch) { int row, col; @@ -2334,10 +3016,10 @@ scr_gotorc (row, col, 0); break; case 'Z': /* identify the terminal type */ - tt_printf("\033/Z"); /* I am a VT100 emulating a VT52 */ + tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ break; case '<': /* turn off VT52 mode */ - PrivMode(0, PrivMode_vt52); + PrivMode (0, PrivMode_vt52); break; case 'F': /* use special graphics character set */ case 'G': /* use regular character set */ @@ -2356,9 +3038,9 @@ void rxvt_term::process_escape_seq () { - unsigned char ch = cmd_getc (); + unicode_t ch = cmd_getc (); - if (PrivateModes & PrivMode_vt52) + if (priv_modes & PrivMode_vt52) { process_escape_vt52 (ch); return; @@ -2383,12 +3065,7 @@ case '+': scr_charset_set (3, (unsigned int)cmd_getc ()); break; -#ifdef MULTICHAR_SET - case '$': - scr_charset_set (-2, (unsigned int)cmd_getc ()); - break; -#endif -#ifndef NO_FRILLS +#if ENABLE_FRILLS case '6': scr_backindex (); break; @@ -2399,14 +3076,14 @@ case '8': scr_cursor (RESTORE); break; -#ifndef NO_FRILLS +#if ENABLE_FRILLS case '9': scr_forwardindex (); break; #endif case '=': case '>': - PrivMode((ch == '='), PrivMode_aplKP); + PrivMode ((ch == '='), PrivMode_aplKP); break; case C1_40: @@ -2419,7 +3096,7 @@ /* 8.3.87: NEXT LINE */ case C1_NEL: /* ESC E */ { - uint32_t nlcr[] = { '\n', '\r' }; + unicode_t nlcr[] = { C0_LF, C0_CR }; scr_add_lines (nlcr, 1, 2); } break; @@ -2440,10 +3117,10 @@ break; /* 8.3.142: SINGLE-SHIFT TWO */ - /*case C1_SS2: scr_single_shift (2); break; */ + /*case C1_SS2: scr_single_shift (2); break; */ /* 8.3.143: SINGLE-SHIFT THREE */ - /*case C1_SS3: scr_single_shift (3); break; */ + /*case C1_SS3: scr_single_shift (3); break; */ /* 8.3.27: DEVICE CONTROL STRING */ case C1_DCS: /* ESC P */ @@ -2452,8 +3129,8 @@ /* 8.3.110: SINGLE CHARACTER INTRODUCER */ case C1_SCI: /* ESC Z */ - tt_write((const unsigned char *)ESCZ_ANSWER, - (unsigned int)(sizeof(ESCZ_ANSWER) - 1)); + tt_write ((const unsigned char *)ESCZ_ANSWER, + (unsigned int) (sizeof (ESCZ_ANSWER) - 1)); break; /* steal obsolete ESC [ c */ /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ @@ -2468,6 +3145,7 @@ /* 8.3.106: RESET TO INITIAL STATE */ case 'c': + mbstate.reset (); scr_poweron (); scrollbar_show (1); break; @@ -2489,7 +3167,7 @@ /* *INDENT-OFF* */ enum { CSI_ICH = 0x40, - CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, + CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F, @@ -2503,28 +3181,28 @@ (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) #define get_byte_array_bit(array, bit) \ - (!!((array)[(bit) / 8] & (128 >> ((bit) & 7)))) + (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) const unsigned char csi_defaults[] = { - make_byte(1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ - make_byte(1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ - make_byte(1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ - make_byte(1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ - make_byte(1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ - make_byte(0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ - make_byte(0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ - make_byte(0,0,0,0,0,0,0,0) /* x, y, z, {, |, }, ~, */ + make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ + make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ + make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ + make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ + make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ + make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ + make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ + make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ }; /* *INDENT-ON* */ void rxvt_term::process_csi_seq () { - unsigned char ch, priv, i; - unsigned int nargs, p; - int n, ndef; - int arg[ESC_ARGS]; + unicode_t ch, priv, i; + unsigned int nargs, p; + int n, ndef; + int arg[ESC_ARGS]; for (nargs = ESC_ARGS; nargs > 0;) arg[--nargs] = 0; @@ -2536,10 +3214,11 @@ priv = ch; ch = cmd_getc (); } + /* read any numerical arguments */ for (n = -1; ch < CSI_ICH; ) { - if (isdigit(ch)) + if (isdigit (ch)) { if (n < 0) n = ch - '0'; @@ -2552,19 +3231,9 @@ arg[nargs++] = n; n = -1; } - else if (ch == '\b') - { - scr_backspace (); - } - else if (ch == C0_ESC) - { - process_escape_seq (); - return; - } - else if (ch < ' ') - { - process_nonprinting (ch); - } + else if (IS_CONTROL (ch)) + process_nonprinting (ch); + ch = cmd_getc (); } @@ -2575,16 +3244,16 @@ arg[nargs++] = n; i = ch - CSI_ICH; - ndef = get_byte_array_bit(csi_defaults, i); + ndef = get_byte_array_bit (csi_defaults, i); for (p = 0; p < nargs; p++) if (arg[p] == -1) arg[p] = ndef; #ifdef DEBUG_CMD - fprintf(stderr, "CSI "); + fprintf (stderr, "CSI "); for (p = 0; p < nargs; p++) - fprintf(stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : ""); - fprintf(stderr, "%c\n", ch); + fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : ""); + fprintf (stderr, "%c\n", ch); #endif /* @@ -2596,7 +3265,7 @@ { case '>': if (ch == CSI_DA) /* secondary device attributes */ - tt_printf("\033[>%d;%-.8s;0c", 'R', VSTRING); + tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); break; case '?': if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') @@ -2609,7 +3278,7 @@ switch (ch) { /* - * ISO/IEC 6429:1992(E) CSI sequences (defaults in parentheses) + * ISO/IEC 6429:1992 (E) CSI sequences (defaults in parentheses) */ #ifdef PRINTPIPE case CSI_MC: /* 8.3.83: (0) MEDIA COPY */ @@ -2711,12 +3380,12 @@ arg[0] = -arg[0]; /* FALLTHROUGH */ case CSI_SU: /* 8.3.148: (1) SCROLL UP */ - scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); + scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); break; case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ - tt_write((const unsigned char *)VT100_ANS, - (unsigned int)(sizeof(VT100_ANS) - 1)); + tt_write ((const unsigned char *)VT100_ANS, + (unsigned int) (sizeof (VT100_ANS) - 1)); break; case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ @@ -2727,18 +3396,17 @@ switch (arg[0]) { case 5: /* DSR requested */ - tt_printf("\033[0n"); + tt_printf ("\033[0n"); break; case 6: /* CPR requested */ scr_report_position (); break; -#if defined (ENABLE_DISPLAY_ANSWER) case 7: /* unofficial extension */ - tt_printf("%-.250s\n", rs[Rs_display_name]); + if (options & Opt_insecure) + tt_printf ("%-.250s\012", rs[Rs_display_name]); break; -#endif case 8: /* unofficial extension */ - xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST); + process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); break; } break; @@ -2781,11 +3449,15 @@ case CSI_RM: /* 8.3.107: RESET MODE */ if (arg[0] == 4) scr_insert_mode (0); + else if (arg[0] == 20) + priv_modes &= ~PrivMode_LFNL; break; case CSI_SM: /* 8.3.126: SET MODE */ if (arg[0] == 4) scr_insert_mode (1); + else if (arg[0] == 20) + priv_modes |= PrivMode_LFNL; break; /* @@ -2807,7 +3479,7 @@ scr_cursor (RESTORE); break; -#ifndef NO_FRILLS +#if ENABLE_FRILLS case CSI_74: process_window_ops (arg, nargs); break; @@ -2815,8 +3487,8 @@ case CSI_78: /* DECREQTPARM */ if (arg[0] == 0 || arg[0] == 1) - tt_printf("\033[%d;1;1;128;128;1;0x", arg[0] + 2); - /* FALLTHROUGH */ + tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2); + break; default: break; @@ -2824,88 +3496,98 @@ } /*}}} */ -#ifndef NO_FRILLS +#if ENABLE_FRILLS /* ARGSUSED */ void rxvt_term::process_window_ops (const int *args, unsigned int nargs) { - int x, y; -#if 0 - char *s; -#endif + int x, y; XWindowAttributes wattr; - Window wdummy; + Window wdummy; + dDisp; if (nargs == 0) return; + switch (args[0]) { - /* - * commands - */ + /* + * commands + */ case 1: /* deiconify window */ - XMapWindow(Xdisplay, TermWin.parent[0]); + XMapWindow (disp, parent[0]); break; case 2: /* iconify window */ - XIconifyWindow(Xdisplay, TermWin.parent[0], - DefaultScreen(Xdisplay)); + XIconifyWindow (disp, parent[0], display->screen); break; case 3: /* set position (pixels) */ - XMoveWindow(Xdisplay, TermWin.parent[0], args[1], args[2]); + XMoveWindow (disp, 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(Xdisplay, TermWin.parent[0]); + XRaiseWindow (disp, parent[0]); break; case 6: /* lower window */ - XLowerWindow(Xdisplay, TermWin.parent[0]); + XLowerWindow (disp, parent[0]); break; case 7: /* refresh window */ scr_touch (true); break; case 8: /* set size (chars) */ - set_widthheight ((unsigned int)(args[2] * TermWin.fwidth), - (unsigned int)(args[1] * TermWin.fheight)); + set_widthheight ((unsigned int) (args[2] * fwidth), + (unsigned int) (args[1] * fheight)); break; + + //case 9: NYI, TODO, restore maximized window or maximize window default: if (args[0] >= 24) /* set height (chars) */ - set_widthheight ((unsigned int)TermWin.width, - (unsigned int)(args[1] * TermWin.fheight)); + set_widthheight ((unsigned int)width, + (unsigned int) (args[1] * fheight)); break; - /* - * reports - some output format copied from XTerm - */ + + + /* + * reports - some output format copied from XTerm + */ case 11: /* report window state */ - XGetWindowAttributes(Xdisplay, TermWin.parent[0], &wattr); - tt_printf("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); + XGetWindowAttributes (disp, parent[0], &wattr); + tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); break; case 13: /* report window position */ - XGetWindowAttributes(Xdisplay, TermWin.parent[0], &wattr); - XTranslateCoordinates(Xdisplay, TermWin.parent[0], wattr.root, - -wattr.border_width, -wattr.border_width, - &x, &y, &wdummy); - tt_printf("\033[3;%d;%dt", x, y); + XGetWindowAttributes (disp, parent[0], &wattr); + XTranslateCoordinates (disp, 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(Xdisplay, TermWin.parent[0], &wattr); - tt_printf("\033[4;%d;%dt", wattr.height, wattr.width); + XGetWindowAttributes (disp, parent[0], &wattr); + tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); break; - case 18: /* report window size (chars) */ - tt_printf("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); + case 18: /* report text area size (chars) */ + tt_printf ("\033[8;%d;%dt", nrow, ncol); + break; + case 19: /* report window size (chars) */ + tt_printf ("\033[9;%d;%dt", nrow, ncol); break; -#if 0 /* XXX: currently disabled due to security concerns */ case 20: /* report icon label */ - XGetIconName(Xdisplay, TermWin.parent[0], &s); - tt_printf("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ + { + char *s; + XGetIconName (disp, parent[0], &s); + tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ + XFree (s); + } break; case 21: /* report window title */ - XFetchName(Xdisplay, TermWin.parent[0], &s); - tt_printf("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ + { + char *s; + XFetchName (disp, parent[0], &s); + tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ + XFree (s); + } break; -#endif - } } #endif @@ -2913,41 +3595,52 @@ /*----------------------------------------------------------------------*/ /* * get input up until STRING TERMINATOR (or BEL) - * ends_how is terminator used. returned input must be free()d + * ends_how is terminator used. returned input must be free()'d */ -unsigned char * -rxvt_term::get_to_st (unsigned char *ends_how) +unsigned char * +rxvt_term::get_to_st (unicode_t &ends_how) { - int seen_esc = 0; /* seen escape? */ - unsigned int n = 0; - unsigned char *s; - unsigned char ch, string[STRING_MAX]; + unicode_t ch; + bool seen_esc = false; + unsigned int n = 0; + wchar_t string[STRING_MAX]; - for (; (ch = cmd_getc ());) + while ((ch = cmd_getc ()) != NOCHAR) { - if (ch == C0_BEL - || ch == CHAR_ST - || (ch == 0x5c && seen_esc)) /* 7bit ST */ - break; - if (ch == C0_ESC) + if (seen_esc) + { + if (ch == 0x5c) /* 7bit ST */ + break; + else + return NULL; + } + else if (ch == C0_ESC) { - seen_esc = 1; + seen_esc = true; continue; } - else if (ch == '\t') - ch = ' '; /* translate '\t' to space */ - else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) + else if (ch == C0_BEL || ch == CHAR_ST) + break; + else if (ch < 0x20) return NULL; /* other control character - exit */ - if (n < sizeof(string) - 1) + + seen_esc = false; + + if (n >= STRING_MAX - 1) + // stop at some sane length + return NULL; + + if (ch == C0_SYN) + string[n++] = cmd_get8 (); + else string[n++] = ch; - seen_esc = 0; } + string[n++] = '\0'; - if ((s = (unsigned char *)rxvt_malloc(n)) == NULL) - return NULL; - *ends_how = (ch == 0x5c ? C0_ESC : ch); - STRNCPY(s, string, n); - return s; + + ends_how = (ch == 0x5c ? C0_ESC : ch); + + return (unsigned char *)rxvt_wcstombs (string); } /*----------------------------------------------------------------------*/ @@ -2957,13 +3650,16 @@ void rxvt_term::process_dcs_seq () { - unsigned char eh, *s; + unsigned char *s; + unicode_t eh; + /* * Not handled yet */ - s = get_to_st (&eh); + s = get_to_st (eh); if (s) - free(s); + free (s); + return; } @@ -2974,114 +3670,167 @@ void rxvt_term::process_osc_seq () { - unsigned char ch, eh, *s; - int arg; + unicode_t ch, eh; + int arg; ch = cmd_getc (); - for (arg = 0; isdigit(ch); ch = cmd_getc ()) + for (arg = 0; isdigit (ch); ch = cmd_getc ()) arg = arg * 10 + (ch - '0'); if (ch == ';') { - s = get_to_st (&eh); + unsigned char *s = get_to_st (eh); + if (s) { - /* - * rxvt_menubar_dispatch() violates the constness of the string, - * so do it here - */ - if (arg == XTerm_Menu) -#if 0 /* XXX: currently disabled due to security concerns */ - menubar_dispatch ((char *)s); -#else - (void)0; -#endif - else - xterm_seq (arg, (char *)s, eh); - free(s); + process_xterm_seq (arg, (char *)s, eh); + free (s); } } } + +void +rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) +{ + 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); + } + else + set_window_color (color, str); +} + /* * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) - * 0 = change iconName/title - * 1 = change iconName - * 2 = change title - * 4 = change color - * 12 = change text color - * 13 = change mouse foreground color - * 17 = change highlight character colour - * 18 = change bold character color - * 19 = change underlined character color - * 46 = change logfile (not implemented) - * 50 = change font - * - * rxvt extensions: - * 10 = menu (may change in future) - * 20 = bg pixmap - * 39 = change default fg color - * 49 = change default bg color - * 55 = dump scrollback buffer and all of screen */ void -rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__((unused))) +rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) { - int changed = 0; - int color; - char *buf, *name; + int changed = 0; + int color; + char *buf, *name; + bool query = str[0] == '?' && !str[1]; + int saveop = op; + dDisp; - assert(str != NULL); + assert (str != NULL); switch (op) { case XTerm_name: set_title (str); /* FALLTHROUGH */ case XTerm_iconName: - set_iconName (str); + set_icon_name (str); break; case XTerm_title: set_title (str); break; + case XTerm_property: + if (str[0] == '?') + { + Atom prop = display->atom (str + 1); + Atom actual_type; + int actual_format; + unsigned long nitems; + unsigned long bytes_after; + unsigned char *value = 0; + const char *str = ""; + + if (prop + && XGetWindowProperty (disp, parent[0], + prop, 0, 1<<16, 0, AnyPropertyType, + &actual_type, &actual_format, + &nitems, &bytes_after, &value) == Success + && actual_type != None + && actual_format == 8) + str = (const char *)(value); + + tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); + + XFree (value); + } + else + { + char *eq = strchr (str, '='); // constness lost, but verified to be ok + + if (eq) + { + *eq = 0; + set_utf8_property (display->atom (str), eq + 1); + } + else + XDeleteProperty (disp, parent[0], + display->atom (str)); + } + break; + case XTerm_Color: for (buf = (char *)str; buf && *buf;) { - if ((name = STRCHR(buf, ';')) == NULL) + if ((name = strchr (buf, ';')) == NULL) break; + *name++ = '\0'; - color = atoi(buf); + color = atoi (buf); + if (color < 0 || color >= TOTAL_COLORS) break; - if ((buf = STRCHR(name, ';')) != NULL) + + if ((buf = strchr (name, ';')) != NULL) *buf++ = '\0'; - set_window_color (color + minCOLOR, name); + + if (name[0] == '?' && !name[1]) + { + unsigned short r, g, b; + pix_colors_focused[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); } break; + case XTerm_Color00: + process_color_seq (XTerm_Color00, Color_fg, str, resp); + break; + case XTerm_Color01: + process_color_seq (XTerm_Color00, Color_bg, str, resp); + break; #ifndef NO_CURSORCOLOR case XTerm_Color_cursor: - set_window_color (Color_cursor, str); + process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); break; #endif - case XTerm_Color_pointer: - set_window_color (Color_pointer, str); + case XTerm_Color_pointer_fg: + process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); + break; + case XTerm_Color_pointer_bg: + process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); break; #ifndef NO_BOLD_UNDERLINE_REVERSE case XTerm_Color_BD: - set_window_color (Color_BD, str); + process_color_seq (XTerm_Color_BD, Color_BD, str, resp); break; case XTerm_Color_UL: - set_window_color (Color_UL, str); + process_color_seq (XTerm_Color_UL, Color_UL, str, resp); break; case XTerm_Color_RV: - set_window_color (Color_RV, str); + process_color_seq (XTerm_Color_RV, Color_RV, str, resp); + break; + case URxvt_Color_IT: + process_color_seq (URxvt_Color_IT, Color_IT, str, resp); break; #endif - - case XTerm_Menu: - /* - * rxvt_menubar_dispatch() violates the constness of the string, - * so DON'T do it here - */ +#if TRANSPARENT && TINTING + case URxvt_Color_tint: + process_color_seq (URxvt_Color_tint, Color_tint, str, resp); + check_our_parents (); + if (am_transparent) + want_full_refresh = want_refresh = 1; break; +#endif + case XTerm_Pixmap: if (*str != ';') { @@ -3091,14 +3840,14 @@ #endif scr_touch (true); } - while ((str = STRCHR(str, ';')) != NULL) + while ((str = strchr (str, ';')) != NULL) { str++; #if XPM_BACKGROUND changed += scale_pixmap (str); #endif - } + if (changed) { #ifdef XPM_BACKGROUND @@ -3114,24 +3863,77 @@ case XTerm_restoreBG: set_window_color (Color_bg, str); break; + case XTerm_logfile: + // TODO, when secure mode? break; - case XTerm_font: - change_font (0, str); - break; + +#ifdef MENUBAR + case URxvt_Menu: + if (options & Opt_insecure) + menubar_dispatch (const_cast(str)); // casting away constness is checked + break; +#endif #if 0 case XTerm_dumpscreen: /* no error notices */ { - int fd; - if ((fd = open(str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) + int fd; + if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) { scr_dump (fd); - close(fd); + close (fd); } } break; #endif + case XTerm_font: + op = URxvt_font; + case URxvt_font: +#if ENABLE_STYLES + case URxvt_boldFont: + case URxvt_italicFont: + case URxvt_boldItalicFont: +#endif + if (query) + tt_printf ("\33]%d;%-.250s%c", saveop, + (options & Opt_insecure) && fontset[op - URxvt_font]->fontdesc + ? fontset[op - URxvt_font]->fontdesc : "", + resp); + else + { + const char *&res = rs[Rs_font + (op - URxvt_font)]; + + res = strdup (str); + allocated.push_back ((void *)res); + set_fonts (); + } + break; + +#if ENABLE_FRILLS + case URxvt_locale: + if (query) + tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp); + else + { + set_locale (str); + pty.set_utf8_mode (enc_utf8); + init_xlocale (); + } + break; + case URxvt_view_up: + case URxvt_view_down: + int lines = atoi (str); + + if (lines) + scr_page (op == URxvt_view_up ? UP : DN, lines); + else + { + scr_erase_savelines (); + } + + break; +#endif } } /*----------------------------------------------------------------------*/ @@ -3149,11 +3951,11 @@ int rxvt_term::privcases (int mode, unsigned long bit) { - int state; + int state; if (mode == 's') { - SavedModes |= (PrivateModes & bit); + SavedModes |= (priv_modes & bit); return -1; } else @@ -3161,23 +3963,26 @@ if (mode == 'r') state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ else - state = (mode == 't') ? !(PrivateModes & bit) : mode; - PrivMode(state, bit); + state = (mode == 't') ? ! (priv_modes & bit) : mode; + PrivMode (state, bit); } + return state; } /* we're not using priv _yet_ */ void -rxvt_term::process_terminal_mode (int mode, int priv __attribute__((unused)), unsigned int nargs, const int *arg) +rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) { - unsigned int i, j; - int state; + unsigned int i, j; + int state; + static const struct { const int argval; const unsigned long bit; } + argtopriv[] = { { 1, PrivMode_aplCUR }, { 2, PrivMode_vt52 }, @@ -3186,26 +3991,39 @@ { 5, PrivMode_rVideo }, { 6, PrivMode_relOrigin }, { 7, PrivMode_Autowrap }, + // 8, bi-directional support mode { 9, PrivMode_MouseX10 }, #ifdef menuBar_esc { menuBar_esc, PrivMode_menuBar }, #endif + // 18, 19 printing-related + { 25, PrivMode_VisibleCursor }, #ifdef scrollBar_esc { scrollBar_esc, PrivMode_scrollBar }, #endif - { 25, PrivMode_VisibleCursor }, - { 35, PrivMode_ShiftKeys }, + { 35, PrivMode_ShiftKeys }, // rxvt extension { 40, PrivMode_132OK }, + // 41 xterm more fixes NYI + // 45 margin bell NYI + // 46 start logging { 47, PrivMode_Screen }, { 66, PrivMode_aplKP }, #ifndef NO_BACKSPACE_KEY { 67, PrivMode_BackSpace }, #endif { 1000, PrivMode_MouseX11 }, - { 1010, PrivMode_TtyOutputInh }, - { 1011, PrivMode_Keypress }, + // 1001 Use Hilite Mouse Tracking. NYI, TODO + // 1002 Use Cell Motion Mouse Tracking. NYI, TODO + // 1003 Use All Motion Mouse Tracking. NYI, TODO + { 1010, PrivMode_TtyOutputInh }, // rxvt extension + { 1011, PrivMode_Keypress }, // rxvt extension + // 1035 enable modifiers for alt, numlock NYI + // 1036 send ESC for meta keys NYI + // 1037 send DEL for keypad delete NYI { 1047, PrivMode_Screen }, - { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */ + // 1048 save and restore cursor + { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ + // 1051, 1052, 1060, 1061 keyboard emulation NYI }; if (nargs == 0) @@ -3222,7 +4040,7 @@ state = -1; /* basic handling */ - for (j = 0; j < (sizeof(argtopriv)/sizeof(argtopriv[0])); j++) + for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) if (argtopriv[j].argval == arg[i]) { state = privcases (mode, argtopriv[j].bit); @@ -3230,110 +4048,115 @@ } /* extra handling for values with state unkept */ - if (state == -1) - switch (arg[i]) - { - case 1048: /* alternative cursor save */ + switch (arg[i]) + { + case 1048: /* alternative cursor save */ + case 1049: + if (options & Opt_secondaryScreen) if (mode == 0) scr_cursor (RESTORE); else if (mode == 1) scr_cursor (SAVE); - /* FALLTHROUGH */ - default: - continue; /* for(;i;) */ - } - - /* extra handling for values with valid 0 or 1 state */ - switch (arg[i]) - { - /* case 1: - application cursor keys */ - case 2: /* VT52 mode */ - /* oddball mode. should be set regardless of set/reset - * parameter. Return from VT52 mode with an ESC < from - * within VT52 mode - */ - PrivMode(1, PrivMode_vt52); - break; - case 3: /* 80/132 */ - if (PrivateModes & PrivMode_132OK) - set_widthheight ( (unsigned int)((state ? 132 : 80) * TermWin.fwidth), - (unsigned int)TermWin.height); - break; - case 4: /* smooth scrolling */ - if (state) - Options &= ~Opt_jumpScroll; - else - Options |= Opt_jumpScroll; - break; - case 5: /* reverse video */ - scr_rvideo_mode (state); - break; - case 6: /* relative/absolute origins */ - scr_relative_origin (state); - break; - case 7: /* autowrap */ - scr_autowrap (state); break; + } + + if (state >= 0) + /* extra handling for values with valid 0 or 1 state */ + switch (arg[i]) + { + /* case 1: - application cursor keys */ + case 2: /* VT52 mode */ + /* oddball mode. should be set regardless of set/reset + * parameter. Return from VT52 mode with an ESC < from + * within VT52 mode + */ + PrivMode (1, PrivMode_vt52); + break; + case 3: /* 80/132 */ + if (priv_modes & PrivMode_132OK) + set_widthheight (((state ? 132 : 80) * fwidth), height); + break; + case 4: /* smooth scrolling */ + if (state) + options &= ~Opt_jumpScroll; + else + options |= Opt_jumpScroll; + break; + case 5: /* reverse video */ + scr_rvideo_mode (state); + break; + case 6: /* relative/absolute origins */ + scr_relative_origin (state); + break; + case 7: /* autowrap */ + scr_autowrap (state); + break; /* case 8: - auto repeat, can't do on a per window basis */ - case 9: /* X10 mouse reporting */ - if (state) /* orthogonal */ - PrivateModes &= ~(PrivMode_MouseX11); - break; + case 9: /* X10 mouse reporting */ + if (state) /* orthogonal */ + priv_modes &= ~PrivMode_MouseX11; + break; #ifdef menuBar_esc - case menuBar_esc: + case menuBar_esc: #ifdef MENUBAR - map_menuBar (state); + map_menuBar (state); #endif - break; + break; #endif #ifdef scrollBar_esc - case scrollBar_esc: - if (scrollbar_mapping (state)) - { - resize_all_windows (0, 0, 0); - scr_touch (true); - } - break; + case scrollBar_esc: + if (scrollbar_mapping (state)) + { + resize_all_windows (0, 0, 0); + scr_touch (true); + } + break; #endif - case 25: /* visible/invisible cursor */ - scr_cursor_visible (state); - break; + case 25: /* visible/invisible cursor */ + scr_cursor_visible (state); + break; /* case 35: - shift keys */ /* case 40: - 80 <--> 132 mode */ - case 47: /* secondary screen */ - scr_change_screen (state); - break; + case 47: /* secondary screen */ + scr_change_screen (state); + break; /* case 66: - application key pad */ /* case 67: - backspace key */ - case 1000: /* X11 mouse reporting */ - if (state) /* orthogonal */ - PrivateModes &= ~(PrivMode_MouseX10); - break; + case 1000: /* X11 mouse reporting */ + if (state) /* orthogonal */ + priv_modes &= ~PrivMode_MouseX10; + break; #if 0 - case 1001: - break; /* X11 mouse highlighting */ + case 1001: + break; /* X11 mouse highlighting */ #endif - case 1010: /* scroll to bottom on TTY output inhibit */ - if (state) - Options &= ~Opt_scrollTtyOutput; - else - Options |= Opt_scrollTtyOutput; - break; - case 1011: /* scroll to bottom on key press */ - if (state) - Options |= Opt_scrollTtyKeypress; - else - Options &= ~Opt_scrollTtyKeypress; - break; - case 1047: /* secondary screen w/ clearing */ - case 1049: /* better secondary screen w/ clearing, but not fully implemented */ - if (current_screen != PRIMARY) - scr_erase_screen (2); - scr_change_screen (state); - /* FALLTHROUGH */ - default: - break; - } + case 1010: /* scroll to bottom on TTY output inhibit */ + if (state) + options &= ~Opt_scrollTtyOutput; + else + options |= Opt_scrollTtyOutput; + break; + case 1011: /* scroll to bottom on key press */ + if (state) + options |= Opt_scrollTtyKeypress; + else + options &= ~Opt_scrollTtyKeypress; + break; + case 1047: /* secondary screen w/ clearing last */ + if (options & Opt_secondaryScreen) + if (current_screen != PRIMARY) + scr_erase_screen (2); + scr_change_screen (state); + break; + case 1049: /* secondary screen w/ clearing first */ + scr_change_screen (state); + if (options & Opt_secondaryScreen) + if (current_screen != PRIMARY) + scr_erase_screen (2); + break; + default: + break; + } } } /*}}} */ @@ -3342,15 +4165,16 @@ void rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) { - unsigned int i; - short rendset; - int rendstyle; + unsigned int i; + short rendset; + int rendstyle; if (nargs == 0) { scr_rendition (0, ~RS_None); return; } + for (i = 0; i < nargs; i++) { rendset = -1; @@ -3362,32 +4186,60 @@ case 1: rendset = 1, rendstyle = RS_Bold; break; + //case 2: // low intensity + case 3: + rendset = 1, rendstyle = RS_Italic; + break; 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 case 7: rendset = 1, rendstyle = RS_RVid; break; - case 22: + case 8: + // invisible. NYI + break; + //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, sometimes doubly underlined (iso 8613) + rendset = 0, rendstyle = RS_Bold; + break; + case 22: // normal intensity rendset = 0, rendstyle = RS_Bold; break; + case 23: // disable italic + rendset = 0, rendstyle = RS_Italic; + break; case 24: rendset = 0, rendstyle = RS_Uline; break; case 25: rendset = 0, rendstyle = RS_Blink; break; + case 26: // variable spacing (iso 8613) + rendset = 0, rendstyle = RS_Blink; + break; case 27: rendset = 0, rendstyle = RS_RVid; break; + //case 28: // visible. NYI + //case 29: // not crossed-out } + if (rendset != -1) { scr_rendition (rendset, rendstyle); - continue; /* for(;i;) */ + continue; /* for (;i;) */ } switch (arg[i]) @@ -3400,19 +4252,15 @@ case 35: case 36: case 37: - scr_color ((unsigned int)(minCOLOR + (arg[i] - 30)), - Color_fg); + scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); break; -#ifdef TTY_256COLOR - case 38: + case 38: // set fg color, ISO 8613-6 if (nargs > i + 2 && arg[i + 1] == 5) { - scr_color ((unsigned int)(minCOLOR + arg[i + 2]), - Color_fg); + scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); i += 2; } break; -#endif case 39: /* default fg */ scr_color (Color_fg, Color_fg); break; @@ -3425,23 +4273,21 @@ case 45: case 46: case 47: - scr_color ((unsigned int)(minCOLOR + (arg[i] - 40)), - Color_bg); + scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); break; -#ifdef TTY_256COLOR - case 48: + case 48: // set bg color, ISO 8613-6 if (nargs > i + 2 && arg[i + 1] == 5) { - scr_color ((unsigned int)(minCOLOR + arg[i + 2]), - Color_bg); + scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); i += 2; } break; -#endif case 49: /* default bg */ scr_color (Color_bg, Color_bg); break; + //case 50: // not variable spacing + #ifndef NO_BRIGHTCOLOR case 90: case 91: /* set bright fg color */ @@ -3451,8 +4297,7 @@ case 95: case 96: case 97: - scr_color ((unsigned int)(minBrightCOLOR + (arg[i] - 90)), - Color_fg); + scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg); break; case 100: case 101: /* set bright bg color */ @@ -3462,8 +4307,7 @@ case 105: case 106: case 107: - scr_color ((unsigned int)(minBrightCOLOR + (arg[i] - 100)), - Color_bg); + scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); break; #endif @@ -3472,74 +4316,28 @@ } /*}}} */ -/*{{{ process Rob Nation's own graphics mode sequences */ +/*{{{ (do not) process Rob Nation's own graphics mode sequences */ void rxvt_term::process_graphics () { - unsigned char ch, cmd = cmd_getc (); + unicode_t ch, cmd = cmd_getc (); -#ifndef RXVT_GRAPHICS if (cmd == 'Q') { /* query graphics */ - tt_printf("\033G0\n"); /* no graphics */ + tt_printf ("\033G0\012"); /* no graphics */ return; } /* swallow other graphics sequences until terminating ':' */ do ch = cmd_getc (); while (ch != ':'); -#else - unsigned int nargs; - int args[NGRX_PTS]; - unsigned char *text = NULL; - - if (cmd == 'Q') - { /* query graphics */ - tt_printf("\033G1\n"); /* yes, graphics (color) */ - return; - } - for (nargs = 0; nargs < (sizeof(args) / sizeof(args[0])) - 1;) - { - int neg; - - ch = cmd_getc (); - neg = (ch == '-'); - if (neg || ch == '+') - ch = cmd_getc (); - - for (args[nargs] = 0; isdigit(ch); ch = cmd_getc ()) - args[nargs] = args[nargs] * 10 + (ch - '0'); - if (neg) - args[nargs] = -args[nargs]; - - nargs++; - args[nargs] = 0; - if (ch != ';') - break; - } - - if ((cmd == 'T') && (nargs >= 5)) - { - int i, len = args[4]; - - text = (unsigned char *)rxvt_malloc((len + 1) * sizeof(char)); - - if (text != NULL) - { - for (i = 0; i < len; i++) - text[i] = cmd_getc (); - text[len] = '\0'; - } - } - Gr_do_graphics (cmd, nargs, args, text); -#endif } /*}}} */ /* ------------------------------------------------------------------------- */ /* - * Send printf() formatted output to the command. + * Send printf () formatted output to the command. * Only use for small amounts of data. */ void @@ -3551,67 +4349,59 @@ va_start (arg_ptr, fmt); vsnprintf ((char *)buf, 256, fmt, arg_ptr); va_end (arg_ptr); - tt_write (buf, STRLEN (buf)); + tt_write (buf, strlen (buf)); } /* ---------------------------------------------------------------------- */ /* Write data to the pty as typed by the user, pasted with the mouse, * or generated by us in response to a query ESC sequence. */ +const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT + void rxvt_term::tt_write (const unsigned char *data, unsigned int len) { - enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT - - if (len) + if (v_buflen == 0) { - if (v_buflen == 0) - { - ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len)); + ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); - if ((unsigned int)written == len) - return; + if ((unsigned int)written == len) + return; - data += written; - len -= written; - } + data += written; + len -= written; + } + v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); - v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); + memcpy (v_buffer + v_buflen, data, len); + v_buflen += len; - memcpy (v_buffer + v_buflen, data, len); - v_buflen += len; - } + pty_ev.set (EVENT_READ | EVENT_WRITE); +} - for (;;) +void rxvt_term::pty_write () +{ + int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); + + if (written > 0) { - int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen)); + v_buflen -= written; - if (written > 0) + if (v_buflen == 0) { - v_buflen -= written; - - if (v_buflen == 0) - { - free (v_buffer); - v_buffer = 0; - v_buflen = 0; + free (v_buffer); + v_buffer = 0; + v_buflen = 0; - pty_ev.set (EVENT_READ); - return; - } - - memmove (v_buffer, v_buffer + written, v_buflen); - } - else if (written != -1 || (errno != EAGAIN && errno != EINTR)) - // original code just ignores this... - destroy (); - else - { - pty_ev.set (EVENT_READ | EVENT_WRITE); + pty_ev.set (EVENT_READ); return; } + + memmove (v_buffer, v_buffer + written, v_buflen); } + else if (written != -1 || (errno != EAGAIN && errno != EINTR)) + pty_ev.set (EVENT_READ); } /*----------------------- end-of-file (C source) -----------------------*/