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.216 by root, Tue Dec 27 01:25:42 2005 UTC vs.
Revision 1.252 by root, Mon Jan 9 22:41:41 2006 UTC

… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2005 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
31 * 31 *
32 * This program is free software; you can redistribute it and/or modify 32 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 33 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 34 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 35 * (at your option) any later version.
… …
43 * along with this program; if not, write to the Free Software 43 * along with this program; if not, write to the Free Software
44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
45 *----------------------------------------------------------------------*/ 45 *----------------------------------------------------------------------*/
46 46
47/*{{{ includes: */ 47/*{{{ includes: */
48#include "../config.h" /* NECESSARY */ 48#include "../config.h"
49#include "rxvt.h" /* NECESSARY */ 49#include "rxvt.h"
50#include "rxvtperl.h"
50#include "version.h" 51#include "version.h"
51#include "command.h" 52#include "command.h"
53
54#if HAVE_SCHED_YIELD
55#undef HAVE_SCHED_YIELD // disabled for the time being
56//# include <sched.h>
57#endif
52 58
53#ifdef KEYSYM_RESOURCE 59#ifdef KEYSYM_RESOURCE
54# include "keyboard.h" 60# include "keyboard.h"
55#endif 61#endif
56 62
… …
147 153
148 text_t t = l.t[x]; 154 text_t t = l.t[x];
149 155
150 if (t != NOCHAR || !x) 156 if (t != NOCHAR || !x)
151 { 157 {
152 iso14755_51 (l.t[x], l.r[x]); 158 iso14755_51 (l.t[x], l.r[x], x, y);
153 iso14755buf = ISO_14755_54; 159 iso14755buf = ISO_14755_54;
154 break; 160 break;
155 } 161 }
156 162
157 x--; 163 x--;
158 } 164 }
159} 165}
160#endif
161 166
162#if ENABLE_OVERLAY
163void 167void
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r) 168rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
165{ 169{
166 rxvt_fontset *fs = FONTSET (r); 170 rxvt_fontset *fs = FONTSET (r);
167 rxvt_font *f = (*fs)[fs->find_font (ch)]; 171 rxvt_font *f = (*fs)[fs->find_font (ch)];
168 wchar_t *chr, *alloc, ch2, *fname; 172 wchar_t *chr, *alloc, ch2, *fname;
169 int len; 173 int len;
170 174
171 fname = rxvt_utf8towcs (f->name); 175 fname = rxvt_utf8towcs (f->name);
172 176
173#if ENABLE_COMBINING 177# if ENABLE_COMBINING
174 if (IS_COMPOSE (ch)) 178 if (IS_COMPOSE (ch))
175 { 179 {
176 len = rxvt_composite.expand (ch, 0); 180 len = rxvt_composite.expand (ch, 0);
177 alloc = chr = new wchar_t[len]; 181 alloc = chr = new wchar_t[len];
178 rxvt_composite.expand (ch, chr); 182 rxvt_composite.expand (ch, chr);
179 } 183 }
180 else 184 else
181#endif 185# endif
182 { 186 {
183 ch2 = ch; 187 ch2 = ch;
184 188
185 alloc = 0; 189 alloc = 0;
186 chr = &ch2; 190 chr = &ch2;
… …
189 193
190 char attr[80]; // plenty 194 char attr[80]; // plenty
191 195
192 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s", 196 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
193 (int)r, 197 (int)r,
194 GET_FGCOLOR (r), GET_BGCOLOR (r), 198 fgcolor_of (r), bgcolor_of (r),
195 r & RS_Bold ? " bold" : "", 199 r & RS_Bold ? " bold" : "",
196 r & RS_Italic ? " italic" : "", 200 r & RS_Italic ? " italic" : "",
197 r & RS_Blink ? " blink" : "", 201 r & RS_Blink ? " blink" : "",
198 r & RS_RVid ? " rvid" : "", 202 r & RS_RVid ? " rvid" : "",
199 r & RS_Uline ? " uline" : "", 203 r & RS_Uline ? " uline" : "",
… …
202 int width = wcswidth (fname, wcslen (fname)); 206 int width = wcswidth (fname, wcslen (fname));
203 207
204 max_it (width, 8+5); // for char + hey 208 max_it (width, 8+5); // for char + hey
205 max_it (width, strlen (attr)); 209 max_it (width, strlen (attr));
206 210
211 if (y >= 0)
212 {
213 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
214 x = 0;
215 }
216
207 scr_overlay_new (0, -1, width, len + 2); 217 scr_overlay_new (x, y, width, len + 2);
208 218
209 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 219 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
210 220
211 for (int y = 0; y < len; y++) 221 for (int y = 0; y < len; y++)
212 { 222 {
… …
215 ch = *chr++; 225 ch = *chr++;
216 226
217 sprintf (buf, "%8x", ch); 227 sprintf (buf, "%8x", ch);
218 scr_overlay_set (0, y, buf); 228 scr_overlay_set (0, y, buf);
219 scr_overlay_set (9, y, '='); 229 scr_overlay_set (9, y, '=');
220#if !UNICODE3 230# if !UNICODE3
221 if (ch >= 0x10000) 231 if (ch >= 0x10000)
222 ch = 0xfffd; 232 ch = 0xfffd;
223#endif 233# endif
224 scr_overlay_set (11, y, ch, r); 234 scr_overlay_set (11, y, ch, r);
225 scr_overlay_set (12, y, NOCHAR, r); 235 scr_overlay_set (12, y, NOCHAR, r);
226 } 236 }
227 237
228 scr_overlay_set (0, len , attr); 238 scr_overlay_set (0, len , attr);
229 scr_overlay_set (0, len + 1, fname); 239 scr_overlay_set (0, len + 1, fname);
230 240
231 free (fname); 241 free (fname);
232 242
233#if ENABLE_COMBINING 243# if ENABLE_COMBINING
234 if (alloc) 244 if (alloc)
235 delete [] alloc; 245 delete [] alloc;
236#endif 246# endif
237} 247}
238#endif 248#endif
239 249
240void 250void
241rxvt_term::commit_iso14755 () 251rxvt_term::commit_iso14755 ()
… …
258 mb[0] = ch[0]; 268 mb[0] = ch[0];
259 len = 1; 269 len = 1;
260 } 270 }
261 271
262 if (len > 0) 272 if (len > 0)
263 tt_write ((unsigned char *)mb, len); 273 tt_write (mb, len);
264 else 274 else
265 scr_bell (); 275 scr_bell ();
266 } 276 }
267 277
268 iso14755buf = 0; 278 iso14755buf = 0;
… …
296 KeySym keysym; 306 KeySym keysym;
297#ifdef DEBUG_CMD 307#ifdef DEBUG_CMD
298 static int debug_key = 1; /* accessible by a debugger only */ 308 static int debug_key = 1; /* accessible by a debugger only */
299#endif 309#endif
300 int valid_keysym; 310 int valid_keysym;
301 unsigned char kbuf[KBUFSZ]; 311 char kbuf[KBUFSZ];
302 312
303 /* 313 /*
304 * 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
305 * escape sequence to toggle the Keypad. 315 * escape sequence to toggle the Keypad.
306 * 316 *
… …
324 Status status_return; 334 Status status_return;
325 335
326#if 0 336#if 0
327#ifdef X_HAVE_UTF8_STRING 337#ifdef X_HAVE_UTF8_STRING
328 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
329 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 339 len = Xutf8LookupString (Input_Context, &ev, kbuf,
330 KBUFSZ, &keysym, &status_return); 340 KBUFSZ, &keysym, &status_return);
331 else 341 else
332#endif 342#endif
333#endif 343#endif
334 { 344 {
… …
371 || status_return == XLookupBoth; 381 || status_return == XLookupBoth;
372 } 382 }
373 else 383 else
374#endif 384#endif
375 { 385 {
376 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 386 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
377 valid_keysym = keysym != NoSymbol; 387 valid_keysym = keysym != NoSymbol;
378 } 388 }
379 389
380 if (valid_keysym) 390 if (valid_keysym)
381 { 391 {
… …
845 { 855 {
846#ifdef META8_OPTION 856#ifdef META8_OPTION
847 /* set 8-bit on */ 857 /* set 8-bit on */
848 if (meta && (meta_char == 0x80)) 858 if (meta && (meta_char == 0x80))
849 { 859 {
850 unsigned char *ch; 860 char *ch;
851 861
852 for (ch = kbuf; ch < kbuf + len; ch++) 862 for (ch = kbuf; ch < kbuf + len; ch++)
853 *ch |= 0x80; 863 *ch |= 0x80;
854 864
855 meta = 0; 865 meta = 0;
… …
857#endif 867#endif
858 /* nil */ ; 868 /* nil */ ;
859 } 869 }
860 } 870 }
861 871
872 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
873 return;
874
862 if (len <= 0) 875 if (len <= 0)
863 return; /* not mapped */ 876 return; /* not mapped */
864 877
865 if (options & Opt_scrollTtyKeypress) 878 if (OPTION (Opt_scrollTtyKeypress))
866 if (view_start) 879 if (view_start)
867 { 880 {
868 view_start = 0; 881 view_start = 0;
869 want_refresh = 1; 882 want_refresh = 1;
870 } 883 }
… …
888#ifdef META8_OPTION 901#ifdef META8_OPTION
889 && meta_char == C0_ESC 902 && meta_char == C0_ESC
890#endif 903#endif
891 ) 904 )
892 { 905 {
893 const unsigned char ch = C0_ESC; 906 const char ch = C0_ESC;
894 tt_write (&ch, 1); 907 tt_write (&ch, 1);
895 } 908 }
896 909
897#if defined(DEBUG_CMD) 910#if defined(DEBUG_CMD)
898 /* Display keyboard buffer contents */ 911 /* Display keyboard buffer contents */
… …
910 923
911#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 924#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)
912/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 925/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
913/* attempt to `write' count to the input buffer */ 926/* attempt to `write' count to the input buffer */
914unsigned int 927unsigned int
915rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 928rxvt_term::cmd_write (const char *str, unsigned int count)
916{ 929{
917 unsigned int n, s; 930 unsigned int n, s;
918 931
919 n = cmdbuf_ptr - cmdbuf_base; 932 n = cmdbuf_ptr - cmdbuf_base;
920 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 933 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
957 } 970 }
958#endif 971#endif
959 972
960 if (want_refresh) 973 if (want_refresh)
961 { 974 {
975 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
976 {
977 int row = -view_start;
978 int end_row = row + nrow;
979
980 while (row > -nsaved && ROW (row - 1).is_longer ())
981 --row;
982
983 do
984 {
985 int start_row = row;
986 line_t *l;
987
988 do
989 {
990 l = &ROW (row++);
991
992 if (l->f & LINE_FILTERED)
993 row++;
994 else
995 {
996 // line not filtered, mark it as filtered
997 l->f |= LINE_FILTERED;
998 while (l->is_longer ())
999 {
1000 l = &ROW (++row);
1001 l->f |= LINE_FILTERED;
1002 }
1003
1004 // and filter it
1005 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1006
1007 break;
1008 }
1009 }
1010 while (l->is_longer () && row < end_row);
1011 }
1012 while (++row < end_row);
1013 }
1014
962 scr_refresh (refresh_type); 1015 scr_refresh (refresh_type);
963 scrollbar_show (1); 1016 scrollbar_show (1);
964#ifdef USE_XIM 1017#ifdef USE_XIM
965 IMSendSpot (); 1018 IMSendSpot ();
966#endif 1019#endif
… …
976 SET_LOCALE (locale); 1029 SET_LOCALE (locale);
977 1030
978 display->flush (); 1031 display->flush ();
979 1032
980 if (want_refresh && !flush_ev.active) 1033 if (want_refresh && !flush_ev.active)
981 flush_ev.start (NOW + 0.01); 1034 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
982} 1035}
983 1036
984void 1037void
985rxvt_term::flush_cb (time_watcher &w) 1038rxvt_term::flush_cb (time_watcher &w)
986{ 1039{
… …
1061 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1114 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1062 } 1115 }
1063} 1116}
1064#endif 1117#endif
1065 1118
1119#if HAVE_SCHED_YIELD
1120static struct event_handler
1121{
1122 check_watcher cw_yield;
1123
1124 void yield (check_watcher &w)
1125 {
1126 sched_yield ();
1127 w.stop ();
1128 }
1129
1130 event_handler ()
1131 : cw_yield (this, &event_handler::yield)
1132 {
1133 }
1134} event_handler;
1135#endif
1136
1066bool 1137bool
1067rxvt_term::pty_fill () 1138rxvt_term::pty_fill ()
1068{ 1139{
1069 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1140 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1070 1141
1071 if (CBUFSIZ == n) 1142 if (CBUFSIZ == n)
1072 { 1143 {
1073 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1144 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1074 n = 0; 1145 n = 0;
1075 } 1146 }
1076 1147
1077 memmove (cmdbuf_base, cmdbuf_ptr, n); 1148 memmove (cmdbuf_base, cmdbuf_ptr, n);
1078 cmdbuf_ptr = cmdbuf_base; 1149 cmdbuf_ptr = cmdbuf_base;
1079 cmdbuf_endp = cmdbuf_ptr + n; 1150 cmdbuf_endp = cmdbuf_ptr + n;
1080 1151
1081 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1152 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
1082 1153
1083 if (n > 0) 1154 if (r > 0)
1084 { 1155 {
1085 cmdbuf_endp += n; 1156 cmdbuf_endp += r;
1086 return true; 1157 return true;
1087 } 1158 }
1088 else if ((n < 0 && errno != EAGAIN && errno != EINTR) || n == 0) 1159 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1160 {
1161#if HAVE_SCHED_YIELD
1162 if (display->is_local)
1163 event_handler.cw_yield.start ();
1164#endif
1165 }
1166 else
1089 { 1167 {
1090 pty_ev.stop (); 1168 pty_ev.stop ();
1091 1169
1092 if (!(options & Opt_hold)) 1170 if (!OPTION (Opt_hold))
1093 destroy (); 1171 destroy ();
1094 } 1172 }
1095 1173
1096 return false; 1174 return false;
1097} 1175}
… …
1119 recolour_cursor (); 1197 recolour_cursor ();
1120 1198
1121#ifdef POINTER_BLANK 1199#ifdef POINTER_BLANK
1122 hidden_pointer = 0; 1200 hidden_pointer = 0;
1123 1201
1124 if (options & Opt_pointerBlank) 1202 if (OPTION (Opt_pointerBlank))
1125 pointer_ev.start (NOW + pointerBlankDelay); 1203 pointer_ev.start (NOW + pointerBlankDelay);
1126#endif 1204#endif
1127} 1205}
1128 1206
1129#ifdef POINTER_BLANK 1207#ifdef POINTER_BLANK
1130void 1208void
1131rxvt_term::pointer_blank () 1209rxvt_term::pointer_blank ()
1132{ 1210{
1133 if (! (options & Opt_pointerBlank)) 1211 if (!OPTION (Opt_pointerBlank))
1134 return; 1212 return;
1135 1213
1136 XDefineCursor (display->display, vt, display->blank_cursor); 1214 XDefineCursor (display->display, vt, display->blank_cursor);
1137 XFlush (display->display); 1215 XFlush (display->display);
1138 1216
… …
1235 dDisp; 1313 dDisp;
1236 1314
1237 SET_R (this); 1315 SET_R (this);
1238 SET_LOCALE (locale); 1316 SET_LOCALE (locale);
1239 1317
1240#if defined(CURSOR_BLINK)
1241 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
1242 {
1243 if (hidden_cursor)
1244 {
1245 hidden_cursor = 0;
1246 want_refresh = 1;
1247 }
1248
1249 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1250 }
1251#endif
1252
1253#if defined(POINTER_BLANK)
1254 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
1255 {
1256 if (ev.type == MotionNotify
1257 || ev.type == ButtonPress
1258 || ev.type == ButtonRelease)
1259 if (hidden_pointer)
1260 pointer_unblank ();
1261
1262 if (ev.type == KeyPress && hidden_pointer == 0)
1263 pointer_blank ();
1264 }
1265#endif
1266
1267 Window unused_root, unused_child; 1318 Window unused_root, unused_child;
1268 int unused_root_x, unused_root_y; 1319 int unused_root_x, unused_root_y;
1269 unsigned int unused_mask; 1320 unsigned int unused_mask;
1270 1321
1271 switch (ev.type) 1322 switch (ev.type)
… …
1278 1329
1279 break; 1330 break;
1280 1331
1281 case KeyRelease: 1332 case KeyRelease:
1282 { 1333 {
1283#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 1334#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1284 KeySym ks; 1335 KeySym keysym;
1285 1336
1286 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ 1337 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1287#endif 1338#endif
1288 1339
1289#if ENABLE_FRILLS || ISO_14755 1340#if ENABLE_FRILLS || ISO_14755
1290 // ISO 14755 support 1341 // ISO 14755 support
1291 if (iso14755buf) 1342 if (iso14755buf)
… …
1296# endif 1347# endif
1297# if ISO_14755 1348# if ISO_14755
1298 // iso14755 part 5.2 handling: release time 1349 // iso14755 part 5.2 handling: release time
1299 // first: controls 1350 // first: controls
1300 if ((ev.xkey.state & ControlMask) 1351 if ((ev.xkey.state & ControlMask)
1301 && ((ks >= 0x40 && ks <= 0x5f) 1352 && ((keysym >= 0x40 && keysym <= 0x5f)
1302 || (ks >= 0x61 && ks <= 0x7f))) 1353 || (keysym >= 0x61 && keysym <= 0x7f)))
1303 { 1354 {
1304 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); 1355 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1305 commit_iso14755 (); 1356 commit_iso14755 ();
1306 return; // case-break; 1357 goto skip_switch;
1307 } 1358 }
1308 1359
1309 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1360 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1310 if (i[0] == ks) 1361 if (i[0] == keysym)
1311 { 1362 {
1312 iso14755buf = ISO_14755_51 | i[1]; 1363 iso14755buf = ISO_14755_51 | i[1];
1313 commit_iso14755 (); 1364 commit_iso14755 ();
1314 return; // case-break; 1365 goto skip_switch;
1315 } 1366 }
1316 1367
1317 scr_bell (); 1368 scr_bell ();
1318# endif 1369# endif
1319 iso14755buf = 0; 1370 iso14755buf = 0;
… …
1338 else 1389 else
1339 iso14755buf = 0; 1390 iso14755buf = 0;
1340 } 1391 }
1341#endif 1392#endif
1342 1393
1394 if (ev.xany.window == vt
1395 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1396 break;
1397
1343#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1398#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1344 if (!(ev.xkey.state & ControlMask)) 1399 if (!(ev.xkey.state & ControlMask))
1345 slip_wheel_ev.stop (); 1400 slip_wheel_ev.stop ();
1346 else if (ks == XK_Control_L || ks == XK_Control_R) 1401 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1347 mouse_slip_wheel_speed = 0; 1402 mouse_slip_wheel_speed = 0;
1348#endif 1403#endif
1349 break; 1404 break;
1350 } 1405 }
1351 1406
… …
1455 seen_resize = 1; 1510 seen_resize = 1;
1456 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1511 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1457 } 1512 }
1458 1513
1459#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1514#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1460 if (options & Opt_transparent) 1515 if (OPTION (Opt_transparent))
1461 check_our_parents (); 1516 check_our_parents ();
1462#endif 1517#endif
1463 } 1518 }
1464 break; 1519 break;
1465 1520
… …
1481 1536
1482 case SelectionRequest: 1537 case SelectionRequest:
1483 selection_send (ev.xselectionrequest); 1538 selection_send (ev.xselectionrequest);
1484 break; 1539 break;
1485 1540
1541 case MapNotify:
1542 mapped = 1;
1543#ifdef TEXT_BLINK
1544 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1545#endif
1546 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1547 break;
1548
1486 case UnmapNotify: 1549 case UnmapNotify:
1487 mapped = 0; 1550 mapped = 0;
1488#ifdef TEXT_BLINK 1551#ifdef TEXT_BLINK
1489 text_blink_ev.stop (); 1552 text_blink_ev.stop ();
1490#endif 1553#endif
1491 break; 1554 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1492
1493 case MapNotify:
1494 mapped = 1;
1495#ifdef TEXT_BLINK
1496 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1497#endif
1498 break; 1555 break;
1499 1556
1500#ifdef TRANSPARENT 1557#ifdef TRANSPARENT
1501 case ReparentNotify: 1558 case ReparentNotify:
1502 rootwin_cb (ev); 1559 rootwin_cb (ev);
… …
1561 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1618 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1562 break; 1619 break;
1563 1620
1564 if (ev.xany.window == vt) 1621 if (ev.xany.window == vt)
1565 { 1622 {
1623 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1624 ; // nop
1566 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1625 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1567 { 1626 {
1568 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1627 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1569 ; 1628 ;
1570 1629
1571 XQueryPointer (disp, vt, 1630 XQueryPointer (disp, vt,
… …
1657 refresh_limit = 0; 1716 refresh_limit = 0;
1658 scrollbar_show (1); 1717 scrollbar_show (1);
1659 } 1718 }
1660 break; 1719 break;
1661 } 1720 }
1721
1722skip_switch: ;
1723
1724#if defined(CURSOR_BLINK)
1725 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1726 {
1727 if (hidden_cursor)
1728 {
1729 hidden_cursor = 0;
1730 want_refresh = 1;
1731 }
1732
1733 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1734 }
1735#endif
1736
1737#if defined(POINTER_BLANK)
1738 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1739 {
1740 if (ev.type == MotionNotify
1741 || ev.type == ButtonPress
1742 || ev.type == ButtonRelease)
1743 if (hidden_pointer)
1744 pointer_unblank ();
1745
1746 if (ev.type == KeyPress && hidden_pointer == 0)
1747 pointer_blank ();
1748 }
1749#endif
1662} 1750}
1663 1751
1664void 1752void
1665rxvt_term::focus_in () 1753rxvt_term::focus_in ()
1666{ 1754{
1667 if (!focus) 1755 if (!focus)
1668 { 1756 {
1669 focus = 1; 1757 focus = 1;
1670 want_refresh = 1; 1758 want_refresh = 1;
1759
1760 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1761
1671#if USE_XIM 1762#if USE_XIM
1672 if (Input_Context != NULL) 1763 if (Input_Context != NULL)
1673 { 1764 {
1674 IMSetStatusPosition (); 1765 IMSetStatusPosition ();
1675 XSetICFocus (Input_Context); 1766 XSetICFocus (Input_Context);
1676 } 1767 }
1677#endif 1768#endif
1678#if CURSOR_BLINK 1769#if CURSOR_BLINK
1679 if (options & Opt_cursorBlink) 1770 if (OPTION (Opt_cursorBlink))
1680 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1771 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1681#endif 1772#endif
1682#if OFF_FOCUS_FADING 1773#if OFF_FOCUS_FADING
1683 if (rs[Rs_fade]) 1774 if (rs[Rs_fade])
1684 { 1775 {
… …
1695 if (focus) 1786 if (focus)
1696 { 1787 {
1697 focus = 0; 1788 focus = 0;
1698 want_refresh = 1; 1789 want_refresh = 1;
1699 1790
1791 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1792
1700#if ENABLE_FRILLS || ISO_14755 1793#if ENABLE_FRILLS || ISO_14755
1794 if (iso14755buf)
1795 {
1701 iso14755buf = 0; 1796 iso14755buf = 0;
1702#endif
1703#if ENABLE_OVERLAY 1797# if ENABLE_OVERLAY
1704 scr_overlay_off (); 1798 scr_overlay_off ();
1799# endif
1800 }
1705#endif 1801#endif
1706#if USE_XIM 1802#if USE_XIM
1707 if (Input_Context != NULL) 1803 if (Input_Context != NULL)
1708 XUnsetICFocus (Input_Context); 1804 XUnsetICFocus (Input_Context);
1709#endif 1805#endif
1710#if CURSOR_BLINK 1806#if CURSOR_BLINK
1711 if (options & Opt_cursorBlink) 1807 if (OPTION (Opt_cursorBlink))
1712 cursor_blink_ev.stop (); 1808 cursor_blink_ev.stop ();
1713 hidden_cursor = 0; 1809 hidden_cursor = 0;
1714#endif 1810#endif
1715#if OFF_FOCUS_FADING 1811#if OFF_FOCUS_FADING
1716 if (rs[Rs_fade]) 1812 if (rs[Rs_fade])
… …
1740 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1836 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1741 return; 1837 return;
1742 1838
1743 /* FALLTHROUGH */ 1839 /* FALLTHROUGH */
1744 case ReparentNotify: 1840 case ReparentNotify:
1745 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1841 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1746 want_refresh = want_full_refresh = 1; 1842 want_refresh = want_full_refresh = 1;
1747 break; 1843 break;
1748 } 1844 }
1749} 1845}
1750#endif 1846#endif
… …
1753rxvt_term::button_press (XButtonEvent &ev) 1849rxvt_term::button_press (XButtonEvent &ev)
1754{ 1850{
1755 int reportmode = 0, clickintime; 1851 int reportmode = 0, clickintime;
1756 1852
1757 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1853 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1854
1758 if (!bypass_keystate) 1855 if (!bypass_keystate)
1759 reportmode = !! (priv_modes & PrivMode_mouse_report); 1856 reportmode = !! (priv_modes & PrivMode_mouse_report);
1760 1857
1761 /* 1858 /*
1762 * VT window processing of button press 1859 * VT window processing of button press
… …
1782#ifdef MOUSE_REPORT_DOUBLECLICK 1879#ifdef MOUSE_REPORT_DOUBLECLICK
1783 if (ev.button == MEvent.button && clickintime) 1880 if (ev.button == MEvent.button && clickintime)
1784 { 1881 {
1785 /* same button, within alloted time */ 1882 /* same button, within alloted time */
1786 MEvent.clicks++; 1883 MEvent.clicks++;
1884
1787 if (MEvent.clicks > 1) 1885 if (MEvent.clicks > 1)
1788 { 1886 {
1789 /* only report double clicks */ 1887 /* only report double clicks */
1790 MEvent.clicks = 2; 1888 MEvent.clicks = 2;
1791 mouse_report (ev); 1889 mouse_report (ev);
… …
1811 else 1909 else
1812 { 1910 {
1813 if (ev.button != MEvent.button) 1911 if (ev.button != MEvent.button)
1814 MEvent.clicks = 0; 1912 MEvent.clicks = 0;
1815 1913
1914 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1816 switch (ev.button) 1915 switch (ev.button)
1817 { 1916 {
1818 case Button1: 1917 case Button1:
1819 /* allow meta + click to select rectangular areas */ 1918 /* allow meta + click to select rectangular areas */
1820 /* should be done in screen.C */ 1919 /* should be done in screen.C */
1821#if ENABLE_FRILLS 1920#if ENABLE_FRILLS
1822 selection.rect = !!(ev.state & ModMetaMask); 1921 selection.rect = !!(ev.state & ModMetaMask);
1823#else 1922#else
1824 selection.rect = false; 1923 selection.rect = false;
1825#endif 1924#endif
1826 1925
1827 /* allow shift+left click to extend selection */ 1926 /* allow shift+left click to extend selection */
1828 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1927 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1829 { 1928 {
1830 if (MEvent.button == Button1 && clickintime) 1929 if (MEvent.button == Button1 && clickintime)
1831 selection_rotate (ev.x, ev.y); 1930 selection_rotate (ev.x, ev.y);
1832 else 1931 else
1833 selection_extend (ev.x, ev.y, 1); 1932 selection_extend (ev.x, ev.y, 1);
1834 } 1933 }
1835 else 1934 else
1836 { 1935 {
1837 if (MEvent.button == Button1 && clickintime) 1936 if (MEvent.button == Button1 && clickintime)
1838 MEvent.clicks++; 1937 MEvent.clicks++;
1839 else 1938 else
1840 MEvent.clicks = 1; 1939 MEvent.clicks = 1;
1841 1940
1842 selection_click (MEvent.clicks, ev.x, ev.y); 1941 selection_click (MEvent.clicks, ev.x, ev.y);
1843 } 1942 }
1844 1943
1845 MEvent.button = Button1; 1944 MEvent.button = Button1;
1846 break; 1945 break;
1847 1946
1848 case Button3: 1947 case Button3:
1849 if (MEvent.button == Button3 && clickintime) 1948 if (MEvent.button == Button3 && clickintime)
1850 selection_rotate (ev.x, ev.y); 1949 selection_rotate (ev.x, ev.y);
1851 else 1950 else
1852 selection_extend (ev.x, ev.y, 1); 1951 selection_extend (ev.x, ev.y, 1);
1853 1952
1854 MEvent.button = Button3; 1953 MEvent.button = Button3;
1855 break; 1954 break;
1856 } 1955 }
1857 } 1956 }
1858 1957
1859 MEvent.time = ev.time; 1958 MEvent.time = ev.time;
1860 return; 1959 return;
1861 } 1960 }
1862 1961
… …
1998 } 2097 }
1999 2098
2000 break; 2099 break;
2001 } 2100 }
2002 } 2101 }
2102
2003 return; 2103 return;
2004 } 2104 }
2105
2005#if MENUBAR 2106#if MENUBAR
2006 /* 2107 /*
2007 * Menubar window processing of button press 2108 * Menubar window processing of button press
2008 */ 2109 */
2009 if (isMenuBarWindow (ev.window)) 2110 if (isMenuBarWindow (ev.window))
… …
2072 if (priv_modes & PrivMode_mouse_report 2173 if (priv_modes & PrivMode_mouse_report
2073 && bypass_keystate 2174 && bypass_keystate
2074 && ev.button == Button1 && MEvent.clicks <= 1) 2175 && ev.button == Button1 && MEvent.clicks <= 1)
2075 selection_extend (ev.x, ev.y, 0); 2176 selection_extend (ev.x, ev.y, 0);
2076 2177
2178 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2179 return;
2180
2077 switch (ev.button) 2181 switch (ev.button)
2078 { 2182 {
2079 case Button1: 2183 case Button1:
2080 case Button3: 2184 case Button3:
2081 selection_make (ev.time); 2185 selection_make (ev.time);
… …
2092 2196
2093 v = ev.button == Button4 ? UP : DN; 2197 v = ev.button == Button4 ? UP : DN;
2094 2198
2095 if (ev.state & ShiftMask) 2199 if (ev.state & ShiftMask)
2096 i = 1; 2200 i = 1;
2097 else if (options & Opt_mouseWheelScrollPage) 2201 else if (OPTION (Opt_mouseWheelScrollPage))
2098 i = nrow - 1; 2202 i = nrow - 1;
2099 else 2203 else
2100 i = 5; 2204 i = 5;
2101 2205
2102# ifdef MOUSE_SLIP_WHEELING 2206# ifdef MOUSE_SLIP_WHEELING
… …
2388 XWindowAttributes wattr, wrootattr; 2492 XWindowAttributes wattr, wrootattr;
2389 dDisp; 2493 dDisp;
2390 2494
2391 pchanged = 0; 2495 pchanged = 0;
2392 2496
2393 if (!(options & Opt_transparent)) 2497 if (!OPTION (Opt_transparent))
2394 return pchanged; /* Don't try any more */ 2498 return pchanged; /* Don't try any more */
2395 2499
2396 XGetWindowAttributes (disp, display->root, &wrootattr); 2500 XGetWindowAttributes (disp, display->root, &wrootattr);
2397 rootdepth = wrootattr.depth; 2501 rootdepth = wrootattr.depth;
2398 2502
… …
2625 2729
2626bool 2730bool
2627rxvt_term::cmd_parse () 2731rxvt_term::cmd_parse ()
2628{ 2732{
2629 bool flag = false; 2733 bool flag = false;
2630 unicode_t ch = NOCHAR; 2734 wchar_t ch = NOCHAR;
2631 unsigned char *seq_begin; // remember start of esc-sequence here 2735 char *seq_begin; // remember start of esc-sequence here
2632 2736
2633 for (;;) 2737 for (;;)
2634 { 2738 {
2635 if (ch == NOCHAR) 2739 if (ch == NOCHAR)
2636 { 2740 {
2637 seq_begin = cmdbuf_ptr; 2741 seq_begin = cmdbuf_ptr;
2638 ch = next_char (); 2742 ch = next_char ();
2639 }
2640 2743
2641 if (ch == NOCHAR) // TODO: improve 2744 if (ch == NOCHAR)
2642 break; 2745 break;
2746 }
2643 2747
2644 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2748 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2645 { 2749 {
2646 if (!seen_input) 2750 if (!seen_input)
2647 { 2751 {
… …
2656 if (seen_resize && cmd_pid) 2760 if (seen_resize && cmd_pid)
2657 kill (-cmd_pid, SIGWINCH); 2761 kill (-cmd_pid, SIGWINCH);
2658 } 2762 }
2659 2763
2660 /* Read a text string from the input buffer */ 2764 /* Read a text string from the input buffer */
2661 unicode_t buf[UBUFSIZ]; 2765 wchar_t buf[UBUFSIZ];
2662 bool refreshnow = false; 2766 bool refreshnow = false;
2663 int nlines = 0; 2767 int nlines = 0;
2664 unicode_t *str = buf; 2768 wchar_t *str = buf;
2665 unicode_t *eol = str + min (ncol, UBUFSIZ); 2769 wchar_t *eol = str + min (ncol, UBUFSIZ);
2666 2770
2667 for (;;) 2771 for (;;)
2668 { 2772 {
2669 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2773 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2670 break; 2774 break;
… …
2676 if (ch == C0_LF) 2780 if (ch == C0_LF)
2677 nlines++; 2781 nlines++;
2678 2782
2679 refresh_count++; 2783 refresh_count++;
2680 2784
2681 if (!(options & Opt_jumpScroll) 2785 if (!OPTION (Opt_jumpScroll)
2682 || (refresh_count >= refresh_limit * (nrow - 1))) 2786 || (refresh_count >= refresh_limit * (nrow - 1)))
2683 { 2787 {
2684 refreshnow = true; 2788 refreshnow = true;
2789 refresh_count = 0;
2685 ch = NOCHAR; 2790 ch = NOCHAR;
2686 break; 2791 break;
2687 } 2792 }
2688 2793
2689 // scr_add_lines only works for nlines <= nrow - 1. 2794 // scr_add_lines only works for nlines <= nrow - 1.
2690 if (nlines >= nrow - 1) 2795 if (nlines >= nrow - 1)
2691 { 2796 {
2797 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2692 scr_add_lines (buf, nlines, str - buf); 2798 scr_add_lines (buf, str - buf, nlines);
2799
2693 nlines = 0; 2800 nlines = 0;
2694 str = buf; 2801 str = buf;
2695 eol = str + min (ncol, UBUFSIZ); 2802 eol = str + min (ncol, UBUFSIZ);
2696 } 2803 }
2697 2804
… …
2710 2817
2711 seq_begin = cmdbuf_ptr; 2818 seq_begin = cmdbuf_ptr;
2712 ch = next_char (); 2819 ch = next_char ();
2713 } 2820 }
2714 2821
2822 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2715 scr_add_lines (buf, nlines, str - buf); 2823 scr_add_lines (buf, str - buf, nlines);
2716 2824
2717 /* 2825 /*
2718 * If there have been a lot of new lines, then update the screen 2826 * If there have been a lot of new lines, then update the screen
2719 * What the heck I'll cheat and only refresh less than every page-full. 2827 * What the heck I'll cheat and only refresh less than every page-full.
2720 * the number of pages between refreshes is refresh_limit, which 2828 * the number of pages between refreshes is refresh_limit, which
2721 * is incremented here because we must be doing flat-out scrolling. 2829 * is incremented here because we must be doing flat-out scrolling.
2722 */ 2830 */
2723 if (refreshnow) 2831 if (refreshnow)
2724 { 2832 {
2725 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2833 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2726 refresh_limit++; 2834 refresh_limit++;
2727 else 2835 else
2728 { 2836 {
2729 flag = true; 2837 flag = true;
2730 scr_refresh (refresh_type); 2838 scr_refresh (refresh_type);
2839 flush_ev.stop ();
2731 } 2840 }
2732 } 2841 }
2733 2842
2734 } 2843 }
2735 else 2844 else
… …
2750 } 2859 }
2751 2860
2752 return flag; 2861 return flag;
2753} 2862}
2754 2863
2755// read the next octet
2756unicode_t
2757rxvt_term::next_octet ()
2758{
2759 return cmdbuf_ptr < cmdbuf_endp
2760 ? *cmdbuf_ptr++
2761 : NOCHAR;
2762}
2763
2764// read the next character 2864// read the next character
2765unicode_t 2865wchar_t
2766rxvt_term::next_char () 2866rxvt_term::next_char ()
2767{ 2867{
2768 while (cmdbuf_ptr < cmdbuf_endp) 2868 while (cmdbuf_ptr < cmdbuf_endp)
2769 { 2869 {
2770 // assume 7-bit to be ascii ALWAYS 2870 // assume 7-bit to be ascii ALWAYS
2771 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2871 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2772 return *cmdbuf_ptr++; 2872 return *cmdbuf_ptr++;
2773 2873
2774 wchar_t wc; 2874 wchar_t wc;
2775 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2875 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2776 2876
2777 if (len == (size_t)-2) 2877 if (len == (size_t)-2)
2778 { 2878 {
2779 // the mbstate stores incomplete sequences. didn't know this :/ 2879 // the mbstate stores incomplete sequences. didn't know this :/
2780 cmdbuf_ptr = cmdbuf_endp; 2880 cmdbuf_ptr = cmdbuf_endp;
2781 break; 2881 break;
2782 } 2882 }
2783 2883
2784 if (len == (size_t)-1) 2884 if (len == (size_t)-1)
2785 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2885 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2786 2886
2787 // assume wchar == unicode 2887 // assume wchar == unicode
2788 cmdbuf_ptr += len; 2888 cmdbuf_ptr += len;
2789 return wc & UNICODE_MASK; 2889 return wc & UNICODE_MASK;
2790 } 2890 }
2791 2891
2792 return NOCHAR; 2892 return NOCHAR;
2893}
2894
2895// read the next octet
2896uint32_t
2897rxvt_term::next_octet ()
2898{
2899 return cmdbuf_ptr < cmdbuf_endp
2900 ? (unsigned char)*cmdbuf_ptr++
2901 : NOCHAR;
2793} 2902}
2794 2903
2795/* rxvt_cmd_getc () - Return next input character */ 2904/* rxvt_cmd_getc () - Return next input character */
2796/* 2905/*
2797 * Return the next input character after first passing any keyboard input 2906 * Return the next input character after first passing any keyboard input
2798 * to the command. 2907 * to the command.
2799 */ 2908 */
2800unicode_t 2909wchar_t
2801rxvt_term::cmd_getc () 2910rxvt_term::cmd_getc ()
2802{ 2911{
2803 unicode_t c = next_char (); 2912 wchar_t c = next_char ();
2804 2913
2805 if (c == NOCHAR) 2914 if (c == NOCHAR)
2806 throw out_of_input; 2915 throw out_of_input;
2807 2916
2808 return c; 2917 return c;
2809} 2918}
2810 2919
2811unicode_t 2920uint32_t
2812rxvt_term::cmd_get8 () 2921rxvt_term::cmd_get8 ()
2813{ 2922{
2814 unicode_t c = next_octet (); 2923 uint32_t c = next_octet ();
2815 2924
2816 if (c == NOCHAR) 2925 if (c == NOCHAR)
2817 throw out_of_input; 2926 throw out_of_input;
2818 2927
2819 return c; 2928 return c;
… …
2919 case C0_ESC: 3028 case C0_ESC:
2920 process_escape_seq (); 3029 process_escape_seq ();
2921 break; 3030 break;
2922 case C0_ENQ: /* terminal Status */ 3031 case C0_ENQ: /* terminal Status */
2923 if (rs[Rs_answerbackstring]) 3032 if (rs[Rs_answerbackstring])
2924 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 3033 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2925 (unsigned int)strlen (rs[Rs_answerbackstring]));
2926 else 3034 else
2927 tt_write ((unsigned char *)VT100_ANS, 3035 tt_write (VT100_ANS, strlen (VT100_ANS));
2928 (unsigned int)strlen (VT100_ANS));
2929 break; 3036 break;
2930 case C0_BEL: /* bell */ 3037 case C0_BEL: /* bell */
2931 scr_bell (); 3038 scr_bell ();
2932 break; 3039 break;
2933 case C0_BS: /* backspace */ 3040 case C0_BS: /* backspace */
… …
3088 break; 3195 break;
3089 3196
3090 /* 8.3.87: NEXT LINE */ 3197 /* 8.3.87: NEXT LINE */
3091 case C1_NEL: /* ESC E */ 3198 case C1_NEL: /* ESC E */
3092 { 3199 {
3093 unicode_t nlcr[] = { C0_LF, C0_CR }; 3200 wchar_t nlcr[] = { C0_LF, C0_CR };
3094 scr_add_lines (nlcr, 1, 2); 3201 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3095 } 3202 }
3096 break; 3203 break;
3097 3204
3098 /* kidnapped escape sequence: Should be 8.3.48 */ 3205 /* kidnapped escape sequence: Should be 8.3.48 */
3099 case C1_ESA: /* ESC G */ 3206 case C1_ESA: /* ESC G */
… …
3121 process_dcs_seq (); 3228 process_dcs_seq ();
3122 break; 3229 break;
3123 3230
3124 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3231 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3125 case C1_SCI: /* ESC Z */ 3232 case C1_SCI: /* ESC Z */
3126 tt_write ((const unsigned char *)ESCZ_ANSWER, 3233 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3127 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3128 break; /* steal obsolete ESC [ c */ 3234 break; /* steal obsolete ESC [ c */
3129 3235
3130 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3236 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3131 case C1_CSI: /* ESC [ */ 3237 case C1_CSI: /* ESC [ */
3132 process_csi_seq (); 3238 process_csi_seq ();
… …
3376 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3482 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3377 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); 3483 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3378 break; 3484 break;
3379 3485
3380 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3486 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3381 tt_write ((const unsigned char *)VT100_ANS, 3487 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3382 (unsigned int) (sizeof (VT100_ANS) - 1));
3383 break; 3488 break;
3384 3489
3385 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3490 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3386 process_sgr_mode (nargs, arg); 3491 process_sgr_mode (nargs, arg);
3387 break; 3492 break;
… …
3394 break; 3499 break;
3395 case 6: /* CPR requested */ 3500 case 6: /* CPR requested */
3396 scr_report_position (); 3501 scr_report_position ();
3397 break; 3502 break;
3398 case 7: /* unofficial extension */ 3503 case 7: /* unofficial extension */
3399 if (options & Opt_insecure) 3504 if (OPTION (Opt_insecure))
3400 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3505 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3401 break; 3506 break;
3402 case 8: /* unofficial extension */ 3507 case 8: /* unofficial extension */
3403 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3508 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3404 break; 3509 break;
… …
3568 break; 3673 break;
3569 case 20: /* report icon label */ 3674 case 20: /* report icon label */
3570 { 3675 {
3571 char *s; 3676 char *s;
3572 XGetIconName (disp, parent[0], &s); 3677 XGetIconName (disp, parent[0], &s);
3573 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3678 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3574 XFree (s); 3679 XFree (s);
3575 } 3680 }
3576 break; 3681 break;
3577 case 21: /* report window title */ 3682 case 21: /* report window title */
3578 { 3683 {
3579 char *s; 3684 char *s;
3580 XFetchName (disp, parent[0], &s); 3685 XFetchName (disp, parent[0], &s);
3581 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3686 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3582 XFree (s); 3687 XFree (s);
3583 } 3688 }
3584 break; 3689 break;
3585 } 3690 }
3586} 3691}
… …
3589/*----------------------------------------------------------------------*/ 3694/*----------------------------------------------------------------------*/
3590/* 3695/*
3591 * get input up until STRING TERMINATOR (or BEL) 3696 * get input up until STRING TERMINATOR (or BEL)
3592 * ends_how is terminator used. returned input must be free()'d 3697 * ends_how is terminator used. returned input must be free()'d
3593 */ 3698 */
3594unsigned char * 3699char *
3595rxvt_term::get_to_st (unicode_t &ends_how) 3700rxvt_term::get_to_st (unicode_t &ends_how)
3596{ 3701{
3597 unicode_t ch; 3702 unicode_t ch;
3598 bool seen_esc = false; 3703 bool seen_esc = false;
3599 unsigned int n = 0; 3704 unsigned int n = 0;
… …
3632 3737
3633 string[n++] = '\0'; 3738 string[n++] = '\0';
3634 3739
3635 ends_how = (ch == 0x5c ? C0_ESC : ch); 3740 ends_how = (ch == 0x5c ? C0_ESC : ch);
3636 3741
3637 return (unsigned char *)rxvt_wcstombs (string); 3742 return rxvt_wcstombs (string);
3638} 3743}
3639 3744
3640/*----------------------------------------------------------------------*/ 3745/*----------------------------------------------------------------------*/
3641/* 3746/*
3642 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3747 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3643 */ 3748 */
3644void 3749void
3645rxvt_term::process_dcs_seq () 3750rxvt_term::process_dcs_seq ()
3646{ 3751{
3647 unsigned char *s; 3752 char *s;
3648 unicode_t eh; 3753 unicode_t eh;
3649 3754
3650 /* 3755 /*
3651 * Not handled yet 3756 * Not handled yet
3652 */ 3757 */
… …
3671 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3776 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3672 arg = arg * 10 + (ch - '0'); 3777 arg = arg * 10 + (ch - '0');
3673 3778
3674 if (ch == ';') 3779 if (ch == ';')
3675 { 3780 {
3676 unsigned char *s = get_to_st (eh); 3781 char *s = get_to_st (eh);
3677 3782
3678 if (s) 3783 if (s)
3679 { 3784 {
3680 process_xterm_seq (arg, (char *)s, eh); 3785 process_xterm_seq (arg, s, eh);
3681 free (s); 3786 free (s);
3682 } 3787 }
3683 } 3788 }
3684} 3789}
3685 3790
3686void 3791void
3687rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3792rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3688{ 3793{
3689 if (str[0] == '?' && !str[1]) 3794 if (str[0] == '?' && !str[1])
3690 { 3795 {
3691 unsigned short r, g, b; 3796 unsigned short r, g, b;
3692 pix_colors_focused[color].get (display, r, g, b); 3797 pix_colors_focused[color].get (display, r, g, b);
… …
3698 3803
3699/* 3804/*
3700 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3805 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3701 */ 3806 */
3702void 3807void
3703rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3808rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3704{ 3809{
3705 int changed = 0; 3810 int changed = 0;
3706 int color; 3811 int color;
3707 char *buf, *name; 3812 char *buf, *name;
3708 bool query = str[0] == '?' && !str[1]; 3813 bool query = str[0] == '?' && !str[1];
… …
3862 // TODO, when secure mode? 3967 // TODO, when secure mode?
3863 break; 3968 break;
3864 3969
3865#ifdef MENUBAR 3970#ifdef MENUBAR
3866 case URxvt_Menu: 3971 case URxvt_Menu:
3867 if (options & Opt_insecure) 3972 if (OPTION (Opt_insecure))
3868 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3973 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3869 break; 3974 break;
3870#endif 3975#endif
3871#if 0 3976#if 0
3872 case XTerm_dumpscreen: /* no error notices */ 3977 case XTerm_dumpscreen: /* no error notices */
… …
3888 case URxvt_italicFont: 3993 case URxvt_italicFont:
3889 case URxvt_boldItalicFont: 3994 case URxvt_boldItalicFont:
3890#endif 3995#endif
3891 if (query) 3996 if (query)
3892 tt_printf ("\33]%d;%-.250s%c", saveop, 3997 tt_printf ("\33]%d;%-.250s%c", saveop,
3893 (options & Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3998 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3894 ? fontset[op - URxvt_font]->fontdesc : "", 3999 ? fontset[op - URxvt_font]->fontdesc : "",
3895 resp); 4000 resp);
3896 else 4001 else
3897 { 4002 {
3898 const char *&res = rs[Rs_font + (op - URxvt_font)]; 4003 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3904 break; 4009 break;
3905 4010
3906#if ENABLE_FRILLS 4011#if ENABLE_FRILLS
3907 case URxvt_locale: 4012 case URxvt_locale:
3908 if (query) 4013 if (query)
3909 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp); 4014 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3910 else 4015 else
3911 { 4016 {
3912 set_locale (str); 4017 set_locale (str);
3913 pty.set_utf8_mode (enc_utf8); 4018 pty.set_utf8_mode (enc_utf8);
3914 init_xlocale (); 4019 init_xlocale ();
3915 } 4020 }
3916 break; 4021 break;
3917 4022
3918 case URxvt_view_up: 4023 case URxvt_view_up:
3919 case URxvt_view_down: 4024 case URxvt_view_down:
4025 {
3920 int lines = atoi (str); 4026 int lines = atoi (str);
3921 4027
3922 if (lines) 4028 if (lines)
3923 scr_page (op == URxvt_view_up ? UP : DN, lines); 4029 scr_page (op == URxvt_view_up ? UP : DN, lines);
3924 else 4030 else
3925 {
3926 scr_erase_savelines (); 4031 scr_erase_savelines ();
3927 } 4032 }
3928 4033
4034 break;
4035#endif
4036
4037#if ENABLE_PERL
4038 case URxvt_perl:
4039 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
4040 ; // no responses yet
3929 break; 4041 break;
3930#endif 4042#endif
3931 } 4043 }
3932} 4044}
3933/*----------------------------------------------------------------------*/ 4045/*----------------------------------------------------------------------*/
… …
4042 } 4154 }
4043 4155
4044 /* extra handling for values with state unkept */ 4156 /* extra handling for values with state unkept */
4045 switch (arg[i]) 4157 switch (arg[i])
4046 { 4158 {
4159#if ENABLE_STYLES
4160 case 1021:
4161 set_option (Opt_intensityStyles, mode);
4162
4163 scr_touch (true);
4164 break;
4165#endif
4047 case 1048: /* alternative cursor save */ 4166 case 1048: /* alternative cursor save */
4048 case 1049: 4167 case 1049:
4049 if (options & Opt_secondaryScreen) 4168 if (OPTION (Opt_secondaryScreen))
4050 if (mode == 0) 4169 if (mode == 0)
4051 scr_cursor (RESTORE); 4170 scr_cursor (RESTORE);
4052 else if (mode == 1) 4171 else if (mode == 1)
4053 scr_cursor (SAVE); 4172 scr_cursor (SAVE);
4054 break; 4173 break;
… …
4069 case 3: /* 80/132 */ 4188 case 3: /* 80/132 */
4070 if (priv_modes & PrivMode_132OK) 4189 if (priv_modes & PrivMode_132OK)
4071 set_widthheight (((state ? 132 : 80) * fwidth), height); 4190 set_widthheight (((state ? 132 : 80) * fwidth), height);
4072 break; 4191 break;
4073 case 4: /* smooth scrolling */ 4192 case 4: /* smooth scrolling */
4074 if (state)
4075 options &= ~Opt_jumpScroll;
4076 else
4077 options |= Opt_jumpScroll; 4193 set_option (Opt_jumpScroll, !state);
4078 break; 4194 break;
4079 case 5: /* reverse video */ 4195 case 5: /* reverse video */
4080 scr_rvideo_mode (state); 4196 scr_rvideo_mode (state);
4081 break; 4197 break;
4082 case 6: /* relative/absolute origins */ 4198 case 6: /* relative/absolute origins */
… …
4123#if 0 4239#if 0
4124 case 1001: 4240 case 1001:
4125 break; /* X11 mouse highlighting */ 4241 break; /* X11 mouse highlighting */
4126#endif 4242#endif
4127 case 1010: /* scroll to bottom on TTY output inhibit */ 4243 case 1010: /* scroll to bottom on TTY output inhibit */
4128 if (state)
4129 options &= ~Opt_scrollTtyOutput;
4130 else
4131 options |= Opt_scrollTtyOutput; 4244 set_option (Opt_scrollTtyOutput, !state);
4132 break; 4245 break;
4133 case 1011: /* scroll to bottom on key press */ 4246 case 1011: /* scroll to bottom on key press */
4134 if (state)
4135 options |= Opt_scrollTtyKeypress; 4247 set_option (Opt_scrollTtyKeypress, state);
4136 else
4137 options &= ~Opt_scrollTtyKeypress;
4138 break; 4248 break;
4139 case 1047: /* secondary screen w/ clearing last */ 4249 case 1047: /* secondary screen w/ clearing last */
4140 if (options & Opt_secondaryScreen) 4250 if (OPTION (Opt_secondaryScreen))
4141 if (current_screen != PRIMARY) 4251 if (current_screen != PRIMARY)
4142 scr_erase_screen (2); 4252 scr_erase_screen (2);
4143 scr_change_screen (state); 4253 scr_change_screen (state);
4144 break; 4254 break;
4145 case 1049: /* secondary screen w/ clearing first */ 4255 case 1049: /* secondary screen w/ clearing first */
4146 scr_change_screen (state); 4256 scr_change_screen (state);
4147 if (options & Opt_secondaryScreen) 4257 if (OPTION (Opt_secondaryScreen))
4148 if (current_screen != PRIMARY) 4258 if (current_screen != PRIMARY)
4149 scr_erase_screen (2); 4259 scr_erase_screen (2);
4150 break; 4260 break;
4151 default: 4261 default:
4152 break; 4262 break;
… …
4280 scr_color (Color_bg, Color_bg); 4390 scr_color (Color_bg, Color_bg);
4281 break; 4391 break;
4282 4392
4283 //case 50: // not variable spacing 4393 //case 50: // not variable spacing
4284 4394
4285#ifndef NO_BRIGHTCOLOR 4395#if ENABLE_FRILLS
4286 case 90: 4396 case 90:
4287 case 91: /* set bright fg color */ 4397 case 91: /* set bright fg color */
4288 case 92: 4398 case 92:
4289 case 93: 4399 case 93:
4290 case 94: 4400 case 94:
… …
4302 case 106: 4412 case 106:
4303 case 107: 4413 case 107:
4304 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 4414 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4305 break; 4415 break;
4306#endif 4416#endif
4307
4308 } 4417 }
4309 } 4418 }
4310} 4419}
4311/*}}} */ 4420/*}}} */
4312 4421
… …
4336 */ 4445 */
4337void 4446void
4338rxvt_term::tt_printf (const char *fmt,...) 4447rxvt_term::tt_printf (const char *fmt,...)
4339{ 4448{
4340 va_list arg_ptr; 4449 va_list arg_ptr;
4341 unsigned char buf[256]; 4450 char buf[256];
4342 4451
4343 va_start (arg_ptr, fmt); 4452 va_start (arg_ptr, fmt);
4344 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4453 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4345 va_end (arg_ptr); 4454 va_end (arg_ptr);
4346 tt_write (buf, strlen (buf)); 4455 tt_write (buf, strlen (buf));
… …
4351 * or generated by us in response to a query ESC sequence. 4460 * or generated by us in response to a query ESC sequence.
4352 */ 4461 */
4353const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4462const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4354 4463
4355void 4464void
4356rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4465rxvt_term::tt_write (const char *data, unsigned int len)
4357{ 4466{
4467 if (pty.pty < 0)
4468 return;
4469
4358 if (v_buflen == 0) 4470 if (v_buflen == 0)
4359 { 4471 {
4360 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4472 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4361 4473
4362 if ((unsigned int)written == len) 4474 if ((unsigned int)written == len)
… …
4364 4476
4365 data += written; 4477 data += written;
4366 len -= written; 4478 len -= written;
4367 } 4479 }
4368 4480
4369 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4481 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4370 4482
4371 memcpy (v_buffer + v_buflen, data, len); 4483 memcpy (v_buffer + v_buflen, data, len);
4372 v_buflen += len; 4484 v_buflen += len;
4373 4485
4374 pty_ev.set (EVENT_READ | EVENT_WRITE); 4486 pty_ev.set (EVENT_READ | EVENT_WRITE);

Diff Legend

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