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.249 by root, Sun Jan 8 01:02:15 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
… …
1214{ 1311{
1215 dDisp; 1312 dDisp;
1216 1313
1217 SET_R (this); 1314 SET_R (this);
1218 SET_LOCALE (locale); 1315 SET_LOCALE (locale);
1219
1220#if defined(CURSOR_BLINK)
1221 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
1222 {
1223 if (hidden_cursor)
1224 {
1225 hidden_cursor = 0;
1226 want_refresh = 1;
1227 }
1228
1229 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1230 }
1231#endif
1232
1233#if defined(POINTER_BLANK)
1234 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
1235 {
1236 if (ev.type == MotionNotify
1237 || ev.type == ButtonPress
1238 || ev.type == ButtonRelease)
1239 if (hidden_pointer)
1240 pointer_unblank ();
1241
1242 if (ev.type == KeyPress && hidden_pointer == 0)
1243 pointer_blank ();
1244 }
1245#endif
1246 1316
1247 Window unused_root, unused_child; 1317 Window unused_root, unused_child;
1248 int unused_root_x, unused_root_y; 1318 int unused_root_x, unused_root_y;
1249 unsigned int unused_mask; 1319 unsigned int unused_mask;
1250 1320
… …
1281 && ((ks >= 0x40 && ks <= 0x5f) 1351 && ((ks >= 0x40 && ks <= 0x5f)
1282 || (ks >= 0x61 && ks <= 0x7f))) 1352 || (ks >= 0x61 && ks <= 0x7f)))
1283 { 1353 {
1284 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); 1354 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1285 commit_iso14755 (); 1355 commit_iso14755 ();
1286 return; // case-break; 1356 goto skip_switch;
1287 } 1357 }
1288 1358
1289 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1359 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1290 if (i[0] == ks) 1360 if (i[0] == ks)
1291 { 1361 {
1292 iso14755buf = ISO_14755_51 | i[1]; 1362 iso14755buf = ISO_14755_51 | i[1];
1293 commit_iso14755 (); 1363 commit_iso14755 ();
1294 return; // case-break; 1364 goto skip_switch;
1295 } 1365 }
1296 1366
1297 scr_bell (); 1367 scr_bell ();
1298# endif 1368# endif
1299 iso14755buf = 0; 1369 iso14755buf = 0;
… …
1317# endif 1387# endif
1318 else 1388 else
1319 iso14755buf = 0; 1389 iso14755buf = 0;
1320 } 1390 }
1321#endif 1391#endif
1392
1393 if (ev.xany.window == vt
1394 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_END)))
1395 break;
1322 1396
1323#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1397#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1324 if (!(ev.xkey.state & ControlMask)) 1398 if (!(ev.xkey.state & ControlMask))
1325 slip_wheel_ev.stop (); 1399 slip_wheel_ev.stop ();
1326 else if (ks == XK_Control_L || ks == XK_Control_R) 1400 else if (ks == XK_Control_L || ks == XK_Control_R)
… …
1435 seen_resize = 1; 1509 seen_resize = 1;
1436 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1510 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1437 } 1511 }
1438 1512
1439#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1513#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1440 if (options & Opt_transparent) 1514 if (OPTION (Opt_transparent))
1441 check_our_parents (); 1515 check_our_parents ();
1442#endif 1516#endif
1443 } 1517 }
1444 break; 1518 break;
1445 1519
… …
1461 1535
1462 case SelectionRequest: 1536 case SelectionRequest:
1463 selection_send (ev.xselectionrequest); 1537 selection_send (ev.xselectionrequest);
1464 break; 1538 break;
1465 1539
1540 case MapNotify:
1541 mapped = 1;
1542#ifdef TEXT_BLINK
1543 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1544#endif
1545 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1546 break;
1547
1466 case UnmapNotify: 1548 case UnmapNotify:
1467 mapped = 0; 1549 mapped = 0;
1468#ifdef TEXT_BLINK 1550#ifdef TEXT_BLINK
1469 text_blink_ev.stop (); 1551 text_blink_ev.stop ();
1470#endif 1552#endif
1471 break; 1553 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; 1554 break;
1479 1555
1480#ifdef TRANSPARENT 1556#ifdef TRANSPARENT
1481 case ReparentNotify: 1557 case ReparentNotify:
1482 rootwin_cb (ev); 1558 rootwin_cb (ev);
… …
1541 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1617 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1542 break; 1618 break;
1543 1619
1544 if (ev.xany.window == vt) 1620 if (ev.xany.window == vt)
1545 { 1621 {
1622 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1623 ; // nop
1546 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1624 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1547 { 1625 {
1548 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1626 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1549 ; 1627 ;
1550 1628
1551 XQueryPointer (disp, vt, 1629 XQueryPointer (disp, vt,
… …
1601 } 1679 }
1602 1680
1603 scroll_selection_lines = Pixel2Height (dist) 1681 scroll_selection_lines = Pixel2Height (dist)
1604 / SELECTION_SCROLL_LINE_SPEEDUP 1682 / SELECTION_SCROLL_LINE_SPEEDUP
1605 + 1; 1683 + 1;
1606 MIN_IT (scroll_selection_lines, 1684 min_it (scroll_selection_lines,
1607 SELECTION_SCROLL_MAX_LINES); 1685 SELECTION_SCROLL_MAX_LINES);
1608 } 1686 }
1609 else 1687 else
1610 { 1688 {
1611 /* we are within the text window, so we 1689 /* we are within the text window, so we
… …
1637 refresh_limit = 0; 1715 refresh_limit = 0;
1638 scrollbar_show (1); 1716 scrollbar_show (1);
1639 } 1717 }
1640 break; 1718 break;
1641 } 1719 }
1720
1721skip_switch: ;
1722
1723#if defined(CURSOR_BLINK)
1724 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1725 {
1726 if (hidden_cursor)
1727 {
1728 hidden_cursor = 0;
1729 want_refresh = 1;
1730 }
1731
1732 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1733 }
1734#endif
1735
1736#if defined(POINTER_BLANK)
1737 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1738 {
1739 if (ev.type == MotionNotify
1740 || ev.type == ButtonPress
1741 || ev.type == ButtonRelease)
1742 if (hidden_pointer)
1743 pointer_unblank ();
1744
1745 if (ev.type == KeyPress && hidden_pointer == 0)
1746 pointer_blank ();
1747 }
1748#endif
1642} 1749}
1643 1750
1644void 1751void
1645rxvt_term::focus_in () 1752rxvt_term::focus_in ()
1646{ 1753{
1647 if (!focus) 1754 if (!focus)
1648 { 1755 {
1649 focus = 1; 1756 focus = 1;
1650 want_refresh = 1; 1757 want_refresh = 1;
1758
1759 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1760
1651#if USE_XIM 1761#if USE_XIM
1652 if (Input_Context != NULL) 1762 if (Input_Context != NULL)
1653 { 1763 {
1654 IMSetStatusPosition (); 1764 IMSetStatusPosition ();
1655 XSetICFocus (Input_Context); 1765 XSetICFocus (Input_Context);
1656 } 1766 }
1657#endif 1767#endif
1658#if CURSOR_BLINK 1768#if CURSOR_BLINK
1659 if (options & Opt_cursorBlink) 1769 if (OPTION (Opt_cursorBlink))
1660 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1770 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1661#endif 1771#endif
1662#if OFF_FOCUS_FADING 1772#if OFF_FOCUS_FADING
1663 if (rs[Rs_fade]) 1773 if (rs[Rs_fade])
1664 { 1774 {
… …
1675 if (focus) 1785 if (focus)
1676 { 1786 {
1677 focus = 0; 1787 focus = 0;
1678 want_refresh = 1; 1788 want_refresh = 1;
1679 1789
1790 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1791
1680#if ENABLE_FRILLS || ISO_14755 1792#if ENABLE_FRILLS || ISO_14755
1793 if (iso14755buf)
1794 {
1681 iso14755buf = 0; 1795 iso14755buf = 0;
1682#endif
1683#if ENABLE_OVERLAY 1796# if ENABLE_OVERLAY
1684 scr_overlay_off (); 1797 scr_overlay_off ();
1798# endif
1799 }
1685#endif 1800#endif
1686#if USE_XIM 1801#if USE_XIM
1687 if (Input_Context != NULL) 1802 if (Input_Context != NULL)
1688 XUnsetICFocus (Input_Context); 1803 XUnsetICFocus (Input_Context);
1689#endif 1804#endif
1690#if CURSOR_BLINK 1805#if CURSOR_BLINK
1691 if (options & Opt_cursorBlink) 1806 if (OPTION (Opt_cursorBlink))
1692 cursor_blink_ev.stop (); 1807 cursor_blink_ev.stop ();
1693 hidden_cursor = 0; 1808 hidden_cursor = 0;
1694#endif 1809#endif
1695#if OFF_FOCUS_FADING 1810#if OFF_FOCUS_FADING
1696 if (rs[Rs_fade]) 1811 if (rs[Rs_fade])
… …
1720 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1835 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1721 return; 1836 return;
1722 1837
1723 /* FALLTHROUGH */ 1838 /* FALLTHROUGH */
1724 case ReparentNotify: 1839 case ReparentNotify:
1725 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1840 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1726 want_refresh = want_full_refresh = 1; 1841 want_refresh = want_full_refresh = 1;
1727 break; 1842 break;
1728 } 1843 }
1729} 1844}
1730#endif 1845#endif
… …
1733rxvt_term::button_press (XButtonEvent &ev) 1848rxvt_term::button_press (XButtonEvent &ev)
1734{ 1849{
1735 int reportmode = 0, clickintime; 1850 int reportmode = 0, clickintime;
1736 1851
1737 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1852 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1853
1738 if (!bypass_keystate) 1854 if (!bypass_keystate)
1739 reportmode = !! (priv_modes & PrivMode_mouse_report); 1855 reportmode = !! (priv_modes & PrivMode_mouse_report);
1740 1856
1741 /* 1857 /*
1742 * VT window processing of button press 1858 * VT window processing of button press
… …
1762#ifdef MOUSE_REPORT_DOUBLECLICK 1878#ifdef MOUSE_REPORT_DOUBLECLICK
1763 if (ev.button == MEvent.button && clickintime) 1879 if (ev.button == MEvent.button && clickintime)
1764 { 1880 {
1765 /* same button, within alloted time */ 1881 /* same button, within alloted time */
1766 MEvent.clicks++; 1882 MEvent.clicks++;
1883
1767 if (MEvent.clicks > 1) 1884 if (MEvent.clicks > 1)
1768 { 1885 {
1769 /* only report double clicks */ 1886 /* only report double clicks */
1770 MEvent.clicks = 2; 1887 MEvent.clicks = 2;
1771 mouse_report (ev); 1888 mouse_report (ev);
… …
1791 else 1908 else
1792 { 1909 {
1793 if (ev.button != MEvent.button) 1910 if (ev.button != MEvent.button)
1794 MEvent.clicks = 0; 1911 MEvent.clicks = 0;
1795 1912
1913 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1796 switch (ev.button) 1914 switch (ev.button)
1797 { 1915 {
1798 case Button1: 1916 case Button1:
1799 /* allow meta + click to select rectangular areas */ 1917 /* allow meta + click to select rectangular areas */
1800 /* should be done in screen.C */ 1918 /* should be done in screen.C */
1801#if ENABLE_FRILLS 1919#if ENABLE_FRILLS
1802 selection.rect = !!(ev.state & ModMetaMask); 1920 selection.rect = !!(ev.state & ModMetaMask);
1803#else 1921#else
1804 selection.rect = false; 1922 selection.rect = false;
1805#endif 1923#endif
1806 1924
1807 /* allow shift+left click to extend selection */ 1925 /* allow shift+left click to extend selection */
1808 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1926 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1809 { 1927 {
1810 if (MEvent.button == Button1 && clickintime) 1928 if (MEvent.button == Button1 && clickintime)
1811 selection_rotate (ev.x, ev.y); 1929 selection_rotate (ev.x, ev.y);
1812 else 1930 else
1813 selection_extend (ev.x, ev.y, 1); 1931 selection_extend (ev.x, ev.y, 1);
1814 } 1932 }
1815 else 1933 else
1816 { 1934 {
1817 if (MEvent.button == Button1 && clickintime) 1935 if (MEvent.button == Button1 && clickintime)
1818 MEvent.clicks++; 1936 MEvent.clicks++;
1819 else 1937 else
1820 MEvent.clicks = 1; 1938 MEvent.clicks = 1;
1821 1939
1822 selection_click (MEvent.clicks, ev.x, ev.y); 1940 selection_click (MEvent.clicks, ev.x, ev.y);
1823 } 1941 }
1824 1942
1825 MEvent.button = Button1; 1943 MEvent.button = Button1;
1826 break; 1944 break;
1827 1945
1828 case Button3: 1946 case Button3:
1829 if (MEvent.button == Button3 && clickintime) 1947 if (MEvent.button == Button3 && clickintime)
1830 selection_rotate (ev.x, ev.y); 1948 selection_rotate (ev.x, ev.y);
1831 else 1949 else
1832 selection_extend (ev.x, ev.y, 1); 1950 selection_extend (ev.x, ev.y, 1);
1833 1951
1834 MEvent.button = Button3; 1952 MEvent.button = Button3;
1835 break; 1953 break;
1836 } 1954 }
1837 } 1955 }
1838 1956
1839 MEvent.time = ev.time; 1957 MEvent.time = ev.time;
1840 return; 1958 return;
1841 } 1959 }
1842 1960
… …
1978 } 2096 }
1979 2097
1980 break; 2098 break;
1981 } 2099 }
1982 } 2100 }
2101
1983 return; 2102 return;
1984 } 2103 }
2104
1985#if MENUBAR 2105#if MENUBAR
1986 /* 2106 /*
1987 * Menubar window processing of button press 2107 * Menubar window processing of button press
1988 */ 2108 */
1989 if (isMenuBarWindow (ev.window)) 2109 if (isMenuBarWindow (ev.window))
… …
2052 if (priv_modes & PrivMode_mouse_report 2172 if (priv_modes & PrivMode_mouse_report
2053 && bypass_keystate 2173 && bypass_keystate
2054 && ev.button == Button1 && MEvent.clicks <= 1) 2174 && ev.button == Button1 && MEvent.clicks <= 1)
2055 selection_extend (ev.x, ev.y, 0); 2175 selection_extend (ev.x, ev.y, 0);
2056 2176
2177 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2178 return;
2179
2057 switch (ev.button) 2180 switch (ev.button)
2058 { 2181 {
2059 case Button1: 2182 case Button1:
2060 case Button3: 2183 case Button3:
2061 selection_make (ev.time); 2184 selection_make (ev.time);
… …
2072 2195
2073 v = ev.button == Button4 ? UP : DN; 2196 v = ev.button == Button4 ? UP : DN;
2074 2197
2075 if (ev.state & ShiftMask) 2198 if (ev.state & ShiftMask)
2076 i = 1; 2199 i = 1;
2077 else if (options & Opt_mouseWheelScrollPage) 2200 else if (OPTION (Opt_mouseWheelScrollPage))
2078 i = nrow - 1; 2201 i = nrow - 1;
2079 else 2202 else
2080 i = 5; 2203 i = 5;
2081 2204
2082# ifdef MOUSE_SLIP_WHEELING 2205# ifdef MOUSE_SLIP_WHEELING
… …
2368 XWindowAttributes wattr, wrootattr; 2491 XWindowAttributes wattr, wrootattr;
2369 dDisp; 2492 dDisp;
2370 2493
2371 pchanged = 0; 2494 pchanged = 0;
2372 2495
2373 if (!(options & Opt_transparent)) 2496 if (!OPTION (Opt_transparent))
2374 return pchanged; /* Don't try any more */ 2497 return pchanged; /* Don't try any more */
2375 2498
2376 XGetWindowAttributes (disp, display->root, &wrootattr); 2499 XGetWindowAttributes (disp, display->root, &wrootattr);
2377 rootdepth = wrootattr.depth; 2500 rootdepth = wrootattr.depth;
2378 2501
… …
2452 nh += sy; 2575 nh += sy;
2453 ny = -sy; 2576 ny = -sy;
2454 sy = 0; 2577 sy = 0;
2455 } 2578 }
2456 2579
2457 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2580 min_it (nw, (unsigned int) (wrootattr.width - sx));
2458 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2581 min_it (nh, (unsigned int) (wrootattr.height - sy));
2459 2582
2460 XSync (disp, False); 2583 XSync (disp, False);
2461 allowedxerror = -1; 2584 allowedxerror = -1;
2462 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2585 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2463 2586
… …
2605 2728
2606bool 2729bool
2607rxvt_term::cmd_parse () 2730rxvt_term::cmd_parse ()
2608{ 2731{
2609 bool flag = false; 2732 bool flag = false;
2610 unicode_t ch = NOCHAR; 2733 wchar_t ch = NOCHAR;
2611 unsigned char *seq_begin; // remember start of esc-sequence here 2734 char *seq_begin; // remember start of esc-sequence here
2612 2735
2613 for (;;) 2736 for (;;)
2614 { 2737 {
2615 if (ch == NOCHAR) 2738 if (ch == NOCHAR)
2616 { 2739 {
2617 seq_begin = cmdbuf_ptr; 2740 seq_begin = cmdbuf_ptr;
2618 ch = next_char (); 2741 ch = next_char ();
2619 }
2620 2742
2621 if (ch == NOCHAR) // TODO: improve 2743 if (ch == NOCHAR)
2622 break; 2744 break;
2745 }
2623 2746
2624 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2747 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2625 { 2748 {
2626 if (!seen_input) 2749 if (!seen_input)
2627 { 2750 {
… …
2636 if (seen_resize && cmd_pid) 2759 if (seen_resize && cmd_pid)
2637 kill (-cmd_pid, SIGWINCH); 2760 kill (-cmd_pid, SIGWINCH);
2638 } 2761 }
2639 2762
2640 /* Read a text string from the input buffer */ 2763 /* Read a text string from the input buffer */
2641 unicode_t buf[UBUFSIZ]; 2764 wchar_t buf[UBUFSIZ];
2642 bool refreshnow = false; 2765 bool refreshnow = false;
2643 int nlines = 0; 2766 int nlines = 0;
2644 unicode_t *str = buf; 2767 wchar_t *str = buf;
2645 unicode_t *eol = str + min (ncol, UBUFSIZ); 2768 wchar_t *eol = str + min (ncol, UBUFSIZ);
2646 2769
2647 for (;;) 2770 for (;;)
2648 { 2771 {
2649 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2772 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2650 break; 2773 break;
… …
2656 if (ch == C0_LF) 2779 if (ch == C0_LF)
2657 nlines++; 2780 nlines++;
2658 2781
2659 refresh_count++; 2782 refresh_count++;
2660 2783
2661 if (!(options & Opt_jumpScroll) 2784 if (!OPTION (Opt_jumpScroll)
2662 || (refresh_count >= refresh_limit * (nrow - 1))) 2785 || (refresh_count >= refresh_limit * (nrow - 1)))
2663 { 2786 {
2664 refreshnow = true; 2787 refreshnow = true;
2788 refresh_count = 0;
2665 ch = NOCHAR; 2789 ch = NOCHAR;
2666 break; 2790 break;
2667 } 2791 }
2668 2792
2669 // scr_add_lines only works for nlines <= nrow - 1. 2793 // scr_add_lines only works for nlines <= nrow - 1.
2670 if (nlines >= nrow - 1) 2794 if (nlines >= nrow - 1)
2671 { 2795 {
2796 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2672 scr_add_lines (buf, nlines, str - buf); 2797 scr_add_lines (buf, str - buf, nlines);
2798
2673 nlines = 0; 2799 nlines = 0;
2674 str = buf; 2800 str = buf;
2675 eol = str + min (ncol, UBUFSIZ); 2801 eol = str + min (ncol, UBUFSIZ);
2676 } 2802 }
2677 2803
… …
2690 2816
2691 seq_begin = cmdbuf_ptr; 2817 seq_begin = cmdbuf_ptr;
2692 ch = next_char (); 2818 ch = next_char ();
2693 } 2819 }
2694 2820
2821 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2695 scr_add_lines (buf, nlines, str - buf); 2822 scr_add_lines (buf, str - buf, nlines);
2696 2823
2697 /* 2824 /*
2698 * If there have been a lot of new lines, then update the screen 2825 * 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. 2826 * 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 2827 * the number of pages between refreshes is refresh_limit, which
2701 * is incremented here because we must be doing flat-out scrolling. 2828 * is incremented here because we must be doing flat-out scrolling.
2702 */ 2829 */
2703 if (refreshnow) 2830 if (refreshnow)
2704 { 2831 {
2705 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2832 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2706 refresh_limit++; 2833 refresh_limit++;
2707 else 2834 else
2708 { 2835 {
2709 flag = true; 2836 flag = true;
2710 scr_refresh (refresh_type); 2837 scr_refresh (refresh_type);
2838 flush_ev.stop ();
2711 } 2839 }
2712 } 2840 }
2713 2841
2714 } 2842 }
2715 else 2843 else
… …
2730 } 2858 }
2731 2859
2732 return flag; 2860 return flag;
2733} 2861}
2734 2862
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 2863// read the next character
2745unicode_t 2864wchar_t
2746rxvt_term::next_char () 2865rxvt_term::next_char ()
2747{ 2866{
2748 while (cmdbuf_ptr < cmdbuf_endp) 2867 while (cmdbuf_ptr < cmdbuf_endp)
2749 { 2868 {
2750 // assume 7-bit to be ascii ALWAYS 2869 // assume 7-bit to be ascii ALWAYS
2751 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2870 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2752 return *cmdbuf_ptr++; 2871 return *cmdbuf_ptr++;
2753 2872
2754 wchar_t wc; 2873 wchar_t wc;
2755 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2874 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2756 2875
2757 if (len == (size_t)-2) 2876 if (len == (size_t)-2)
2758 { 2877 {
2759 // the mbstate stores incomplete sequences. didn't know this :/ 2878 // the mbstate stores incomplete sequences. didn't know this :/
2760 cmdbuf_ptr = cmdbuf_endp; 2879 cmdbuf_ptr = cmdbuf_endp;
2761 break; 2880 break;
2762 } 2881 }
2763 2882
2764 if (len == (size_t)-1) 2883 if (len == (size_t)-1)
2765 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2884 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2766 2885
2767 // assume wchar == unicode 2886 // assume wchar == unicode
2768 cmdbuf_ptr += len; 2887 cmdbuf_ptr += len;
2769 return wc & UNICODE_MASK; 2888 return wc & UNICODE_MASK;
2770 } 2889 }
2771 2890
2772 return NOCHAR; 2891 return NOCHAR;
2892}
2893
2894// read the next octet
2895uint32_t
2896rxvt_term::next_octet ()
2897{
2898 return cmdbuf_ptr < cmdbuf_endp
2899 ? (unsigned char)*cmdbuf_ptr++
2900 : NOCHAR;
2773} 2901}
2774 2902
2775/* rxvt_cmd_getc () - Return next input character */ 2903/* rxvt_cmd_getc () - Return next input character */
2776/* 2904/*
2777 * Return the next input character after first passing any keyboard input 2905 * Return the next input character after first passing any keyboard input
2778 * to the command. 2906 * to the command.
2779 */ 2907 */
2780unicode_t 2908wchar_t
2781rxvt_term::cmd_getc () 2909rxvt_term::cmd_getc ()
2782{ 2910{
2783 unicode_t c = next_char (); 2911 wchar_t c = next_char ();
2784 2912
2785 if (c == NOCHAR) 2913 if (c == NOCHAR)
2786 throw out_of_input; 2914 throw out_of_input;
2787 2915
2788 return c; 2916 return c;
2789} 2917}
2790 2918
2791unicode_t 2919uint32_t
2792rxvt_term::cmd_get8 () 2920rxvt_term::cmd_get8 ()
2793{ 2921{
2794 unicode_t c = next_octet (); 2922 uint32_t c = next_octet ();
2795 2923
2796 if (c == NOCHAR) 2924 if (c == NOCHAR)
2797 throw out_of_input; 2925 throw out_of_input;
2798 2926
2799 return c; 2927 return c;
… …
2899 case C0_ESC: 3027 case C0_ESC:
2900 process_escape_seq (); 3028 process_escape_seq ();
2901 break; 3029 break;
2902 case C0_ENQ: /* terminal Status */ 3030 case C0_ENQ: /* terminal Status */
2903 if (rs[Rs_answerbackstring]) 3031 if (rs[Rs_answerbackstring])
2904 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 3032 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2905 (unsigned int)strlen (rs[Rs_answerbackstring]));
2906 else 3033 else
2907 tt_write ((unsigned char *)VT100_ANS, 3034 tt_write (VT100_ANS, strlen (VT100_ANS));
2908 (unsigned int)strlen (VT100_ANS));
2909 break; 3035 break;
2910 case C0_BEL: /* bell */ 3036 case C0_BEL: /* bell */
2911 scr_bell (); 3037 scr_bell ();
2912 break; 3038 break;
2913 case C0_BS: /* backspace */ 3039 case C0_BS: /* backspace */
… …
3068 break; 3194 break;
3069 3195
3070 /* 8.3.87: NEXT LINE */ 3196 /* 8.3.87: NEXT LINE */
3071 case C1_NEL: /* ESC E */ 3197 case C1_NEL: /* ESC E */
3072 { 3198 {
3073 unicode_t nlcr[] = { C0_LF, C0_CR }; 3199 wchar_t nlcr[] = { C0_LF, C0_CR };
3074 scr_add_lines (nlcr, 1, 2); 3200 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3075 } 3201 }
3076 break; 3202 break;
3077 3203
3078 /* kidnapped escape sequence: Should be 8.3.48 */ 3204 /* kidnapped escape sequence: Should be 8.3.48 */
3079 case C1_ESA: /* ESC G */ 3205 case C1_ESA: /* ESC G */
… …
3101 process_dcs_seq (); 3227 process_dcs_seq ();
3102 break; 3228 break;
3103 3229
3104 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3230 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3105 case C1_SCI: /* ESC Z */ 3231 case C1_SCI: /* ESC Z */
3106 tt_write ((const unsigned char *)ESCZ_ANSWER, 3232 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3107 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3108 break; /* steal obsolete ESC [ c */ 3233 break; /* steal obsolete ESC [ c */
3109 3234
3110 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3235 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3111 case C1_CSI: /* ESC [ */ 3236 case C1_CSI: /* ESC [ */
3112 process_csi_seq (); 3237 process_csi_seq ();
… …
3356 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3481 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3357 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); 3482 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3358 break; 3483 break;
3359 3484
3360 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3485 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3361 tt_write ((const unsigned char *)VT100_ANS, 3486 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3362 (unsigned int) (sizeof (VT100_ANS) - 1));
3363 break; 3487 break;
3364 3488
3365 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3489 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3366 process_sgr_mode (nargs, arg); 3490 process_sgr_mode (nargs, arg);
3367 break; 3491 break;
… …
3374 break; 3498 break;
3375 case 6: /* CPR requested */ 3499 case 6: /* CPR requested */
3376 scr_report_position (); 3500 scr_report_position ();
3377 break; 3501 break;
3378 case 7: /* unofficial extension */ 3502 case 7: /* unofficial extension */
3379 if (options & Opt_insecure) 3503 if (OPTION (Opt_insecure))
3380 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3504 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3381 break; 3505 break;
3382 case 8: /* unofficial extension */ 3506 case 8: /* unofficial extension */
3383 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3507 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3384 break; 3508 break;
… …
3548 break; 3672 break;
3549 case 20: /* report icon label */ 3673 case 20: /* report icon label */
3550 { 3674 {
3551 char *s; 3675 char *s;
3552 XGetIconName (disp, parent[0], &s); 3676 XGetIconName (disp, parent[0], &s);
3553 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3677 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3554 XFree (s); 3678 XFree (s);
3555 } 3679 }
3556 break; 3680 break;
3557 case 21: /* report window title */ 3681 case 21: /* report window title */
3558 { 3682 {
3559 char *s; 3683 char *s;
3560 XFetchName (disp, parent[0], &s); 3684 XFetchName (disp, parent[0], &s);
3561 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3685 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3562 XFree (s); 3686 XFree (s);
3563 } 3687 }
3564 break; 3688 break;
3565 } 3689 }
3566} 3690}
… …
3569/*----------------------------------------------------------------------*/ 3693/*----------------------------------------------------------------------*/
3570/* 3694/*
3571 * get input up until STRING TERMINATOR (or BEL) 3695 * get input up until STRING TERMINATOR (or BEL)
3572 * ends_how is terminator used. returned input must be free()'d 3696 * ends_how is terminator used. returned input must be free()'d
3573 */ 3697 */
3574unsigned char * 3698char *
3575rxvt_term::get_to_st (unicode_t &ends_how) 3699rxvt_term::get_to_st (unicode_t &ends_how)
3576{ 3700{
3577 unicode_t ch; 3701 unicode_t ch;
3578 bool seen_esc = false; 3702 bool seen_esc = false;
3579 unsigned int n = 0; 3703 unsigned int n = 0;
… …
3612 3736
3613 string[n++] = '\0'; 3737 string[n++] = '\0';
3614 3738
3615 ends_how = (ch == 0x5c ? C0_ESC : ch); 3739 ends_how = (ch == 0x5c ? C0_ESC : ch);
3616 3740
3617 return (unsigned char *)rxvt_wcstombs (string); 3741 return rxvt_wcstombs (string);
3618} 3742}
3619 3743
3620/*----------------------------------------------------------------------*/ 3744/*----------------------------------------------------------------------*/
3621/* 3745/*
3622 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3746 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3623 */ 3747 */
3624void 3748void
3625rxvt_term::process_dcs_seq () 3749rxvt_term::process_dcs_seq ()
3626{ 3750{
3627 unsigned char *s; 3751 char *s;
3628 unicode_t eh; 3752 unicode_t eh;
3629 3753
3630 /* 3754 /*
3631 * Not handled yet 3755 * Not handled yet
3632 */ 3756 */
… …
3651 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3775 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3652 arg = arg * 10 + (ch - '0'); 3776 arg = arg * 10 + (ch - '0');
3653 3777
3654 if (ch == ';') 3778 if (ch == ';')
3655 { 3779 {
3656 unsigned char *s = get_to_st (eh); 3780 char *s = get_to_st (eh);
3657 3781
3658 if (s) 3782 if (s)
3659 { 3783 {
3660 process_xterm_seq (arg, (char *)s, eh); 3784 process_xterm_seq (arg, s, eh);
3661 free (s); 3785 free (s);
3662 } 3786 }
3663 } 3787 }
3664} 3788}
3665 3789
3666void 3790void
3667rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3791rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3668{ 3792{
3669 if (str[0] == '?' && !str[1]) 3793 if (str[0] == '?' && !str[1])
3670 { 3794 {
3671 unsigned short r, g, b; 3795 unsigned short r, g, b;
3672 pix_colors_focused[color].get (display, r, g, b); 3796 pix_colors_focused[color].get (display, r, g, b);
… …
3678 3802
3679/* 3803/*
3680 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3804 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3681 */ 3805 */
3682void 3806void
3683rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3807rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3684{ 3808{
3685 int changed = 0; 3809 int changed = 0;
3686 int color; 3810 int color;
3687 char *buf, *name; 3811 char *buf, *name;
3688 bool query = str[0] == '?' && !str[1]; 3812 bool query = str[0] == '?' && !str[1];
… …
3842 // TODO, when secure mode? 3966 // TODO, when secure mode?
3843 break; 3967 break;
3844 3968
3845#ifdef MENUBAR 3969#ifdef MENUBAR
3846 case URxvt_Menu: 3970 case URxvt_Menu:
3847 if (options & Opt_insecure) 3971 if (OPTION (Opt_insecure))
3848 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3972 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3849 break; 3973 break;
3850#endif 3974#endif
3851#if 0 3975#if 0
3852 case XTerm_dumpscreen: /* no error notices */ 3976 case XTerm_dumpscreen: /* no error notices */
… …
3868 case URxvt_italicFont: 3992 case URxvt_italicFont:
3869 case URxvt_boldItalicFont: 3993 case URxvt_boldItalicFont:
3870#endif 3994#endif
3871 if (query) 3995 if (query)
3872 tt_printf ("\33]%d;%-.250s%c", saveop, 3996 tt_printf ("\33]%d;%-.250s%c", saveop,
3873 (options & Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3997 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3874 ? fontset[op - URxvt_font]->fontdesc : "", 3998 ? fontset[op - URxvt_font]->fontdesc : "",
3875 resp); 3999 resp);
3876 else 4000 else
3877 { 4001 {
3878 const char *&res = rs[Rs_font + (op - URxvt_font)]; 4002 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3884 break; 4008 break;
3885 4009
3886#if ENABLE_FRILLS 4010#if ENABLE_FRILLS
3887 case URxvt_locale: 4011 case URxvt_locale:
3888 if (query) 4012 if (query)
3889 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp); 4013 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3890 else 4014 else
3891 { 4015 {
3892 set_locale (str); 4016 set_locale (str);
3893 pty.set_utf8_mode (enc_utf8); 4017 pty.set_utf8_mode (enc_utf8);
3894 init_xlocale (); 4018 init_xlocale ();
3895 } 4019 }
3896 break; 4020 break;
3897 4021
3898 case URxvt_view_up: 4022 case URxvt_view_up:
3899 case URxvt_view_down: 4023 case URxvt_view_down:
4024 {
3900 int lines = atoi (str); 4025 int lines = atoi (str);
3901 4026
3902 if (lines) 4027 if (lines)
3903 scr_page (op == URxvt_view_up ? UP : DN, lines); 4028 scr_page (op == URxvt_view_up ? UP : DN, lines);
3904 else 4029 else
3905 {
3906 scr_erase_savelines (); 4030 scr_erase_savelines ();
3907 } 4031 }
3908 4032
4033 break;
4034#endif
4035
4036#if ENABLE_PERL
4037 case URxvt_perl:
4038 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
4039 ; // no responses yet
3909 break; 4040 break;
3910#endif 4041#endif
3911 } 4042 }
3912} 4043}
3913/*----------------------------------------------------------------------*/ 4044/*----------------------------------------------------------------------*/
… …
4022 } 4153 }
4023 4154
4024 /* extra handling for values with state unkept */ 4155 /* extra handling for values with state unkept */
4025 switch (arg[i]) 4156 switch (arg[i])
4026 { 4157 {
4158#if ENABLE_STYLES
4159 case 1021:
4160 set_option (Opt_intensityStyles, mode);
4161
4162 scr_touch (true);
4163 break;
4164#endif
4027 case 1048: /* alternative cursor save */ 4165 case 1048: /* alternative cursor save */
4028 case 1049: 4166 case 1049:
4029 if (options & Opt_secondaryScreen) 4167 if (OPTION (Opt_secondaryScreen))
4030 if (mode == 0) 4168 if (mode == 0)
4031 scr_cursor (RESTORE); 4169 scr_cursor (RESTORE);
4032 else if (mode == 1) 4170 else if (mode == 1)
4033 scr_cursor (SAVE); 4171 scr_cursor (SAVE);
4034 break; 4172 break;
… …
4049 case 3: /* 80/132 */ 4187 case 3: /* 80/132 */
4050 if (priv_modes & PrivMode_132OK) 4188 if (priv_modes & PrivMode_132OK)
4051 set_widthheight (((state ? 132 : 80) * fwidth), height); 4189 set_widthheight (((state ? 132 : 80) * fwidth), height);
4052 break; 4190 break;
4053 case 4: /* smooth scrolling */ 4191 case 4: /* smooth scrolling */
4054 if (state)
4055 options &= ~Opt_jumpScroll;
4056 else
4057 options |= Opt_jumpScroll; 4192 set_option (Opt_jumpScroll, !state);
4058 break; 4193 break;
4059 case 5: /* reverse video */ 4194 case 5: /* reverse video */
4060 scr_rvideo_mode (state); 4195 scr_rvideo_mode (state);
4061 break; 4196 break;
4062 case 6: /* relative/absolute origins */ 4197 case 6: /* relative/absolute origins */
… …
4103#if 0 4238#if 0
4104 case 1001: 4239 case 1001:
4105 break; /* X11 mouse highlighting */ 4240 break; /* X11 mouse highlighting */
4106#endif 4241#endif
4107 case 1010: /* scroll to bottom on TTY output inhibit */ 4242 case 1010: /* scroll to bottom on TTY output inhibit */
4108 if (state)
4109 options &= ~Opt_scrollTtyOutput;
4110 else
4111 options |= Opt_scrollTtyOutput; 4243 set_option (Opt_scrollTtyOutput, !state);
4112 break; 4244 break;
4113 case 1011: /* scroll to bottom on key press */ 4245 case 1011: /* scroll to bottom on key press */
4114 if (state)
4115 options |= Opt_scrollTtyKeypress; 4246 set_option (Opt_scrollTtyKeypress, state);
4116 else
4117 options &= ~Opt_scrollTtyKeypress;
4118 break; 4247 break;
4119 case 1047: /* secondary screen w/ clearing last */ 4248 case 1047: /* secondary screen w/ clearing last */
4120 if (options & Opt_secondaryScreen) 4249 if (OPTION (Opt_secondaryScreen))
4121 if (current_screen != PRIMARY) 4250 if (current_screen != PRIMARY)
4122 scr_erase_screen (2); 4251 scr_erase_screen (2);
4123 scr_change_screen (state); 4252 scr_change_screen (state);
4124 break; 4253 break;
4125 case 1049: /* secondary screen w/ clearing first */ 4254 case 1049: /* secondary screen w/ clearing first */
4126 scr_change_screen (state); 4255 scr_change_screen (state);
4127 if (options & Opt_secondaryScreen) 4256 if (OPTION (Opt_secondaryScreen))
4128 if (current_screen != PRIMARY) 4257 if (current_screen != PRIMARY)
4129 scr_erase_screen (2); 4258 scr_erase_screen (2);
4130 break; 4259 break;
4131 default: 4260 default:
4132 break; 4261 break;
… …
4260 scr_color (Color_bg, Color_bg); 4389 scr_color (Color_bg, Color_bg);
4261 break; 4390 break;
4262 4391
4263 //case 50: // not variable spacing 4392 //case 50: // not variable spacing
4264 4393
4265#ifndef NO_BRIGHTCOLOR 4394#if ENABLE_FRILLS
4266 case 90: 4395 case 90:
4267 case 91: /* set bright fg color */ 4396 case 91: /* set bright fg color */
4268 case 92: 4397 case 92:
4269 case 93: 4398 case 93:
4270 case 94: 4399 case 94:
… …
4282 case 106: 4411 case 106:
4283 case 107: 4412 case 107:
4284 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 4413 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4285 break; 4414 break;
4286#endif 4415#endif
4287
4288 } 4416 }
4289 } 4417 }
4290} 4418}
4291/*}}} */ 4419/*}}} */
4292 4420
… …
4316 */ 4444 */
4317void 4445void
4318rxvt_term::tt_printf (const char *fmt,...) 4446rxvt_term::tt_printf (const char *fmt,...)
4319{ 4447{
4320 va_list arg_ptr; 4448 va_list arg_ptr;
4321 unsigned char buf[256]; 4449 char buf[256];
4322 4450
4323 va_start (arg_ptr, fmt); 4451 va_start (arg_ptr, fmt);
4324 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4452 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4325 va_end (arg_ptr); 4453 va_end (arg_ptr);
4326 tt_write (buf, strlen (buf)); 4454 tt_write (buf, strlen (buf));
… …
4331 * or generated by us in response to a query ESC sequence. 4459 * or generated by us in response to a query ESC sequence.
4332 */ 4460 */
4333const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4461const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4334 4462
4335void 4463void
4336rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4464rxvt_term::tt_write (const char *data, unsigned int len)
4337{ 4465{
4466 if (pty.pty < 0)
4467 return;
4468
4338 if (v_buflen == 0) 4469 if (v_buflen == 0)
4339 { 4470 {
4340 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4471 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4341 4472
4342 if ((unsigned int)written == len) 4473 if ((unsigned int)written == len)
… …
4344 4475
4345 data += written; 4476 data += written;
4346 len -= written; 4477 len -= written;
4347 } 4478 }
4348 4479
4349 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4480 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4350 4481
4351 memcpy (v_buffer + v_buflen, data, len); 4482 memcpy (v_buffer + v_buflen, data, len);
4352 v_buflen += len; 4483 v_buflen += len;
4353 4484
4354 pty_ev.set (EVENT_READ | EVENT_WRITE); 4485 pty_ev.set (EVENT_READ | EVENT_WRITE);
… …
4373 } 4504 }
4374 4505
4375 memmove (v_buffer, v_buffer + written, v_buflen); 4506 memmove (v_buffer, v_buffer + written, v_buflen);
4376 } 4507 }
4377 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4508 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4378 // original code just ignores this... 4509 pty_ev.set (EVENT_READ);
4379 destroy ();
4380} 4510}
4381 4511
4382/*----------------------- end-of-file (C source) -----------------------*/ 4512/*----------------------- end-of-file (C source) -----------------------*/
4383 4513

Diff Legend

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