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.210 by root, Tue Dec 20 20:58:31 2005 UTC vs.
Revision 1.247 by root, Sat Jan 7 20:23:52 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
… …
135rxvt_term::iso14755_54 (int x, int y) 141rxvt_term::iso14755_54 (int x, int y)
136{ 142{
137 x = Pixel2Col (x); 143 x = Pixel2Col (x);
138 y = Pixel2Row (y); 144 y = Pixel2Row (y);
139 145
140 if (x < 0 || x >= ncol 146 if (!IN_RANGE_EXC (x, 0, ncol)
141 || y < 0 || y >= nrow) 147 || !IN_RANGE_EXC (y, 0, nrow))
142 return; 148 return;
143 149
144 for (;;) 150 for (;;)
145 { 151 {
146 const line_t &l = save[y + saveLines - view_start]; 152 const line_t &l = ROW(y - view_start);
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
160} 165}
161#endif
162 166
163#if ENABLE_OVERLAY
164void 167void
165rxvt_term::iso14755_51 (unicode_t ch, rend_t r) 168rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
166{ 169{
167 rxvt_fontset *fs = FONTSET (r); 170 rxvt_fontset *fs = FONTSET (r);
168 rxvt_font *f = (*fs)[fs->find_font (ch)]; 171 rxvt_font *f = (*fs)[fs->find_font (ch)];
169 wchar_t *chr, *alloc, ch2, *fname; 172 wchar_t *chr, *alloc, ch2, *fname;
170 int len; 173 int len;
171 174
172 fname = rxvt_utf8towcs (f->name); 175 fname = rxvt_utf8towcs (f->name);
173 176
174#if ENABLE_COMBINING 177# if ENABLE_COMBINING
175 if (IS_COMPOSE (ch)) 178 if (IS_COMPOSE (ch))
176 { 179 {
177 len = rxvt_composite.expand (ch, 0); 180 len = rxvt_composite.expand (ch, 0);
178 alloc = chr = new wchar_t[len]; 181 alloc = chr = new wchar_t[len];
179 rxvt_composite.expand (ch, chr); 182 rxvt_composite.expand (ch, chr);
180 } 183 }
181 else 184 else
182#endif 185# endif
183 { 186 {
184 ch2 = ch; 187 ch2 = ch;
185 188
186 alloc = 0; 189 alloc = 0;
187 chr = &ch2; 190 chr = &ch2;
188 len = 1; 191 len = 1;
189 } 192 }
190 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
191 int width = wcswidth (fname, wcslen (fname)); 206 int width = wcswidth (fname, wcslen (fname));
192 207
193 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);
194 218
195 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 219 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
196 220
197 for (int y = 0; y < len; y++) 221 for (int y = 0; y < len; y++)
198 { 222 {
… …
201 ch = *chr++; 225 ch = *chr++;
202 226
203 sprintf (buf, "%8x", ch); 227 sprintf (buf, "%8x", ch);
204 scr_overlay_set (0, y, buf); 228 scr_overlay_set (0, y, buf);
205 scr_overlay_set (9, y, '='); 229 scr_overlay_set (9, y, '=');
206#if !UNICODE3 230# if !UNICODE3
207 if (ch >= 0x10000) 231 if (ch >= 0x10000)
208 ch = 0xfffd; 232 ch = 0xfffd;
209#endif 233# endif
210 scr_overlay_set (11, y, ch, r); 234 scr_overlay_set (11, y, ch, r);
211 scr_overlay_set (12, y, NOCHAR, r); 235 scr_overlay_set (12, y, NOCHAR, r);
212 } 236 }
213 237
238 scr_overlay_set (0, len , attr);
214 scr_overlay_set (0, len, fname); 239 scr_overlay_set (0, len + 1, fname);
215 240
216 free (fname); 241 free (fname);
217 242
218#if ENABLE_COMBINING 243# if ENABLE_COMBINING
219 if (alloc) 244 if (alloc)
220 delete [] alloc; 245 delete [] alloc;
221#endif 246# endif
222} 247}
223#endif 248#endif
224 249
225void 250void
226rxvt_term::commit_iso14755 () 251rxvt_term::commit_iso14755 ()
… …
243 mb[0] = ch[0]; 268 mb[0] = ch[0];
244 len = 1; 269 len = 1;
245 } 270 }
246 271
247 if (len > 0) 272 if (len > 0)
248 tt_write ((unsigned char *)mb, len); 273 tt_write (mb, len);
249 else 274 else
250 scr_bell (); 275 scr_bell ();
251 } 276 }
252 277
253 iso14755buf = 0; 278 iso14755buf = 0;
… …
281 KeySym keysym; 306 KeySym keysym;
282#ifdef DEBUG_CMD 307#ifdef DEBUG_CMD
283 static int debug_key = 1; /* accessible by a debugger only */ 308 static int debug_key = 1; /* accessible by a debugger only */
284#endif 309#endif
285 int valid_keysym; 310 int valid_keysym;
286 unsigned char kbuf[KBUFSZ]; 311 char kbuf[KBUFSZ];
287 312
288 /* 313 /*
289 * 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
290 * escape sequence to toggle the Keypad. 315 * escape sequence to toggle the Keypad.
291 * 316 *
… …
309 Status status_return; 334 Status status_return;
310 335
311#if 0 336#if 0
312#ifdef X_HAVE_UTF8_STRING 337#ifdef X_HAVE_UTF8_STRING
313 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
314 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 339 len = Xutf8LookupString (Input_Context, &ev, kbuf,
315 KBUFSZ, &keysym, &status_return); 340 KBUFSZ, &keysym, &status_return);
316 else 341 else
317#endif 342#endif
318#endif 343#endif
319 { 344 {
… …
356 || status_return == XLookupBoth; 381 || status_return == XLookupBoth;
357 } 382 }
358 else 383 else
359#endif 384#endif
360 { 385 {
361 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 386 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
362 valid_keysym = keysym != NoSymbol; 387 valid_keysym = keysym != NoSymbol;
363 } 388 }
364 389
365 if (valid_keysym) 390 if (valid_keysym)
366 { 391 {
… …
830 { 855 {
831#ifdef META8_OPTION 856#ifdef META8_OPTION
832 /* set 8-bit on */ 857 /* set 8-bit on */
833 if (meta && (meta_char == 0x80)) 858 if (meta && (meta_char == 0x80))
834 { 859 {
835 unsigned char *ch; 860 char *ch;
836 861
837 for (ch = kbuf; ch < kbuf + len; ch++) 862 for (ch = kbuf; ch < kbuf + len; ch++)
838 *ch |= 0x80; 863 *ch |= 0x80;
839 864
840 meta = 0; 865 meta = 0;
… …
842#endif 867#endif
843 /* nil */ ; 868 /* nil */ ;
844 } 869 }
845 } 870 }
846 871
872 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_STR_LEN, kbuf, len, DT_END)))
873 return;
874
847 if (len <= 0) 875 if (len <= 0)
848 return; /* not mapped */ 876 return; /* not mapped */
849 877
850 if (options & Opt_scrollTtyKeypress) 878 if (OPTION (Opt_scrollTtyKeypress))
851 if (view_start) 879 if (view_start)
852 { 880 {
853 view_start = 0; 881 view_start = 0;
854 want_refresh = 1; 882 want_refresh = 1;
855 } 883 }
… …
873#ifdef META8_OPTION 901#ifdef META8_OPTION
874 && meta_char == C0_ESC 902 && meta_char == C0_ESC
875#endif 903#endif
876 ) 904 )
877 { 905 {
878 const unsigned char ch = C0_ESC; 906 const char ch = C0_ESC;
879 tt_write (&ch, 1); 907 tt_write (&ch, 1);
880 } 908 }
881 909
882#if defined(DEBUG_CMD) 910#if defined(DEBUG_CMD)
883 /* Display keyboard buffer contents */ 911 /* Display keyboard buffer contents */
… …
895 923
896#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 924#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)
897/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 925/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
898/* attempt to `write' count to the input buffer */ 926/* attempt to `write' count to the input buffer */
899unsigned int 927unsigned int
900rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 928rxvt_term::cmd_write (const char *str, unsigned int count)
901{ 929{
902 unsigned int n, s; 930 unsigned int n, s;
903 931
904 n = cmdbuf_ptr - cmdbuf_base; 932 n = cmdbuf_ptr - cmdbuf_base;
905 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 933 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
942 } 970 }
943#endif 971#endif
944 972
945 if (want_refresh) 973 if (want_refresh)
946 { 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
947 scr_refresh (refresh_type); 1014 scr_refresh (refresh_type);
948 scrollbar_show (1); 1015 scrollbar_show (1);
949#ifdef USE_XIM 1016#ifdef USE_XIM
950 IMSendSpot (); 1017 IMSendSpot ();
951#endif 1018#endif
… …
961 SET_LOCALE (locale); 1028 SET_LOCALE (locale);
962 1029
963 display->flush (); 1030 display->flush ();
964 1031
965 if (want_refresh && !flush_ev.active) 1032 if (want_refresh && !flush_ev.active)
966 flush_ev.start (NOW + 0.01); 1033 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
967} 1034}
968 1035
969void 1036void
970rxvt_term::flush_cb (time_watcher &w) 1037rxvt_term::flush_cb (time_watcher &w)
971{ 1038{
… …
1046 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1113 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1047 } 1114 }
1048} 1115}
1049#endif 1116#endif
1050 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
1051bool 1136bool
1052rxvt_term::pty_fill () 1137rxvt_term::pty_fill ()
1053{ 1138{
1054 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1139 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1055 1140
1056 if (CBUFSIZ == n) 1141 if (CBUFSIZ == n)
1057 { 1142 {
1058 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");
1059 n = 0; 1144 n = 0;
1060 } 1145 }
1061 1146
1062 memmove (cmdbuf_base, cmdbuf_ptr, n); 1147 memmove (cmdbuf_base, cmdbuf_ptr, n);
1063 cmdbuf_ptr = cmdbuf_base; 1148 cmdbuf_ptr = cmdbuf_base;
1064 cmdbuf_endp = cmdbuf_ptr + n; 1149 cmdbuf_endp = cmdbuf_ptr + n;
1065 1150
1066 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1151 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
1067 1152
1068 if (n > 0) 1153 if (r > 0)
1069 { 1154 {
1070 cmdbuf_endp += n; 1155 cmdbuf_endp += r;
1071 return true; 1156 return true;
1072 } 1157 }
1073 else if (n < 0 && errno != EAGAIN) 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
1166 {
1167 pty_ev.stop ();
1168
1169 if (!OPTION (Opt_hold))
1074 destroy (); 1170 destroy ();
1171 }
1075 1172
1076 return false; 1173 return false;
1077} 1174}
1078 1175
1079void 1176void
… …
1099 recolour_cursor (); 1196 recolour_cursor ();
1100 1197
1101#ifdef POINTER_BLANK 1198#ifdef POINTER_BLANK
1102 hidden_pointer = 0; 1199 hidden_pointer = 0;
1103 1200
1104 if (options & Opt_pointerBlank) 1201 if (OPTION (Opt_pointerBlank))
1105 pointer_ev.start (NOW + pointerBlankDelay); 1202 pointer_ev.start (NOW + pointerBlankDelay);
1106#endif 1203#endif
1107} 1204}
1108 1205
1109#ifdef POINTER_BLANK 1206#ifdef POINTER_BLANK
1110void 1207void
1111rxvt_term::pointer_blank () 1208rxvt_term::pointer_blank ()
1112{ 1209{
1113 if (! (options & Opt_pointerBlank)) 1210 if (!OPTION (Opt_pointerBlank))
1114 return; 1211 return;
1115 1212
1116 XDefineCursor (display->display, vt, display->blank_cursor); 1213 XDefineCursor (display->display, vt, display->blank_cursor);
1117 XFlush (display->display); 1214 XFlush (display->display);
1118 1215
… …
1216 1313
1217 SET_R (this); 1314 SET_R (this);
1218 SET_LOCALE (locale); 1315 SET_LOCALE (locale);
1219 1316
1220#if defined(CURSOR_BLINK) 1317#if defined(CURSOR_BLINK)
1221 if ((options & Opt_cursorBlink) && ev.type == KeyPress) 1318 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1222 { 1319 {
1223 if (hidden_cursor) 1320 if (hidden_cursor)
1224 { 1321 {
1225 hidden_cursor = 0; 1322 hidden_cursor = 0;
1226 want_refresh = 1; 1323 want_refresh = 1;
… …
1229 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1326 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1230 } 1327 }
1231#endif 1328#endif
1232 1329
1233#if defined(POINTER_BLANK) 1330#if defined(POINTER_BLANK)
1234 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0) 1331 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1235 { 1332 {
1236 if (ev.type == MotionNotify 1333 if (ev.type == MotionNotify
1237 || ev.type == ButtonPress 1334 || ev.type == ButtonPress
1238 || ev.type == ButtonRelease) 1335 || ev.type == ButtonRelease)
1239 if (hidden_pointer) 1336 if (hidden_pointer)
… …
1317# endif 1414# endif
1318 else 1415 else
1319 iso14755buf = 0; 1416 iso14755buf = 0;
1320 } 1417 }
1321#endif 1418#endif
1419
1420 if (ev.xany.window == vt
1421 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_END)))
1422 break;
1322 1423
1323#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1424#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1324 if (!(ev.xkey.state & ControlMask)) 1425 if (!(ev.xkey.state & ControlMask))
1325 slip_wheel_ev.stop (); 1426 slip_wheel_ev.stop ();
1326 else if (ks == XK_Control_L || ks == XK_Control_R) 1427 else if (ks == XK_Control_L || ks == XK_Control_R)
… …
1435 seen_resize = 1; 1536 seen_resize = 1;
1436 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1537 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1437 } 1538 }
1438 1539
1439#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1540#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1440 if (options & Opt_transparent) 1541 if (OPTION (Opt_transparent))
1441 check_our_parents (); 1542 check_our_parents ();
1442#endif 1543#endif
1443 } 1544 }
1444 break; 1545 break;
1445 1546
… …
1461 1562
1462 case SelectionRequest: 1563 case SelectionRequest:
1463 selection_send (ev.xselectionrequest); 1564 selection_send (ev.xselectionrequest);
1464 break; 1565 break;
1465 1566
1567 case MapNotify:
1568 mapped = 1;
1569#ifdef TEXT_BLINK
1570 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1571#endif
1572 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1573 break;
1574
1466 case UnmapNotify: 1575 case UnmapNotify:
1467 mapped = 0; 1576 mapped = 0;
1468#ifdef TEXT_BLINK 1577#ifdef TEXT_BLINK
1469 text_blink_ev.stop (); 1578 text_blink_ev.stop ();
1470#endif 1579#endif
1471 break; 1580 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1472
1473 case MapNotify:
1474 mapped = 1;
1475#ifdef TEXT_BLINK
1476 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1477#endif
1478 break; 1581 break;
1479 1582
1480#ifdef TRANSPARENT 1583#ifdef TRANSPARENT
1481 case ReparentNotify: 1584 case ReparentNotify:
1482 rootwin_cb (ev); 1585 rootwin_cb (ev);
… …
1541 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1644 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1542 break; 1645 break;
1543 1646
1544 if (ev.xany.window == vt) 1647 if (ev.xany.window == vt)
1545 { 1648 {
1649 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1650 ; // nop
1546 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1651 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1547 { 1652 {
1548 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1653 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1549 ; 1654 ;
1550 1655
1551 XQueryPointer (disp, vt, 1656 XQueryPointer (disp, vt,
… …
1601 } 1706 }
1602 1707
1603 scroll_selection_lines = Pixel2Height (dist) 1708 scroll_selection_lines = Pixel2Height (dist)
1604 / SELECTION_SCROLL_LINE_SPEEDUP 1709 / SELECTION_SCROLL_LINE_SPEEDUP
1605 + 1; 1710 + 1;
1606 MIN_IT (scroll_selection_lines, 1711 min_it (scroll_selection_lines,
1607 SELECTION_SCROLL_MAX_LINES); 1712 SELECTION_SCROLL_MAX_LINES);
1608 } 1713 }
1609 else 1714 else
1610 { 1715 {
1611 /* we are within the text window, so we 1716 /* we are within the text window, so we
… …
1646{ 1751{
1647 if (!focus) 1752 if (!focus)
1648 { 1753 {
1649 focus = 1; 1754 focus = 1;
1650 want_refresh = 1; 1755 want_refresh = 1;
1756
1757 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1758
1651#if USE_XIM 1759#if USE_XIM
1652 if (Input_Context != NULL) 1760 if (Input_Context != NULL)
1653 { 1761 {
1654 IMSetStatusPosition (); 1762 IMSetStatusPosition ();
1655 XSetICFocus (Input_Context); 1763 XSetICFocus (Input_Context);
1656 } 1764 }
1657#endif 1765#endif
1658#if CURSOR_BLINK 1766#if CURSOR_BLINK
1659 if (options & Opt_cursorBlink) 1767 if (OPTION (Opt_cursorBlink))
1660 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1768 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1661#endif 1769#endif
1662#if OFF_FOCUS_FADING 1770#if OFF_FOCUS_FADING
1663 if (rs[Rs_fade]) 1771 if (rs[Rs_fade])
1664 { 1772 {
… …
1675 if (focus) 1783 if (focus)
1676 { 1784 {
1677 focus = 0; 1785 focus = 0;
1678 want_refresh = 1; 1786 want_refresh = 1;
1679 1787
1788 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1789
1680#if ENABLE_FRILLS || ISO_14755 1790#if ENABLE_FRILLS || ISO_14755
1791 if (iso14755buf)
1792 {
1681 iso14755buf = 0; 1793 iso14755buf = 0;
1682#endif
1683#if ENABLE_OVERLAY 1794# if ENABLE_OVERLAY
1684 scr_overlay_off (); 1795 scr_overlay_off ();
1796# endif
1797 }
1685#endif 1798#endif
1686#if USE_XIM 1799#if USE_XIM
1687 if (Input_Context != NULL) 1800 if (Input_Context != NULL)
1688 XUnsetICFocus (Input_Context); 1801 XUnsetICFocus (Input_Context);
1689#endif 1802#endif
1690#if CURSOR_BLINK 1803#if CURSOR_BLINK
1691 if (options & Opt_cursorBlink) 1804 if (OPTION (Opt_cursorBlink))
1692 cursor_blink_ev.stop (); 1805 cursor_blink_ev.stop ();
1693 hidden_cursor = 0; 1806 hidden_cursor = 0;
1694#endif 1807#endif
1695#if OFF_FOCUS_FADING 1808#if OFF_FOCUS_FADING
1696 if (rs[Rs_fade]) 1809 if (rs[Rs_fade])
… …
1720 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1833 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1721 return; 1834 return;
1722 1835
1723 /* FALLTHROUGH */ 1836 /* FALLTHROUGH */
1724 case ReparentNotify: 1837 case ReparentNotify:
1725 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1838 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1726 want_refresh = want_full_refresh = 1; 1839 want_refresh = want_full_refresh = 1;
1727 break; 1840 break;
1728 } 1841 }
1729} 1842}
1730#endif 1843#endif
… …
1733rxvt_term::button_press (XButtonEvent &ev) 1846rxvt_term::button_press (XButtonEvent &ev)
1734{ 1847{
1735 int reportmode = 0, clickintime; 1848 int reportmode = 0, clickintime;
1736 1849
1737 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1850 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1851
1738 if (!bypass_keystate) 1852 if (!bypass_keystate)
1739 reportmode = !! (priv_modes & PrivMode_mouse_report); 1853 reportmode = !! (priv_modes & PrivMode_mouse_report);
1740 1854
1741 /* 1855 /*
1742 * VT window processing of button press 1856 * VT window processing of button press
… …
1762#ifdef MOUSE_REPORT_DOUBLECLICK 1876#ifdef MOUSE_REPORT_DOUBLECLICK
1763 if (ev.button == MEvent.button && clickintime) 1877 if (ev.button == MEvent.button && clickintime)
1764 { 1878 {
1765 /* same button, within alloted time */ 1879 /* same button, within alloted time */
1766 MEvent.clicks++; 1880 MEvent.clicks++;
1881
1767 if (MEvent.clicks > 1) 1882 if (MEvent.clicks > 1)
1768 { 1883 {
1769 /* only report double clicks */ 1884 /* only report double clicks */
1770 MEvent.clicks = 2; 1885 MEvent.clicks = 2;
1771 mouse_report (ev); 1886 mouse_report (ev);
… …
1791 else 1906 else
1792 { 1907 {
1793 if (ev.button != MEvent.button) 1908 if (ev.button != MEvent.button)
1794 MEvent.clicks = 0; 1909 MEvent.clicks = 0;
1795 1910
1911 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1796 switch (ev.button) 1912 switch (ev.button)
1797 { 1913 {
1798 case Button1: 1914 case Button1:
1799 /* allow meta + click to select rectangular areas */ 1915 /* allow meta + click to select rectangular areas */
1800 /* should be done in screen.C */ 1916 /* should be done in screen.C */
1801#if ENABLE_FRILLS 1917#if ENABLE_FRILLS
1802 selection.rect = !!(ev.state & ModMetaMask); 1918 selection.rect = !!(ev.state & ModMetaMask);
1803#else 1919#else
1804 selection.rect = false; 1920 selection.rect = false;
1805#endif 1921#endif
1806 1922
1807 /* allow shift+left click to extend selection */ 1923 /* allow shift+left click to extend selection */
1808 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1924 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1809 { 1925 {
1810 if (MEvent.button == Button1 && clickintime) 1926 if (MEvent.button == Button1 && clickintime)
1811 selection_rotate (ev.x, ev.y); 1927 selection_rotate (ev.x, ev.y);
1812 else 1928 else
1813 selection_extend (ev.x, ev.y, 1); 1929 selection_extend (ev.x, ev.y, 1);
1814 } 1930 }
1815 else 1931 else
1816 { 1932 {
1817 if (MEvent.button == Button1 && clickintime) 1933 if (MEvent.button == Button1 && clickintime)
1818 MEvent.clicks++; 1934 MEvent.clicks++;
1819 else 1935 else
1820 MEvent.clicks = 1; 1936 MEvent.clicks = 1;
1821 1937
1822 selection_click (MEvent.clicks, ev.x, ev.y); 1938 selection_click (MEvent.clicks, ev.x, ev.y);
1823 } 1939 }
1824 1940
1825 MEvent.button = Button1; 1941 MEvent.button = Button1;
1826 break; 1942 break;
1827 1943
1828 case Button3: 1944 case Button3:
1829 if (MEvent.button == Button3 && clickintime) 1945 if (MEvent.button == Button3 && clickintime)
1830 selection_rotate (ev.x, ev.y); 1946 selection_rotate (ev.x, ev.y);
1831 else 1947 else
1832 selection_extend (ev.x, ev.y, 1); 1948 selection_extend (ev.x, ev.y, 1);
1833 1949
1834 MEvent.button = Button3; 1950 MEvent.button = Button3;
1835 break; 1951 break;
1836 } 1952 }
1837 } 1953 }
1838 1954
1839 MEvent.time = ev.time; 1955 MEvent.time = ev.time;
1840 return; 1956 return;
1841 } 1957 }
1842 1958
… …
1978 } 2094 }
1979 2095
1980 break; 2096 break;
1981 } 2097 }
1982 } 2098 }
2099
1983 return; 2100 return;
1984 } 2101 }
2102
1985#if MENUBAR 2103#if MENUBAR
1986 /* 2104 /*
1987 * Menubar window processing of button press 2105 * Menubar window processing of button press
1988 */ 2106 */
1989 if (isMenuBarWindow (ev.window)) 2107 if (isMenuBarWindow (ev.window))
… …
2052 if (priv_modes & PrivMode_mouse_report 2170 if (priv_modes & PrivMode_mouse_report
2053 && bypass_keystate 2171 && bypass_keystate
2054 && ev.button == Button1 && MEvent.clicks <= 1) 2172 && ev.button == Button1 && MEvent.clicks <= 1)
2055 selection_extend (ev.x, ev.y, 0); 2173 selection_extend (ev.x, ev.y, 0);
2056 2174
2175 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2176 return;
2177
2057 switch (ev.button) 2178 switch (ev.button)
2058 { 2179 {
2059 case Button1: 2180 case Button1:
2060 case Button3: 2181 case Button3:
2061 selection_make (ev.time); 2182 selection_make (ev.time);
… …
2072 2193
2073 v = ev.button == Button4 ? UP : DN; 2194 v = ev.button == Button4 ? UP : DN;
2074 2195
2075 if (ev.state & ShiftMask) 2196 if (ev.state & ShiftMask)
2076 i = 1; 2197 i = 1;
2077 else if (options & Opt_mouseWheelScrollPage) 2198 else if (OPTION (Opt_mouseWheelScrollPage))
2078 i = nrow - 1; 2199 i = nrow - 1;
2079 else 2200 else
2080 i = 5; 2201 i = 5;
2081 2202
2082# ifdef MOUSE_SLIP_WHEELING 2203# ifdef MOUSE_SLIP_WHEELING
… …
2368 XWindowAttributes wattr, wrootattr; 2489 XWindowAttributes wattr, wrootattr;
2369 dDisp; 2490 dDisp;
2370 2491
2371 pchanged = 0; 2492 pchanged = 0;
2372 2493
2373 if (!(options & Opt_transparent)) 2494 if (!OPTION (Opt_transparent))
2374 return pchanged; /* Don't try any more */ 2495 return pchanged; /* Don't try any more */
2375 2496
2376 XGetWindowAttributes (disp, display->root, &wrootattr); 2497 XGetWindowAttributes (disp, display->root, &wrootattr);
2377 rootdepth = wrootattr.depth; 2498 rootdepth = wrootattr.depth;
2378 2499
… …
2452 nh += sy; 2573 nh += sy;
2453 ny = -sy; 2574 ny = -sy;
2454 sy = 0; 2575 sy = 0;
2455 } 2576 }
2456 2577
2457 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2578 min_it (nw, (unsigned int) (wrootattr.width - sx));
2458 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2579 min_it (nh, (unsigned int) (wrootattr.height - sy));
2459 2580
2460 XSync (disp, False); 2581 XSync (disp, False);
2461 allowedxerror = -1; 2582 allowedxerror = -1;
2462 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2583 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2463 2584
… …
2605 2726
2606bool 2727bool
2607rxvt_term::cmd_parse () 2728rxvt_term::cmd_parse ()
2608{ 2729{
2609 bool flag = false; 2730 bool flag = false;
2610 unicode_t ch = NOCHAR; 2731 wchar_t ch = NOCHAR;
2611 unsigned char *seq_begin; // remember start of esc-sequence here 2732 char *seq_begin; // remember start of esc-sequence here
2612 2733
2613 for (;;) 2734 for (;;)
2614 { 2735 {
2615 if (ch == NOCHAR) 2736 if (ch == NOCHAR)
2616 { 2737 {
2617 seq_begin = cmdbuf_ptr; 2738 seq_begin = cmdbuf_ptr;
2618 ch = next_char (); 2739 ch = next_char ();
2619 }
2620 2740
2621 if (ch == NOCHAR) // TODO: improve 2741 if (ch == NOCHAR)
2622 break; 2742 break;
2743 }
2623 2744
2624 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2745 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2625 { 2746 {
2626 if (!seen_input) 2747 if (!seen_input)
2627 { 2748 {
… …
2636 if (seen_resize && cmd_pid) 2757 if (seen_resize && cmd_pid)
2637 kill (-cmd_pid, SIGWINCH); 2758 kill (-cmd_pid, SIGWINCH);
2638 } 2759 }
2639 2760
2640 /* Read a text string from the input buffer */ 2761 /* Read a text string from the input buffer */
2641 unicode_t buf[UBUFSIZ]; 2762 wchar_t buf[UBUFSIZ];
2642 bool refreshnow = false; 2763 bool refreshnow = false;
2643 int nlines = 0; 2764 int nlines = 0;
2644 unicode_t *str = buf; 2765 wchar_t *str = buf;
2645 unicode_t *eol = str + min (ncol, UBUFSIZ); 2766 wchar_t *eol = str + min (ncol, UBUFSIZ);
2646 2767
2647 for (;;) 2768 for (;;)
2648 { 2769 {
2649 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2770 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2650 break; 2771 break;
… …
2656 if (ch == C0_LF) 2777 if (ch == C0_LF)
2657 nlines++; 2778 nlines++;
2658 2779
2659 refresh_count++; 2780 refresh_count++;
2660 2781
2661 if (!(options & Opt_jumpScroll) 2782 if (!OPTION (Opt_jumpScroll)
2662 || (refresh_count >= refresh_limit * (nrow - 1))) 2783 || (refresh_count >= refresh_limit * (nrow - 1)))
2663 { 2784 {
2664 refreshnow = true; 2785 refreshnow = true;
2786 refresh_count = 0;
2665 ch = NOCHAR; 2787 ch = NOCHAR;
2666 break; 2788 break;
2667 } 2789 }
2668 2790
2669 // scr_add_lines only works for nlines <= nrow - 1. 2791 // scr_add_lines only works for nlines <= nrow - 1.
2670 if (nlines >= nrow - 1) 2792 if (nlines >= nrow - 1)
2671 { 2793 {
2794 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2672 scr_add_lines (buf, nlines, str - buf); 2795 scr_add_lines (buf, str - buf, nlines);
2796
2673 nlines = 0; 2797 nlines = 0;
2674 str = buf; 2798 str = buf;
2675 eol = str + min (ncol, UBUFSIZ); 2799 eol = str + min (ncol, UBUFSIZ);
2676 } 2800 }
2677 2801
… …
2690 2814
2691 seq_begin = cmdbuf_ptr; 2815 seq_begin = cmdbuf_ptr;
2692 ch = next_char (); 2816 ch = next_char ();
2693 } 2817 }
2694 2818
2819 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2695 scr_add_lines (buf, nlines, str - buf); 2820 scr_add_lines (buf, str - buf, nlines);
2696 2821
2697 /* 2822 /*
2698 * If there have been a lot of new lines, then update the screen 2823 * If there have been a lot of new lines, then update the screen
2699 * What the heck I'll cheat and only refresh less than every page-full. 2824 * What the heck I'll cheat and only refresh less than every page-full.
2700 * the number of pages between refreshes is refresh_limit, which 2825 * the number of pages between refreshes is refresh_limit, which
2701 * is incremented here because we must be doing flat-out scrolling. 2826 * is incremented here because we must be doing flat-out scrolling.
2702 */ 2827 */
2703 if (refreshnow) 2828 if (refreshnow)
2704 { 2829 {
2705 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2830 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2706 refresh_limit++; 2831 refresh_limit++;
2707 else 2832 else
2708 { 2833 {
2709 flag = true; 2834 flag = true;
2710 scr_refresh (refresh_type); 2835 scr_refresh (refresh_type);
2836 flush_ev.stop ();
2711 } 2837 }
2712 } 2838 }
2713 2839
2714 } 2840 }
2715 else 2841 else
… …
2730 } 2856 }
2731 2857
2732 return flag; 2858 return flag;
2733} 2859}
2734 2860
2735// read the next octet
2736unicode_t
2737rxvt_term::next_octet ()
2738{
2739 return cmdbuf_ptr < cmdbuf_endp
2740 ? *cmdbuf_ptr++
2741 : NOCHAR;
2742}
2743
2744// read the next character 2861// read the next character
2745unicode_t 2862wchar_t
2746rxvt_term::next_char () 2863rxvt_term::next_char ()
2747{ 2864{
2748 while (cmdbuf_ptr < cmdbuf_endp) 2865 while (cmdbuf_ptr < cmdbuf_endp)
2749 { 2866 {
2750 // assume 7-bit to be ascii ALWAYS 2867 // assume 7-bit to be ascii ALWAYS
2751 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2868 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2752 return *cmdbuf_ptr++; 2869 return *cmdbuf_ptr++;
2753 2870
2754 wchar_t wc; 2871 wchar_t wc;
2755 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2872 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2756 2873
2757 if (len == (size_t)-2) 2874 if (len == (size_t)-2)
2758 { 2875 {
2759 // the mbstate stores incomplete sequences. didn't know this :/ 2876 // the mbstate stores incomplete sequences. didn't know this :/
2760 cmdbuf_ptr = cmdbuf_endp; 2877 cmdbuf_ptr = cmdbuf_endp;
2761 break; 2878 break;
2762 } 2879 }
2763 2880
2764 if (len == (size_t)-1) 2881 if (len == (size_t)-1)
2765 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2882 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2766 2883
2767 // assume wchar == unicode 2884 // assume wchar == unicode
2768 cmdbuf_ptr += len; 2885 cmdbuf_ptr += len;
2769 return wc & UNICODE_MASK; 2886 return wc & UNICODE_MASK;
2770 } 2887 }
2771 2888
2772 return NOCHAR; 2889 return NOCHAR;
2890}
2891
2892// read the next octet
2893uint32_t
2894rxvt_term::next_octet ()
2895{
2896 return cmdbuf_ptr < cmdbuf_endp
2897 ? (unsigned char)*cmdbuf_ptr++
2898 : NOCHAR;
2773} 2899}
2774 2900
2775/* rxvt_cmd_getc () - Return next input character */ 2901/* rxvt_cmd_getc () - Return next input character */
2776/* 2902/*
2777 * Return the next input character after first passing any keyboard input 2903 * Return the next input character after first passing any keyboard input
2778 * to the command. 2904 * to the command.
2779 */ 2905 */
2780unicode_t 2906wchar_t
2781rxvt_term::cmd_getc () 2907rxvt_term::cmd_getc ()
2782{ 2908{
2783 unicode_t c = next_char (); 2909 wchar_t c = next_char ();
2784 2910
2785 if (c == NOCHAR) 2911 if (c == NOCHAR)
2786 throw out_of_input; 2912 throw out_of_input;
2787 2913
2788 return c; 2914 return c;
2789} 2915}
2790 2916
2791unicode_t 2917uint32_t
2792rxvt_term::cmd_get8 () 2918rxvt_term::cmd_get8 ()
2793{ 2919{
2794 unicode_t c = next_octet (); 2920 uint32_t c = next_octet ();
2795 2921
2796 if (c == NOCHAR) 2922 if (c == NOCHAR)
2797 throw out_of_input; 2923 throw out_of_input;
2798 2924
2799 return c; 2925 return c;
… …
2899 case C0_ESC: 3025 case C0_ESC:
2900 process_escape_seq (); 3026 process_escape_seq ();
2901 break; 3027 break;
2902 case C0_ENQ: /* terminal Status */ 3028 case C0_ENQ: /* terminal Status */
2903 if (rs[Rs_answerbackstring]) 3029 if (rs[Rs_answerbackstring])
2904 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 3030 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2905 (unsigned int)strlen (rs[Rs_answerbackstring]));
2906 else 3031 else
2907 tt_write ((unsigned char *)VT100_ANS, 3032 tt_write (VT100_ANS, strlen (VT100_ANS));
2908 (unsigned int)strlen (VT100_ANS));
2909 break; 3033 break;
2910 case C0_BEL: /* bell */ 3034 case C0_BEL: /* bell */
2911 scr_bell (); 3035 scr_bell ();
2912 break; 3036 break;
2913 case C0_BS: /* backspace */ 3037 case C0_BS: /* backspace */
… …
3068 break; 3192 break;
3069 3193
3070 /* 8.3.87: NEXT LINE */ 3194 /* 8.3.87: NEXT LINE */
3071 case C1_NEL: /* ESC E */ 3195 case C1_NEL: /* ESC E */
3072 { 3196 {
3073 unicode_t nlcr[] = { C0_LF, C0_CR }; 3197 wchar_t nlcr[] = { C0_LF, C0_CR };
3074 scr_add_lines (nlcr, 1, 2); 3198 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3075 } 3199 }
3076 break; 3200 break;
3077 3201
3078 /* kidnapped escape sequence: Should be 8.3.48 */ 3202 /* kidnapped escape sequence: Should be 8.3.48 */
3079 case C1_ESA: /* ESC G */ 3203 case C1_ESA: /* ESC G */
… …
3101 process_dcs_seq (); 3225 process_dcs_seq ();
3102 break; 3226 break;
3103 3227
3104 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3228 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3105 case C1_SCI: /* ESC Z */ 3229 case C1_SCI: /* ESC Z */
3106 tt_write ((const unsigned char *)ESCZ_ANSWER, 3230 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3107 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3108 break; /* steal obsolete ESC [ c */ 3231 break; /* steal obsolete ESC [ c */
3109 3232
3110 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3233 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3111 case C1_CSI: /* ESC [ */ 3234 case C1_CSI: /* ESC [ */
3112 process_csi_seq (); 3235 process_csi_seq ();
… …
3356 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3479 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3357 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); 3480 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3358 break; 3481 break;
3359 3482
3360 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3483 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3361 tt_write ((const unsigned char *)VT100_ANS, 3484 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3362 (unsigned int) (sizeof (VT100_ANS) - 1));
3363 break; 3485 break;
3364 3486
3365 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3487 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3366 process_sgr_mode (nargs, arg); 3488 process_sgr_mode (nargs, arg);
3367 break; 3489 break;
… …
3374 break; 3496 break;
3375 case 6: /* CPR requested */ 3497 case 6: /* CPR requested */
3376 scr_report_position (); 3498 scr_report_position ();
3377 break; 3499 break;
3378 case 7: /* unofficial extension */ 3500 case 7: /* unofficial extension */
3379 if (options & Opt_insecure) 3501 if (OPTION (Opt_insecure))
3380 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3502 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3381 break; 3503 break;
3382 case 8: /* unofficial extension */ 3504 case 8: /* unofficial extension */
3383 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3505 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3384 break; 3506 break;
… …
3548 break; 3670 break;
3549 case 20: /* report icon label */ 3671 case 20: /* report icon label */
3550 { 3672 {
3551 char *s; 3673 char *s;
3552 XGetIconName (disp, parent[0], &s); 3674 XGetIconName (disp, parent[0], &s);
3553 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3675 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3554 XFree (s); 3676 XFree (s);
3555 } 3677 }
3556 break; 3678 break;
3557 case 21: /* report window title */ 3679 case 21: /* report window title */
3558 { 3680 {
3559 char *s; 3681 char *s;
3560 XFetchName (disp, parent[0], &s); 3682 XFetchName (disp, parent[0], &s);
3561 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3683 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3562 XFree (s); 3684 XFree (s);
3563 } 3685 }
3564 break; 3686 break;
3565 } 3687 }
3566} 3688}
… …
3569/*----------------------------------------------------------------------*/ 3691/*----------------------------------------------------------------------*/
3570/* 3692/*
3571 * get input up until STRING TERMINATOR (or BEL) 3693 * get input up until STRING TERMINATOR (or BEL)
3572 * ends_how is terminator used. returned input must be free()'d 3694 * ends_how is terminator used. returned input must be free()'d
3573 */ 3695 */
3574unsigned char * 3696char *
3575rxvt_term::get_to_st (unicode_t &ends_how) 3697rxvt_term::get_to_st (unicode_t &ends_how)
3576{ 3698{
3577 unicode_t ch; 3699 unicode_t ch;
3578 bool seen_esc = false; 3700 bool seen_esc = false;
3579 unsigned int n = 0; 3701 unsigned int n = 0;
… …
3612 3734
3613 string[n++] = '\0'; 3735 string[n++] = '\0';
3614 3736
3615 ends_how = (ch == 0x5c ? C0_ESC : ch); 3737 ends_how = (ch == 0x5c ? C0_ESC : ch);
3616 3738
3617 return (unsigned char *)rxvt_wcstombs (string); 3739 return rxvt_wcstombs (string);
3618} 3740}
3619 3741
3620/*----------------------------------------------------------------------*/ 3742/*----------------------------------------------------------------------*/
3621/* 3743/*
3622 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3744 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3623 */ 3745 */
3624void 3746void
3625rxvt_term::process_dcs_seq () 3747rxvt_term::process_dcs_seq ()
3626{ 3748{
3627 unsigned char *s; 3749 char *s;
3628 unicode_t eh; 3750 unicode_t eh;
3629 3751
3630 /* 3752 /*
3631 * Not handled yet 3753 * Not handled yet
3632 */ 3754 */
… …
3651 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3773 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3652 arg = arg * 10 + (ch - '0'); 3774 arg = arg * 10 + (ch - '0');
3653 3775
3654 if (ch == ';') 3776 if (ch == ';')
3655 { 3777 {
3656 unsigned char *s = get_to_st (eh); 3778 char *s = get_to_st (eh);
3657 3779
3658 if (s) 3780 if (s)
3659 { 3781 {
3660 process_xterm_seq (arg, (char *)s, eh); 3782 process_xterm_seq (arg, s, eh);
3661 free (s); 3783 free (s);
3662 } 3784 }
3663 } 3785 }
3664} 3786}
3665 3787
3666void 3788void
3667rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3789rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3668{ 3790{
3669 if (str[0] == '?' && !str[1]) 3791 if (str[0] == '?' && !str[1])
3670 { 3792 {
3671 unsigned short r, g, b; 3793 unsigned short r, g, b;
3672 pix_colors_focused[color].get (display, r, g, b); 3794 pix_colors_focused[color].get (display, r, g, b);
… …
3678 3800
3679/* 3801/*
3680 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3802 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3681 */ 3803 */
3682void 3804void
3683rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3805rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3684{ 3806{
3685 int changed = 0; 3807 int changed = 0;
3686 int color; 3808 int color;
3687 char *buf, *name; 3809 char *buf, *name;
3688 bool query = str[0] == '?' && !str[1]; 3810 bool query = str[0] == '?' && !str[1];
… …
3842 // TODO, when secure mode? 3964 // TODO, when secure mode?
3843 break; 3965 break;
3844 3966
3845#ifdef MENUBAR 3967#ifdef MENUBAR
3846 case URxvt_Menu: 3968 case URxvt_Menu:
3847 if (options & Opt_insecure) 3969 if (OPTION (Opt_insecure))
3848 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3970 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3849 break; 3971 break;
3850#endif 3972#endif
3851#if 0 3973#if 0
3852 case XTerm_dumpscreen: /* no error notices */ 3974 case XTerm_dumpscreen: /* no error notices */
… …
3868 case URxvt_italicFont: 3990 case URxvt_italicFont:
3869 case URxvt_boldItalicFont: 3991 case URxvt_boldItalicFont:
3870#endif 3992#endif
3871 if (query) 3993 if (query)
3872 tt_printf ("\33]%d;%-.250s%c", saveop, 3994 tt_printf ("\33]%d;%-.250s%c", saveop,
3873 (options & Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3995 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3874 ? fontset[op - URxvt_font]->fontdesc : "", 3996 ? fontset[op - URxvt_font]->fontdesc : "",
3875 resp); 3997 resp);
3876 else 3998 else
3877 { 3999 {
3878 const char *&res = rs[Rs_font + (op - URxvt_font)]; 4000 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3884 break; 4006 break;
3885 4007
3886#if ENABLE_FRILLS 4008#if ENABLE_FRILLS
3887 case URxvt_locale: 4009 case URxvt_locale:
3888 if (query) 4010 if (query)
3889 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp); 4011 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3890 else 4012 else
3891 { 4013 {
3892 set_locale (str); 4014 set_locale (str);
3893 pty.set_utf8_mode (enc_utf8); 4015 pty.set_utf8_mode (enc_utf8);
3894 init_xlocale (); 4016 init_xlocale ();
3895 } 4017 }
3896 break; 4018 break;
3897 4019
3898 case URxvt_view_up: 4020 case URxvt_view_up:
3899 case URxvt_view_down: 4021 case URxvt_view_down:
4022 {
3900 int lines = atoi (str); 4023 int lines = atoi (str);
3901 4024
3902 if (lines) 4025 if (lines)
3903 scr_page (op == URxvt_view_up ? UP : DN, lines); 4026 scr_page (op == URxvt_view_up ? UP : DN, lines);
3904 else 4027 else
3905 {
3906 scr_erase_savelines (); 4028 scr_erase_savelines ();
3907 } 4029 }
3908 4030
4031 break;
4032#endif
4033
4034#if ENABLE_PERL
4035 case URxvt_perl:
4036 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
4037 ; // no responses yet
3909 break; 4038 break;
3910#endif 4039#endif
3911 } 4040 }
3912} 4041}
3913/*----------------------------------------------------------------------*/ 4042/*----------------------------------------------------------------------*/
… …
4022 } 4151 }
4023 4152
4024 /* extra handling for values with state unkept */ 4153 /* extra handling for values with state unkept */
4025 switch (arg[i]) 4154 switch (arg[i])
4026 { 4155 {
4156#if ENABLE_STYLES
4157 case 1021:
4158 if (mode)
4159 SET_OPTION (Opt_intensityStyles);
4160 else
4161 CLR_OPTION (Opt_intensityStyles);
4162
4163 scr_touch (true);
4164 break;
4165#endif
4027 case 1048: /* alternative cursor save */ 4166 case 1048: /* alternative cursor save */
4028 case 1049: 4167 case 1049:
4029 if (options & Opt_secondaryScreen) 4168 if (OPTION (Opt_secondaryScreen))
4030 if (mode == 0) 4169 if (mode == 0)
4031 scr_cursor (RESTORE); 4170 scr_cursor (RESTORE);
4032 else if (mode == 1) 4171 else if (mode == 1)
4033 scr_cursor (SAVE); 4172 scr_cursor (SAVE);
4034 break; 4173 break;
… …
4049 case 3: /* 80/132 */ 4188 case 3: /* 80/132 */
4050 if (priv_modes & PrivMode_132OK) 4189 if (priv_modes & PrivMode_132OK)
4051 set_widthheight (((state ? 132 : 80) * fwidth), height); 4190 set_widthheight (((state ? 132 : 80) * fwidth), height);
4052 break; 4191 break;
4053 case 4: /* smooth scrolling */ 4192 case 4: /* smooth scrolling */
4054 if (state) 4193 if (!state)
4055 options &= ~Opt_jumpScroll; 4194 SET_OPTION (Opt_jumpScroll);
4056 else 4195 else
4057 options |= Opt_jumpScroll; 4196 CLR_OPTION (Opt_jumpScroll);
4058 break; 4197 break;
4059 case 5: /* reverse video */ 4198 case 5: /* reverse video */
4060 scr_rvideo_mode (state); 4199 scr_rvideo_mode (state);
4061 break; 4200 break;
4062 case 6: /* relative/absolute origins */ 4201 case 6: /* relative/absolute origins */
… …
4103#if 0 4242#if 0
4104 case 1001: 4243 case 1001:
4105 break; /* X11 mouse highlighting */ 4244 break; /* X11 mouse highlighting */
4106#endif 4245#endif
4107 case 1010: /* scroll to bottom on TTY output inhibit */ 4246 case 1010: /* scroll to bottom on TTY output inhibit */
4108 if (state) 4247 if (!state)
4109 options &= ~Opt_scrollTtyOutput; 4248 SET_OPTION (Opt_scrollTtyOutput);
4110 else 4249 else
4111 options |= Opt_scrollTtyOutput; 4250 CLR_OPTION (Opt_scrollTtyOutput);
4112 break; 4251 break;
4113 case 1011: /* scroll to bottom on key press */ 4252 case 1011: /* scroll to bottom on key press */
4114 if (state) 4253 if (state)
4115 options |= Opt_scrollTtyKeypress; 4254 SET_OPTION (Opt_scrollTtyKeypress);
4116 else 4255 else
4117 options &= ~Opt_scrollTtyKeypress; 4256 CLR_OPTION (Opt_scrollTtyKeypress);
4118 break; 4257 break;
4119 case 1047: /* secondary screen w/ clearing last */ 4258 case 1047: /* secondary screen w/ clearing last */
4120 if (options & Opt_secondaryScreen) 4259 if (OPTION (Opt_secondaryScreen))
4121 if (current_screen != PRIMARY) 4260 if (current_screen != PRIMARY)
4122 scr_erase_screen (2); 4261 scr_erase_screen (2);
4123 scr_change_screen (state); 4262 scr_change_screen (state);
4124 break; 4263 break;
4125 case 1049: /* secondary screen w/ clearing first */ 4264 case 1049: /* secondary screen w/ clearing first */
4126 scr_change_screen (state); 4265 scr_change_screen (state);
4127 if (options & Opt_secondaryScreen) 4266 if (OPTION (Opt_secondaryScreen))
4128 if (current_screen != PRIMARY) 4267 if (current_screen != PRIMARY)
4129 scr_erase_screen (2); 4268 scr_erase_screen (2);
4130 break; 4269 break;
4131 default: 4270 default:
4132 break; 4271 break;
… …
4260 scr_color (Color_bg, Color_bg); 4399 scr_color (Color_bg, Color_bg);
4261 break; 4400 break;
4262 4401
4263 //case 50: // not variable spacing 4402 //case 50: // not variable spacing
4264 4403
4265#ifndef NO_BRIGHTCOLOR 4404#if ENABLE_FRILLS
4266 case 90: 4405 case 90:
4267 case 91: /* set bright fg color */ 4406 case 91: /* set bright fg color */
4268 case 92: 4407 case 92:
4269 case 93: 4408 case 93:
4270 case 94: 4409 case 94:
… …
4282 case 106: 4421 case 106:
4283 case 107: 4422 case 107:
4284 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 4423 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4285 break; 4424 break;
4286#endif 4425#endif
4287
4288 } 4426 }
4289 } 4427 }
4290} 4428}
4291/*}}} */ 4429/*}}} */
4292 4430
… …
4316 */ 4454 */
4317void 4455void
4318rxvt_term::tt_printf (const char *fmt,...) 4456rxvt_term::tt_printf (const char *fmt,...)
4319{ 4457{
4320 va_list arg_ptr; 4458 va_list arg_ptr;
4321 unsigned char buf[256]; 4459 char buf[256];
4322 4460
4323 va_start (arg_ptr, fmt); 4461 va_start (arg_ptr, fmt);
4324 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4462 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4325 va_end (arg_ptr); 4463 va_end (arg_ptr);
4326 tt_write (buf, strlen (buf)); 4464 tt_write (buf, strlen (buf));
… …
4331 * or generated by us in response to a query ESC sequence. 4469 * or generated by us in response to a query ESC sequence.
4332 */ 4470 */
4333const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4471const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4334 4472
4335void 4473void
4336rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4474rxvt_term::tt_write (const char *data, unsigned int len)
4337{ 4475{
4476 if (pty.pty < 0)
4477 return;
4478
4338 if (v_buflen == 0) 4479 if (v_buflen == 0)
4339 { 4480 {
4340 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4481 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4341 4482
4342 if ((unsigned int)written == len) 4483 if ((unsigned int)written == len)
… …
4344 4485
4345 data += written; 4486 data += written;
4346 len -= written; 4487 len -= written;
4347 } 4488 }
4348 4489
4349 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4490 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4350 4491
4351 memcpy (v_buffer + v_buflen, data, len); 4492 memcpy (v_buffer + v_buflen, data, len);
4352 v_buflen += len; 4493 v_buflen += len;
4353 4494
4354 pty_ev.set (EVENT_READ | EVENT_WRITE); 4495 pty_ev.set (EVENT_READ | EVENT_WRITE);
… …
4373 } 4514 }
4374 4515
4375 memmove (v_buffer, v_buffer + written, v_buflen); 4516 memmove (v_buffer, v_buffer + written, v_buflen);
4376 } 4517 }
4377 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4518 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4378 // original code just ignores this... 4519 pty_ev.set (EVENT_READ);
4379 destroy ();
4380} 4520}
4381 4521
4382/*----------------------- end-of-file (C source) -----------------------*/ 4522/*----------------------- end-of-file (C source) -----------------------*/
4383 4523

Diff Legend

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