--- rxvt-unicode/src/command.C 2004/08/10 22:36:30 1.120 +++ rxvt-unicode/src/command.C 2004/12/21 06:43:00 1.183 @@ -50,7 +50,8 @@ #include "version.h" #include "command.h" -#include +#include +#include /*----------------------------------------------------------------------*/ @@ -59,6 +60,202 @@ // 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, + XK_KP_Space, 0x2422, + 0, +}; + +void +rxvt_term::iso14755_54 (int x, int y) +{ + x = Pixel2Col (x); + y = Pixel2Row (y); + + if (x < 0 || x >= TermWin.ncol + || y < 0 || y >= TermWin.nrow) + return; + + for (;;) + { + text_t t = screen.text[y + TermWin.saveLines - TermWin.view_start][x]; + + if (t != NOCHAR || !x) + { + iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x], + screen.rend[y + TermWin.saveLines - TermWin.view_start][x]); + iso14755buf = ISO_14755_54; + break; + } + + x--; + } + +} +#endif + +#if ENABLE_OVERLAY +void +rxvt_term::iso14755_51 (unicode_t ch, rend_t r) +{ + rxvt_fontset *fs = FONTSET (r); + rxvt_font *f = (*fs)[fs->find_font (ch)]; + wchar_t *chr, *alloc, ch2; + int len; + +#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; + } + + int width = strlen (f->name); + + scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1); + + 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, f->name); + +#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) @@ -153,11 +350,10 @@ { #ifdef UNSHIFTED_SCROLLKEYS if (!ctrl && !meta) - { #else if (IS_SCROLL_MOD) - { #endif + { int lnsppg; #ifdef PAGING_CONTEXT_LINES @@ -216,7 +412,7 @@ 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) { @@ -224,6 +420,7 @@ case XK_Insert: /* Shift+Insert = paste mouse selection */ selection_request (ev.time, 0, 0); return; +#if TODO /* rxvt extras */ case XK_KP_Add: /* Shift+KP_Add = bigger font */ change_font (FONT_UP); @@ -231,9 +428,57 @@ case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 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) { @@ -245,7 +490,7 @@ if (keysym >= 0xFF00 && keysym <= 0xFFFF) { #ifdef KEYSYM_RESOURCE - if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL) + if (!(shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL) { unsigned int l; const unsigned char *kbuf0; @@ -275,24 +520,24 @@ { #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); + strcpy (kbuf, key_backspace); break; #endif #ifndef NO_DELETE_KEY case XK_Delete: - STRCPY (kbuf, key_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 @@ -312,9 +557,9 @@ 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"); + strcpy (kbuf, "\033OZ"); kbuf[2] = "txvr"[keysym - XK_KP_Left]; break; } @@ -327,7 +572,7 @@ case XK_Down: /* "\033[B" */ case XK_Right: /* "\033[C" */ case XK_Left: /* "\033[D" */ - STRCPY (kbuf, "\033[Z"); + strcpy (kbuf, "\033[Z"); kbuf[2] = "DACB"[keysym - XK_Left]; /* do Shift first */ if (shft) @@ -337,7 +582,7 @@ kbuf[1] = 'O'; kbuf[2] = "dacb"[keysym - XK_Left]; } - else if (PrivateModes & PrivMode_aplCUR) + else if (priv_modes & PrivMode_aplCUR) kbuf[1] = 'O'; break; @@ -345,61 +590,72 @@ # 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"); + strcpy (kbuf, "\033Ou"); break; case XK_KP_Insert: - STRCPY (kbuf, "\033Op"); + strcpy (kbuf, "\033Op"); break; case XK_KP_Delete: - STRCPY (kbuf, "\033On"); + 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; @@ -420,9 +676,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 @@ -433,46 +689,46 @@ break; case XK_Find: - STRCPY (kbuf, "\033[1~"); + strcpy (kbuf, "\033[1~"); break; 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) \ @@ -531,11 +787,15 @@ break; #undef FKEY default: - newlen = 0; - break; + if (len == 0 + && (keysym & 0xfff0) != 0xff70 + && (keysym & 0xfff0) != 0xffe0) + /* generate a keycode for every remaining keypress */ + sprintf ((char *)kbuf, "\033[%x;%xA", (unsigned char)ev.state, (unsigned short)keysym); } + if (newlen) - len = STRLEN (kbuf); + len = strlen (kbuf); } /* @@ -552,6 +812,18 @@ len = 1; kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ } + else if (keysym == XK_ISO_Left_Tab) + { + strcpy (kbuf, "\033[Z"); + len = 3; + } + else if (len == 0 + && (keysym & 0xffe0) != 0xfe00 + && (keysym < 0xfe50 || keysym > 0xfe6f)) + { + /* generate a keycode for every remaining keypress */ + len = sprintf ((char *)kbuf, "\033[%x;%xA", (unsigned char)ev.state, (unsigned short)keysym); + } else { #ifdef META8_OPTION @@ -573,7 +845,7 @@ if (len <= 0) return; /* not mapped */ - if (Options & Opt_scrollTtyKeypress) + if (options & Opt_scrollTtyKeypress) if (TermWin.view_start) { TermWin.view_start = 0; @@ -632,7 +904,7 @@ if (n > 0 && s < count) { - MEMMOVE (cmdbuf_base, cmdbuf_ptr, + memmove (cmdbuf_base, cmdbuf_ptr, (unsigned int) (cmdbuf_endp - cmdbuf_ptr)); cmdbuf_ptr = cmdbuf_base; cmdbuf_endp -= n; @@ -657,6 +929,8 @@ void rxvt_term::flush () { + flush_ev.stop (); + #ifdef TRANSPARENT if (want_full_refresh) { @@ -676,8 +950,6 @@ } display->flush (); - - flush_ev.stop (); } void @@ -785,7 +1057,7 @@ cmdbuf_ptr = cmdbuf_base; cmdbuf_endp = cmdbuf_ptr + n; - n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n); + n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); if (n > 0) { @@ -804,13 +1076,14 @@ SET_R (this); SET_LOCALE (locale); - if (revents & EVENT_WRITE) - tt_write (0, 0); - else if (revents & EVENT_READ) + if (revents & EVENT_READ) // loop, but don't allow a single term to monopolize us while (pty_fill ()) if (cmd_parse ()) break; + + if (revents & EVENT_WRITE) + pty_write (); } void @@ -822,7 +1095,7 @@ #ifdef POINTER_BLANK hidden_pointer = 0; - if (Options & Opt_pointerBlank) + if (options & Opt_pointerBlank) pointer_ev.start (NOW + pointerBlankDelay); #endif } @@ -831,7 +1104,7 @@ void rxvt_term::pointer_blank () { - if (! (Options & Opt_pointerBlank)) + if (! (options & Opt_pointerBlank)) return; XDefineCursor (display->display, TermWin.vt, blank_cursor); @@ -861,9 +1134,7 @@ pixel_position (&x, &y); if (MEvent.button == AnyButton) - { - button_number = 3; - } + button_number = 3; else { button_number = MEvent.button - Button1; @@ -872,7 +1143,7 @@ button_number += (64 - 3); } - if (PrivateModes & PrivMode_MouseX10) + if (priv_modes & PrivMode_MouseX10) { /* * do not report ButtonRelease @@ -897,10 +1168,9 @@ #ifdef MOUSE_REPORT_DOUBLECLICK key_state += ((MEvent.clicks > 1) ? 32 : 0); #endif - } -#ifdef DEBUG_MOUSEREPORT +#if DEBUG_MOUSEREPORT fprintf (stderr, "Mouse ["); if (key_state & 16) fputc ('C', stderr); @@ -914,12 +1184,12 @@ button_number, x + 1, y + 1); -#else +#endif + tt_printf ("\033[M%c%c%c", (32 + button_number + key_state), (32 + x + 1), (32 + y + 1)); -#endif } #ifdef USING_W11LIB @@ -940,7 +1210,7 @@ SET_LOCALE (locale); #if defined(CURSOR_BLINK) - if ((Options & Opt_cursorBlink) && ev.type == KeyPress) + if ((options & Opt_cursorBlink) && ev.type == KeyPress) { if (hidden_cursor) { @@ -953,7 +1223,7 @@ #endif #if defined(POINTER_BLANK) - if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0) + if ((options & Opt_pointerBlank) && pointerBlankDelay > 0) { if (ev.type == MotionNotify || ev.type == ButtonPress @@ -966,86 +1236,90 @@ } #endif -#ifdef USE_XIM - if (XFilterEvent (&ev, None)) - return; -#endif - - 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)); -#endif + Window unused_root, unused_child; + int unused_root_x, unused_root_y; + unsigned int unused_mask; switch (ev.type) { case KeyPress: - lookup_key (ev.xkey); +#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 (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 + KeySym ks; + + 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 - { - KeySym ks; - - ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0); - if (ks == XK_Control_L || ks == XK_Control_R) - mouse_slip_wheel_speed = 0; - } + else if (ks == XK_Control_L || ks == XK_Control_R) + mouse_slip_wheel_speed = 0; +#endif break; } -#endif case ButtonPress: button_press (ev.xbutton); @@ -1079,12 +1353,9 @@ &ActualType, &ActualFormat, &Size, &RemainingBytes, &data); - XChangeProperty (display->display, display->root, - XA_CUT_BUFFER0, XA_STRING, - 8, PropModeReplace, - data, STRLEN (data)); + set_string_property (XA_CUT_BUFFER0, data); XFree (data); - selection_paste (display->root, XA_CUT_BUFFER0, True); + selection_paste (display->root, XA_CUT_BUFFER0, true); XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); } #endif /* OFFIX_DND */ @@ -1126,19 +1397,20 @@ want_refresh = 1; #ifdef USE_XIM if (Input_Context != NULL) - XSetICFocus (Input_Context); + { + IMSetStatusPosition (); + XSetICFocus (Input_Context); + } #endif #ifdef CURSOR_BLINK - if (Options & Opt_cursorBlink) + if (options & Opt_cursorBlink) cursor_blink_ev.start (NOW + BLINK_INTERVAL); #endif #ifdef OFF_FOCUS_FADING if (rs[Rs_fade]) { - PixColors = PixColorsFocused; - set_colorfgbg (); - scr_clear (); - scr_touch (true); + pix_colors = pix_colors_focused; + scr_recolour (); } #endif @@ -1150,25 +1422,29 @@ { TermWin.focus = 0; want_refresh = 1; + +#if ENABLE_FRILLS || ISO_14755 + iso14755buf = 0; +#endif +#if ENABLE_OVERLAY + scr_overlay_off (); +#endif #ifdef USE_XIM if (Input_Context != NULL) XUnsetICFocus (Input_Context); #endif #ifdef CURSOR_BLINK - if (Options & Opt_cursorBlink) + if (options & Opt_cursorBlink) cursor_blink_ev.stop (); hidden_cursor = 0; #endif #ifdef OFF_FOCUS_FADING if (rs[Rs_fade]) { - PixColors = PixColorsUnFocused; - set_colorfgbg (); - scr_clear (); - scr_touch (true); + pix_colors = pix_colors_unfocused; + scr_recolour (); } #endif - } break; @@ -1186,27 +1462,32 @@ while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); if (szHint.width != width || szHint.height != height) - resize_all_windows (width, height, 1); - -#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ - if (Options & Opt_transparent) { - check_our_parents (); - if (am_transparent) - want_refresh = want_full_refresh = 1; + seen_resize = 1; + resize_all_windows (width, height, 1); } + +#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ + 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: @@ -1288,28 +1569,37 @@ 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.xbutton.state & (Button1Mask | Button3Mask))) + if (ev.xbutton.state & (Button1Mask | Button3Mask)) { while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) ; XQueryPointer (display->display, TermWin.vt, - &unused_root, &unused_child, - &unused_root_x, &unused_root_y, - & (ev.xbutton.x), & (ev.xbutton.y), - &unused_mask); + &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) { #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)) @@ -1325,13 +1615,12 @@ /* 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.ydisplay, scrollBar.win, - MotionNotify, &ev)) ; + MotionNotify, &ev)) + ; + XQueryPointer (display->display, 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 ()); @@ -1382,6 +1672,7 @@ } } +#if TRANSPARENT void rxvt_term::rootwin_cb (XEvent &ev) { @@ -1391,34 +1682,22 @@ switch (ev.type) { case PropertyNotify: - if (ev.xproperty.atom == xa[XA_VT_SELECTION]) - { - if (ev.xproperty.state == PropertyNewValue) - selection_property (ev.xproperty.window, ev.xproperty.atom); - break; - } -#ifdef TRANSPARENT - else - { - /* - * if user used some Esetroot compatible prog to set the root bg, - * use the property to determine the pixmap. We use it later on. - */ - if (xa[XA_XROOTPMAPID] == 0) - xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False); - - if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) - return; - } + /* + * 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) + if ((options & Opt_transparent) && check_our_parents () && am_transparent) want_refresh = want_full_refresh = 1; break; -#endif } } +#endif void rxvt_term::button_press (XButtonEvent &ev) @@ -1427,13 +1706,24 @@ 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 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) { /* mouse report from vt window */ @@ -1472,11 +1762,20 @@ { if (ev.button != MEvent.button) MEvent.clicks = 0; + switch (ev.button) { 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 && ! (PrivateModes & PrivMode_mouse_report)) + if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) { if (MEvent.button == Button1 && clickintime) selection_rotate (ev.x, ev.y); @@ -1501,10 +1800,12 @@ selection_rotate (ev.x, ev.y); else selection_extend (ev.x, ev.y, 1); + MEvent.button = Button3; break; } } + MEvent.time = ev.time; return; } @@ -1667,7 +1968,7 @@ csrO = 0; /* reset csr Offset */ if (!bypass_keystate) - reportmode = !! (PrivateModes & PrivMode_mouse_report); + reportmode = !! (priv_modes & PrivMode_mouse_report); if (scrollbar_isUpDn ()) { @@ -1676,14 +1977,20 @@ #ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING refresh_type &= ~SMOOTH_REFRESH; #endif - } + #ifdef SELECTION_SCROLLING if (sel_scroll_ev.active) sel_scroll_ev.stop(); #endif + if (ev.window == TermWin.vt) { +#if ISO_14755 + // 5.4 + if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) + return; +#endif if (reportmode) { /* mouse report from vt window */ @@ -1707,11 +2014,12 @@ #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 + if (priv_modes & PrivMode_mouse_report && bypass_keystate && ev.button == Button1 && MEvent.clicks <= 1) selection_extend (ev.x, ev.y, 0); @@ -1736,7 +2044,7 @@ if (ev.state & ShiftMask) i = 1; - else if (Options & Opt_mouseWheelScrollPage) + else if (options & Opt_mouseWheelScrollPage) i = TermWin.nrow - 1; else i = 5; @@ -2031,7 +2339,7 @@ pchanged = 0; - if (!(Options & Opt_transparent)) + if (!(options & Opt_transparent)) return pchanged; /* Don't try any more */ XGetWindowAttributes (display->display, display->root, &wrootattr); @@ -2044,7 +2352,7 @@ if (am_transparent) { pchanged = 1; - XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]); + XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); am_transparent = am_pixmap_trans = 0; } @@ -2059,14 +2367,14 @@ * 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] - && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], + i = (xa[XA_XROOTPMAP_ID] + && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAP_ID], 0L, 1L, False, XA_PIXMAP, &atype, &aformat, &nitems, &bytes_after, &prop) == Success); if (!i || prop == NULL) - i = (xa[XA_XSETROOTID] - && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], + i = (xa[XA_ESETROOT_PMAP_ID] + && XGetWindowProperty (display->display, display->root, xa[XA_ESETROOT_PMAP_ID], 0L, 1L, False, XA_PIXMAP, &atype, &aformat, &nitems, &bytes_after, &prop) == Success); @@ -2117,6 +2425,8 @@ MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); + + XSync (display->display, False); allowedxerror = -1; image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); @@ -2149,7 +2459,7 @@ unsigned short rm, gm, bm; int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; - PixColorsFocused[Color_tint].get (display, rm, gm, bm); + pix_colors_focused[Color_tint].get (display, rm, gm, bm); ShadeXImage (display, image, shade, rm, gm, bm); } @@ -2172,20 +2482,20 @@ } } - if (!am_pixmap_trans) + if (am_pixmap_trans) + XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); + else { unsigned int n; /* * InheritPixmap transparency */ - D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root)); for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) { oldp = TermWin.parent[i]; XQueryTree (display->display, 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] == display->root) { @@ -2206,7 +2516,6 @@ for (; n < (unsigned int)i; n++) { XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); - D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL")); if (wattr.depth != rootdepth || wattr.c_class == InputOnly) { n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; @@ -2217,9 +2526,8 @@ if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) { - D_X ((stderr, "InheritPixmap Turning off")); - XSetWindowBackground (display->display, TermWin.parent[0], PixColorsFocused[Color_fg]); - XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]); + XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]); + XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); am_transparent = 0; /* XXX: also turn off Opt_transparent? */ } @@ -2230,7 +2538,6 @@ * needed for fvwm2.2.2 (and before?) */ sleep (1); #endif - D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1)); for (n = 0; n < (unsigned int)i; n++) { XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); @@ -2245,15 +2552,20 @@ TermWin.parent[i] = None; } - // this is experimental if (scrollBar.win) { XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative); - XClearWindow (display->display, scrollBar.win); scrollBar.setIdle (); scrollbar_show (0); } + if (am_transparent) + { + want_refresh = want_full_refresh = 1; + if (am_pixmap_trans) + flush (); + } + return pchanged; } #endif @@ -2280,6 +2592,20 @@ 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) + kill (-cmd_pid, SIGWINCH); + } + /* Read a text string from the input buffer */ unicode_t buf[UBUFSIZ]; bool refreshnow = false; @@ -2298,7 +2624,7 @@ nlines++; refresh_count++; - if (!(Options & Opt_jumpScroll) + if (!(options & Opt_jumpScroll) || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) { refreshnow = true; @@ -2335,7 +2661,7 @@ */ if (refreshnow) { - if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) + if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) refresh_limit++; else { @@ -2399,7 +2725,7 @@ // assume wchar == unicode cmdbuf_ptr += len; - return wc; + return wc & UNICODE_MASK; } return NOCHAR; @@ -2535,10 +2861,10 @@ case C0_ENQ: /* terminal Status */ if (rs[Rs_answerbackstring]) tt_write ((const unsigned char *)rs[Rs_answerbackstring], - (unsigned int)STRLEN (rs[Rs_answerbackstring])); + (unsigned int)strlen (rs[Rs_answerbackstring])); else tt_write ((unsigned char *)VT100_ANS, - (unsigned int)STRLEN (VT100_ANS)); + (unsigned int)strlen (VT100_ANS)); break; case C0_BEL: /* bell */ scr_bell (); @@ -2647,7 +2973,7 @@ { unicode_t ch = cmd_getc (); - if (PrivateModes & PrivMode_vt52) + if (priv_modes & PrivMode_vt52) { process_escape_vt52 (ch); return; @@ -2672,7 +2998,7 @@ case '+': scr_charset_set (3, (unsigned int)cmd_getc ()); break; -#ifndef NO_FRILLS +#if ENABLE_FRILLS case '6': scr_backindex (); break; @@ -2683,7 +3009,7 @@ case '8': scr_cursor (RESTORE); break; -#ifndef NO_FRILLS +#if ENABLE_FRILLS case '9': scr_forwardindex (); break; @@ -2992,7 +3318,7 @@ case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ tt_write ((const unsigned char *)VT100_ANS, - (unsigned int) (sizeof (VT100_ANS) - 1)); + (unsigned int) (sizeof (VT100_ANS) - 1)); break; case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ @@ -3009,8 +3335,8 @@ scr_report_position (); break; case 7: /* unofficial extension */ - if (Options & Opt_insecure) - tt_printf ("%-.250s\n", rs[Rs_display_name]); + if (options & Opt_insecure) + tt_printf ("%-.250s\012", rs[Rs_display_name]); break; case 8: /* unofficial extension */ process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); @@ -3056,11 +3382,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; /* @@ -3082,7 +3412,7 @@ scr_cursor (RESTORE); break; -#ifndef NO_FRILLS +#if ENABLE_FRILLS case CSI_74: process_window_ops (arg, nargs); break; @@ -3099,7 +3429,7 @@ } /*}}} */ -#ifndef NO_FRILLS +#if ENABLE_FRILLS /* ARGSUSED */ void rxvt_term::process_window_ops (const int *args, unsigned int nargs) @@ -3176,20 +3506,20 @@ tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); break; case 20: /* report icon label */ - if (Options & Opt_insecure) - { - char *s; - XGetIconName (display->display, TermWin.parent[0], &s); - tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ - } + { + char *s; + XGetIconName (display->display, TermWin.parent[0], &s); + tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ + XFree (s); + } break; case 21: /* report window title */ - if (Options & Opt_insecure) - { - char *s; - XFetchName (display->display, TermWin.parent[0], &s); - tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ - } + { + char *s; + XFetchName (display->display, TermWin.parent[0], &s); + tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ + XFree (s); + } break; } } @@ -3203,46 +3533,47 @@ unsigned char * rxvt_term::get_to_st (unicode_t &ends_how) { - unicode_t prev = 0, ch; + unicode_t ch; + bool seen_esc = false; unsigned int n = 0; - unsigned char *s; - unsigned char string[STRING_MAX]; + wchar_t string[STRING_MAX]; while ((ch = cmd_getc ()) != NOCHAR) { - if (prev == C0_ESC) + if (seen_esc) { if (ch == 0x5c) /* 7bit ST */ break; else return NULL; } + else if (ch == C0_ESC) + { + seen_esc = true; + continue; + } else if (ch == C0_BEL || ch == CHAR_ST) break; else if (ch < 0x20) return NULL; /* other control character - exit */ + seen_esc = false; + if (n >= sizeof (string) - 1) // stop at some sane length return NULL; if (ch == C0_SYN) - { - string[n++] = cmd_get8 (); - prev = 0; - } + string[n++] = cmd_get8 (); else - string[n++] = prev = ch; + string[n++] = ch; } 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; + + return (unsigned char *)rxvt_wcstombs (string); } /*----------------------------------------------------------------------*/ @@ -3296,12 +3627,9 @@ { if (str[0] == '?' && !str[1]) { - if (Options & Opt_insecure) - { - unsigned short r, g, b; - PixColorsFocused[color].get (display, r, g, b); - tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); - } + 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); @@ -3339,6 +3667,7 @@ int color; char *buf, *name; bool query = str[0] == '?' && !str[1]; + int saveop = op; assert (str != NULL); switch (op) @@ -3355,7 +3684,7 @@ case XTerm_property: if (str[0] == '?') { - Atom prop = XInternAtom (display->display, str + 1, True); + Atom prop = display->atom (str + 1); Atom actual_type; int actual_format; unsigned long nitems; @@ -3383,10 +3712,7 @@ if (eq) { *eq = 0; - XChangeProperty (display->display, TermWin.parent[0], - display->atom (str), XA_STRING, 8, - PropModeReplace, (unsigned char *)eq + 1, - strlen (eq + 1)); + set_utf8_property (display->atom (str), eq + 1); } else XDeleteProperty (display->display, TermWin.parent[0], @@ -3397,7 +3723,7 @@ case XTerm_Color: for (buf = (char *)str; buf && *buf;) { - if ((name = STRCHR (buf, ';')) == NULL) + if ((name = strchr (buf, ';')) == NULL) break; *name++ = '\0'; @@ -3406,17 +3732,14 @@ if (color < 0 || color >= TOTAL_COLORS) break; - if ((buf = STRCHR (name, ';')) != NULL) + if ((buf = strchr (name, ';')) != NULL) *buf++ = '\0'; if (name[0] == '?' && !name[1]) { - if (Options & Opt_insecure) - { - unsigned short r, g, b; - PixColorsFocused[color + minCOLOR].get (display, r, g, b); - tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); - } + 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); @@ -3443,6 +3766,9 @@ case XTerm_Color_BD: process_color_seq (XTerm_Color_BD, Color_BD, str, resp); break; + case XTerm_Color_IT: + process_color_seq (XTerm_Color_IT, Color_IT, str, resp); + break; case XTerm_Color_UL: process_color_seq (XTerm_Color_UL, Color_UL, str, resp); break; @@ -3450,6 +3776,14 @@ process_color_seq (XTerm_Color_RV, Color_RV, str, resp); break; #endif +#if TRANSPARENT && TINTING + case XTerm_Color_tint: + process_color_seq (XTerm_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 != ';') @@ -3460,7 +3794,7 @@ #endif scr_touch (true); } - while ((str = STRCHR (str, ';')) != NULL) + while ((str = strchr (str, ';')) != NULL) { str++; #if XPM_BACKGROUND @@ -3489,26 +3823,32 @@ break; 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) && TermWin.fontset[op - URxvt_font]->fontdesc + ? TermWin.fontset[op - URxvt_font]->fontdesc : "", + resp); + else { - if (Options & Opt_insecure) - tt_printf ("\33]%d;%-.250s%c", XTerm_font, - TermWin.fontset->fontdesc - ? TermWin.fontset->fontdesc - : "", - resp); + const char *&res = rs[Rs_font + (op - URxvt_font)]; + + res = strdup (str); + allocated.push_back ((void *)res); + set_fonts (); } - else - change_font (str); break; -#ifndef NO_FRILLS +#if ENABLE_FRILLS case XTerm_locale: if (query) - { - if (Options & Opt_insecure) - tt_printf ("\33]%d;%-.250s%c", XTerm_locale, locale, resp); - } + tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp); else { set_locale (str); @@ -3517,20 +3857,11 @@ # endif } break; - - case XTerm_findfont: - if (Options & Opt_insecure) - { - int fid = TermWin.fontset->find_font (atoi (str)); - tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont, - fid, (*TermWin.fontset)[fid]->name, resp); - } - break; #endif #ifdef MENUBAR case XTerm_Menu: - if (Options & Opt_insecure) + if (options & Opt_insecure) menubar_dispatch (const_cast(str)); // casting away constness is checked break; #endif @@ -3567,7 +3898,7 @@ if (mode == 's') { - SavedModes |= (PrivateModes & bit); + SavedModes |= (priv_modes & bit); return -1; } else @@ -3575,7 +3906,7 @@ if (mode == 'r') state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ else - state = (mode == 't') ? ! (PrivateModes & bit) : mode; + state = (mode == 't') ? ! (priv_modes & bit) : mode; PrivMode (state, bit); } @@ -3603,16 +3934,16 @@ { 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 - // 18, 19 printing-related - { 25, PrivMode_VisibleCursor }, - // 30 show scrollbar rxvt. extension { 35, PrivMode_ShiftKeys }, // rxvt extension { 40, PrivMode_132OK }, // 41 xterm more fixes NYI @@ -3663,7 +3994,8 @@ switch (arg[i]) { case 1048: /* alternative cursor save */ - if (Options & Opt_secondaryScreen) + case 1049: + if (options & Opt_secondaryScreen) if (mode == 0) scr_cursor (RESTORE); else if (mode == 1) @@ -3684,14 +4016,14 @@ PrivMode (1, PrivMode_vt52); break; case 3: /* 80/132 */ - if (PrivateModes & PrivMode_132OK) + if (priv_modes & PrivMode_132OK) set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); break; case 4: /* smooth scrolling */ if (state) - Options &= ~Opt_jumpScroll; + options &= ~Opt_jumpScroll; else - Options |= Opt_jumpScroll; + options |= Opt_jumpScroll; break; case 5: /* reverse video */ scr_rvideo_mode (state); @@ -3705,7 +4037,7 @@ /* case 8: - auto repeat, can't do on a per window basis */ case 9: /* X10 mouse reporting */ if (state) /* orthogonal */ - PrivateModes &= ~PrivMode_MouseX11; + priv_modes &= ~PrivMode_MouseX11; break; #ifdef menuBar_esc case menuBar_esc: @@ -3735,7 +4067,7 @@ /* case 67: - backspace key */ case 1000: /* X11 mouse reporting */ if (state) /* orthogonal */ - PrivateModes &= ~PrivMode_MouseX10; + priv_modes &= ~PrivMode_MouseX10; break; #if 0 case 1001: @@ -3743,25 +4075,25 @@ #endif case 1010: /* scroll to bottom on TTY output inhibit */ if (state) - Options &= ~Opt_scrollTtyOutput; + options &= ~Opt_scrollTtyOutput; else - Options |= Opt_scrollTtyOutput; + options |= Opt_scrollTtyOutput; break; case 1011: /* scroll to bottom on key press */ if (state) - Options |= Opt_scrollTtyKeypress; + options |= Opt_scrollTtyKeypress; else - Options &= ~Opt_scrollTtyKeypress; + options &= ~Opt_scrollTtyKeypress; break; case 1047: /* secondary screen w/ clearing last */ - if (Options & Opt_secondaryScreen) + 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 (options & Opt_secondaryScreen) if (current_screen != PRIMARY) scr_erase_screen (2); break; @@ -3797,7 +4129,10 @@ case 1: rendset = 1, rendstyle = RS_Bold; break; - //case 2: // faint or second colour + //case 2: // low intensity + case 3: + rendset = 1, rendstyle = RS_Italic; + break; case 4: rendset = 1, rendstyle = RS_Uline; break; @@ -3819,19 +4154,24 @@ //... //case 19: // ninth alt font //case 20: // gothic - case 21: // disable bold, faint + case 21: // disable bold, faint, sometimes doubly underlined (iso 8613) rendset = 0, rendstyle = RS_Bold; break; - case 22: + case 22: // normal intensity rendset = 0, rendstyle = RS_Bold; break; - //case 23: disable italic + 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; @@ -3857,15 +4197,13 @@ case 37: 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); i += 2; } break; -#endif case 39: /* default fg */ scr_color (Color_fg, Color_fg); break; @@ -3880,19 +4218,19 @@ case 47: 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); 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 */ @@ -3902,8 +4240,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 */ @@ -3913,8 +4250,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 @@ -3931,7 +4267,7 @@ if (cmd == 'Q') { /* query graphics */ - tt_printf ("\033G0\n"); /* no graphics */ + tt_printf ("\033G0\012"); /* no graphics */ return; } /* swallow other graphics sequences until terminating ':' */ @@ -3956,67 +4292,60 @@ 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)) + // original code just ignores this... + destroy (); } /*----------------------- end-of-file (C source) -----------------------*/