ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.215 by root, Fri Dec 23 14:46:34 2005 UTC vs.
Revision 1.245 by root, Fri Jan 6 18:33:30 2006 UTC

… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2005 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
31 * 31 *
32 * This program is free software; you can redistribute it and/or modify 32 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 33 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 34 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 35 * (at your option) any later version.
… …
43 * along with this program; if not, write to the Free Software 43 * along with this program; if not, write to the Free Software
44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
45 *----------------------------------------------------------------------*/ 45 *----------------------------------------------------------------------*/
46 46
47/*{{{ includes: */ 47/*{{{ includes: */
48#include "../config.h" /* NECESSARY */ 48#include "../config.h"
49#include "rxvt.h" /* NECESSARY */ 49#include "rxvt.h"
50#include "rxvtperl.h"
50#include "version.h" 51#include "version.h"
51#include "command.h" 52#include "command.h"
53
54#if HAVE_SCHED_YIELD
55#undef HAVE_SCHED_YIELD // disabled for the time being
56//# include <sched.h>
57#endif
52 58
53#ifdef KEYSYM_RESOURCE 59#ifdef KEYSYM_RESOURCE
54# include "keyboard.h" 60# include "keyboard.h"
55#endif 61#endif
56 62
… …
147 153
148 text_t t = l.t[x]; 154 text_t t = l.t[x];
149 155
150 if (t != NOCHAR || !x) 156 if (t != NOCHAR || !x)
151 { 157 {
152 iso14755_51 (l.t[x], l.r[x]); 158 iso14755_51 (l.t[x], l.r[x], x, y);
153 iso14755buf = ISO_14755_54; 159 iso14755buf = ISO_14755_54;
154 break; 160 break;
155 } 161 }
156 162
157 x--; 163 x--;
158 } 164 }
159} 165}
160#endif
161 166
162#if ENABLE_OVERLAY
163void 167void
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r) 168rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
165{ 169{
166 rxvt_fontset *fs = FONTSET (r); 170 rxvt_fontset *fs = FONTSET (r);
167 rxvt_font *f = (*fs)[fs->find_font (ch)]; 171 rxvt_font *f = (*fs)[fs->find_font (ch)];
168 wchar_t *chr, *alloc, ch2, *fname; 172 wchar_t *chr, *alloc, ch2, *fname;
169 int len; 173 int len;
170 174
171 fname = rxvt_utf8towcs (f->name); 175 fname = rxvt_utf8towcs (f->name);
172 176
173#if ENABLE_COMBINING 177# if ENABLE_COMBINING
174 if (IS_COMPOSE (ch)) 178 if (IS_COMPOSE (ch))
175 { 179 {
176 len = rxvt_composite.expand (ch, 0); 180 len = rxvt_composite.expand (ch, 0);
177 alloc = chr = new wchar_t[len]; 181 alloc = chr = new wchar_t[len];
178 rxvt_composite.expand (ch, chr); 182 rxvt_composite.expand (ch, chr);
179 } 183 }
180 else 184 else
181#endif 185# endif
182 { 186 {
183 ch2 = ch; 187 ch2 = ch;
184 188
185 alloc = 0; 189 alloc = 0;
186 chr = &ch2; 190 chr = &ch2;
187 len = 1; 191 len = 1;
188 } 192 }
189 193
194 char attr[80]; // plenty
195
196 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
197 (int)r,
198 fgcolor_of (r), bgcolor_of (r),
199 r & RS_Bold ? " bold" : "",
200 r & RS_Italic ? " italic" : "",
201 r & RS_Blink ? " blink" : "",
202 r & RS_RVid ? " rvid" : "",
203 r & RS_Uline ? " uline" : "",
204 r & RS_Careful ? " careful" : "");
205
190 int width = wcswidth (fname, wcslen (fname)); 206 int width = wcswidth (fname, wcslen (fname));
191 207
192 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1); 208 max_it (width, 8+5); // for char + hey
209 max_it (width, strlen (attr));
210
211 if (y >= 0)
212 {
213 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
214 x = 0;
215 }
216
217 scr_overlay_new (x, y, width, len + 2);
193 218
194 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 219 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
195 220
196 for (int y = 0; y < len; y++) 221 for (int y = 0; y < len; y++)
197 { 222 {
… …
200 ch = *chr++; 225 ch = *chr++;
201 226
202 sprintf (buf, "%8x", ch); 227 sprintf (buf, "%8x", ch);
203 scr_overlay_set (0, y, buf); 228 scr_overlay_set (0, y, buf);
204 scr_overlay_set (9, y, '='); 229 scr_overlay_set (9, y, '=');
205#if !UNICODE3 230# if !UNICODE3
206 if (ch >= 0x10000) 231 if (ch >= 0x10000)
207 ch = 0xfffd; 232 ch = 0xfffd;
208#endif 233# endif
209 scr_overlay_set (11, y, ch, r); 234 scr_overlay_set (11, y, ch, r);
210 scr_overlay_set (12, y, NOCHAR, r); 235 scr_overlay_set (12, y, NOCHAR, r);
211 } 236 }
212 237
238 scr_overlay_set (0, len , attr);
213 scr_overlay_set (0, len, fname); 239 scr_overlay_set (0, len + 1, fname);
214 240
215 free (fname); 241 free (fname);
216 242
217#if ENABLE_COMBINING 243# if ENABLE_COMBINING
218 if (alloc) 244 if (alloc)
219 delete [] alloc; 245 delete [] alloc;
220#endif 246# endif
221} 247}
222#endif 248#endif
223 249
224void 250void
225rxvt_term::commit_iso14755 () 251rxvt_term::commit_iso14755 ()
… …
242 mb[0] = ch[0]; 268 mb[0] = ch[0];
243 len = 1; 269 len = 1;
244 } 270 }
245 271
246 if (len > 0) 272 if (len > 0)
247 tt_write ((unsigned char *)mb, len); 273 tt_write (mb, len);
248 else 274 else
249 scr_bell (); 275 scr_bell ();
250 } 276 }
251 277
252 iso14755buf = 0; 278 iso14755buf = 0;
… …
280 KeySym keysym; 306 KeySym keysym;
281#ifdef DEBUG_CMD 307#ifdef DEBUG_CMD
282 static int debug_key = 1; /* accessible by a debugger only */ 308 static int debug_key = 1; /* accessible by a debugger only */
283#endif 309#endif
284 int valid_keysym; 310 int valid_keysym;
285 unsigned char kbuf[KBUFSZ]; 311 char kbuf[KBUFSZ];
286 312
287 /* 313 /*
288 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 314 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
289 * escape sequence to toggle the Keypad. 315 * escape sequence to toggle the Keypad.
290 * 316 *
… …
308 Status status_return; 334 Status status_return;
309 335
310#if 0 336#if 0
311#ifdef X_HAVE_UTF8_STRING 337#ifdef X_HAVE_UTF8_STRING
312 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful 338 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
313 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 339 len = Xutf8LookupString (Input_Context, &ev, kbuf,
314 KBUFSZ, &keysym, &status_return); 340 KBUFSZ, &keysym, &status_return);
315 else 341 else
316#endif 342#endif
317#endif 343#endif
318 { 344 {
… …
355 || status_return == XLookupBoth; 381 || status_return == XLookupBoth;
356 } 382 }
357 else 383 else
358#endif 384#endif
359 { 385 {
360 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 386 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
361 valid_keysym = keysym != NoSymbol; 387 valid_keysym = keysym != NoSymbol;
362 } 388 }
363 389
364 if (valid_keysym) 390 if (valid_keysym)
365 { 391 {
… …
829 { 855 {
830#ifdef META8_OPTION 856#ifdef META8_OPTION
831 /* set 8-bit on */ 857 /* set 8-bit on */
832 if (meta && (meta_char == 0x80)) 858 if (meta && (meta_char == 0x80))
833 { 859 {
834 unsigned char *ch; 860 char *ch;
835 861
836 for (ch = kbuf; ch < kbuf + len; ch++) 862 for (ch = kbuf; ch < kbuf + len; ch++)
837 *ch |= 0x80; 863 *ch |= 0x80;
838 864
839 meta = 0; 865 meta = 0;
… …
841#endif 867#endif
842 /* nil */ ; 868 /* nil */ ;
843 } 869 }
844 } 870 }
845 871
872 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_STR_LEN, kbuf, len, DT_END)))
873 return;
874
846 if (len <= 0) 875 if (len <= 0)
847 return; /* not mapped */ 876 return; /* not mapped */
848 877
849 if (options & Opt_scrollTtyKeypress) 878 if (OPTION (Opt_scrollTtyKeypress))
850 if (view_start) 879 if (view_start)
851 { 880 {
852 view_start = 0; 881 view_start = 0;
853 want_refresh = 1; 882 want_refresh = 1;
854 } 883 }
… …
872#ifdef META8_OPTION 901#ifdef META8_OPTION
873 && meta_char == C0_ESC 902 && meta_char == C0_ESC
874#endif 903#endif
875 ) 904 )
876 { 905 {
877 const unsigned char ch = C0_ESC; 906 const char ch = C0_ESC;
878 tt_write (&ch, 1); 907 tt_write (&ch, 1);
879 } 908 }
880 909
881#if defined(DEBUG_CMD) 910#if defined(DEBUG_CMD)
882 /* Display keyboard buffer contents */ 911 /* Display keyboard buffer contents */
… …
894 923
895#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 924#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)
896/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 925/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
897/* attempt to `write' count to the input buffer */ 926/* attempt to `write' count to the input buffer */
898unsigned int 927unsigned int
899rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 928rxvt_term::cmd_write (const char *str, unsigned int count)
900{ 929{
901 unsigned int n, s; 930 unsigned int n, s;
902 931
903 n = cmdbuf_ptr - cmdbuf_base; 932 n = cmdbuf_ptr - cmdbuf_base;
904 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 933 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
941 } 970 }
942#endif 971#endif
943 972
944 if (want_refresh) 973 if (want_refresh)
945 { 974 {
975 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
976 {
977 int row = -view_start;
978
979 while (row > -nsaved && ROW (row - 1).is_longer ())
980 --row;
981
982 while (row < -view_start + nrow)
983 {
984 int start_row = row;
985 line_t *l;
986
987 do
988 {
989 l = &ROW (row);
990
991 if (!(l->f & LINE_FILTERED))
992 {
993 // line not filtered, mark it as filtered
994 l->f |= LINE_FILTERED;
995 while (l->is_longer ())
996 {
997 l = &ROW (++row);
998 l->f |= LINE_FILTERED;
999 }
1000
1001 // and filter it
1002 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1003
1004 break;
1005 }
1006 }
1007 while (l->is_longer ());
1008
1009 row++;
1010 }
1011
1012 }
1013
946 scr_refresh (refresh_type); 1014 scr_refresh (refresh_type);
947 scrollbar_show (1); 1015 scrollbar_show (1);
948#ifdef USE_XIM 1016#ifdef USE_XIM
949 IMSendSpot (); 1017 IMSendSpot ();
950#endif 1018#endif
… …
960 SET_LOCALE (locale); 1028 SET_LOCALE (locale);
961 1029
962 display->flush (); 1030 display->flush ();
963 1031
964 if (want_refresh && !flush_ev.active) 1032 if (want_refresh && !flush_ev.active)
965 flush_ev.start (NOW + 0.01); 1033 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
966} 1034}
967 1035
968void 1036void
969rxvt_term::flush_cb (time_watcher &w) 1037rxvt_term::flush_cb (time_watcher &w)
970{ 1038{
… …
1045 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1113 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1046 } 1114 }
1047} 1115}
1048#endif 1116#endif
1049 1117
1118#if HAVE_SCHED_YIELD
1119static struct event_handler
1120{
1121 check_watcher cw_yield;
1122
1123 void yield (check_watcher &w)
1124 {
1125 sched_yield ();
1126 w.stop ();
1127 }
1128
1129 event_handler ()
1130 : cw_yield (this, &event_handler::yield)
1131 {
1132 }
1133} event_handler;
1134#endif
1135
1050bool 1136bool
1051rxvt_term::pty_fill () 1137rxvt_term::pty_fill ()
1052{ 1138{
1053 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1139 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1054 1140
1055 if (CBUFSIZ == n) 1141 if (CBUFSIZ == n)
1056 { 1142 {
1057 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1143 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1058 n = 0; 1144 n = 0;
1059 } 1145 }
1060 1146
1061 memmove (cmdbuf_base, cmdbuf_ptr, n); 1147 memmove (cmdbuf_base, cmdbuf_ptr, n);
1062 cmdbuf_ptr = cmdbuf_base; 1148 cmdbuf_ptr = cmdbuf_base;
1063 cmdbuf_endp = cmdbuf_ptr + n; 1149 cmdbuf_endp = cmdbuf_ptr + n;
1064 1150
1065 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1151 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
1066 1152
1067 if (n > 0) 1153 if (r > 0)
1068 { 1154 {
1069 cmdbuf_endp += n; 1155 cmdbuf_endp += r;
1070 return true; 1156 return true;
1071 } 1157 }
1072 else if ((n < 0 && errno != EAGAIN && errno != EINTR) || n == 0) 1158 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1159 {
1160#if HAVE_SCHED_YIELD
1161 if (display->is_local)
1162 event_handler.cw_yield.start ();
1163#endif
1164 }
1165 else
1073 { 1166 {
1074 pty_ev.stop (); 1167 pty_ev.stop ();
1075 1168
1076 if (!(options & Opt_hold)) 1169 if (!OPTION (Opt_hold))
1077 destroy (); 1170 destroy ();
1078 } 1171 }
1079 1172
1080 return false; 1173 return false;
1081} 1174}
… …
1103 recolour_cursor (); 1196 recolour_cursor ();
1104 1197
1105#ifdef POINTER_BLANK 1198#ifdef POINTER_BLANK
1106 hidden_pointer = 0; 1199 hidden_pointer = 0;
1107 1200
1108 if (options & Opt_pointerBlank) 1201 if (OPTION (Opt_pointerBlank))
1109 pointer_ev.start (NOW + pointerBlankDelay); 1202 pointer_ev.start (NOW + pointerBlankDelay);
1110#endif 1203#endif
1111} 1204}
1112 1205
1113#ifdef POINTER_BLANK 1206#ifdef POINTER_BLANK
1114void 1207void
1115rxvt_term::pointer_blank () 1208rxvt_term::pointer_blank ()
1116{ 1209{
1117 if (! (options & Opt_pointerBlank)) 1210 if (!OPTION (Opt_pointerBlank))
1118 return; 1211 return;
1119 1212
1120 XDefineCursor (display->display, vt, display->blank_cursor); 1213 XDefineCursor (display->display, vt, display->blank_cursor);
1121 XFlush (display->display); 1214 XFlush (display->display);
1122 1215
… …
1220 1313
1221 SET_R (this); 1314 SET_R (this);
1222 SET_LOCALE (locale); 1315 SET_LOCALE (locale);
1223 1316
1224#if defined(CURSOR_BLINK) 1317#if defined(CURSOR_BLINK)
1225 if ((options & Opt_cursorBlink) && ev.type == KeyPress) 1318 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1226 { 1319 {
1227 if (hidden_cursor) 1320 if (hidden_cursor)
1228 { 1321 {
1229 hidden_cursor = 0; 1322 hidden_cursor = 0;
1230 want_refresh = 1; 1323 want_refresh = 1;
… …
1233 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1326 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1234 } 1327 }
1235#endif 1328#endif
1236 1329
1237#if defined(POINTER_BLANK) 1330#if defined(POINTER_BLANK)
1238 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0) 1331 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1239 { 1332 {
1240 if (ev.type == MotionNotify 1333 if (ev.type == MotionNotify
1241 || ev.type == ButtonPress 1334 || ev.type == ButtonPress
1242 || ev.type == ButtonRelease) 1335 || ev.type == ButtonRelease)
1243 if (hidden_pointer) 1336 if (hidden_pointer)
… …
1321# endif 1414# endif
1322 else 1415 else
1323 iso14755buf = 0; 1416 iso14755buf = 0;
1324 } 1417 }
1325#endif 1418#endif
1419
1420 if (ev.xany.window == vt
1421 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_END)))
1422 break;
1326 1423
1327#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1424#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1328 if (!(ev.xkey.state & ControlMask)) 1425 if (!(ev.xkey.state & ControlMask))
1329 slip_wheel_ev.stop (); 1426 slip_wheel_ev.stop ();
1330 else if (ks == XK_Control_L || ks == XK_Control_R) 1427 else if (ks == XK_Control_L || ks == XK_Control_R)
… …
1439 seen_resize = 1; 1536 seen_resize = 1;
1440 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1537 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1441 } 1538 }
1442 1539
1443#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1540#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1444 if (options & Opt_transparent) 1541 if (OPTION (Opt_transparent))
1445 check_our_parents (); 1542 check_our_parents ();
1446#endif 1543#endif
1447 } 1544 }
1448 break; 1545 break;
1449 1546
… …
1545 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1642 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1546 break; 1643 break;
1547 1644
1548 if (ev.xany.window == vt) 1645 if (ev.xany.window == vt)
1549 { 1646 {
1647 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1648 ; // nop
1550 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1649 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1551 { 1650 {
1552 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1651 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1553 ; 1652 ;
1554 1653
1555 XQueryPointer (disp, vt, 1654 XQueryPointer (disp, vt,
… …
1650{ 1749{
1651 if (!focus) 1750 if (!focus)
1652 { 1751 {
1653 focus = 1; 1752 focus = 1;
1654 want_refresh = 1; 1753 want_refresh = 1;
1754
1755 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1756
1655#if USE_XIM 1757#if USE_XIM
1656 if (Input_Context != NULL) 1758 if (Input_Context != NULL)
1657 { 1759 {
1658 IMSetStatusPosition (); 1760 IMSetStatusPosition ();
1659 XSetICFocus (Input_Context); 1761 XSetICFocus (Input_Context);
1660 } 1762 }
1661#endif 1763#endif
1662#if CURSOR_BLINK 1764#if CURSOR_BLINK
1663 if (options & Opt_cursorBlink) 1765 if (OPTION (Opt_cursorBlink))
1664 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1766 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1665#endif 1767#endif
1666#if OFF_FOCUS_FADING 1768#if OFF_FOCUS_FADING
1667 if (rs[Rs_fade]) 1769 if (rs[Rs_fade])
1668 { 1770 {
… …
1679 if (focus) 1781 if (focus)
1680 { 1782 {
1681 focus = 0; 1783 focus = 0;
1682 want_refresh = 1; 1784 want_refresh = 1;
1683 1785
1786 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1787
1684#if ENABLE_FRILLS || ISO_14755 1788#if ENABLE_FRILLS || ISO_14755
1789 if (iso14755buf)
1790 {
1685 iso14755buf = 0; 1791 iso14755buf = 0;
1686#endif
1687#if ENABLE_OVERLAY 1792# if ENABLE_OVERLAY
1688 scr_overlay_off (); 1793 scr_overlay_off ();
1794# endif
1795 }
1689#endif 1796#endif
1690#if USE_XIM 1797#if USE_XIM
1691 if (Input_Context != NULL) 1798 if (Input_Context != NULL)
1692 XUnsetICFocus (Input_Context); 1799 XUnsetICFocus (Input_Context);
1693#endif 1800#endif
1694#if CURSOR_BLINK 1801#if CURSOR_BLINK
1695 if (options & Opt_cursorBlink) 1802 if (OPTION (Opt_cursorBlink))
1696 cursor_blink_ev.stop (); 1803 cursor_blink_ev.stop ();
1697 hidden_cursor = 0; 1804 hidden_cursor = 0;
1698#endif 1805#endif
1699#if OFF_FOCUS_FADING 1806#if OFF_FOCUS_FADING
1700 if (rs[Rs_fade]) 1807 if (rs[Rs_fade])
… …
1724 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1831 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1725 return; 1832 return;
1726 1833
1727 /* FALLTHROUGH */ 1834 /* FALLTHROUGH */
1728 case ReparentNotify: 1835 case ReparentNotify:
1729 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1836 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1730 want_refresh = want_full_refresh = 1; 1837 want_refresh = want_full_refresh = 1;
1731 break; 1838 break;
1732 } 1839 }
1733} 1840}
1734#endif 1841#endif
… …
1737rxvt_term::button_press (XButtonEvent &ev) 1844rxvt_term::button_press (XButtonEvent &ev)
1738{ 1845{
1739 int reportmode = 0, clickintime; 1846 int reportmode = 0, clickintime;
1740 1847
1741 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1848 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1849
1742 if (!bypass_keystate) 1850 if (!bypass_keystate)
1743 reportmode = !! (priv_modes & PrivMode_mouse_report); 1851 reportmode = !! (priv_modes & PrivMode_mouse_report);
1744 1852
1745 /* 1853 /*
1746 * VT window processing of button press 1854 * VT window processing of button press
… …
1766#ifdef MOUSE_REPORT_DOUBLECLICK 1874#ifdef MOUSE_REPORT_DOUBLECLICK
1767 if (ev.button == MEvent.button && clickintime) 1875 if (ev.button == MEvent.button && clickintime)
1768 { 1876 {
1769 /* same button, within alloted time */ 1877 /* same button, within alloted time */
1770 MEvent.clicks++; 1878 MEvent.clicks++;
1879
1771 if (MEvent.clicks > 1) 1880 if (MEvent.clicks > 1)
1772 { 1881 {
1773 /* only report double clicks */ 1882 /* only report double clicks */
1774 MEvent.clicks = 2; 1883 MEvent.clicks = 2;
1775 mouse_report (ev); 1884 mouse_report (ev);
… …
1795 else 1904 else
1796 { 1905 {
1797 if (ev.button != MEvent.button) 1906 if (ev.button != MEvent.button)
1798 MEvent.clicks = 0; 1907 MEvent.clicks = 0;
1799 1908
1909 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1800 switch (ev.button) 1910 switch (ev.button)
1801 { 1911 {
1802 case Button1: 1912 case Button1:
1803 /* allow meta + click to select rectangular areas */ 1913 /* allow meta + click to select rectangular areas */
1804 /* should be done in screen.C */ 1914 /* should be done in screen.C */
1805#if ENABLE_FRILLS 1915#if ENABLE_FRILLS
1806 selection.rect = !!(ev.state & ModMetaMask); 1916 selection.rect = !!(ev.state & ModMetaMask);
1807#else 1917#else
1808 selection.rect = false; 1918 selection.rect = false;
1809#endif 1919#endif
1810 1920
1811 /* allow shift+left click to extend selection */ 1921 /* allow shift+left click to extend selection */
1812 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1922 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1813 { 1923 {
1814 if (MEvent.button == Button1 && clickintime) 1924 if (MEvent.button == Button1 && clickintime)
1815 selection_rotate (ev.x, ev.y); 1925 selection_rotate (ev.x, ev.y);
1816 else 1926 else
1817 selection_extend (ev.x, ev.y, 1); 1927 selection_extend (ev.x, ev.y, 1);
1818 } 1928 }
1819 else 1929 else
1820 { 1930 {
1821 if (MEvent.button == Button1 && clickintime) 1931 if (MEvent.button == Button1 && clickintime)
1822 MEvent.clicks++; 1932 MEvent.clicks++;
1823 else 1933 else
1824 MEvent.clicks = 1; 1934 MEvent.clicks = 1;
1825 1935
1826 selection_click (MEvent.clicks, ev.x, ev.y); 1936 selection_click (MEvent.clicks, ev.x, ev.y);
1827 } 1937 }
1828 1938
1829 MEvent.button = Button1; 1939 MEvent.button = Button1;
1830 break; 1940 break;
1831 1941
1832 case Button3: 1942 case Button3:
1833 if (MEvent.button == Button3 && clickintime) 1943 if (MEvent.button == Button3 && clickintime)
1834 selection_rotate (ev.x, ev.y); 1944 selection_rotate (ev.x, ev.y);
1835 else 1945 else
1836 selection_extend (ev.x, ev.y, 1); 1946 selection_extend (ev.x, ev.y, 1);
1837 1947
1838 MEvent.button = Button3; 1948 MEvent.button = Button3;
1839 break; 1949 break;
1840 } 1950 }
1841 } 1951 }
1842 1952
1843 MEvent.time = ev.time; 1953 MEvent.time = ev.time;
1844 return; 1954 return;
1845 } 1955 }
1846 1956
… …
1982 } 2092 }
1983 2093
1984 break; 2094 break;
1985 } 2095 }
1986 } 2096 }
2097
1987 return; 2098 return;
1988 } 2099 }
2100
1989#if MENUBAR 2101#if MENUBAR
1990 /* 2102 /*
1991 * Menubar window processing of button press 2103 * Menubar window processing of button press
1992 */ 2104 */
1993 if (isMenuBarWindow (ev.window)) 2105 if (isMenuBarWindow (ev.window))
… …
2056 if (priv_modes & PrivMode_mouse_report 2168 if (priv_modes & PrivMode_mouse_report
2057 && bypass_keystate 2169 && bypass_keystate
2058 && ev.button == Button1 && MEvent.clicks <= 1) 2170 && ev.button == Button1 && MEvent.clicks <= 1)
2059 selection_extend (ev.x, ev.y, 0); 2171 selection_extend (ev.x, ev.y, 0);
2060 2172
2173 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2174 return;
2175
2061 switch (ev.button) 2176 switch (ev.button)
2062 { 2177 {
2063 case Button1: 2178 case Button1:
2064 case Button3: 2179 case Button3:
2065 selection_make (ev.time); 2180 selection_make (ev.time);
… …
2076 2191
2077 v = ev.button == Button4 ? UP : DN; 2192 v = ev.button == Button4 ? UP : DN;
2078 2193
2079 if (ev.state & ShiftMask) 2194 if (ev.state & ShiftMask)
2080 i = 1; 2195 i = 1;
2081 else if (options & Opt_mouseWheelScrollPage) 2196 else if (OPTION (Opt_mouseWheelScrollPage))
2082 i = nrow - 1; 2197 i = nrow - 1;
2083 else 2198 else
2084 i = 5; 2199 i = 5;
2085 2200
2086# ifdef MOUSE_SLIP_WHEELING 2201# ifdef MOUSE_SLIP_WHEELING
… …
2372 XWindowAttributes wattr, wrootattr; 2487 XWindowAttributes wattr, wrootattr;
2373 dDisp; 2488 dDisp;
2374 2489
2375 pchanged = 0; 2490 pchanged = 0;
2376 2491
2377 if (!(options & Opt_transparent)) 2492 if (!OPTION (Opt_transparent))
2378 return pchanged; /* Don't try any more */ 2493 return pchanged; /* Don't try any more */
2379 2494
2380 XGetWindowAttributes (disp, display->root, &wrootattr); 2495 XGetWindowAttributes (disp, display->root, &wrootattr);
2381 rootdepth = wrootattr.depth; 2496 rootdepth = wrootattr.depth;
2382 2497
… …
2609 2724
2610bool 2725bool
2611rxvt_term::cmd_parse () 2726rxvt_term::cmd_parse ()
2612{ 2727{
2613 bool flag = false; 2728 bool flag = false;
2614 unicode_t ch = NOCHAR; 2729 wchar_t ch = NOCHAR;
2615 unsigned char *seq_begin; // remember start of esc-sequence here 2730 char *seq_begin; // remember start of esc-sequence here
2616 2731
2617 for (;;) 2732 for (;;)
2618 { 2733 {
2619 if (ch == NOCHAR) 2734 if (ch == NOCHAR)
2620 { 2735 {
2621 seq_begin = cmdbuf_ptr; 2736 seq_begin = cmdbuf_ptr;
2622 ch = next_char (); 2737 ch = next_char ();
2623 }
2624 2738
2625 if (ch == NOCHAR) // TODO: improve 2739 if (ch == NOCHAR)
2626 break; 2740 break;
2741 }
2627 2742
2628 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2743 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2629 { 2744 {
2630 if (!seen_input) 2745 if (!seen_input)
2631 { 2746 {
… …
2640 if (seen_resize && cmd_pid) 2755 if (seen_resize && cmd_pid)
2641 kill (-cmd_pid, SIGWINCH); 2756 kill (-cmd_pid, SIGWINCH);
2642 } 2757 }
2643 2758
2644 /* Read a text string from the input buffer */ 2759 /* Read a text string from the input buffer */
2645 unicode_t buf[UBUFSIZ]; 2760 wchar_t buf[UBUFSIZ];
2646 bool refreshnow = false; 2761 bool refreshnow = false;
2647 int nlines = 0; 2762 int nlines = 0;
2648 unicode_t *str = buf; 2763 wchar_t *str = buf;
2649 unicode_t *eol = str + min (ncol, UBUFSIZ); 2764 wchar_t *eol = str + min (ncol, UBUFSIZ);
2650 2765
2651 for (;;) 2766 for (;;)
2652 { 2767 {
2653 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2768 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2654 break; 2769 break;
… …
2660 if (ch == C0_LF) 2775 if (ch == C0_LF)
2661 nlines++; 2776 nlines++;
2662 2777
2663 refresh_count++; 2778 refresh_count++;
2664 2779
2665 if (!(options & Opt_jumpScroll) 2780 if (!OPTION (Opt_jumpScroll)
2666 || (refresh_count >= refresh_limit * (nrow - 1))) 2781 || (refresh_count >= refresh_limit * (nrow - 1)))
2667 { 2782 {
2668 refreshnow = true; 2783 refreshnow = true;
2784 refresh_count = 0;
2669 ch = NOCHAR; 2785 ch = NOCHAR;
2670 break; 2786 break;
2671 } 2787 }
2672 2788
2673 // scr_add_lines only works for nlines <= nrow - 1. 2789 // scr_add_lines only works for nlines <= nrow - 1.
2674 if (nlines >= nrow - 1) 2790 if (nlines >= nrow - 1)
2675 { 2791 {
2792 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2676 scr_add_lines (buf, nlines, str - buf); 2793 scr_add_lines (buf, str - buf, nlines);
2794
2677 nlines = 0; 2795 nlines = 0;
2678 str = buf; 2796 str = buf;
2679 eol = str + min (ncol, UBUFSIZ); 2797 eol = str + min (ncol, UBUFSIZ);
2680 } 2798 }
2681 2799
… …
2694 2812
2695 seq_begin = cmdbuf_ptr; 2813 seq_begin = cmdbuf_ptr;
2696 ch = next_char (); 2814 ch = next_char ();
2697 } 2815 }
2698 2816
2817 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2699 scr_add_lines (buf, nlines, str - buf); 2818 scr_add_lines (buf, str - buf, nlines);
2700 2819
2701 /* 2820 /*
2702 * If there have been a lot of new lines, then update the screen 2821 * If there have been a lot of new lines, then update the screen
2703 * What the heck I'll cheat and only refresh less than every page-full. 2822 * What the heck I'll cheat and only refresh less than every page-full.
2704 * the number of pages between refreshes is refresh_limit, which 2823 * the number of pages between refreshes is refresh_limit, which
2705 * is incremented here because we must be doing flat-out scrolling. 2824 * is incremented here because we must be doing flat-out scrolling.
2706 */ 2825 */
2707 if (refreshnow) 2826 if (refreshnow)
2708 { 2827 {
2709 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2828 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2710 refresh_limit++; 2829 refresh_limit++;
2711 else 2830 else
2712 { 2831 {
2713 flag = true; 2832 flag = true;
2714 scr_refresh (refresh_type); 2833 scr_refresh (refresh_type);
2834 flush_ev.stop ();
2715 } 2835 }
2716 } 2836 }
2717 2837
2718 } 2838 }
2719 else 2839 else
… …
2734 } 2854 }
2735 2855
2736 return flag; 2856 return flag;
2737} 2857}
2738 2858
2859// read the next character
2860wchar_t
2861rxvt_term::next_char ()
2862{
2863 while (cmdbuf_ptr < cmdbuf_endp)
2864 {
2865 // assume 7-bit to be ascii ALWAYS
2866 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2867 return *cmdbuf_ptr++;
2868
2869 wchar_t wc;
2870 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2871
2872 if (len == (size_t)-2)
2873 {
2874 // the mbstate stores incomplete sequences. didn't know this :/
2875 cmdbuf_ptr = cmdbuf_endp;
2876 break;
2877 }
2878
2879 if (len == (size_t)-1)
2880 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2881
2882 // assume wchar == unicode
2883 cmdbuf_ptr += len;
2884 return wc & UNICODE_MASK;
2885 }
2886
2887 return NOCHAR;
2888}
2889
2739// read the next octet 2890// read the next octet
2740unicode_t 2891uint32_t
2741rxvt_term::next_octet () 2892rxvt_term::next_octet ()
2742{ 2893{
2743 return cmdbuf_ptr < cmdbuf_endp 2894 return cmdbuf_ptr < cmdbuf_endp
2744 ? *cmdbuf_ptr++ 2895 ? *cmdbuf_ptr++
2745 : NOCHAR; 2896 : NOCHAR;
2746}
2747
2748// read the next character
2749unicode_t
2750rxvt_term::next_char ()
2751{
2752 while (cmdbuf_ptr < cmdbuf_endp)
2753 {
2754 // assume 7-bit to be ascii ALWAYS
2755 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2756 return *cmdbuf_ptr++;
2757
2758 wchar_t wc;
2759 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2760
2761 if (len == (size_t)-2)
2762 {
2763 // the mbstate stores incomplete sequences. didn't know this :/
2764 cmdbuf_ptr = cmdbuf_endp;
2765 break;
2766 }
2767
2768 if (len == (size_t)-1)
2769 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2770
2771 // assume wchar == unicode
2772 cmdbuf_ptr += len;
2773 return wc & UNICODE_MASK;
2774 }
2775
2776 return NOCHAR;
2777} 2897}
2778 2898
2779/* rxvt_cmd_getc () - Return next input character */ 2899/* rxvt_cmd_getc () - Return next input character */
2780/* 2900/*
2781 * Return the next input character after first passing any keyboard input 2901 * Return the next input character after first passing any keyboard input
2782 * to the command. 2902 * to the command.
2783 */ 2903 */
2784unicode_t 2904wchar_t
2785rxvt_term::cmd_getc () 2905rxvt_term::cmd_getc ()
2786{ 2906{
2787 unicode_t c = next_char (); 2907 wchar_t c = next_char ();
2788 2908
2789 if (c == NOCHAR) 2909 if (c == NOCHAR)
2790 throw out_of_input; 2910 throw out_of_input;
2791 2911
2792 return c; 2912 return c;
2793} 2913}
2794 2914
2795unicode_t 2915uint32_t
2796rxvt_term::cmd_get8 () 2916rxvt_term::cmd_get8 ()
2797{ 2917{
2798 unicode_t c = next_octet (); 2918 uint32_t c = next_octet ();
2799 2919
2800 if (c == NOCHAR) 2920 if (c == NOCHAR)
2801 throw out_of_input; 2921 throw out_of_input;
2802 2922
2803 return c; 2923 return c;
… …
2903 case C0_ESC: 3023 case C0_ESC:
2904 process_escape_seq (); 3024 process_escape_seq ();
2905 break; 3025 break;
2906 case C0_ENQ: /* terminal Status */ 3026 case C0_ENQ: /* terminal Status */
2907 if (rs[Rs_answerbackstring]) 3027 if (rs[Rs_answerbackstring])
2908 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 3028 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2909 (unsigned int)strlen (rs[Rs_answerbackstring]));
2910 else 3029 else
2911 tt_write ((unsigned char *)VT100_ANS, 3030 tt_write (VT100_ANS, strlen (VT100_ANS));
2912 (unsigned int)strlen (VT100_ANS));
2913 break; 3031 break;
2914 case C0_BEL: /* bell */ 3032 case C0_BEL: /* bell */
2915 scr_bell (); 3033 scr_bell ();
2916 break; 3034 break;
2917 case C0_BS: /* backspace */ 3035 case C0_BS: /* backspace */
… …
3072 break; 3190 break;
3073 3191
3074 /* 8.3.87: NEXT LINE */ 3192 /* 8.3.87: NEXT LINE */
3075 case C1_NEL: /* ESC E */ 3193 case C1_NEL: /* ESC E */
3076 { 3194 {
3077 unicode_t nlcr[] = { C0_LF, C0_CR }; 3195 wchar_t nlcr[] = { C0_LF, C0_CR };
3078 scr_add_lines (nlcr, 1, 2); 3196 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3079 } 3197 }
3080 break; 3198 break;
3081 3199
3082 /* kidnapped escape sequence: Should be 8.3.48 */ 3200 /* kidnapped escape sequence: Should be 8.3.48 */
3083 case C1_ESA: /* ESC G */ 3201 case C1_ESA: /* ESC G */
… …
3105 process_dcs_seq (); 3223 process_dcs_seq ();
3106 break; 3224 break;
3107 3225
3108 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3226 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3109 case C1_SCI: /* ESC Z */ 3227 case C1_SCI: /* ESC Z */
3110 tt_write ((const unsigned char *)ESCZ_ANSWER, 3228 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3111 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3112 break; /* steal obsolete ESC [ c */ 3229 break; /* steal obsolete ESC [ c */
3113 3230
3114 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3231 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3115 case C1_CSI: /* ESC [ */ 3232 case C1_CSI: /* ESC [ */
3116 process_csi_seq (); 3233 process_csi_seq ();
… …
3360 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3477 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3361 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); 3478 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3362 break; 3479 break;
3363 3480
3364 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3481 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3365 tt_write ((const unsigned char *)VT100_ANS, 3482 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3366 (unsigned int) (sizeof (VT100_ANS) - 1));
3367 break; 3483 break;
3368 3484
3369 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3485 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3370 process_sgr_mode (nargs, arg); 3486 process_sgr_mode (nargs, arg);
3371 break; 3487 break;
… …
3378 break; 3494 break;
3379 case 6: /* CPR requested */ 3495 case 6: /* CPR requested */
3380 scr_report_position (); 3496 scr_report_position ();
3381 break; 3497 break;
3382 case 7: /* unofficial extension */ 3498 case 7: /* unofficial extension */
3383 if (options & Opt_insecure) 3499 if (OPTION (Opt_insecure))
3384 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3500 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3385 break; 3501 break;
3386 case 8: /* unofficial extension */ 3502 case 8: /* unofficial extension */
3387 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3503 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3388 break; 3504 break;
… …
3552 break; 3668 break;
3553 case 20: /* report icon label */ 3669 case 20: /* report icon label */
3554 { 3670 {
3555 char *s; 3671 char *s;
3556 XGetIconName (disp, parent[0], &s); 3672 XGetIconName (disp, parent[0], &s);
3557 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3673 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3558 XFree (s); 3674 XFree (s);
3559 } 3675 }
3560 break; 3676 break;
3561 case 21: /* report window title */ 3677 case 21: /* report window title */
3562 { 3678 {
3563 char *s; 3679 char *s;
3564 XFetchName (disp, parent[0], &s); 3680 XFetchName (disp, parent[0], &s);
3565 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3681 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3566 XFree (s); 3682 XFree (s);
3567 } 3683 }
3568 break; 3684 break;
3569 } 3685 }
3570} 3686}
… …
3573/*----------------------------------------------------------------------*/ 3689/*----------------------------------------------------------------------*/
3574/* 3690/*
3575 * get input up until STRING TERMINATOR (or BEL) 3691 * get input up until STRING TERMINATOR (or BEL)
3576 * ends_how is terminator used. returned input must be free()'d 3692 * ends_how is terminator used. returned input must be free()'d
3577 */ 3693 */
3578unsigned char * 3694char *
3579rxvt_term::get_to_st (unicode_t &ends_how) 3695rxvt_term::get_to_st (unicode_t &ends_how)
3580{ 3696{
3581 unicode_t ch; 3697 unicode_t ch;
3582 bool seen_esc = false; 3698 bool seen_esc = false;
3583 unsigned int n = 0; 3699 unsigned int n = 0;
… …
3616 3732
3617 string[n++] = '\0'; 3733 string[n++] = '\0';
3618 3734
3619 ends_how = (ch == 0x5c ? C0_ESC : ch); 3735 ends_how = (ch == 0x5c ? C0_ESC : ch);
3620 3736
3621 return (unsigned char *)rxvt_wcstombs (string); 3737 return rxvt_wcstombs (string);
3622} 3738}
3623 3739
3624/*----------------------------------------------------------------------*/ 3740/*----------------------------------------------------------------------*/
3625/* 3741/*
3626 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3742 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3627 */ 3743 */
3628void 3744void
3629rxvt_term::process_dcs_seq () 3745rxvt_term::process_dcs_seq ()
3630{ 3746{
3631 unsigned char *s; 3747 char *s;
3632 unicode_t eh; 3748 unicode_t eh;
3633 3749
3634 /* 3750 /*
3635 * Not handled yet 3751 * Not handled yet
3636 */ 3752 */
… …
3655 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3771 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3656 arg = arg * 10 + (ch - '0'); 3772 arg = arg * 10 + (ch - '0');
3657 3773
3658 if (ch == ';') 3774 if (ch == ';')
3659 { 3775 {
3660 unsigned char *s = get_to_st (eh); 3776 char *s = get_to_st (eh);
3661 3777
3662 if (s) 3778 if (s)
3663 { 3779 {
3664 process_xterm_seq (arg, (char *)s, eh); 3780 process_xterm_seq (arg, s, eh);
3665 free (s); 3781 free (s);
3666 } 3782 }
3667 } 3783 }
3668} 3784}
3669 3785
3670void 3786void
3671rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3787rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3672{ 3788{
3673 if (str[0] == '?' && !str[1]) 3789 if (str[0] == '?' && !str[1])
3674 { 3790 {
3675 unsigned short r, g, b; 3791 unsigned short r, g, b;
3676 pix_colors_focused[color].get (display, r, g, b); 3792 pix_colors_focused[color].get (display, r, g, b);
… …
3682 3798
3683/* 3799/*
3684 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3800 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3685 */ 3801 */
3686void 3802void
3687rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3803rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3688{ 3804{
3689 int changed = 0; 3805 int changed = 0;
3690 int color; 3806 int color;
3691 char *buf, *name; 3807 char *buf, *name;
3692 bool query = str[0] == '?' && !str[1]; 3808 bool query = str[0] == '?' && !str[1];
… …
3846 // TODO, when secure mode? 3962 // TODO, when secure mode?
3847 break; 3963 break;
3848 3964
3849#ifdef MENUBAR 3965#ifdef MENUBAR
3850 case URxvt_Menu: 3966 case URxvt_Menu:
3851 if (options & Opt_insecure) 3967 if (OPTION (Opt_insecure))
3852 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3968 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3853 break; 3969 break;
3854#endif 3970#endif
3855#if 0 3971#if 0
3856 case XTerm_dumpscreen: /* no error notices */ 3972 case XTerm_dumpscreen: /* no error notices */
… …
3872 case URxvt_italicFont: 3988 case URxvt_italicFont:
3873 case URxvt_boldItalicFont: 3989 case URxvt_boldItalicFont:
3874#endif 3990#endif
3875 if (query) 3991 if (query)
3876 tt_printf ("\33]%d;%-.250s%c", saveop, 3992 tt_printf ("\33]%d;%-.250s%c", saveop,
3877 (options & Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3993 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3878 ? fontset[op - URxvt_font]->fontdesc : "", 3994 ? fontset[op - URxvt_font]->fontdesc : "",
3879 resp); 3995 resp);
3880 else 3996 else
3881 { 3997 {
3882 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3998 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3888 break; 4004 break;
3889 4005
3890#if ENABLE_FRILLS 4006#if ENABLE_FRILLS
3891 case URxvt_locale: 4007 case URxvt_locale:
3892 if (query) 4008 if (query)
3893 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp); 4009 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3894 else 4010 else
3895 { 4011 {
3896 set_locale (str); 4012 set_locale (str);
3897 pty.set_utf8_mode (enc_utf8); 4013 pty.set_utf8_mode (enc_utf8);
3898 init_xlocale (); 4014 init_xlocale ();
3899 } 4015 }
3900 break; 4016 break;
3901 4017
3902 case URxvt_view_up: 4018 case URxvt_view_up:
3903 case URxvt_view_down: 4019 case URxvt_view_down:
4020 {
3904 int lines = atoi (str); 4021 int lines = atoi (str);
3905 4022
3906 if (lines) 4023 if (lines)
3907 scr_page (op == URxvt_view_up ? UP : DN, lines); 4024 scr_page (op == URxvt_view_up ? UP : DN, lines);
3908 else 4025 else
3909 {
3910 scr_erase_savelines (); 4026 scr_erase_savelines ();
3911 } 4027 }
3912 4028
4029 break;
4030#endif
4031
4032#if ENABLE_PERL
4033 case URxvt_perl:
4034 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
4035 ; // no responses yet
3913 break; 4036 break;
3914#endif 4037#endif
3915 } 4038 }
3916} 4039}
3917/*----------------------------------------------------------------------*/ 4040/*----------------------------------------------------------------------*/
… …
4026 } 4149 }
4027 4150
4028 /* extra handling for values with state unkept */ 4151 /* extra handling for values with state unkept */
4029 switch (arg[i]) 4152 switch (arg[i])
4030 { 4153 {
4154#if ENABLE_STYLES
4155 case 1021:
4156 if (mode)
4157 SET_OPTION (Opt_intensityStyles);
4158 else
4159 CLR_OPTION (Opt_intensityStyles);
4160
4161 scr_touch (true);
4162 break;
4163#endif
4031 case 1048: /* alternative cursor save */ 4164 case 1048: /* alternative cursor save */
4032 case 1049: 4165 case 1049:
4033 if (options & Opt_secondaryScreen) 4166 if (OPTION (Opt_secondaryScreen))
4034 if (mode == 0) 4167 if (mode == 0)
4035 scr_cursor (RESTORE); 4168 scr_cursor (RESTORE);
4036 else if (mode == 1) 4169 else if (mode == 1)
4037 scr_cursor (SAVE); 4170 scr_cursor (SAVE);
4038 break; 4171 break;
… …
4053 case 3: /* 80/132 */ 4186 case 3: /* 80/132 */
4054 if (priv_modes & PrivMode_132OK) 4187 if (priv_modes & PrivMode_132OK)
4055 set_widthheight (((state ? 132 : 80) * fwidth), height); 4188 set_widthheight (((state ? 132 : 80) * fwidth), height);
4056 break; 4189 break;
4057 case 4: /* smooth scrolling */ 4190 case 4: /* smooth scrolling */
4058 if (state) 4191 if (!state)
4059 options &= ~Opt_jumpScroll; 4192 SET_OPTION (Opt_jumpScroll);
4060 else 4193 else
4061 options |= Opt_jumpScroll; 4194 CLR_OPTION (Opt_jumpScroll);
4062 break; 4195 break;
4063 case 5: /* reverse video */ 4196 case 5: /* reverse video */
4064 scr_rvideo_mode (state); 4197 scr_rvideo_mode (state);
4065 break; 4198 break;
4066 case 6: /* relative/absolute origins */ 4199 case 6: /* relative/absolute origins */
… …
4107#if 0 4240#if 0
4108 case 1001: 4241 case 1001:
4109 break; /* X11 mouse highlighting */ 4242 break; /* X11 mouse highlighting */
4110#endif 4243#endif
4111 case 1010: /* scroll to bottom on TTY output inhibit */ 4244 case 1010: /* scroll to bottom on TTY output inhibit */
4112 if (state) 4245 if (!state)
4113 options &= ~Opt_scrollTtyOutput; 4246 SET_OPTION (Opt_scrollTtyOutput);
4114 else 4247 else
4115 options |= Opt_scrollTtyOutput; 4248 CLR_OPTION (Opt_scrollTtyOutput);
4116 break; 4249 break;
4117 case 1011: /* scroll to bottom on key press */ 4250 case 1011: /* scroll to bottom on key press */
4118 if (state) 4251 if (state)
4119 options |= Opt_scrollTtyKeypress; 4252 SET_OPTION (Opt_scrollTtyKeypress);
4120 else 4253 else
4121 options &= ~Opt_scrollTtyKeypress; 4254 CLR_OPTION (Opt_scrollTtyKeypress);
4122 break; 4255 break;
4123 case 1047: /* secondary screen w/ clearing last */ 4256 case 1047: /* secondary screen w/ clearing last */
4124 if (options & Opt_secondaryScreen) 4257 if (OPTION (Opt_secondaryScreen))
4125 if (current_screen != PRIMARY) 4258 if (current_screen != PRIMARY)
4126 scr_erase_screen (2); 4259 scr_erase_screen (2);
4127 scr_change_screen (state); 4260 scr_change_screen (state);
4128 break; 4261 break;
4129 case 1049: /* secondary screen w/ clearing first */ 4262 case 1049: /* secondary screen w/ clearing first */
4130 scr_change_screen (state); 4263 scr_change_screen (state);
4131 if (options & Opt_secondaryScreen) 4264 if (OPTION (Opt_secondaryScreen))
4132 if (current_screen != PRIMARY) 4265 if (current_screen != PRIMARY)
4133 scr_erase_screen (2); 4266 scr_erase_screen (2);
4134 break; 4267 break;
4135 default: 4268 default:
4136 break; 4269 break;
… …
4264 scr_color (Color_bg, Color_bg); 4397 scr_color (Color_bg, Color_bg);
4265 break; 4398 break;
4266 4399
4267 //case 50: // not variable spacing 4400 //case 50: // not variable spacing
4268 4401
4269#ifndef NO_BRIGHTCOLOR 4402#if ENABLE_FRILLS
4270 case 90: 4403 case 90:
4271 case 91: /* set bright fg color */ 4404 case 91: /* set bright fg color */
4272 case 92: 4405 case 92:
4273 case 93: 4406 case 93:
4274 case 94: 4407 case 94:
… …
4286 case 106: 4419 case 106:
4287 case 107: 4420 case 107:
4288 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 4421 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4289 break; 4422 break;
4290#endif 4423#endif
4291
4292 } 4424 }
4293 } 4425 }
4294} 4426}
4295/*}}} */ 4427/*}}} */
4296 4428
… …
4320 */ 4452 */
4321void 4453void
4322rxvt_term::tt_printf (const char *fmt,...) 4454rxvt_term::tt_printf (const char *fmt,...)
4323{ 4455{
4324 va_list arg_ptr; 4456 va_list arg_ptr;
4325 unsigned char buf[256]; 4457 char buf[256];
4326 4458
4327 va_start (arg_ptr, fmt); 4459 va_start (arg_ptr, fmt);
4328 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4460 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4329 va_end (arg_ptr); 4461 va_end (arg_ptr);
4330 tt_write (buf, strlen (buf)); 4462 tt_write (buf, strlen (buf));
… …
4335 * or generated by us in response to a query ESC sequence. 4467 * or generated by us in response to a query ESC sequence.
4336 */ 4468 */
4337const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4469const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4338 4470
4339void 4471void
4340rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4472rxvt_term::tt_write (const char *data, unsigned int len)
4341{ 4473{
4474 if (pty.pty < 0)
4475 return;
4476
4342 if (v_buflen == 0) 4477 if (v_buflen == 0)
4343 { 4478 {
4344 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4479 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4345 4480
4346 if ((unsigned int)written == len) 4481 if ((unsigned int)written == len)
… …
4348 4483
4349 data += written; 4484 data += written;
4350 len -= written; 4485 len -= written;
4351 } 4486 }
4352 4487
4353 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4488 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4354 4489
4355 memcpy (v_buffer + v_buflen, data, len); 4490 memcpy (v_buffer + v_buflen, data, len);
4356 v_buflen += len; 4491 v_buflen += len;
4357 4492
4358 pty_ev.set (EVENT_READ | EVENT_WRITE); 4493 pty_ev.set (EVENT_READ | EVENT_WRITE);

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines