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.388 by ayin, Mon Dec 31 01:16:47 2007 UTC vs.
Revision 1.588 by sf-exg, Sun May 9 15:47:51 2021 UTC

… …
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7 * - original version 7 * - original version
8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
9 * - extensive modifications 9 * - extensive modifications
10 * Copyright (c) 1995 Garrett D'Amore <garrett@netcom.com> 10 * Copyright (c) 1995 Garrett D'Amore <garrett@netcom.com>
11 * - vt100 printing 11 * - vt100 printing
12 * Copyright (c) 1995 Steven Hirsch <hirsch@emba.uvm.edu> 12 * Copyright (c) 1995 Steven Hirsch <hirsch@emba.uvm.edu>
13 * - X11 mouse report mode and support for 13 * - X11 mouse report mode and support for
14 * DEC "private mode" save/restore functions. 14 * DEC "private mode" save/restore functions.
… …
20 * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es> 20 * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es>
21 * - modification and cleanups for Solaris 2.x 21 * - modification and cleanups for Solaris 2.x
22 * and Linux 1.2.x 22 * and Linux 1.2.x
23 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 23 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
24 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 24 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
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-2007 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2014 Marc Lehmann <schmorp@schmorp.de>
31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it> 31 * Copyright (c) 2007,2015 Emanuele Giaquinta <e.giaquinta@glauco.it>
32 * 32 *
33 * This program is free software; you can redistribute it and/or modify 33 * This program is free software; you can redistribute it and/or modify
34 * it under the terms of the GNU General Public License as published by 34 * it under the terms of the GNU General Public License as published by
35 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 3 of the License, or
36 * (at your option) any later version. 36 * (at your option) any later version.
37 * 37 *
38 * This program is distributed in the hope that it will be useful, 38 * This program is distributed in the hope that it will be useful,
39 * but WITHOUT ANY WARRANTY; without even the implied warranty of 39 * but WITHOUT ANY WARRANTY; without even the implied warranty of
40 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 40 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
54 54
55#ifdef KEYSYM_RESOURCE 55#ifdef KEYSYM_RESOURCE
56# include "keyboard.h" 56# include "keyboard.h"
57#endif 57#endif
58 58
59#include <csignal> 59#include <signal.h>
60 60
61#if LINUX_YIELD_HACK 61#if LINUX_YIELD_HACK
62# include <ctime> 62# include <time.h>
63#endif 63#endif
64 64
65/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
66 66
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
… …
131 XK_KP_Space, 0x2422, 131 XK_KP_Space, 0x2422,
132#endif 132#endif
133 0, 133 0,
134}; 134};
135 135
136void 136void ecb_cold
137rxvt_term::iso14755_54 (int x, int y) 137rxvt_term::iso14755_54 (int x, int y)
138{ 138{
139 x = Pixel2Col (x); 139 x = Pixel2Col (x);
140 y = Pixel2Row (y); 140 y = Pixel2Row (y);
141 141
… …
149 149
150 text_t t = l.t[x]; 150 text_t t = l.t[x];
151 151
152 if (t != NOCHAR || !x) 152 if (t != NOCHAR || !x)
153 { 153 {
154 iso14755_51 (l.t[x], l.r[x], x, y); 154 iso14755_51 (l.t[x], l.r[x], x, y, view_start);
155 iso14755buf = ISO_14755_54; 155 iso14755buf = ISO_14755_54;
156 break; 156 break;
157 } 157 }
158 158
159 x--; 159 x--;
160 } 160 }
161} 161}
162 162
163void 163void ecb_cold
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y) 164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y, int y2)
165{ 165{
166 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
167 rxvt_font *f = (*fs)[fs->find_font (ch)];
168 wchar_t *chr, *alloc, ch2, *fname; 167 wchar_t *chr, *alloc, ch2, **fname;
169 int len; 168 int len;
170
171 fname = rxvt_utf8towcs (f->name);
172 169
173# if ENABLE_COMBINING 170# if ENABLE_COMBINING
174 if (IS_COMPOSE (ch)) 171 if (IS_COMPOSE (ch))
175 { 172 {
176 len = rxvt_composite.expand (ch, 0); 173 len = rxvt_composite.expand (ch, 0);
… …
184 181
185 alloc = 0; 182 alloc = 0;
186 chr = &ch2; 183 chr = &ch2;
187 len = 1; 184 len = 1;
188 } 185 }
186
187 char rowcol[40];
188 snprintf (rowcol, sizeof rowcol, "col %d row %d @%d", x, y, y2);
189 189
190 char attr[80]; // plenty 190 char attr[80]; // plenty
191 191
192 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s", 192 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
193 (int)r, 193 (int)r,
… …
197 r & RS_Blink ? " blink" : "", 197 r & RS_Blink ? " blink" : "",
198 r & RS_RVid ? " rvid" : "", 198 r & RS_RVid ? " rvid" : "",
199 r & RS_Uline ? " uline" : "", 199 r & RS_Uline ? " uline" : "",
200 r & RS_Careful ? " careful" : ""); 200 r & RS_Careful ? " careful" : "");
201 201
202 int width = 0;
203 fname = rxvt_temp_buf<wchar_t *> (len);
204 for (int i = 0; i < len; i++)
205 {
206 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])];
207 fname[i] = rxvt_utf8towcs (f->name);
202 int width = wcswidth (fname, wcslen (fname)); 208 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
209 }
203 210
204 max_it (width, 8+5); // for char + hex
205 max_it (width, strlen (attr)); 211 max_it (width, strlen (attr));
206 212
207 if (y >= 0) 213 if (y >= 0)
208 { 214 {
209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 215 y = (y >= nrow - len - 5 && x < width + 2) ? 0 : -1;
210 x = 0; 216 x = 0;
211 } 217 }
212 218
213 scr_overlay_new (x, y, width, len + 2); 219 scr_overlay_new (x, y, width, len * 2 + 2);
220
221 scr_overlay_set (0, 0, rowcol);
214 222
215 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 223 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
216 224
217 for (int y = 0; y < len; y++) 225 for (int y = 0; y < len; y++)
218 { 226 {
219 char buf[9]; 227 char buf[9];
220 228
221 ch = *chr++; 229 ch = *chr++;
222 230
223 sprintf (buf, "%8x", ch); 231 sprintf (buf, "%8x", ch);
224 scr_overlay_set (0, y, buf); 232 scr_overlay_set (0, y + 1, buf);
225 scr_overlay_set (9, y, '='); 233 scr_overlay_set (9, y + 1, '=');
226# if !UNICODE_3 234# if !UNICODE_3
227 if (ch >= 0x10000) 235 if (ch >= 0x10000)
228 ch = 0xfffd; 236 ch = 0xfffd;
229# endif 237# endif
230 scr_overlay_set (11, y, ch, r); 238 scr_overlay_set (11, y + 1, ch, r);
231 239
232 if (WCWIDTH (ch) >= 2) 240 if (WCWIDTH (ch) >= 2)
233 scr_overlay_set (12, y, NOCHAR, r); 241 scr_overlay_set (12, y + 1, NOCHAR, r);
234 } 242 }
235 243
236// { 244// {
237// char buf[4+4+3+1]; 245// char buf[4+4+3+1];
238// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y); 246// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
239// scr_overlay_set (0, 0, buf); 247// scr_overlay_set (0, 0, buf);
240// } 248// }
241 scr_overlay_set (0, len , attr); 249 scr_overlay_set (0, len + 1, attr);
250 for (int i = 0; i < len; i++)
251 {
242 scr_overlay_set (0, len + 1, fname); 252 scr_overlay_set (0, len + 2 + i, fname[i]);
243
244 free (fname); 253 free (fname[i]);
254 }
245 255
246# if ENABLE_COMBINING 256# if ENABLE_COMBINING
247 if (alloc) 257 if (alloc)
248 delete [] alloc; 258 delete [] alloc;
249# endif 259# endif
250} 260}
251#endif 261#endif
252 262
253void 263void ecb_cold
254rxvt_term::commit_iso14755 () 264rxvt_term::commit_iso14755 ()
255{ 265{
256 wchar_t ch[2];
257
258 ch[0] = iso14755buf & ISO_14755_MASK; 266 wchar_t ch = iso14755buf & ISO_14755_MASK;
259 ch[1] = 0;
260 267
261 if (iso14755buf & ISO_14755_51) 268 if (iso14755buf & ISO_14755_51)
262 { 269 {
263 char mb[16]; 270 char mb[MB_LEN_MAX];
264 int len; 271 int len;
265 272
266 // allow verbatim 0-bytes and control-bytes to be entered 273 // allow verbatim 0-bytes and control-bytes to be entered
267 if (ch[0] >= 0x20) 274 if (ch >= 0x20)
268 len = wcstombs (mb, ch, 16); 275 len = wctomb (mb, ch);
269 else 276 else
270 { 277 {
271 mb[0] = ch[0]; 278 mb[0] = ch;
272 len = 1; 279 len = 1;
273 } 280 }
274 281
275 if (len > 0) 282 if (len > 0)
276 tt_write (mb, len); 283 tt_write (mb, len);
… …
279 } 286 }
280 287
281 iso14755buf = 0; 288 iso14755buf = 0;
282} 289}
283 290
284int 291static int ecb_cold
285rxvt_term::hex_keyval (XKeyEvent &ev) 292hex_keyval (XKeyEvent &ev)
286{ 293{
287 // check wether this event corresponds to a hex digit 294 // check whether this event corresponds to a hex digit
288 // if the modifiers had not been pressed. 295 // if the modifiers had not been pressed.
289 for (int index = 0; index < 8; index++) 296 for (int index = 0; index < 8; index++)
290 { 297 {
291 KeySym k = XLookupKeysym (&ev, index); 298 KeySym k = XLookupKeysym (&ev, index);
292 299
… …
298 305
299 return -1; 306 return -1;
300} 307}
301#endif 308#endif
302 309
303void 310static inline KeySym ecb_cold
311translate_keypad (KeySym keysym, bool kp)
312{
313#ifdef XK_KP_Home
314 static const KeySym keypadtrans[] = {
315 XK_KP_7, // XK_KP_Home
316 XK_KP_4, // XK_KP_Left
317 XK_KP_8, // XK_KP_Up
318 XK_KP_6, // XK_KP_Right
319 XK_KP_2, // XK_KP_Down
320 XK_KP_9, // XK_KP_Prior
321 XK_KP_3, // XK_KP_Next
322 XK_KP_1, // XK_KP_End
323 XK_KP_5, // XK_KP_Begin
324 };
325
326 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
327 {
328 unsigned int index = keysym - XK_KP_Home;
329 keysym = kp ? keypadtrans[index] : XK_Home + index;
330 }
331 else if (keysym == XK_KP_Insert)
332 keysym = kp ? XK_KP_0 : XK_Insert;
333# ifndef NO_DELETE_KEY
334 else if (keysym == XK_KP_Delete)
335 keysym = kp ? XK_KP_Decimal : XK_Delete;
336# endif
337#endif
338 return keysym;
339}
340
341static inline int ecb_cold
342map_function_key (KeySym keysym)
343{
344 int param = 0;
345
346 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
347 {
348 param = 11 + keysym - XK_F1;
349 if (keysym >= XK_F17)
350 param += 4;
351 else if (keysym >= XK_F15)
352 param += 3;
353 else if (keysym >= XK_F11)
354 param += 2;
355 else if (keysym >= XK_F6)
356 param += 1;
357 }
358 else
359 switch (keysym)
360 {
361 case XK_Find:
362 param = 1;
363 break;
364 case XK_Insert:
365 param = 2;
366 break;
367#ifdef DXK_Remove
368 case DXK_Remove:
369#endif
370 case XK_Execute:
371 param = 3;
372 break;
373 case XK_Select:
374 param = 4;
375 break;
376 case XK_Prior:
377 param = 5;
378 break;
379 case XK_Next:
380 param = 6;
381 break;
382 case XK_Home:
383 param = 7;
384 break;
385 case XK_End:
386 param = 8;
387 break;
388 case XK_Help:
389 param = 28;
390 break;
391 case XK_Menu:
392 param = 29;
393 break;
394 }
395 return param;
396}
397
398static inline wchar_t *
399rxvt_wcsdup (const wchar_t *str, int len)
400{
401 wchar_t *r = (wchar_t *)rxvt_malloc ((len + 1) * sizeof (wchar_t));
402 memcpy (r, str, len * sizeof (wchar_t));
403 r[len] = 0;
404 return r;
405}
406
407void ecb_cold
304rxvt_term::key_press (XKeyEvent &ev) 408rxvt_term::key_press (XKeyEvent &ev)
305{ 409{
306 int ctrl, meta, shft, len; 410 int ctrl, meta, shft, len;
307 unsigned int newlen; 411 KeySym keysym = NoSymbol;
308 KeySym keysym;
309 int valid_keysym;
310 char kbuf[KBUFSZ]; 412 char rkbuf[KBUFSZ + 1];
413 char *kbuf = rkbuf + 1;
311 414
312#if ISO_14755 415#if ISO_14755
313 if (iso14755buf & ISO_14755_52) 416 if (iso14755buf & ISO_14755_52)
314 return; 417 return;
315#endif 418#endif
… …
322 */ 425 */
323 shft = ev.state & ShiftMask; 426 shft = ev.state & ShiftMask;
324 ctrl = ev.state & ControlMask; 427 ctrl = ev.state & ControlMask;
325 meta = ev.state & ModMetaMask; 428 meta = ev.state & ModMetaMask;
326 429
327 if (numlock_state || (ev.state & ModNumLockMask))
328 {
329 numlock_state = (ev.state & ModNumLockMask);
330 PrivMode ((!numlock_state), PrivMode_aplKP);
331 }
332
333 kbuf[0] = 0; 430 kbuf[0] = 0;
334 431
335#ifdef USE_XIM 432#if USE_XIM
336 if (Input_Context) 433 if (Input_Context)
337 { 434 {
338 Status status_return; 435 Status status_return;
339 436
340#if 0 437#if 0
… …
378 } 475 }
379 } 476 }
380 else 477 else
381 len = 0; 478 len = 0;
382 } 479 }
383
384 valid_keysym = status_return == XLookupKeySym
385 || status_return == XLookupBoth;
386 } 480 }
387 else 481 else
388#endif 482#endif
389 { 483 {
390 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose); 484 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
391 valid_keysym = keysym != NoSymbol; 485 }
486
487 if (keysym != NoSymbol)
392 } 488 {
489 KeySym orig_keysym = keysym;
393 490
394 if (valid_keysym) 491 /* Shift + F1 - F10 generates F11 - F20 */
492 if (shft && keysym >= XK_F1 && keysym <= XK_F10)
493 {
494 keysym += (XK_F11 - XK_F1);
495 shft = 0; /* turn off Shift */
496 }
497
498 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
499 {
500 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
501 unsigned int newlen = 1;
502
503 if (ev.state & ModNumLockMask)
504 kp = false;
505
506 keysym = translate_keypad (keysym, kp);
507
508 switch (keysym)
509 {
510#ifndef NO_BACKSPACE_KEY
511 case XK_BackSpace:
512 if (priv_modes & PrivMode_HaveBackSpace)
513 {
514 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
515 ^ !!ctrl) ? '\b' : '\177';
516 kbuf[1] = '\0';
517 }
518 else
519 strcpy (kbuf, rs[Rs_backspace_key]);
520 break;
521#endif
522#ifndef NO_DELETE_KEY
523 case XK_Delete:
524 strcpy (kbuf, rs[Rs_delete_key]);
525 break;
526#endif
527 case XK_Tab:
528 if (shft)
529 strcpy (kbuf, "\033[Z");
530 else
531 {
532#ifdef CTRL_TAB_MAKES_META
533 if (ctrl)
534 meta = 1;
535#endif
536#ifdef MOD4_TAB_MAKES_META
537 if (ev.state & Mod4Mask)
538 meta = 1;
539#endif
540 newlen = 0;
541 }
542 break;
543
544 case XK_Up: /* "\033[A" */
545 case XK_Down: /* "\033[B" */
546 case XK_Right: /* "\033[C" */
547 case XK_Left: /* "\033[D" */
548 strcpy (kbuf, "\033[Z");
549 kbuf[2] = "DACB"[keysym - XK_Left];
550 /* do Shift first */
551 if (shft)
552 kbuf[2] = "dacb"[keysym - XK_Left];
553 else if (ctrl)
554 {
555 kbuf[1] = 'O';
556 kbuf[2] = "dacb"[keysym - XK_Left];
557 }
558 else if (priv_modes & PrivMode_aplCUR)
559 kbuf[1] = 'O';
560 break;
561
562 case XK_KP_Enter:
563 /* allow shift to override */
564 if (kp)
565 {
566 strcpy (kbuf, "\033OM");
567 break;
568 }
569
570 /* FALLTHROUGH */
571
572 case XK_Return:
573 if (priv_modes & PrivMode_LFNL)
574 {
575 kbuf[0] = '\015';
576 kbuf[1] = '\012';
577 kbuf[2] = '\0';
578 }
579 else
580 {
581 kbuf[0] = '\015';
582 kbuf[1] = '\0';
583 }
584 break;
585
586 case XK_KP_F1: /* "\033OP" */
587 case XK_KP_F2: /* "\033OQ" */
588 case XK_KP_F3: /* "\033OR" */
589 case XK_KP_F4: /* "\033OS" */
590 strcpy (kbuf, "\033OP");
591 kbuf[2] += (keysym - XK_KP_F1);
592 break;
593
594 case XK_KP_Multiply: /* "\033Oj" : "*" */
595 case XK_KP_Add: /* "\033Ok" : "+" */
596 case XK_KP_Separator: /* "\033Ol" : "," */
597 case XK_KP_Subtract: /* "\033Om" : "-" */
598 case XK_KP_Decimal: /* "\033On" : "." */
599 case XK_KP_Divide: /* "\033Oo" : "/" */
600 case XK_KP_0: /* "\033Op" : "0" */
601 case XK_KP_1: /* "\033Oq" : "1" */
602 case XK_KP_2: /* "\033Or" : "2" */
603 case XK_KP_3: /* "\033Os" : "3" */
604 case XK_KP_4: /* "\033Ot" : "4" */
605 case XK_KP_5: /* "\033Ou" : "5" */
606 case XK_KP_6: /* "\033Ov" : "6" */
607 case XK_KP_7: /* "\033Ow" : "7" */
608 case XK_KP_8: /* "\033Ox" : "8" */
609 case XK_KP_9: /* "\033Oy" : "9" */
610 /* allow shift to override */
611 if (kp)
612 {
613 strcpy (kbuf, "\033Oj");
614 kbuf[2] += (keysym - XK_KP_Multiply);
615 }
616 else
617 {
618 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
619 kbuf[1] = '\0';
620 }
621 break;
622
623 default:
624 {
625 int param = map_function_key (keysym);
626 if (param > 0)
627 sprintf (kbuf,"\033[%d~", param);
628 else
629 newlen = 0;
630 }
631 break;
632 }
633
634 if (newlen)
635 len = strlen (kbuf);
636
637 if (len > 0)
638 {
639 /*
640 * pass Shift/Control indicators for function keys ending with `~'
641 *
642 * eg,
643 * Prior = "ESC[5~"
644 * Shift+Prior = "ESC[5$"
645 * Ctrl+Prior = "ESC[5^"
646 * Ctrl+Shift+Prior = "ESC[5@"
647 */
648 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
649 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
650
651 /*
652 * Pass meta for all function keys, if 'meta' option set
653 */
654#ifdef META8_OPTION
655 if (meta && (meta_char == 0x80))
656 kbuf[len - 1] |= 0x80;
657#endif
658 }
659
660 }
661 else if (ctrl && keysym == XK_minus)
662 {
663 len = 1;
664 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
665 }
666 else if (keysym == XK_ISO_Left_Tab)
667 {
668 strcpy (kbuf, "\033[Z");
669 len = 3;
670 }
671 else
672 {
673#ifdef META8_OPTION
674 /* set 8-bit on */
675 if (meta && (meta_char == 0x80))
676 {
677 char *ch;
678
679 for (ch = kbuf; ch < kbuf + len; ch++)
680 *ch |= 0x80;
681 }
682#endif
683 /* nil */ ;
684 }
685
686 keysym = orig_keysym;
687 }
688
689 /* escape prefix */
690 if (len && meta
691#ifdef META8_OPTION
692 && meta_char == C0_ESC
693#endif
694 )
695 {
696 *--kbuf = C0_ESC;
697 len++;
698 }
699
700 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
701 return;
702
703 if (keysym != NoSymbol)
395 { 704 {
396#ifdef KEYSYM_RESOURCE 705#ifdef KEYSYM_RESOURCE
397 if (keyboard->dispatch (this, keysym, ev.state)) 706 if (keyboard->dispatch (this, keysym, ev.state, kbuf, len))
398 return; 707 return;
399#endif 708#endif
400 709
401 if (saveLines) 710 if (saveLines)
402 { 711 {
… …
411#ifdef PAGING_CONTEXT_LINES 720#ifdef PAGING_CONTEXT_LINES
412 lnsppg = nrow - PAGING_CONTEXT_LINES; 721 lnsppg = nrow - PAGING_CONTEXT_LINES;
413#else 722#else
414 lnsppg = nrow * 4 / 5; 723 lnsppg = nrow * 4 / 5;
415#endif 724#endif
725 max_it (lnsppg, 1);
726
416 if (keysym == XK_Prior) 727 if (keysym == XK_Prior)
417 { 728 {
418 scr_page (UP, lnsppg); 729 scr_page (lnsppg);
419 return; 730 return;
420 } 731 }
421 else if (keysym == XK_Next) 732 else if (keysym == XK_Next)
422 { 733 {
423 scr_page (DN, lnsppg); 734 scr_page (-lnsppg);
424 return; 735 return;
425 } 736 }
426 } 737 }
427#ifdef SCROLL_ON_UPDOWN_KEYS 738#ifdef SCROLL_ON_UPDOWN_KEYS
428 if (IS_SCROLL_MOD) 739 if (IS_SCROLL_MOD)
429 { 740 {
430 if (keysym == XK_Up) 741 if (keysym == XK_Up)
431 { 742 {
432 scr_page (UP, 1); 743 scr_page (1);
433 return; 744 return;
434 } 745 }
435 else if (keysym == XK_Down) 746 else if (keysym == XK_Down)
436 { 747 {
437 scr_page (DN, 1); 748 scr_page (-1);
438 return; 749 return;
439 } 750 }
440 } 751 }
441#endif 752#endif
442#ifdef SCROLL_ON_HOMEEND_KEYS 753#ifdef SCROLL_ON_HOMEEND_KEYS
443 if (IS_SCROLL_MOD) 754 if (IS_SCROLL_MOD)
444 { 755 {
445 if (keysym == XK_Home) 756 if (keysym == XK_Home)
446 { 757 {
447 scr_move_to (0, 1); 758 scr_changeview (top_row);
448 return; 759 return;
449 } 760 }
450 else if (keysym == XK_End) 761 else if (keysym == XK_End)
451 { 762 {
452 scr_move_to (1, 1); 763 scr_changeview (0);
453 return; 764 return;
454 } 765 }
455 } 766 }
456#endif 767#endif
457 } 768 }
458 769
459 if (shft) 770 if (shft)
460 { 771 {
461 /* Shift + F1 - F10 generates F11 - F20 */
462 if (keysym >= XK_F1 && keysym <= XK_F10)
463 {
464 keysym += (XK_F11 - XK_F1);
465 shft = 0; /* turn off Shift */
466 }
467 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys)) 772 if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
468 { 773 {
469 switch (keysym) 774 switch (keysym)
470 { 775 {
471 /* normal XTerm key bindings */ 776 /* normal XTerm key bindings */
472 case XK_Insert: /* Shift+Insert = paste mouse selection */ 777 case XK_Insert: /* Shift+Insert = paste mouse selection */
473 selection_request (ev.time); 778 selection_request (ev.time);
474 return; 779 return;
475#if TODO 780#if TODO
476 /* rxvt extras */ 781 /* rxvt extras */
477 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 782 case XK_KP_Add: /* Shift+KP_Add = bigger font */
478 change_font (FONT_UP);
479 return; 783 return;
480 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 784 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
481 change_font (FONT_DN);
482 return; 785 return;
483#endif 786#endif
484 } 787 }
485 } 788 }
486 } 789 }
487 790
791 if (ctrl && meta && (keysym == XK_c || keysym == XK_v))
792 {
793 if (keysym == XK_v)
794 selection_request (ev.time, Sel_Clipboard);
795 else if (selection.len > 0)
796 {
797 free (selection.clip_text);
798 selection.clip_text = rxvt_wcsdup (selection.text, selection.len);
799 selection.clip_len = selection.len;
800 selection_grab (CurrentTime, true);
801 }
802
803 return;
804 }
805
488#if ENABLE_FRILLS || ISO_14755 806#if ENABLE_FRILLS || ISO_14755
489 // ISO 14755 support 807 // ISO 14755 support
490 if (shft && ctrl) 808 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
491 { 809 {
492 int hv; 810 int hv;
493 811
494 if (iso14755buf & ISO_14755_51 812 if (iso14755buf & ISO_14755_51
495 && (keysym == XK_space || keysym == XK_KP_Space 813 && (keysym == XK_space || keysym == XK_KP_Space
… …
525 scr_overlay_off (); 843 scr_overlay_off ();
526# endif 844# endif
527 iso14755buf = 0; 845 iso14755buf = 0;
528 } 846 }
529 } 847 }
848 else if (option (Opt_iso14755) &&
530 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 849 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
531 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 850 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
532 if (!(iso14755buf & ISO_14755_STARTED)) 851 if (!(iso14755buf & ISO_14755_STARTED))
533 { 852 {
534 iso14755buf |= ISO_14755_STARTED; 853 iso14755buf |= ISO_14755_STARTED;
535# if ISO_14755 854# if ISO_14755
536 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 855 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
… …
544 { 863 {
545 scr_printscreen (ctrl | shft); 864 scr_printscreen (ctrl | shft);
546 return; 865 return;
547 } 866 }
548#endif 867#endif
549
550 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
551 {
552 {
553 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
554 newlen = 1;
555#ifdef XK_KP_Home
556 static const KeySym keypadtrans[] = {
557 XK_KP_7, // XK_KP_Home
558 XK_KP_4, // XK_KP_Left
559 XK_KP_8, // XK_KP_Up
560 XK_KP_6, // XK_KP_Right
561 XK_KP_2, // XK_KP_Down
562#ifndef UNSHIFTED_SCROLLKEYS
563 XK_KP_9, // XK_KP_Prior
564 XK_KP_3, // XK_KP_Next
565#else
566 XK_Prior,
567 XK_Next,
568#endif
569 XK_KP_1, // XK_KP_End
570 XK_KP_5, // XK_KP_Begin
571 };
572
573 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
574 {
575 unsigned int index = keysym - XK_KP_Home;
576 keysym = kp ? keypadtrans[index] : XK_Home + index;
577 }
578 else if (keysym == XK_KP_Insert)
579 keysym = kp ? XK_KP_0 : XK_Insert;
580#ifndef NO_DELETE_KEY
581 else if (keysym == XK_KP_Delete)
582 keysym = kp ? XK_KP_Decimal : XK_Delete;
583#endif
584#endif
585 switch (keysym)
586 {
587#ifndef NO_BACKSPACE_KEY
588 case XK_BackSpace:
589 if (priv_modes & PrivMode_HaveBackSpace)
590 {
591 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
592 ^ !!ctrl) ? '\b' : '\177';
593 kbuf[1] = '\0';
594 }
595 else
596 strcpy (kbuf, rs[Rs_backspace_key]);
597 break;
598#endif
599#ifndef NO_DELETE_KEY
600 case XK_Delete:
601 strcpy (kbuf, rs[Rs_delete_key]);
602 break;
603#endif
604 case XK_Tab:
605 if (shft)
606 strcpy (kbuf, "\033[Z");
607 else
608 {
609#ifdef CTRL_TAB_MAKES_META
610 if (ctrl)
611 meta = 1;
612#endif
613#ifdef MOD4_TAB_MAKES_META
614 if (ev.state & Mod4Mask)
615 meta = 1;
616#endif
617 newlen = 0;
618 }
619 break;
620
621 case XK_Up: /* "\033[A" */
622 case XK_Down: /* "\033[B" */
623 case XK_Right: /* "\033[C" */
624 case XK_Left: /* "\033[D" */
625 strcpy (kbuf, "\033[Z");
626 kbuf[2] = "DACB"[keysym - XK_Left];
627 /* do Shift first */
628 if (shft)
629 kbuf[2] = "dacb"[keysym - XK_Left];
630 else if (ctrl)
631 {
632 kbuf[1] = 'O';
633 kbuf[2] = "dacb"[keysym - XK_Left];
634 }
635 else if (priv_modes & PrivMode_aplCUR)
636 kbuf[1] = 'O';
637 break;
638
639#ifndef UNSHIFTED_SCROLLKEYS
640 case XK_Prior:
641 strcpy (kbuf, "\033[5~");
642 break;
643 case XK_Next:
644 strcpy (kbuf, "\033[6~");
645 break;
646#endif
647 case XK_KP_Enter:
648 /* allow shift to override */
649 if (kp)
650 {
651 strcpy (kbuf, "\033OM");
652 break;
653 }
654
655 /* FALLTHROUGH */
656
657 case XK_Return:
658 if (priv_modes & PrivMode_LFNL)
659 {
660 kbuf[0] = '\015';
661 kbuf[1] = '\012';
662 kbuf[2] = '\0';
663 }
664 else
665 {
666 kbuf[0] = '\015';
667 kbuf[1] = '\0';
668 }
669 break;
670
671 case XK_KP_F1: /* "\033OP" */
672 case XK_KP_F2: /* "\033OQ" */
673 case XK_KP_F3: /* "\033OR" */
674 case XK_KP_F4: /* "\033OS" */
675 strcpy (kbuf, "\033OP");
676 kbuf[2] += (keysym - XK_KP_F1);
677 break;
678
679 case XK_KP_Multiply: /* "\033Oj" : "*" */
680 case XK_KP_Add: /* "\033Ok" : "+" */
681 case XK_KP_Separator: /* "\033Ol" : "," */
682 case XK_KP_Subtract: /* "\033Om" : "-" */
683 case XK_KP_Decimal: /* "\033On" : "." */
684 case XK_KP_Divide: /* "\033Oo" : "/" */
685 case XK_KP_0: /* "\033Op" : "0" */
686 case XK_KP_1: /* "\033Oq" : "1" */
687 case XK_KP_2: /* "\033Or" : "2" */
688 case XK_KP_3: /* "\033Os" : "3" */
689 case XK_KP_4: /* "\033Ot" : "4" */
690 case XK_KP_5: /* "\033Ou" : "5" */
691 case XK_KP_6: /* "\033Ov" : "6" */
692 case XK_KP_7: /* "\033Ow" : "7" */
693 case XK_KP_8: /* "\033Ox" : "8" */
694 case XK_KP_9: /* "\033Oy" : "9" */
695 /* allow shift to override */
696 if (kp)
697 {
698 strcpy (kbuf, "\033Oj");
699 kbuf[2] += (keysym - XK_KP_Multiply);
700 }
701 else
702 {
703 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
704 kbuf[1] = '\0';
705 }
706 break;
707
708 case XK_Find:
709 strcpy (kbuf, "\033[1~");
710 break;
711
712 case XK_Insert:
713 strcpy (kbuf, "\033[2~");
714 break;
715#ifdef DXK_Remove /* support for DEC remove like key */
716 case DXK_Remove:
717 /* FALLTHROUGH */
718#endif
719 case XK_Execute:
720 strcpy (kbuf, "\033[3~");
721 break;
722 case XK_Select:
723 strcpy (kbuf, "\033[4~");
724 break;
725 case XK_End:
726 strcpy (kbuf, KS_END);
727 break;
728 case XK_Home:
729 strcpy (kbuf, KS_HOME);
730 break;
731
732#define FKEY(n, fkey) \
733 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
734
735 case XK_F1: /* "\033[11~" */
736 case XK_F2: /* "\033[12~" */
737 case XK_F3: /* "\033[13~" */
738 case XK_F4: /* "\033[14~" */
739 case XK_F5: /* "\033[15~" */
740 FKEY (11, XK_F1);
741 break;
742 case XK_F6: /* "\033[17~" */
743 case XK_F7: /* "\033[18~" */
744 case XK_F8: /* "\033[19~" */
745 case XK_F9: /* "\033[20~" */
746 case XK_F10: /* "\033[21~" */
747 FKEY (17, XK_F6);
748 break;
749 case XK_F11: /* "\033[23~" */
750 case XK_F12: /* "\033[24~" */
751 case XK_F13: /* "\033[25~" */
752 case XK_F14: /* "\033[26~" */
753 FKEY (23, XK_F11);
754 break;
755 case XK_F15: /* "\033[28~" */
756 case XK_F16: /* "\033[29~" */
757 FKEY (28, XK_F15);
758 break;
759 case XK_Help: /* "\033[28~" */
760 FKEY (28, XK_Help);
761 break;
762 case XK_Menu: /* "\033[29~" */
763 FKEY (29, XK_Menu);
764 break;
765 case XK_F17: /* "\033[31~" */
766 case XK_F18: /* "\033[32~" */
767 case XK_F19: /* "\033[33~" */
768 case XK_F20: /* "\033[34~" */
769 case XK_F21: /* "\033[35~" */
770 case XK_F22: /* "\033[36~" */
771 case XK_F23: /* "\033[37~" */
772 case XK_F24: /* "\033[38~" */
773 case XK_F25: /* "\033[39~" */
774 case XK_F26: /* "\033[40~" */
775 case XK_F27: /* "\033[41~" */
776 case XK_F28: /* "\033[42~" */
777 case XK_F29: /* "\033[43~" */
778 case XK_F30: /* "\033[44~" */
779 case XK_F31: /* "\033[45~" */
780 case XK_F32: /* "\033[46~" */
781 case XK_F33: /* "\033[47~" */
782 case XK_F34: /* "\033[48~" */
783 case XK_F35: /* "\033[49~" */
784 FKEY (31, XK_F17);
785 break;
786#undef FKEY
787 default:
788 newlen = 0;
789 break;
790 }
791
792 if (newlen)
793 len = strlen (kbuf);
794 }
795
796 /*
797 * Pass meta for all function keys, if 'meta' option set
798 */
799#ifdef META8_OPTION
800 if (meta && (meta_char == 0x80) && len > 0)
801 kbuf[len - 1] |= 0x80;
802#endif
803
804 }
805 else if (ctrl && keysym == XK_minus)
806 {
807 len = 1;
808 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
809 }
810 else if (keysym == XK_ISO_Left_Tab)
811 {
812 strcpy (kbuf, "\033[Z");
813 len = 3;
814 }
815 else
816 {
817#ifdef META8_OPTION
818 /* set 8-bit on */
819 if (meta && (meta_char == 0x80))
820 {
821 char *ch;
822
823 for (ch = kbuf; ch < kbuf + len; ch++)
824 *ch |= 0x80;
825
826 meta = 0;
827 }
828#endif
829 /* nil */ ;
830 }
831 } 868 }
832
833 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
834 return;
835 869
836 if (len <= 0) 870 if (len <= 0)
837 return; /* not mapped */ 871 return; /* not mapped */
838 872
839 if (option (Opt_scrollTtyKeypress))
840 if (view_start)
841 {
842 view_start = 0;
843 want_refresh = 1;
844 }
845
846 /*
847 * these modifications only affect the static keybuffer
848 * pass Shift/Control indicators for function keys ending with `~'
849 *
850 * eg,
851 * Prior = "ESC[5~"
852 * Shift+Prior = "ESC[5$"
853 * Ctrl+Prior = "ESC[5^"
854 * Ctrl+Shift+Prior = "ESC[5@"
855 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
856 */
857 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
858 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
859
860 /* escape prefix */
861 if (meta
862#ifdef META8_OPTION
863 && meta_char == C0_ESC
864#endif
865 )
866 {
867 const char ch = C0_ESC;
868 tt_write (&ch, 1);
869 }
870
871 tt_write (kbuf, (unsigned int)len); 873 tt_write_user_input (kbuf, (unsigned int)len);
872} 874}
873 875
874void 876void ecb_cold
875rxvt_term::key_release (XKeyEvent &ev) 877rxvt_term::key_release (XKeyEvent &ev)
876{ 878{
877#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL 879#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
878 KeySym keysym; 880 KeySym keysym;
879 881
… …
899 commit_iso14755 (); 901 commit_iso14755 ();
900 902
901 return; 903 return;
902 } 904 }
903 905
904 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 906 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
905 if (i[0] == keysym) 907 if (i[0] == keysym)
906 { 908 {
907 iso14755buf = ISO_14755_51 | i[1]; 909 iso14755buf = ISO_14755_51 | i[1];
908 commit_iso14755 (); 910 commit_iso14755 ();
909 911
… …
946 else if (keysym == XK_Control_L || keysym == XK_Control_R) 948 else if (keysym == XK_Control_L || keysym == XK_Control_R)
947 mouse_slip_wheel_speed = 0; 949 mouse_slip_wheel_speed = 0;
948#endif 950#endif
949} 951}
950 952
951#if defined (KEYSYM_RESOURCE)
952unsigned int
953rxvt_term::cmd_write (const char *str, unsigned int count)
954{
955 unsigned int n, s;
956
957 n = cmdbuf_ptr - cmdbuf_base;
958 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
959
960 if (n > 0 && s < count)
961 {
962 memmove (cmdbuf_base, cmdbuf_ptr,
963 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
964 cmdbuf_ptr = cmdbuf_base;
965 cmdbuf_endp -= n;
966 s += n;
967 }
968
969 if (count > s)
970 {
971 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
972 count = s;
973 }
974
975 for (; count--;)
976 *cmdbuf_endp++ = *str++;
977
978 cmd_parse ();
979
980 return 0;
981}
982#endif
983
984void 953void
985rxvt_term::flush () 954rxvt_term::flush ()
986{ 955{
987 flush_ev.stop (); 956 flush_ev.stop ();
988 957
989#ifdef HAVE_BG_PIXMAP 958#ifdef HAVE_IMG
990 if (bgPixmap.check_clearChanged ()) 959 if (bg_flags & BG_NEEDS_REFRESH)
991 { 960 {
992// scr_clear (true); This needs to be researched further! 961 bg_flags &= ~BG_NEEDS_REFRESH;
993 scr_touch (false); 962 scr_touch (false);
994 } 963 }
995#endif 964#endif
996 965
997 if (want_refresh) 966 if (want_refresh)
… …
1033 } 1002 }
1034 while (row < end_row); 1003 while (row < end_row);
1035 } 1004 }
1036 1005
1037 scr_refresh (); 1006 scr_refresh ();
1038 scrollbar_show (1); 1007 scrollBar.show (1);
1039#ifdef USE_XIM 1008#if USE_XIM
1040 IMSendSpot (); 1009 im_send_spot ();
1041#endif 1010#endif
1042 } 1011 }
1043 1012
1044 display->flush (); 1013 display->flush ();
1045} 1014}
1046 1015
1047/* checks wether a refresh is requested and starts the refresh timer */ 1016/* checks whether a refresh is requested and starts the refresh timer */
1048void 1017void
1049rxvt_term::refresh_check () 1018rxvt_term::refresh_check ()
1050{ 1019{
1051 if (want_refresh && !flush_ev.is_active ()) 1020 if (want_refresh && !flush_ev.is_active ())
1052 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally 1021 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
… …
1062 refresh_count = 0; 1031 refresh_count = 0;
1063 flush (); 1032 flush ();
1064} 1033}
1065 1034
1066#ifdef CURSOR_BLINK 1035#ifdef CURSOR_BLINK
1036void
1037rxvt_term::cursor_blink_reset ()
1038{
1039 if (!focus)
1040 return;
1041
1042 if (hidden_cursor)
1043 {
1044 hidden_cursor = 0;
1045 want_refresh = 1;
1046 }
1047
1048 if (option (Opt_cursorBlink) || (priv_modes & PrivMode_BlinkingCursor))
1049 cursor_blink_ev.again ();
1050 else
1051 cursor_blink_ev.stop ();
1052}
1053
1067void 1054void
1068rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 1055rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1069{ 1056{
1070 hidden_cursor = !hidden_cursor; 1057 hidden_cursor = !hidden_cursor;
1071 want_refresh = 1; 1058 want_refresh = 1;
… …
1079{ 1066{
1080 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1067 if (scr_refresh_rend (RS_Blink, RS_Blink))
1081 { 1068 {
1082 hidden_text = !hidden_text; 1069 hidden_text = !hidden_text;
1083 want_refresh = 1; 1070 want_refresh = 1;
1084 refresh_check (); 1071 refresh_check ();
1085 } 1072 }
1086 else 1073 else
1087 w.stop (); 1074 w.stop ();
1088} 1075}
1089#endif 1076#endif
1090 1077
1091#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1078#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1092void 1079void
1093rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1080rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1094{ 1081{
1095 if ((scrollbar_isUp () || scrollbar_isDn ()) 1082 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1096 && scr_page (scrollbar_isUp () ? UP : DN, 1)) 1083 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1097 { 1084 {
1098 want_refresh = 1; 1085 want_refresh = 1;
1099 refresh_check (); 1086 refresh_check ();
1100 } 1087 }
1101 else 1088 else
… …
1105 1092
1106#ifdef SELECTION_SCROLLING 1093#ifdef SELECTION_SCROLLING
1107void 1094void
1108rxvt_term::sel_scroll_cb (ev::timer &w, int revents) 1095rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1109{ 1096{
1110 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1097 if (scr_page (scroll_selection_lines))
1111 { 1098 {
1112 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1099 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1113 want_refresh = 1; 1100 want_refresh = 1;
1114 refresh_check (); 1101 refresh_check ();
1115 } 1102 }
… …
1120 1107
1121#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1108#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1122void 1109void
1123rxvt_term::slip_wheel_cb (ev::timer &w, int revents) 1110rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1124{ 1111{
1125 if (scr_changeview (view_start - mouse_slip_wheel_speed)) 1112 if (scr_page (mouse_slip_wheel_speed))
1126 { 1113 {
1127 want_refresh = 1; 1114 want_refresh = 1;
1128 refresh_check (); 1115 refresh_check ();
1129 } 1116 }
1130 1117
… …
1145 { 1132 {
1146 // this should really be sched_yield(), but the linux guys thought 1133 // this should really be sched_yield(), but the linux guys thought
1147 // that giving a process calling sched_yield () less cpu time than 1134 // that giving a process calling sched_yield () less cpu time than
1148 // ones with high nice levels is a useful thing to do. It surely is is 1135 // ones with high nice levels is a useful thing to do. It surely is is
1149 // allowed by the sus... as is returning ENOSYS. 1136 // allowed by the sus... as is returning ENOSYS.
1137 // since the linux guys additionally thought that breaking the only
1138 // known workaround against their unusable sched_yield hack is cool,
1139 // we just nanosleep a bit and hope for the best.
1150 1140
1151 struct timespec ts = { 0, 0 }; 1141 struct timespec ts = { 0, 1000 };
1152 nanosleep (&ts, 0); 1142 nanosleep (&ts, 0);
1153 1143
1154 w.stop (); 1144 w.stop ();
1155 } 1145 }
1156 1146
… …
1159 { 1149 {
1160 } 1150 }
1161} event_handler; 1151} event_handler;
1162#endif 1152#endif
1163 1153
1154/* make sure all the cmd data is at beginning of cmdbuf */
1155void
1156rxvt_term::cmdbuf_reify ()
1157{
1158 if (cmdbuf_ptr == cmdbuf_base)
1159 return;
1160
1161 ssize_t used = cmdbuf_endp - cmdbuf_ptr;
1162
1163 memmove (cmdbuf_base, cmdbuf_ptr, used);
1164 cmdbuf_ptr = cmdbuf_base;
1165 cmdbuf_endp = cmdbuf_ptr + used;
1166
1167}
1168
1169#if defined (KEYSYM_RESOURCE)
1170void
1171rxvt_term::cmdbuf_append (const char *str, size_t count)
1172{
1173 cmdbuf_reify ();
1174
1175 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1176
1177 if (count > avail)
1178 return;
1179
1180 memcpy (cmdbuf_endp, str, count);
1181 cmdbuf_endp += count;
1182
1183 cmd_parse ();
1184}
1185#endif
1186
1164bool 1187bool
1165rxvt_term::pty_fill () 1188rxvt_term::pty_fill ()
1166{ 1189{
1167 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1190 cmdbuf_reify ();
1168 1191
1169 if (CBUFSIZ == n) 1192 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1170 { 1193
1171 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1194 if (!avail)
1172 n = 0;
1173 } 1195 {
1174 1196 // normally this indicates a "too long" command sequence - just drop the data we have
1175 memmove (cmdbuf_base, cmdbuf_ptr, n);
1176 cmdbuf_ptr = cmdbuf_base; 1197 cmdbuf_ptr = cmdbuf_base;
1177 cmdbuf_endp = cmdbuf_ptr + n; 1198 cmdbuf_endp = cmdbuf_ptr;
1199 avail = CBUFSIZ;
1200 }
1178 1201
1179 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1202 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1180 1203
1181 if (r > 0) 1204 if (r > 0)
1182 { 1205 {
1183 cmdbuf_endp += r; 1206 cmdbuf_endp += r;
1184 return true; 1207 return true;
… …
1206{ 1229{
1207 make_current (); 1230 make_current ();
1208 1231
1209 if (revents & ev::READ) 1232 if (revents & ev::READ)
1210 // loop, but don't allow a single term to monopolize us 1233 // loop, but don't allow a single term to monopolize us
1211 while (pty_fill ()) 1234 for (int i = CBUFCNT; i-- && pty_fill (); )
1212 if (cmd_parse ()) 1235 cmd_parse ();
1213 break;
1214 1236
1215 if (revents & ev::WRITE) 1237 if (revents & ev::WRITE)
1216 pty_write (); 1238 pty_write ();
1217 1239
1218 refresh_check (); 1240 refresh_check ();
1219} 1241}
1220 1242
1221void 1243void ecb_cold
1222rxvt_term::pointer_unblank () 1244rxvt_term::pointer_unblank ()
1223{ 1245{
1224 XDefineCursor (dpy, vt, TermWin_cursor); 1246 XDefineCursor (dpy, vt, TermWin_cursor);
1225 recolour_cursor (); 1247 recolor_cursor ();
1226 1248
1227#ifdef POINTER_BLANK 1249#ifdef POINTER_BLANK
1228 hidden_pointer = 0; 1250 hidden_pointer = 0;
1229 1251
1230 if (option (Opt_pointerBlank)) 1252 if (option (Opt_pointerBlank))
1231 pointer_ev.start (pointerBlankDelay); 1253 pointer_ev.start (pointerBlankDelay);
1232#endif 1254#endif
1233} 1255}
1234 1256
1235#ifdef POINTER_BLANK 1257#ifdef POINTER_BLANK
1236void 1258void ecb_cold
1237rxvt_term::pointer_blank () 1259rxvt_term::pointer_blank ()
1238{ 1260{
1239 if (!option (Opt_pointerBlank)) 1261 if (!option (Opt_pointerBlank))
1240 return; 1262 return;
1241 1263
… …
1243 XFlush (dpy); 1265 XFlush (dpy);
1244 1266
1245 hidden_pointer = 1; 1267 hidden_pointer = 1;
1246} 1268}
1247 1269
1248void 1270void ecb_cold
1249rxvt_term::pointer_cb (ev::timer &w, int revents) 1271rxvt_term::pointer_cb (ev::timer &w, int revents)
1250{ 1272{
1251 make_current (); 1273 make_current ();
1252 1274
1253 pointer_blank (); 1275 pointer_blank ();
… …
1255#endif 1277#endif
1256 1278
1257void 1279void
1258rxvt_term::mouse_report (XButtonEvent &ev) 1280rxvt_term::mouse_report (XButtonEvent &ev)
1259{ 1281{
1260 int button_number, key_state = 0; 1282 int button_number, state = 0;
1261 int x, y; 1283 int x, y;
1262 int code = 32; 1284 bool release = ev.type == ButtonRelease;
1263 1285
1264 x = Pixel2Col (ev.x); 1286 x = Pixel2Col (ev.x) + 1;
1265 y = Pixel2Row (ev.y); 1287 y = Pixel2Row (ev.y) + 1;
1288
1266 if (ev.type == MotionNotify) 1289 if (ev.type == MotionNotify)
1267 { 1290 {
1268 if (x == mouse_row && y == mouse_col) 1291 if (x == mouse_row && y == mouse_col)
1269 return; 1292 return;
1293
1270 mouse_row = x; 1294 mouse_row = x;
1271 mouse_col = y; 1295 mouse_col = y;
1272 code += 32; 1296 state += 32;
1273 }
1274
1275 if (MEvent.button == AnyButton)
1276 button_number = 3;
1277 else
1278 { 1297 }
1298
1279 button_number = MEvent.button - Button1; 1299 button_number = MEvent.button - Button1;
1280 /* add 0x3D for wheel events, like xterm does */ 1300 /* add 0x3D for wheel events, like xterm does */
1281 if (button_number >= 3) 1301 if (button_number >= 3)
1282 button_number += (64 - 3); 1302 button_number += 64 - 3;
1283 }
1284 1303
1285 if (priv_modes & PrivMode_MouseX10) 1304 if (priv_modes & PrivMode_MouseX10)
1286 { 1305 {
1287 /* 1306 /*
1288 * do not report ButtonRelease 1307 * do not report ButtonRelease
1289 * no state info allowed 1308 * no state info allowed
1290 */ 1309 */
1291 key_state = 0; 1310 if (release)
1292 if (button_number == 3)
1293 return; 1311 return;
1294 } 1312 }
1295 else 1313 else
1296 { 1314 {
1297 /* XTerm mouse reporting needs these values: 1315 /* XTerm mouse reporting needs these values:
… …
1299 * 8 = Meta 1317 * 8 = Meta
1300 * 16 = Control 1318 * 16 = Control
1301 * plus will add in our own Double-Click reporting 1319 * plus will add in our own Double-Click reporting
1302 * 32 = Double Click 1320 * 32 = Double Click
1303 */ 1321 */
1304 key_state = ((MEvent.state & ShiftMask) ? 4 : 0) 1322 state += ((MEvent.state & ShiftMask) ? 4 : 0)
1305 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1323 + ((MEvent.state & ModMetaMask) ? 8 : 0)
1306 + ((MEvent.state & ControlMask) ? 16 : 0); 1324 + ((MEvent.state & ControlMask) ? 16 : 0);
1307#ifdef MOUSE_REPORT_DOUBLECLICK 1325#ifdef MOUSE_REPORT_DOUBLECLICK
1308 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1326 state += ((MEvent.clicks > 1) ? 32 : 0);
1309#endif 1327#endif
1310 } 1328 }
1329
1330 int code = 32 + (release ? 3 : button_number) + state;
1311 1331
1312#if DEBUG_MOUSEREPORT 1332#if DEBUG_MOUSEREPORT
1313 fprintf (stderr, "Mouse ["); 1333 fprintf (stderr, "Mouse [");
1314 if (key_state & 16) 1334 if (state & 16)
1315 fputc ('C', stderr); 1335 fputc ('C', stderr);
1316 if (key_state & 4) 1336 if (state & 4)
1317 fputc ('S', stderr); 1337 fputc ('S', stderr);
1318 if (key_state & 8) 1338 if (state & 8)
1319 fputc ('A', stderr); 1339 fputc ('A', stderr);
1320 if (key_state & 32) 1340 if (state & 32)
1321 fputc ('2', stderr); 1341 fputc ('2', stderr);
1322 fprintf (stderr, "]: <%d>, %d/%d\n", 1342 fprintf (stderr, "]: <%d>, %d/%d\n",
1323 button_number, 1343 button_number,
1324 x + 1, 1344 x,
1325 y + 1); 1345 y);
1326#endif 1346#endif
1327 1347
1348#if ENABLE_FRILLS
1349 if (priv_modes & PrivMode_ExtMouseSGR)
1350 tt_printf ("\033[<%d;%d;%d%c",
1351 button_number + state,
1352 x,
1353 y,
1354 release ? 'm' : 'M');
1355 else if (priv_modes & PrivMode_ExtMouseUrxvt)
1356 tt_printf ("\033[%d;%d;%dM",
1357 code,
1358 x,
1359 y);
1360 else if (priv_modes & PrivMode_ExtMouseUTF8)
1361 tt_printf ("\033[M%c%lc%lc",
1362 code,
1363 wint_t (32 + x),
1364 wint_t (32 + y));
1365 else
1366#endif
1328 tt_printf ("\033[M%c%c%c", 1367 tt_printf ("\033[M%c%c%c",
1329 (code + button_number + key_state), 1368 code,
1330 (32 + x + 1), 1369 32 + x,
1331 (32 + y + 1)); 1370 32 + y);
1332} 1371}
1333 1372
1334/*{{{ process an X event */ 1373/*{{{ process an X event */
1335void 1374void ecb_hot
1336rxvt_term::x_cb (XEvent &ev) 1375rxvt_term::x_cb (XEvent &ev)
1337{ 1376{
1338 make_current (); 1377 make_current ();
1339 1378
1340 dLocal (Display *, dpy); 1379 dLocal (Display *, dpy);
… …
1438 && ev.xfocus.mode != NotifyGrab) 1477 && ev.xfocus.mode != NotifyGrab)
1439 focus_out (); 1478 focus_out ();
1440 break; 1479 break;
1441 1480
1442 case ConfigureNotify: 1481 case ConfigureNotify:
1443 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1444 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1445 szHint.width, szHint.height); */
1446 if (ev.xconfigure.window == parent[0]) 1482 if (ev.xconfigure.window == parent)
1447 { 1483 {
1448 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1484 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1449 ; 1485 ;
1486
1487 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1488
1489 if (want_position_change)
1490 {
1491 int x, y;
1492
1493 if (ev.xconfigure.send_event)
1494 {
1495 x = ev.xconfigure.x;
1496 y = ev.xconfigure.y;
1497 }
1498 else
1499 get_window_origin (x, y);
1500
1501 if (x != parent_x || y != parent_y)
1502 {
1503 parent_x = x;
1504 parent_y = y;
1505 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1506 }
1507 }
1450 1508
1451 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1509 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1452 { 1510 {
1453 seen_resize = 1; 1511 seen_resize = 1;
1454 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1512 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1455 } 1513 }
1456 else
1457 {
1458#ifdef HAVE_BG_PIXMAP
1459 if (bgPixmap.window_position_sensitive ())
1460 update_background ();
1461#endif
1462 }
1463 1514
1464 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1515 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1465 } 1516 }
1466 break; 1517 break;
1467 1518
1468 case PropertyNotify: 1519 case PropertyNotify:
1469 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1520 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1470 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1471 && ev.xproperty.state == PropertyNewValue)
1472 selection_property (ev.xproperty.window, ev.xproperty.atom);
1473
1474 break; 1521 break;
1475 1522
1476 case SelectionClear: 1523 case SelectionClear:
1477 selection_clear (); 1524 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1478 break;
1479
1480 case SelectionNotify:
1481 if (selection_wait == Sel_normal)
1482 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1483 break; 1525 break;
1484 1526
1485 case SelectionRequest: 1527 case SelectionRequest:
1486 selection_send (ev.xselectionrequest); 1528 selection_send (ev.xselectionrequest);
1487 break; 1529 break;
… …
1507 if (ev.xany.window == vt) 1549 if (ev.xany.window == vt)
1508 { 1550 {
1509 do 1551 do
1510 { 1552 {
1511 scr_expose (ev.xexpose.x, ev.xexpose.y, 1553 scr_expose (ev.xexpose.x, ev.xexpose.y,
1512 ev.xexpose.width, ev.xexpose.height, False); 1554 ev.xexpose.width, ev.xexpose.height, false);
1513 } 1555 }
1514 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1556 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1515 1557
1516 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1558 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1517 1559
1518 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1560 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1519 { 1561 {
1520 scr_expose (ev.xexpose.x, ev.xexpose.y, 1562 scr_expose (ev.xexpose.x, ev.xexpose.y,
1521 ev.xexpose.width, ev.xexpose.height, False); 1563 ev.xexpose.width, ev.xexpose.height, false);
1522 } 1564 }
1523 1565
1524 want_refresh = 1; 1566 want_refresh = 1;
1525 } 1567 }
1526 else 1568 else
… …
1530 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1572 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1531 ; 1573 ;
1532 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1574 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1533 ; 1575 ;
1534 1576
1535 if (isScrollbarWindow (ev.xany.window)) 1577 if (scrollBar.state && ev.xany.window == scrollBar.win)
1536 { 1578 {
1537 scrollBar.setIdle (); 1579 scrollBar.state = SB_STATE_IDLE;
1538 scrollbar_show (0); 1580 scrollBar.show (0);
1539 } 1581 }
1540 } 1582 }
1541 break; 1583 break;
1542 1584
1543 case MotionNotify: 1585 case MotionNotify:
1544#ifdef POINTER_BLANK 1586#ifdef POINTER_BLANK
1545 if (hidden_pointer) 1587 if (hidden_pointer)
1546 pointer_unblank (); 1588 pointer_unblank ();
1547#endif 1589#endif
1590 if (!bypass_keystate
1548 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask)) 1591 && ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1549 || priv_modes & PrivMode_MouseAnyEvent) 1592 || priv_modes & PrivMode_MouseAnyEvent))
1550 mouse_report (ev.xbutton); 1593 mouse_report (ev.xbutton);
1551 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1594 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1552 break; 1595 break;
1553 1596
1554 if (ev.xany.window == vt) 1597 if (ev.xany.window == vt)
… …
1566 &unused_root_x, &unused_root_y, 1609 &unused_root_x, &unused_root_y,
1567 &ev.xbutton.x, &ev.xbutton.y, 1610 &ev.xbutton.x, &ev.xbutton.y,
1568 &ev.xbutton.state); 1611 &ev.xbutton.state);
1569#ifdef MOUSE_THRESHOLD 1612#ifdef MOUSE_THRESHOLD
1570 /* deal with a `jumpy' mouse */ 1613 /* deal with a `jumpy' mouse */
1571 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1614 if (ev.xmotion.time - MEvent.time > MOUSE_THRESHOLD)
1615#endif
1572 { 1616 {
1573#endif
1574#if ISO_14755 1617#if ISO_14755
1575 // 5.4 1618 // 5.4
1576 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1619 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1577 { 1620 {
1578 iso14755_54 (ev.xbutton.x, ev.xbutton.y); 1621 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
… …
1584 1627
1585#ifdef SELECTION_SCROLLING 1628#ifdef SELECTION_SCROLLING
1586 if (ev.xbutton.y < int_bwidth 1629 if (ev.xbutton.y < int_bwidth
1587 || Pixel2Row (ev.xbutton.y) > (nrow-1)) 1630 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1588 { 1631 {
1632 page_dirn scroll_selection_dir;
1589 int dist; 1633 int dist;
1590 1634
1591 /* don't clobber the current delay if we are 1635 /* don't clobber the current delay if we are
1592 * already in the middle of scrolling. 1636 * already in the middle of scrolling.
1593 */ 1637 */
… …
1608 dist = int_bwidth - ev.xbutton.y; 1652 dist = int_bwidth - ev.xbutton.y;
1609 } 1653 }
1610 else 1654 else
1611 { 1655 {
1612 scroll_selection_dir = DN; 1656 scroll_selection_dir = DN;
1613 dist = ev.xbutton.y - (int_bwidth + height); 1657 dist = ev.xbutton.y - (int_bwidth + vt_height);
1614 } 1658 }
1615 1659
1616 scroll_selection_lines = Pixel2Height (dist) 1660 scroll_selection_lines = Pixel2Height (dist)
1617 / SELECTION_SCROLL_LINE_SPEEDUP 1661 / SELECTION_SCROLL_LINE_SPEEDUP
1618 + 1; 1662 + 1;
1619 min_it (scroll_selection_lines, 1663 min_it (scroll_selection_lines,
1620 SELECTION_SCROLL_MAX_LINES); 1664 SELECTION_SCROLL_MAX_LINES);
1665 scroll_selection_lines *= scroll_selection_dir;
1621 } 1666 }
1622 else 1667 else
1623 { 1668 {
1624 /* we are within the text window, so we 1669 /* we are within the text window, so we
1625 * shouldn't be scrolling 1670 * shouldn't be scrolling
1626 */ 1671 */
1627 sel_scroll_ev.stop(); 1672 sel_scroll_ev.stop();
1628 } 1673 }
1629#endif 1674#endif
1630#ifdef MOUSE_THRESHOLD
1631 } 1675 }
1632#endif
1633 } 1676 }
1634 } 1677 }
1635 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1678 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1636 { 1679 {
1637 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1680 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1638 MotionNotify, &ev)) 1681 MotionNotify, &ev))
1639 ; 1682 ;
1640 1683
1641 XQueryPointer (dpy, scrollBar.win, 1684 XQueryPointer (dpy, scrollBar.win,
1642 &unused_root, &unused_child, 1685 &unused_root, &unused_child,
1643 &unused_root_x, &unused_root_y, 1686 &unused_root_x, &unused_root_y,
1644 &ev.xbutton.x, &ev.xbutton.y, 1687 &ev.xbutton.x, &ev.xbutton.y,
1645 &unused_mask); 1688 &unused_mask);
1646 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1689 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1647 scrollbar_size ()); 1690 scrollBar.size ());
1648 want_refresh = 1; 1691 want_refresh = 1;
1649 scrollbar_show (1); 1692 scrollBar.show (1);
1650 } 1693 }
1651 break; 1694 break;
1652 } 1695 }
1653 1696
1654#if defined(CURSOR_BLINK) 1697#if defined(CURSOR_BLINK)
1655 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1698 if (ev.type == KeyPress)
1656 {
1657 if (hidden_cursor)
1658 {
1659 hidden_cursor = 0;
1660 want_refresh = 1;
1661 }
1662
1663 cursor_blink_ev.again (); 1699 cursor_blink_reset ();
1664 }
1665#endif 1700#endif
1666 1701
1667#if defined(POINTER_BLANK) 1702#if defined(POINTER_BLANK)
1668 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1703 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1669 { 1704 {
… …
1679#endif 1714#endif
1680 1715
1681 refresh_check (); 1716 refresh_check ();
1682} 1717}
1683 1718
1684void 1719#if ENABLE_FRILLS
1720void ecb_cold
1721rxvt_term::set_urgency (bool enable)
1722{
1723 if (enable == urgency_hint)
1724 return;
1725
1726 if (XWMHints *h = XGetWMHints (dpy, parent))
1727 {
1728 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1729 XSetWMHints (dpy, parent, h);
1730 urgency_hint = enable;
1731 XFree (h);
1732 }
1733}
1734#endif
1735
1736void ecb_cold
1685rxvt_term::focus_in () 1737rxvt_term::focus_in ()
1686{ 1738{
1687 if (!focus) 1739 if (!focus)
1688 { 1740 {
1689 focus = 1; 1741 focus = 1;
1690 want_refresh = 1; 1742 want_refresh = 1;
1691 1743
1692 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1693
1694#if USE_XIM 1744#if USE_XIM
1695 if (Input_Context != NULL) 1745 if (Input_Context != NULL)
1696 { 1746 {
1697 IMSetPosition (); 1747 im_set_position ();
1698 XSetICFocus (Input_Context); 1748 XSetICFocus (Input_Context);
1699 } 1749 }
1700#endif 1750#endif
1701#if CURSOR_BLINK 1751#if CURSOR_BLINK
1702 if (option (Opt_cursorBlink)) 1752 if (option (Opt_cursorBlink))
… …
1704#endif 1754#endif
1705#if OFF_FOCUS_FADING 1755#if OFF_FOCUS_FADING
1706 if (rs[Rs_fade]) 1756 if (rs[Rs_fade])
1707 { 1757 {
1708 pix_colors = pix_colors_focused; 1758 pix_colors = pix_colors_focused;
1709 scr_recolour (); 1759 scr_recolor ();
1710 } 1760 }
1711#endif 1761#endif
1712#if ENABLE_FRILLS 1762#if ENABLE_FRILLS
1713 if (option (Opt_urgentOnBell)) 1763 if (option (Opt_urgentOnBell))
1714 { 1764 set_urgency (0);
1715 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1716 {
1717 h->flags &= ~XUrgencyHint;
1718 XSetWMHints (dpy, parent[0], h);
1719 }
1720 }
1721#endif
1722 }
1723}
1724 1765
1725void 1766 if (priv_modes & PrivMode_FocusEvent)
1767 tt_printf ("\x1b[I");
1768#endif
1769
1770 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1771 }
1772}
1773
1774void ecb_cold
1726rxvt_term::focus_out () 1775rxvt_term::focus_out ()
1727{ 1776{
1728 if (focus) 1777 if (focus)
1729 { 1778 {
1730 focus = 0; 1779 focus = 0;
1731 want_refresh = 1; 1780 want_refresh = 1;
1732 1781
1733 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1782#if ENABLE_FRILLS
1783 if (option (Opt_urgentOnBell))
1784 set_urgency (0);
1734 1785
1786 if (priv_modes & PrivMode_FocusEvent)
1787 tt_printf ("\x1b[O");
1788#endif
1735#if ENABLE_FRILLS || ISO_14755 1789#if ENABLE_FRILLS || ISO_14755
1736 if (iso14755buf) 1790 if (iso14755buf)
1737 { 1791 {
1738 iso14755buf = 0; 1792 iso14755buf = 0;
1739# if ISO_14755 1793# if ISO_14755
… …
1753#endif 1807#endif
1754#if OFF_FOCUS_FADING 1808#if OFF_FOCUS_FADING
1755 if (rs[Rs_fade]) 1809 if (rs[Rs_fade])
1756 { 1810 {
1757 pix_colors = pix_colors_unfocused; 1811 pix_colors = pix_colors_unfocused;
1758 scr_recolour (); 1812 scr_recolor ();
1759 } 1813 }
1760#endif 1814#endif
1761 }
1762}
1763 1815
1764void 1816 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1817 }
1818}
1819
1820void ecb_cold
1765rxvt_term::update_fade_color (unsigned int idx) 1821rxvt_term::update_fade_color (unsigned int idx, bool first_time)
1766{ 1822{
1767#if OFF_FOCUS_FADING 1823#if OFF_FOCUS_FADING
1768 if (rs[Rs_fade]) 1824 if (rs[Rs_fade])
1769 { 1825 {
1826 if (!first_time)
1827 pix_colors_focused [idx].free (this);
1828
1770 rgba c; 1829 rgba c;
1771 pix_colors [Color_fade].get (c); 1830 pix_colors [Color_fade].get (c);
1772 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1831 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1773 } 1832 }
1774#endif 1833#endif
1775} 1834}
1776 1835
1777#if ENABLE_TRANSPARENCY || ENABLE_PERL 1836#if ENABLE_PERL
1778void 1837void ecb_hot
1779rxvt_term::rootwin_cb (XEvent &ev) 1838rxvt_term::rootwin_cb (XEvent &ev)
1780{ 1839{
1781 make_current (); 1840 make_current ();
1782 1841
1783 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1842 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1784 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1843 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1785 return; 1844 return;
1786 1845
1787# if ENABLE_TRANSPARENCY
1788 switch (ev.type) 1846 switch (ev.type)
1789 { 1847 {
1790 case PropertyNotify: 1848 case PropertyNotify:
1791 /* 1849 /*
1792 * if user used some Esetroot compatible prog to set the root bg, 1850 * if user used some Esetroot compatible prog to set the root bg,
1793 * use the property to determine the pixmap. We use it later on. 1851 * use the property to determine the pixmap. We use it later on.
1794 */ 1852 */
1795 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1853 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1796 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1854 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1797 { 1855 {
1798 bgPixmap.set_root_pixmap (); 1856 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1799 update_background ();
1800 } 1857 }
1801 1858
1802 break; 1859 break;
1803 } 1860 }
1804# endif
1805 1861
1806 refresh_check (); 1862 refresh_check ();
1807} 1863}
1808#endif 1864#endif
1809 1865
… …
1832 iso14755_54 (ev.x, ev.y); 1888 iso14755_54 (ev.x, ev.y);
1833 return; 1889 return;
1834 } 1890 }
1835#endif 1891#endif
1836 1892
1837 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1893 clickintime = ev.time - MEvent.time < multiClickTime;
1838 1894
1839 if (reportmode) 1895 if (reportmode)
1840 { 1896 {
1841 /* mouse report from vt window */ 1897 /* mouse report from vt window */
1842 /* save the xbutton state (for ButtonRelease) */ 1898 /* save the xbutton state (for ButtonRelease) */
1843 MEvent.state = ev.state; 1899 MEvent.state = ev.state;
1844#ifdef MOUSE_REPORT_DOUBLECLICK 1900#ifdef MOUSE_REPORT_DOUBLECLICK
1845 if (ev.button == MEvent.button && clickintime) 1901 if (ev.button == MEvent.button && clickintime)
1846 { 1902 {
1847 /* same button, within alloted time */ 1903 /* same button, within allowed time */
1848 MEvent.clicks++; 1904 MEvent.clicks++;
1849 1905
1850 if (MEvent.clicks > 1) 1906 if (MEvent.clicks > 1)
1851 { 1907 {
1852 /* only report double clicks */ 1908 /* only report double clicks */
… …
1924 } 1980 }
1925 1981
1926 /* 1982 /*
1927 * Scrollbar window processing of button press 1983 * Scrollbar window processing of button press
1928 */ 1984 */
1929 if (isScrollbarWindow (ev.window)) 1985 if (scrollBar.state && ev.window == scrollBar.win)
1930 { 1986 {
1931 scrollBar.setIdle (); 1987 page_dirn direction = NO_DIR;
1988
1989 if (scrollBar.upButton (ev.y))
1990 direction = UP; /* up */
1991 else if (scrollBar.dnButton (ev.y))
1992 direction = DN; /* down */
1993
1994 scrollBar.state = SB_STATE_IDLE;
1932 /* 1995 /*
1933 * Rxvt-style scrollbar: 1996 * Rxvt-style scrollbar:
1934 * move up if mouse is above slider 1997 * move up if mouse is above slider
1935 * move dn if mouse is below slider 1998 * move dn if mouse is below slider
1936 * 1999 *
… …
1945 /* 2008 /*
1946 * Mouse report disabled scrollbar: 2009 * Mouse report disabled scrollbar:
1947 * arrow buttons - send up/down 2010 * arrow buttons - send up/down
1948 * click on scrollbar - send pageup/down 2011 * click on scrollbar - send pageup/down
1949 */ 2012 */
1950 if ((scrollBar.style == R_SB_NEXT 2013 if (direction == UP)
1951 && scrollbarnext_upButton (ev.y))
1952 || (scrollBar.style == R_SB_RXVT
1953 && scrollbarrxvt_upButton (ev.y)))
1954 tt_printf ("\033[A"); 2014 tt_printf ("\033[A");
1955 else if ((scrollBar.style == R_SB_NEXT 2015 else if (direction == DN)
1956 && scrollbarnext_dnButton (ev.y))
1957 || (scrollBar.style == R_SB_RXVT
1958 && scrollbarrxvt_dnButton (ev.y)))
1959 tt_printf ("\033[B"); 2016 tt_printf ("\033[B");
1960 else 2017 else
1961 switch (ev.button) 2018 switch (ev.button)
1962 { 2019 {
1963 case Button2: 2020 case Button2:
… …
1971 break; 2028 break;
1972 } 2029 }
1973 } 2030 }
1974 else 2031 else
1975#endif /* NO_SCROLLBAR_REPORT */ 2032#endif /* NO_SCROLLBAR_REPORT */
1976
1977 {
1978 char upordown = 0;
1979
1980 if (scrollBar.style == R_SB_NEXT)
1981 { 2033 {
1982 if (scrollbarnext_upButton (ev.y)) 2034 if (direction != NO_DIR)
1983 upordown = -1; /* up */
1984 else if (scrollbarnext_dnButton (ev.y))
1985 upordown = 1; /* down */
1986 }
1987 else if (scrollBar.style == R_SB_RXVT)
1988 {
1989 if (scrollbarrxvt_upButton (ev.y))
1990 upordown = -1; /* up */
1991 else if (scrollbarrxvt_dnButton (ev.y))
1992 upordown = 1; /* down */
1993 }
1994
1995 if (upordown)
1996 { 2035 {
1997#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2036#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1998 if (!cont_scroll_ev.is_active ()) 2037 if (!cont_scroll_ev.is_active ())
1999 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2038 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2000#endif 2039#endif
2001 if (scr_page (upordown < 0 ? UP : DN, 1)) 2040 if (scr_page (direction, 1))
2002 { 2041 {
2003 if (upordown < 0) 2042 if (direction == UP)
2004 scrollBar.setUp (); 2043 scrollBar.state = SB_STATE_UP;
2005 else 2044 else
2006 scrollBar.setDn (); 2045 scrollBar.state = SB_STATE_DOWN;
2007 } 2046 }
2008 } 2047 }
2009 else 2048 else
2010 switch (ev.button) 2049 switch (ev.button)
2011 { 2050 {
2012 case Button2: 2051 case Button2:
2013 switch (scrollBar.align) 2052 switch (scrollBar.align)
2014 { 2053 {
2015 case R_SB_ALIGN_TOP: 2054 case SB_ALIGN_TOP:
2016 csrO = 0; 2055 csrO = 0;
2017 break; 2056 break;
2018 case R_SB_ALIGN_CENTRE: 2057 case SB_ALIGN_CENTRE:
2019 csrO = (scrollBar.bot - scrollBar.top) / 2; 2058 csrO = (scrollBar.bot - scrollBar.top) / 2;
2020 break; 2059 break;
2021 case R_SB_ALIGN_BOTTOM: 2060 case SB_ALIGN_BOTTOM:
2022 csrO = scrollBar.bot - scrollBar.top; 2061 csrO = scrollBar.bot - scrollBar.top;
2023 break; 2062 break;
2024 } 2063 }
2025 2064
2026 if (scrollBar.style == R_SB_XTERM 2065 if (scrollBar.style == SB_STYLE_XTERM
2027 || scrollbar_above_slider (ev.y) 2066 || scrollBar.above_slider (ev.y)
2028 || scrollbar_below_slider (ev.y)) 2067 || scrollBar.below_slider (ev.y))
2029 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2068 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2030 2069
2031 scrollBar.setMotion (); 2070 scrollBar.state = SB_STATE_MOTION;
2032 break; 2071 break;
2033 2072
2034 case Button1: 2073 case Button1:
2035 if (scrollBar.align == R_SB_ALIGN_CENTRE) 2074 if (scrollBar.align == SB_ALIGN_CENTRE)
2036 csrO = ev.y - scrollBar.top; 2075 csrO = ev.y - scrollBar.top;
2037 /* FALLTHROUGH */ 2076 /* FALLTHROUGH */
2038 2077
2039 case Button3: 2078 case Button3:
2040 if (scrollBar.style != R_SB_XTERM) 2079 if (scrollBar.style != SB_STYLE_XTERM)
2041 { 2080 {
2042 if (scrollbar_above_slider (ev.y)) 2081 if (scrollBar.above_slider (ev.y))
2043# ifdef RXVT_SCROLL_FULL 2082# ifdef RXVT_SCROLL_FULL
2044 scr_page (UP, nrow - 1); 2083 scr_page (UP, nrow - 1);
2045# else 2084# else
2046 scr_page (UP, nrow / 4); 2085 scr_page (UP, nrow / 4);
2047# endif 2086# endif
2048 else if (scrollbar_below_slider (ev.y)) 2087 else if (scrollBar.below_slider (ev.y))
2049# ifdef RXVT_SCROLL_FULL 2088# ifdef RXVT_SCROLL_FULL
2050 scr_page (DN, nrow - 1); 2089 scr_page (DN, nrow - 1);
2051# else 2090# else
2052 scr_page (DN, nrow / 4); 2091 scr_page (DN, nrow / 4);
2053# endif 2092# endif
2054 else 2093 else
2055 scrollBar.setMotion (); 2094 scrollBar.state = SB_STATE_MOTION;
2056 } 2095 }
2057 else 2096 else
2058 { 2097 {
2059 scr_page ((ev.button == Button1 ? DN : UP), 2098 scr_page ((ev.button == Button1 ? DN : UP),
2060 (nrow 2099 (nrow
2061 * scrollbar_position (ev.y) 2100 * scrollBar.position (ev.y)
2062 / scrollbar_size ())); 2101 / scrollBar.size ()));
2063 } 2102 }
2064 2103
2065 break; 2104 break;
2066 } 2105 }
2067 } 2106 }
… …
2077 2116
2078 csrO = 0; /* reset csr Offset */ 2117 csrO = 0; /* reset csr Offset */
2079 if (!bypass_keystate) 2118 if (!bypass_keystate)
2080 reportmode = !! (priv_modes & PrivMode_mouse_report); 2119 reportmode = !! (priv_modes & PrivMode_mouse_report);
2081 2120
2082 if (scrollbar_isUpDn ()) 2121 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2083 { 2122 {
2084 scrollBar.setIdle (); 2123 scrollBar.state = SB_STATE_IDLE;
2085 scrollbar_show (0); 2124 scrollBar.show (0);
2086 } 2125 }
2087 2126
2088#ifdef SELECTION_SCROLLING 2127#ifdef SELECTION_SCROLLING
2089 sel_scroll_ev.stop(); 2128 sel_scroll_ev.stop();
2090#endif 2129#endif
… …
2109#ifdef MOUSE_REPORT_DOUBLECLICK 2148#ifdef MOUSE_REPORT_DOUBLECLICK
2110 /* only report the release of 'slow' single clicks */ 2149 /* only report the release of 'slow' single clicks */
2111 if (MEvent.button != AnyButton 2150 if (MEvent.button != AnyButton
2112 && (ev.button != MEvent.button 2151 && (ev.button != MEvent.button
2113 || (ev.time - MEvent.time 2152 || (ev.time - MEvent.time
2114 > MULTICLICK_TIME / 2))) 2153 > multiClickTime / 2)))
2115 { 2154 {
2116 MEvent.clicks = 0; 2155 MEvent.clicks = 0;
2117 MEvent.button = AnyButton; 2156 MEvent.button = ev.button;
2118 mouse_report (ev); 2157 mouse_report (ev);
2119 } 2158 }
2120#else /* MOUSE_REPORT_DOUBLECLICK */ 2159#else /* MOUSE_REPORT_DOUBLECLICK */
2121 MEvent.button = AnyButton; 2160 MEvent.button = ev.button;
2122 mouse_report (ev); 2161 mouse_report (ev);
2123#endif /* MOUSE_REPORT_DOUBLECLICK */ 2162#endif /* MOUSE_REPORT_DOUBLECLICK */
2124 return; 2163 return;
2125 } 2164 }
2126 2165
… …
2139 case Button3: 2178 case Button3:
2140 selection_make (ev.time); 2179 selection_make (ev.time);
2141 break; 2180 break;
2142 2181
2143 case Button2: 2182 case Button2:
2144 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2183 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2145 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2184 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2146 break; 2185 break;
2147 2186
2148#ifdef MOUSE_WHEEL 2187#ifdef MOUSE_WHEEL
2149 case Button4: 2188 case Button4:
2150 case Button5: 2189 case Button5:
2151 { 2190 {
2152 int i; 2191 int lines;
2153 page_dirn v; 2192 page_dirn dirn;
2154 2193
2155 v = ev.button == Button4 ? UP : DN; 2194 dirn = ev.button == Button4 ? UP : DN;
2156 2195
2157 if (ev.state & ShiftMask) 2196 if (ev.state & ShiftMask)
2158 i = 1; 2197 lines = 1;
2159 else if (option (Opt_mouseWheelScrollPage)) 2198 else if (option (Opt_mouseWheelScrollPage))
2160 i = nrow - 1; 2199 lines = nrow - 1;
2161 else 2200 else
2162 i = 5; 2201 lines = 5;
2163 2202
2164# ifdef MOUSE_SLIP_WHEELING 2203# ifdef MOUSE_SLIP_WHEELING
2165 if (ev.state & ControlMask) 2204 if (ev.state & ControlMask)
2166 { 2205 {
2167 mouse_slip_wheel_speed += v ? -1 : 1; 2206 mouse_slip_wheel_speed += dirn;
2168 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2207 clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2169 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2170 2208
2171 if (!slip_wheel_ev.is_active ()) 2209 if (!slip_wheel_ev.is_active ())
2172 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2210 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2173 } 2211 }
2174 else 2212 else
2213# endif
2175 { 2214 {
2176# endif
2177 scr_page (v, i); 2215 scr_page (dirn, lines);
2178 scrollbar_show (1); 2216 scrollBar.show (1);
2179# ifdef MOUSE_SLIP_WHEELING
2180 } 2217 }
2181# endif
2182 } 2218 }
2183 break; 2219 break;
2184#endif 2220#endif
2185 } 2221 }
2186 } 2222 }
2187} 2223}
2188 2224
2189/*}}} */ 2225/*}}} */
2190 2226
2191bool 2227void ecb_hot
2192rxvt_term::cmd_parse () 2228rxvt_term::cmd_parse ()
2193{ 2229{
2194 bool flag = false;
2195 wchar_t ch = NOCHAR; 2230 wchar_t ch = NOCHAR;
2196 char *seq_begin; // remember start of esc-sequence here 2231 char *seq_begin; // remember start of esc-sequence here
2197 2232
2198 for (;;) 2233 for (;;)
2199 { 2234 {
2200 if (ch == NOCHAR) 2235 if (ecb_unlikely (ch == NOCHAR))
2201 { 2236 {
2202 seq_begin = cmdbuf_ptr; 2237 seq_begin = cmdbuf_ptr;
2203 ch = next_char (); 2238 ch = next_char ();
2204 2239
2205 if (ch == NOCHAR) 2240 if (ch == NOCHAR)
2206 break; 2241 break;
2207 } 2242 }
2208 2243
2209 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2244 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2210 { 2245 {
2211 if (!seen_input) 2246 if (ecb_unlikely (!seen_input))
2212 { 2247 {
2213 seen_input = 1; 2248 seen_input = 1;
2214 // many badly-written programs (e.g. jed) contain a race condition: 2249 // many badly-written programs (e.g. jed) contain a race condition:
2215 // they first read the screensize and then install a SIGWINCH handler. 2250 // they first read the screensize and then install a SIGWINCH handler.
2216 // some window managers resize the window early, and these programs 2251 // some window managers resize the window early, and these programs
… …
2229 wchar_t *str = buf; 2264 wchar_t *str = buf;
2230 wchar_t *eol = str + min (ncol, UBUFSIZ); 2265 wchar_t *eol = str + min (ncol, UBUFSIZ);
2231 2266
2232 for (;;) 2267 for (;;)
2233 { 2268 {
2234 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2269 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2235 break; 2270 break;
2236 2271
2237 *str++ = ch; 2272 *str++ = ch;
2238 2273
2239 if (ch == C0_LF || str >= eol) 2274 if (ecb_unlikely (ch == C0_LF || str >= eol))
2240 { 2275 {
2241 if (ch == C0_LF) 2276 if (ch == C0_LF)
2242 nlines++; 2277 nlines++;
2243 2278
2244 refresh_count++; 2279 refresh_count++;
… …
2293 * What the heck we'll cheat and only refresh less than every page-full. 2328 * What the heck we'll cheat and only refresh less than every page-full.
2294 * if skipScroll is enabled. 2329 * if skipScroll is enabled.
2295 */ 2330 */
2296 if (refreshnow) 2331 if (refreshnow)
2297 { 2332 {
2298 flag = true;
2299 scr_refresh (); 2333 scr_refresh ();
2300 want_refresh = 1; 2334 want_refresh = 1;
2301 } 2335 }
2302
2303 } 2336 }
2304 else 2337 else
2305 { 2338 {
2306 try 2339 try
2307 { 2340 {
… …
2315 } 2348 }
2316 2349
2317 ch = NOCHAR; 2350 ch = NOCHAR;
2318 } 2351 }
2319 } 2352 }
2320
2321 return flag;
2322} 2353}
2323 2354
2324// read the next character 2355// read the next character
2325wchar_t 2356wchar_t ecb_hot
2326rxvt_term::next_char () NOTHROW 2357rxvt_term::next_char () NOTHROW
2327{ 2358{
2328 while (cmdbuf_ptr < cmdbuf_endp) 2359 while (cmdbuf_ptr < cmdbuf_endp)
2329 { 2360 {
2330 // assume 7-bit to be ascii ALWAYS 2361 // assume 7-bit to be ascii ALWAYS (always true in POSIX)
2331 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2362 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f))
2332 return *cmdbuf_ptr++; 2363 return *cmdbuf_ptr++;
2333 2364
2334 wchar_t wc; 2365 wchar_t wc;
2335 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2366 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2336 2367
… …
2340 cmdbuf_ptr = cmdbuf_endp; 2371 cmdbuf_ptr = cmdbuf_endp;
2341 break; 2372 break;
2342 } 2373 }
2343 2374
2344 if (len == (size_t)-1) 2375 if (len == (size_t)-1)
2376 {
2377 mbstate.reset (); // reset now undefined conversion state
2378 // a -1 might indicate that a previous incomplete char is invalid (previous return -2)
2379 // in which case we "erroneously" return the next byte which might be valid.
2345 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2380 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2381 }
2346 2382
2347 // assume wchar == unicode 2383 // assume wchar == unicode
2348 cmdbuf_ptr += len; 2384 cmdbuf_ptr += len;
2349 return wc & UNICODE_MASK; 2385 return wc & UNICODE_MASK;
2350 } 2386 }
2351 2387
2352 return NOCHAR; 2388 return NOCHAR;
2353} 2389}
2354 2390
2355// read the next octet 2391// read the next octet
2356uint32_t 2392uint32_t ecb_hot
2357rxvt_term::next_octet () NOTHROW 2393rxvt_term::next_octet () NOTHROW
2358{ 2394{
2359 return cmdbuf_ptr < cmdbuf_endp 2395 return cmdbuf_ptr < cmdbuf_endp
2360 ? (unsigned char)*cmdbuf_ptr++ 2396 ? (unsigned char)*cmdbuf_ptr++
2361 : NOCHAR; 2397 : NOCHAR;
2362} 2398}
2363 2399
2364static class out_of_input out_of_input; 2400static class out_of_input out_of_input;
2365 2401
2366/* rxvt_cmd_getc () - Return next input character */ 2402wchar_t ecb_hot
2367/*
2368 * Return the next input character after first passing any keyboard input
2369 * to the command.
2370 */
2371wchar_t
2372rxvt_term::cmd_getc () THROW ((class out_of_input)) 2403rxvt_term::cmd_getc () THROW ((class out_of_input))
2373{ 2404{
2374 wchar_t c = next_char (); 2405 wchar_t c = next_char ();
2375 2406
2376 if (c == NOCHAR) 2407 if (c == NOCHAR)
2377 throw out_of_input; 2408 throw out_of_input;
2378 2409
2379 return c; 2410 return c;
2380} 2411}
2381 2412
2382uint32_t 2413uint32_t ecb_hot
2383rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2414rxvt_term::cmd_get8 () THROW ((class out_of_input))
2384{ 2415{
2385 uint32_t c = next_octet (); 2416 uint32_t c = next_octet ();
2386 2417
2387 if (c == NOCHAR) 2418 if (c == NOCHAR)
… …
2391} 2422}
2392 2423
2393/*{{{ print pipe */ 2424/*{{{ print pipe */
2394/*----------------------------------------------------------------------*/ 2425/*----------------------------------------------------------------------*/
2395#ifdef PRINTPIPE 2426#ifdef PRINTPIPE
2396FILE * 2427FILE * ecb_cold
2397rxvt_term::popen_printer () 2428rxvt_term::popen_printer ()
2398{ 2429{
2399 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2430 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2400 2431
2401 if (stream == NULL) 2432 if (stream == NULL)
2402 rxvt_warn ("can't open printer pipe, not printing.\n"); 2433 rxvt_warn ("can't open printer pipe, not printing.\n");
2403 2434
2404 return stream; 2435 return stream;
2405} 2436}
2406 2437
2407int 2438int ecb_cold
2408rxvt_term::pclose_printer (FILE *stream) 2439rxvt_term::pclose_printer (FILE *stream)
2409{ 2440{
2410 fflush (stream); 2441 fflush (stream);
2411 return pclose (stream); 2442 return pclose (stream);
2412} 2443}
2413 2444
2414/* 2445/*
2415 * simulate attached vt100 printer 2446 * simulate attached vt100 printer
2416 */ 2447 */
2417void 2448void ecb_cold
2418rxvt_term::process_print_pipe () 2449rxvt_term::process_print_pipe ()
2419{ 2450{
2420 int done; 2451 FILE *fd = popen_printer ();
2421 FILE *fd;
2422 2452
2423 if ((fd = popen_printer ()) == NULL) 2453 if (!fd)
2424 return; 2454 return;
2425 2455
2426 /* 2456 /*
2427 * Send all input to the printer until either ESC[4i or ESC[?4i 2457 * Send all input to the printer until either ESC[4i or ESC[?4i
2428 * is received. 2458 * is received.
2429 */ 2459 */
2430 for (done = 0; !done;) 2460 for (int done = 0; !done; )
2431 { 2461 {
2432 unsigned char buf[8]; 2462 unsigned char buf[8];
2433 unicode_t ch; 2463 unicode_t ch;
2434 unsigned int i, len; 2464 unsigned int i, len;
2435 2465
… …
2469 pclose_printer (fd); 2499 pclose_printer (fd);
2470} 2500}
2471#endif /* PRINTPIPE */ 2501#endif /* PRINTPIPE */
2472/*}}} */ 2502/*}}} */
2473 2503
2474/* *INDENT-OFF* */
2475enum { 2504enum {
2476 C1_40 = 0x40, 2505 C1_40 = 0x40,
2477 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2506 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2478 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2507 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2479 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2508 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2480 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2509 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2481}; 2510};
2482/* *INDENT-ON* */
2483 2511
2484/*{{{ process non-printing single characters */ 2512/*{{{ process non-printing single characters */
2485void 2513void ecb_hot
2486rxvt_term::process_nonprinting (unicode_t ch) 2514rxvt_term::process_nonprinting (unicode_t ch)
2487{ 2515{
2488 switch (ch) 2516 switch (ch)
2489 { 2517 {
2490 case C0_ESC: 2518 case C0_ESC:
… …
2520 scr_charset_choose (0); 2548 scr_charset_choose (0);
2521 break; 2549 break;
2522 2550
2523#ifdef EIGHT_BIT_CONTROLS 2551#ifdef EIGHT_BIT_CONTROLS
2524 // 8-bit controls 2552 // 8-bit controls
2525 case 0x90: /* DCS */ 2553 case 0x90: /* DCS */
2526 process_dcs_seq (); 2554 process_dcs_seq ();
2527 break; 2555 break;
2528 case 0x9b: /* CSI */ 2556 case 0x9b: /* CSI */
2529 process_csi_seq (); 2557 process_csi_seq ();
2530 break; 2558 break;
2531 case 0x9d: /* OSC */ 2559 case 0x9d: /* OSC */
2532 process_osc_seq (); 2560 process_osc_seq ();
2533 break; 2561 break;
2534#endif 2562#endif
2535 } 2563 }
2536} 2564}
2537/*}}} */ 2565/*}}} */
2538 2566
2539 2567
2540/*{{{ process VT52 escape sequences */ 2568/*{{{ process VT52 escape sequences */
2541void 2569void ecb_cold
2542rxvt_term::process_escape_vt52 (unicode_t ch) 2570rxvt_term::process_escape_vt52 (unicode_t ch)
2543{ 2571{
2544 int row, col; 2572 int row, col;
2545 2573
2546 switch (ch) 2574 switch (ch)
… …
2580 break; 2608 break;
2581 case 'Z': /* identify the terminal type */ 2609 case 'Z': /* identify the terminal type */
2582 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2610 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2583 break; 2611 break;
2584 case '<': /* turn off VT52 mode */ 2612 case '<': /* turn off VT52 mode */
2585 PrivMode (0, PrivMode_vt52); 2613 priv_modes &= ~PrivMode_vt52;
2586 break; 2614 break;
2587 case 'F': /* use special graphics character set */ 2615 case 'F': /* use special graphics character set */
2588 case 'G': /* use regular character set */ 2616 case 'G': /* use regular character set */
2589 /* unimplemented */ 2617 /* unimplemented */
2590 break; 2618 break;
… …
2596} 2624}
2597/*}}} */ 2625/*}}} */
2598 2626
2599 2627
2600/*{{{ process escape sequences */ 2628/*{{{ process escape sequences */
2601void 2629void ecb_hot
2602rxvt_term::process_escape_seq () 2630rxvt_term::process_escape_seq ()
2603{ 2631{
2604 unicode_t ch = cmd_getc (); 2632 unicode_t ch = cmd_getc ();
2605 2633
2606 if (priv_modes & PrivMode_vt52) 2634 if (priv_modes & PrivMode_vt52)
… …
2609 return; 2637 return;
2610 } 2638 }
2611 2639
2612 switch (ch) 2640 switch (ch)
2613 { 2641 {
2614 /* case 1: do_tek_mode (); break; */
2615 case '#': 2642 case '#':
2616 if (cmd_getc () == '8') 2643 if (cmd_getc () == '8')
2617 scr_E (); 2644 scr_E ();
2618 break; 2645 break;
2619 case '(': 2646 case '(':
… …
2642#if !ENABLE_MINIMAL 2669#if !ENABLE_MINIMAL
2643 case '9': 2670 case '9':
2644 scr_forwardindex (); 2671 scr_forwardindex ();
2645 break; 2672 break;
2646#endif 2673#endif
2674 // DECPAM/DECPNM
2647 case '=': 2675 case '=':
2676 priv_modes |= PrivMode_aplKP;
2677 break;
2648 case '>': 2678 case '>':
2649 PrivMode ((ch == '='), PrivMode_aplKP); 2679 priv_modes &= ~PrivMode_aplKP;
2650 break; 2680 break;
2651 2681
2652 case C1_40: 2682 case C1_40:
2653 cmd_getc (); 2683 cmd_getc ();
2654 break; 2684 break;
… …
2658 2688
2659 /* 8.3.87: NEXT LINE */ 2689 /* 8.3.87: NEXT LINE */
2660 case C1_NEL: /* ESC E */ 2690 case C1_NEL: /* ESC E */
2661 { 2691 {
2662 wchar_t nlcr[] = { C0_LF, C0_CR }; 2692 wchar_t nlcr[] = { C0_LF, C0_CR };
2663 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2693 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2664 } 2694 }
2665 break; 2695 break;
2666 2696
2697#if 0 // disabled because embedded newlines can make exploits easier
2667 /* kidnapped escape sequence: Should be 8.3.48 */ 2698 /* kidnapped escape sequence: Should be 8.3.48 */
2668 case C1_ESA: /* ESC G */ 2699 case C1_ESA: /* ESC G */
2669 process_graphics (); 2700 // used by original rxvt for rob nations own graphics mode
2701 if (cmd_getc () == 'Q' && option (Opt_insecure))
2702 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2670 break; 2703 break;
2704#endif
2671 2705
2672 /* 8.3.63: CHARACTER TABULATION SET */ 2706 /* 8.3.63: CHARACTER TABULATION SET */
2673 case C1_HTS: /* ESC H */ 2707 case C1_HTS: /* ESC H */
2674 scr_set_tab (1); 2708 scr_set_tab (1);
2675 break; 2709 break;
… …
2678 case C1_RI: /* ESC M */ 2712 case C1_RI: /* ESC M */
2679 scr_index (DN); 2713 scr_index (DN);
2680 break; 2714 break;
2681 2715
2682 /* 8.3.142: SINGLE-SHIFT TWO */ 2716 /* 8.3.142: SINGLE-SHIFT TWO */
2683 /*case C1_SS2: scr_single_shift (2); break; */ 2717 /* case C1_SS2: break; */
2684 2718
2685 /* 8.3.143: SINGLE-SHIFT THREE */ 2719 /* 8.3.143: SINGLE-SHIFT THREE */
2686 /*case C1_SS3: scr_single_shift (3); break; */ 2720 /* case C1_SS3: break; */
2687 2721
2688 /* 8.3.27: DEVICE CONTROL STRING */ 2722 /* 8.3.27: DEVICE CONTROL STRING */
2689 case C1_DCS: /* ESC P */ 2723 case C1_DCS: /* ESC P */
2690 process_dcs_seq (); 2724 process_dcs_seq ();
2691 break; 2725 break;
… …
2693 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2727 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2694 case C1_SCI: /* ESC Z */ 2728 case C1_SCI: /* ESC Z */
2695 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2729 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2696 break; /* steal obsolete ESC [ c */ 2730 break; /* steal obsolete ESC [ c */
2697 2731
2698 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2732 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2699 case C1_CSI: /* ESC [ */ 2733 case C1_CSI: /* ESC [ */
2700 process_csi_seq (); 2734 process_csi_seq ();
2701 break; 2735 break;
2702 2736
2703 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2737 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2704 case C1_OSC: /* ESC ] */ 2738 case C1_OSC: /* ESC ] */
2705 process_osc_seq (); 2739 process_osc_seq ();
2706 break; 2740 break;
2707 2741
2708 /* 8.3.106: RESET TO INITIAL STATE */ 2742 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2709 case 'c': 2743 case 'c':
2710 mbstate.reset (); 2744 mbstate.reset ();
2711 scr_poweron (); 2745 scr_poweron ();
2712 scrollbar_show (1); 2746 scrollBar.show (1);
2713 break; 2747 break;
2714 2748
2715 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2749 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2716 case 'n': 2750 case 'n':
2717 scr_charset_choose (2); 2751 scr_charset_choose (2);
… …
2724 } 2758 }
2725} 2759}
2726/*}}} */ 2760/*}}} */
2727 2761
2728/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2762/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2729/* *INDENT-OFF* */
2730enum { 2763enum {
2731 CSI_ICH = 0x40, 2764 CSI_ICH = 0x40,
2732 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2765 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2733 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2766 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2734 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2767 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
2737 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2770 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2738 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2771 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2739 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2772 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2740}; 2773};
2741 2774
2742#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2775#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2743 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2776 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2744 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2777 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2745#define get_byte_array_bit(array, bit) \ 2778#define get_byte_array_bit(array, bit) \
2746 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2779 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2747 2780
2748const unsigned char csi_defaults[] = 2781static const unsigned char csi_defaults[] =
2749 { 2782 {
2750 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2783 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2751 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2784 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2752 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2785 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2753 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2786 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2754 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2787 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2755 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2788 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2756 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2789 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2757 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2790 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2758 }; 2791 };
2759/* *INDENT-ON* */
2760 2792
2761void 2793void ecb_hot
2762rxvt_term::process_csi_seq () 2794rxvt_term::process_csi_seq ()
2763{ 2795{
2764 unicode_t ch, priv, i; 2796 unicode_t ch, priv, prev_ch, i;
2765 unsigned int nargs, p; 2797 unsigned int nargs, p;
2766 int n, ndef; 2798 int n, ndef;
2767 int arg[ESC_ARGS] = { }; 2799 int arg[ESC_ARGS] = { };
2768 2800
2769 nargs = 0; 2801 nargs = 0;
2770 2802
2771 priv = 0; 2803 priv = 0;
2772 ch = cmd_getc (); 2804 ch = cmd_getc ();
2773 if (ch >= '<' && ch <= '?') 2805 if ((ch >= '<' && ch <= '?') || ch == '!')
2774 { 2806 {
2775 /* '<' '=' '>' '?' */ 2807 /* '<' '=' '>' '?' '!' */
2776 priv = ch; 2808 priv = ch;
2777 ch = cmd_getc (); 2809 ch = cmd_getc ();
2778 } 2810 }
2779 2811
2812 prev_ch = 0;
2780 /* read any numerical arguments */ 2813 /* read any numerical arguments */
2781 for (n = -1; ch < CSI_ICH; ) 2814 for (n = -1; ch < CSI_ICH; )
2782 { 2815 {
2783 if (isdigit (ch)) 2816 if (isdigit (ch))
2784 { 2817 {
… …
2794 n = -1; 2827 n = -1;
2795 } 2828 }
2796 else if (IS_CONTROL (ch)) 2829 else if (IS_CONTROL (ch))
2797 process_nonprinting (ch); 2830 process_nonprinting (ch);
2798 2831
2832 prev_ch = ch;
2799 ch = cmd_getc (); 2833 ch = cmd_getc ();
2800 } 2834 }
2801 2835
2802 if (ch > CSI_7F) 2836 if (ch > CSI_7F)
2803 return; 2837 return;
… …
2829 // versions. 2863 // versions.
2830 // 2864 //
2831 tt_printf ("\033[>%d;95;0c", 'U'); 2865 tt_printf ("\033[>%d;95;0c", 'U');
2832 } 2866 }
2833 break; 2867 break;
2868
2834 case '?': 2869 case '?':
2835 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2870 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2836 process_terminal_mode (ch, priv, nargs, arg); 2871 process_terminal_mode (ch, priv, nargs, arg);
2837 break; 2872 break;
2873
2874 case '!':
2875 if (ch == CSI_70)
2876 {
2877 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2878 scr_soft_reset ();
2879
2880 static const int pm_h[] = { 7, 25 };
2881 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1006, 1015, 1049 };
2882
2883 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2884 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2838 } 2885 }
2886 break;
2887 }
2888
2839 return; 2889 return;
2840 } 2890 }
2841 2891
2842 switch (ch) 2892 switch (ch)
2843 { 2893 {
… …
2857 } 2907 }
2858 break; 2908 break;
2859#endif 2909#endif
2860 2910
2861 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2911 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2862 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2912 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2863 arg[0] = -arg[0]; 2913 arg[0] = -arg[0];
2864 /* FALLTHROUGH */ 2914 /* FALLTHROUGH */
2865 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2915 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2866 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2916 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2867 scr_gotorc (arg[0], 0, RELATIVE); 2917 scr_gotorc (arg[0], 0, RELATIVE);
2868 break; 2918 break;
2869 2919
2870 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2920 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2871 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2921 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
2872#ifdef ISO6429 2922#ifdef ISO6429
2873 arg[0] = -arg[0]; 2923 arg[0] = -arg[0];
2874#else /* emulate common DEC VTs */ 2924#else /* emulate common DEC VTs */
2875 arg[0] = arg[0] ? -arg[0] : -1; 2925 arg[0] = arg[0] ? -arg[0] : -1;
2876#endif 2926#endif
… …
3021 scr_insert_mode (1); 3071 scr_insert_mode (1);
3022 else if (arg[0] == 20) 3072 else if (arg[0] == 20)
3023 priv_modes |= PrivMode_LFNL; 3073 priv_modes |= PrivMode_LFNL;
3024 break; 3074 break;
3025 3075
3076 case CSI_71: // DECSCUSR: set cursor style
3077 if (prev_ch == ' ')
3078 set_cursor_style (arg[0]);
3079 break;
3080
3026 /* 3081 /*
3027 * PRIVATE USE beyond this point. All CSI_7? sequences here 3082 * PRIVATE USE beyond this point. All CSI_7? sequences here
3028 */ 3083 */
3029 case CSI_72: /* DECSTBM: set top and bottom margins */ 3084 case CSI_72: /* DECSTBM: set top and bottom margins */
3030 if (nargs == 1) 3085 if (nargs == 1)
… …
3058 } 3113 }
3059} 3114}
3060/*}}} */ 3115/*}}} */
3061 3116
3062#if !ENABLE_MINIMAL 3117#if !ENABLE_MINIMAL
3063/* ARGSUSED */
3064void 3118void
3065rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3119rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3066{ 3120{
3067 int x, y; 3121 int x, y;
3068 XWindowAttributes wattr; 3122 XWindowAttributes wattr;
… …
3077 { 3131 {
3078 /* 3132 /*
3079 * commands 3133 * commands
3080 */ 3134 */
3081 case 1: /* deiconify window */ 3135 case 1: /* deiconify window */
3082 XMapWindow (dpy, parent[0]); 3136 XMapWindow (dpy, parent);
3083 break; 3137 break;
3084 case 2: /* iconify window */ 3138 case 2: /* iconify window */
3085 XIconifyWindow (dpy, parent[0], display->screen); 3139 XIconifyWindow (dpy, parent, display->screen);
3086 break; 3140 break;
3087 case 3: /* set position (pixels) */ 3141 case 3: /* set position (pixels) */
3088 XMoveWindow (dpy, parent[0], args[1], args[2]); 3142 XMoveWindow (dpy, parent, args[1], args[2]);
3089 break; 3143 break;
3090 case 4: /* set size (pixels) */ 3144 case 4: /* set size (pixels) */
3091 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3145 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3092 break; 3146 break;
3093 case 5: /* raise window */ 3147 case 5: /* raise window */
3094 XRaiseWindow (dpy, parent[0]); 3148 XRaiseWindow (dpy, parent);
3095 break; 3149 break;
3096 case 6: /* lower window */ 3150 case 6: /* lower window */
3097 XLowerWindow (dpy, parent[0]); 3151 XLowerWindow (dpy, parent);
3098 break; 3152 break;
3099 case 7: /* refresh window */ 3153 case 7: /* refresh window */
3100 scr_touch (true); 3154 scr_touch (true);
3101 break; 3155 break;
3102 case 8: /* set size (chars) */ 3156 case 8: /* set size (chars) */
… …
3105 break; 3159 break;
3106 3160
3107 //case 9: NYI, TODO, restore maximized window or maximize window 3161 //case 9: NYI, TODO, restore maximized window or maximize window
3108 default: 3162 default:
3109 if (args[0] >= 24) /* set height (chars) */ 3163 if (args[0] >= 24) /* set height (chars) */
3110 set_widthheight ((unsigned int)width, 3164 set_widthheight ((unsigned int)vt_width,
3111 (unsigned int) (args[1] * fheight)); 3165 (unsigned int) (args[1] * fheight));
3112 break; 3166 break;
3113 3167
3114 /* 3168 /*
3115 * reports - some output format copied from XTerm 3169 * reports - some output format copied from XTerm
3116 */ 3170 */
3117 case 11: /* report window state */ 3171 case 11: /* report window state */
3118 XGetWindowAttributes (dpy, parent[0], &wattr); 3172 XGetWindowAttributes (dpy, parent, &wattr);
3119 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3173 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3120 break; 3174 break;
3121 case 13: /* report window position */ 3175 case 13: /* report window position */
3122 XGetWindowAttributes (dpy, parent[0], &wattr); 3176 XGetWindowAttributes (dpy, parent, &wattr);
3123 XTranslateCoordinates (dpy, parent[0], wattr.root, 3177 XTranslateCoordinates (dpy, parent, wattr.root,
3124 -wattr.border_width, -wattr.border_width, 3178 -wattr.border_width, -wattr.border_width,
3125 &x, &y, &wdummy); 3179 &x, &y, &wdummy);
3126 tt_printf ("\033[3;%d;%dt", x, y); 3180 tt_printf ("\033[3;%d;%dt", x, y);
3127 break; 3181 break;
3128 case 14: /* report window size (pixels) */ 3182 case 14: /* report window size (pixels) */
3129 XGetWindowAttributes (dpy, parent[0], &wattr); 3183 XGetWindowAttributes (dpy, parent, &wattr);
3130 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3184 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3131 break; 3185 break;
3132 case 18: /* report text area size (chars) */ 3186 case 18: /* report text area size (chars) */
3133 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3187 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3134 break; 3188 break;
… …
3136 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3190 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3137 break; 3191 break;
3138 case 20: /* report icon label */ 3192 case 20: /* report icon label */
3139 { 3193 {
3140 char *s; 3194 char *s;
3141 XGetIconName (dpy, parent[0], &s); 3195 XGetIconName (dpy, parent, &s);
3142 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3196 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3143 XFree (s); 3197 XFree (s);
3144 } 3198 }
3145 break; 3199 break;
3146 case 21: /* report window title */ 3200 case 21: /* report window title */
3147 { 3201 {
3148 char *s; 3202 char *s;
3149 XFetchName (dpy, parent[0], &s); 3203 XFetchName (dpy, parent, &s);
3150 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3204 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3151 XFree (s); 3205 XFree (s);
3152 } 3206 }
3153 break; 3207 break;
3154 } 3208 }
… …
3164rxvt_term::get_to_st (unicode_t &ends_how) 3218rxvt_term::get_to_st (unicode_t &ends_how)
3165{ 3219{
3166 unicode_t ch; 3220 unicode_t ch;
3167 bool seen_esc = false; 3221 bool seen_esc = false;
3168 unsigned int n = 0; 3222 unsigned int n = 0;
3169 wchar_t string[STRING_MAX]; 3223 wchar_t string[CBUFSIZ];
3170 3224
3171 while ((ch = cmd_getc ()) != NOCHAR) 3225 while ((ch = cmd_getc ()) != NOCHAR)
3172 { 3226 {
3173 if (seen_esc) 3227 if (seen_esc)
3174 { 3228 {
… …
3189 else if (ch < 0x20) 3243 else if (ch < 0x20)
3190 return NULL; /* other control character - exit */ 3244 return NULL; /* other control character - exit */
3191 3245
3192 seen_esc = false; 3246 seen_esc = false;
3193 3247
3194 if (n >= STRING_MAX - 1) 3248 if (n >= sizeof (string) - 1)
3195 // stop at some sane length 3249 // stop at some sane length
3196 return NULL; 3250 return NULL;
3197 3251
3198 string[n++] = ch; 3252 string[n++] = ch;
3199 } 3253 }
… …
3210 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3264 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3211 */ 3265 */
3212void 3266void
3213rxvt_term::process_dcs_seq () 3267rxvt_term::process_dcs_seq ()
3214{ 3268{
3215 char *s;
3216 unicode_t eh;
3217
3218 /* 3269 /*
3219 * Not handled yet 3270 * Not handled yet
3220 */ 3271 */
3272
3273 unicode_t eh;
3221 s = get_to_st (eh); 3274 char *s = get_to_st (eh);
3222 if (s) 3275 if (s)
3223 free (s); 3276 free (s);
3224 3277
3225 return; 3278 return;
3226} 3279}
… …
3230 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3283 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3231 */ 3284 */
3232void 3285void
3233rxvt_term::process_osc_seq () 3286rxvt_term::process_osc_seq ()
3234{ 3287{
3235 unicode_t ch, eh;
3236 int arg; 3288 int arg;
3237 3289
3238 ch = cmd_getc (); 3290 unicode_t ch = cmd_getc ();
3239 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3291 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3240 arg = arg * 10 + (ch - '0'); 3292 arg = arg * 10 + (ch - '0');
3241 3293
3242 if (ch == ';') 3294 if (ch == ';')
3243 { 3295 {
3296 unicode_t eh;
3244 char *s = get_to_st (eh); 3297 char *s = get_to_st (eh);
3245 3298
3246 if (s) 3299 if (s)
3247 { 3300 {
3248 process_xterm_seq (arg, s, eh); 3301 process_xterm_seq (arg, s, eh);
3249 free (s); 3302 free (s);
3250 } 3303 }
3251 } 3304 }
3252} 3305}
3253 3306
3307static unsigned int
3308colorcube_index (unsigned int idx_r,
3309 unsigned int idx_g,
3310 unsigned int idx_b)
3311{
3312 assert (idx_r < Red_levels);
3313 assert (idx_g < Green_levels);
3314 assert (idx_b < Blue_levels);
3315
3316 return idx_r * Blue_levels * Green_levels +
3317 idx_g * Blue_levels +
3318 idx_b;
3319}
3320
3321/*
3322 * Find the nearest color slot in the hidden color cube,
3323 * adapt its value to the 32bit RGBA color.
3324 */
3325unsigned int
3326rxvt_term::map_rgb24_color (unsigned int r, unsigned int g, unsigned int b, unsigned int a)
3327{
3328 r &= 0xff;
3329 g &= 0xff;
3330 b &= 0xff;
3331 a &= 0xff;
3332
3333 uint32_t color = (a << 24) | (r << 16) | (g << 8) | b;
3334
3335 unsigned int idx_r = r * (Red_levels - 1) / 0xff;
3336 unsigned int idx_g = g * (Green_levels - 1) / 0xff;
3337 unsigned int idx_b = b * (Blue_levels - 1) / 0xff;
3338 unsigned int idx = colorcube_index (idx_r, idx_g, idx_b);
3339
3340 /* we allow one of the 6 directly neighbouring colours */
3341 /* to replace the current color, if they not used recently */
3342 static const signed char dxyz[][3] = {
3343 0, 0, 0,
3344 0, 0, +1,
3345 0, 0, -1,
3346 0, +1, 0,
3347 0, -1, 0,
3348 +1, 0, 0,
3349 -1, 0, 0,
3350 };
3351
3352 for (int n = 0; n < ecb_array_length (dxyz); ++n)
3353 {
3354 int r = idx_r + dxyz[n][0];
3355 int g = idx_g + dxyz[n][1];
3356 int b = idx_b + dxyz[n][2];
3357
3358 if (!IN_RANGE_EXC (r, 0, Red_levels )) continue;
3359 if (!IN_RANGE_EXC (g, 0, Green_levels)) continue;
3360 if (!IN_RANGE_EXC (b, 0, Blue_levels )) continue;
3361
3362 unsigned int index = colorcube_index (r, g, b);
3363
3364 if (rgb24_color[index] == color)
3365 {
3366 rgb24_seqno[index] = ++rgb24_sequence;
3367 return index + minTermCOLOR24;
3368 }
3369
3370 // minor issue: could update index 0 few more times
3371 if ((rgb24_seqno[index] | rgb24_color[index]) == 0)
3372 {
3373 idx = index;
3374 goto update;
3375 }
3376
3377 // like (rgb24_seqno[idx] > rgb24_seqno[index])
3378 // but also handles wrap around values good enough
3379 if ((uint16_t)(rgb24_seqno[idx] - rgb24_seqno[index]) < 0x7fff)
3380 idx = index;
3381 }
3382
3383update:
3384 rgb24_color[idx] = color;
3385 rgb24_seqno[idx] = ++rgb24_sequence;
3386
3387 idx += minTermCOLOR24;
3388 pix_colors_focused [idx].free (this);
3389 pix_colors_focused [idx].set (this, rgba (r * 0x0101, g * 0x0101, b * 0x0101, a * 0x0101));
3390 update_fade_color (idx, false);
3391
3392 return idx;
3393}
3394
3254void 3395void
3255rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3396rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3256{ 3397{
3257 if (str[0] == '?' && !str[1]) 3398 if (str[0] == '?' && !str[1])
3258 { 3399 {
3400 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3401 return;
3402
3259 rgba c; 3403 rgba c;
3260 pix_colors_focused[color].get (c); 3404 pix_colors_focused[color].get (c);
3405 color -= minCOLOR;
3261 3406
3262#if XFT 3407#if XFT
3263 if (c.a != rgba::MAX_CC) 3408 if (c.a != rgba::MAX_CC)
3264 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp); 3409 tt_printf ("\033]%d;%d;rgba:%04x/%04x/%04x/%04x%c", report, color, c.r, c.g, c.b, c.a, resp);
3265 else 3410 else
3266#endif 3411#endif
3267 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp); 3412 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", report, color, c.r, c.g, c.b, resp);
3268 } 3413 }
3269 else 3414 else
3270 set_window_color (color, str); 3415 set_window_color (color, str);
3271} 3416}
3272 3417
3273/* 3418/*
3274 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3419 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3275 */ 3420 */
3276void 3421void
3277rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3422rxvt_term::process_xterm_seq (int op, char *str, char resp)
3278{ 3423{
3279 int color; 3424 int color;
3280 char *buf, *name; 3425 char *buf, *name;
3281 bool query = str[0] == '?' && !str[1]; 3426 bool query = str[0] == '?' && !str[1];
3282 int saveop = op; 3427 int saveop = op;
… …
3309 unsigned long bytes_after; 3454 unsigned long bytes_after;
3310 unsigned char *value = 0; 3455 unsigned char *value = 0;
3311 const char *str = ""; 3456 const char *str = "";
3312 3457
3313 if (prop 3458 if (prop
3314 && XGetWindowProperty (dpy, parent[0], 3459 && XGetWindowProperty (dpy, parent,
3315 prop, 0, 1<<16, 0, AnyPropertyType, 3460 prop, 0, 1<<16, 0, AnyPropertyType,
3316 &actual_type, &actual_format, 3461 &actual_type, &actual_format,
3317 &nitems, &bytes_after, &value) == Success 3462 &nitems, &bytes_after, &value) == Success
3318 && actual_type != None 3463 && actual_type != None
3319 && actual_format == 8) 3464 && actual_format == 8)
3320 str = (const char *)(value); 3465 str = (const char *)(value);
3321 3466
3322 tt_printf ("\033]%d;%s%c", op, str, resp); 3467 tt_printf ("\033]%d;%s%c", op, option (Opt_insecure) ? str : "", resp);
3323 3468
3324 XFree (value); 3469 XFree (value);
3325 } 3470 }
3326 else 3471 else
3327 { 3472 {
3328 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3473 char *eq = strchr (str, '=');
3329 3474
3330 if (eq) 3475 if (eq)
3331 { 3476 {
3332 *eq = 0; 3477 *eq = 0;
3333 set_utf8_property (display->atom (str), eq + 1); 3478 set_utf8_property (display->atom (str), eq + 1);
3334 } 3479 }
3335 else 3480 else
3336 XDeleteProperty (dpy, parent[0], 3481 XDeleteProperty (dpy, parent,
3337 display->atom (str)); 3482 display->atom (str));
3338 } 3483 }
3339 break; 3484 break;
3340 3485
3341 case XTerm_Color: 3486 case XTerm_Color:
… …
3354 *buf++ = '\0'; 3499 *buf++ = '\0';
3355 3500
3356 process_color_seq (op, color, name, resp); 3501 process_color_seq (op, color, name, resp);
3357 } 3502 }
3358 break; 3503 break;
3504 case Rxvt_restoreFG:
3359 case XTerm_Color00: 3505 case XTerm_Color00:
3360 process_color_seq (op, Color_fg, str, resp); 3506 process_color_seq (op, Color_fg, str, resp);
3361 break; 3507 break;
3508 case Rxvt_restoreBG:
3362 case XTerm_Color01: 3509 case XTerm_Color01:
3363 process_color_seq (op, Color_bg, str, resp); 3510 process_color_seq (op, Color_bg, str, resp);
3364 break; 3511 break;
3365#ifndef NO_CURSORCOLOR 3512#ifndef NO_CURSORCOLOR
3366 case XTerm_Color_cursor: 3513 case XTerm_Color_cursor:
… …
3371 process_color_seq (op, Color_pointer_fg, str, resp); 3518 process_color_seq (op, Color_pointer_fg, str, resp);
3372 break; 3519 break;
3373 case XTerm_Color_pointer_bg: 3520 case XTerm_Color_pointer_bg:
3374 process_color_seq (op, Color_pointer_bg, str, resp); 3521 process_color_seq (op, Color_pointer_bg, str, resp);
3375 break; 3522 break;
3523#ifdef OPTION_HC
3524 case XTerm_Color_HC:
3525 process_color_seq (op, Color_HC, str, resp);
3526 break;
3527 case XTerm_Color_HTC:
3528 process_color_seq (op, Color_HTC, str, resp);
3529 break;
3530#endif
3376#ifndef NO_BOLD_UNDERLINE_REVERSE 3531#ifndef NO_BOLD_UNDERLINE_REVERSE
3377 case XTerm_Color_RV:
3378 process_color_seq (op, Color_RV, str, resp);
3379 break;
3380 case Rxvt_Color_BD:
3381 case URxvt_Color_BD: 3532 case URxvt_Color_BD:
3382 process_color_seq (op, Color_BD, str, resp); 3533 process_color_seq (op, Color_BD, str, resp);
3383 break; 3534 break;
3384 case Rxvt_Color_UL:
3385 case URxvt_Color_UL: 3535 case URxvt_Color_UL:
3386 process_color_seq (op, Color_UL, str, resp); 3536 process_color_seq (op, Color_UL, str, resp);
3387 break; 3537 break;
3388 case URxvt_Color_IT: 3538 case URxvt_Color_IT:
3389 process_color_seq (op, Color_IT, str, resp); 3539 process_color_seq (op, Color_IT, str, resp);
3390 break; 3540 break;
3391#endif 3541#endif
3392#if ENABLE_TRANSPARENCY
3393 case URxvt_Color_tint: 3542 case URxvt_Color_border:
3394 process_color_seq (op, Color_tint, str, resp); 3543 process_color_seq (op, Color_border, str, resp);
3395 {
3396 bool changed = false;
3397
3398 if (ISSET_PIXCOLOR (Color_tint))
3399 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3400 else
3401 changed = bgPixmap.unset_tint ();
3402
3403 if (changed)
3404 update_background ();
3405 }
3406
3407 break;
3408#endif
3409
3410#if BG_IMAGE_FROM_FILE
3411 case Rxvt_Pixmap:
3412 if (!strcmp (str, "?"))
3413 {
3414 char str[256];
3415
3416 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3417 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3418 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3419 process_xterm_seq (XTerm_title, str, CHAR_ST);
3420 }
3421 else
3422 {
3423 int changed = 0;
3424
3425 if (*str != ';')
3426 {
3427 /* reset to default scaling :*/
3428 bgPixmap.unset_geometry ();
3429 if (bgPixmap.set_file (str)) /* change pixmap */
3430 changed++;
3431 str = strchr (str, ';');
3432 if (str == NULL)
3433 bgPixmap.set_defaultGeometry ();
3434 }
3435
3436 while (str)
3437 {
3438 str++;
3439 if (bgPixmap.set_geometry (str))
3440 changed++;
3441 str = strchr (str, ';');
3442 }
3443
3444 if (changed)
3445 update_background ();
3446 }
3447 break;
3448#endif
3449
3450 case Rxvt_restoreFG:
3451 set_window_color (Color_fg, str);
3452 break;
3453 case Rxvt_restoreBG:
3454 set_window_color (Color_bg, str);
3455 break; 3544 break;
3456 3545
3457 case XTerm_logfile: 3546 case XTerm_logfile:
3458 // TODO, when secure mode? 3547 // TODO, when secure mode?
3459 break; 3548 break;
… …
3527 break; 3616 break;
3528#endif 3617#endif
3529 3618
3530#if ENABLE_PERL 3619#if ENABLE_PERL
3531 case URxvt_perl: 3620 case URxvt_perl:
3532 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3621 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3533 ; // no responses yet
3534 break; 3622 break;
3535#endif 3623#endif
3536 } 3624 }
3537} 3625}
3538/*----------------------------------------------------------------------*/ 3626/*----------------------------------------------------------------------*/
… …
3545 * 's' = save 3633 * 's' = save
3546 * 'r' = restore 3634 * 'r' = restore
3547 * 't' = toggle 3635 * 't' = toggle
3548 * so no need for fancy checking 3636 * so no need for fancy checking
3549 */ 3637 */
3550int 3638int ecb_cold
3551rxvt_term::privcases (int mode, unsigned long bit) 3639rxvt_term::privcases (int mode, unsigned long bit)
3552{ 3640{
3553 int state; 3641 int state;
3554 3642
3555 if (mode == 's') 3643 if (mode == 's')
3556 { 3644 {
3557 SavedModes |= (priv_modes & bit); 3645 if (priv_modes & bit)
3646 SavedModes |= bit;
3647 else
3648 SavedModes &= ~bit;
3558 return -1; 3649 return -1;
3559 } 3650 }
3560 else 3651 else
3561 { 3652 {
3562 if (mode == 'r') 3653 if (mode == 'r')
3563 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3654 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3564 else 3655 else
3565 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3656 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3566 PrivMode (state, bit); 3657
3658 if (state)
3659 priv_modes |= bit;
3660 else
3661 priv_modes &= ~bit;
3567 } 3662 }
3568 3663
3569 return state; 3664 return state;
3570} 3665}
3571 3666
3572/* we're not using priv _yet_ */ 3667/* we're not using priv _yet_ */
3573void 3668void
3574rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3669rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3575{ 3670{
3576 unsigned int i, j; 3671 unsigned int i, j;
3577 int state; 3672 int state;
3578 3673
3579 static const struct 3674 static const struct
3580 { 3675 {
3581 const int argval; 3676 const int argval;
3582 const unsigned long bit; 3677 const unsigned long bit;
3583 } argtopriv[] = { 3678 } argtopriv[] = {
3584 { 1, PrivMode_aplCUR }, 3679 { 1, PrivMode_aplCUR }, // DECCKM
3585 { 2, PrivMode_vt52 }, 3680 { 2, PrivMode_vt52 }, // DECANM
3586 { 3, PrivMode_132 }, 3681 { 3, PrivMode_132 }, // DECCOLM
3587 { 4, PrivMode_smoothScroll }, 3682 { 4, PrivMode_smoothScroll }, // DECSCLM
3588 { 5, PrivMode_rVideo }, 3683 { 5, PrivMode_rVideo }, // DECSCNM
3589 { 6, PrivMode_relOrigin }, 3684 { 6, PrivMode_relOrigin }, // DECOM
3590 { 7, PrivMode_Autowrap }, 3685 { 7, PrivMode_Autowrap }, // DECAWM
3591 // 8, bi-directional support mode 3686 // 8, auto-repeat keys // DECARM
3592 { 9, PrivMode_MouseX10 }, 3687 { 9, PrivMode_MouseX10 },
3593 // 18, 19 printing-related
3594 { 25, PrivMode_VisibleCursor }, 3688 { 12, PrivMode_BlinkingCursor },
3689 // 18 end FF to printer after print screen
3690 // 19 Print screen prints full screen/scroll region
3691 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3595#ifdef scrollBar_esc 3692#ifdef scrollBar_esc
3596 { scrollBar_esc, PrivMode_scrollBar }, 3693 { scrollBar_esc, PrivMode_scrollBar },
3597#endif 3694#endif
3598 { 35, PrivMode_ShiftKeys }, // rxvt extension 3695 { 35, PrivMode_ShiftKeys }, // rxvt extension
3696 // 38, tektronix mode // DECTEK
3599 { 40, PrivMode_132OK }, 3697 { 40, PrivMode_132OK },
3600 // 41 xterm more fixes NYI 3698 // 41 xterm more fixes NYI
3601 // 45 margin bell NYI 3699 // 45 margin bell NYI
3602 // 46 start logging 3700 // 46 start logging
3603 { 47, PrivMode_Screen }, 3701 { 47, PrivMode_Screen },
3604 { 66, PrivMode_aplKP }, 3702 { 66, PrivMode_aplKP }, // DECNKM
3605#ifndef NO_BACKSPACE_KEY 3703#ifndef NO_BACKSPACE_KEY
3606 { 67, PrivMode_BackSpace }, 3704 { 67, PrivMode_BackSpace }, // DECBKM
3607#endif 3705#endif
3608 { 1000, PrivMode_MouseX11 }, 3706 { 1000, PrivMode_MouseX11 },
3609 { 1002, PrivMode_MouseBtnEvent }, 3707 { 1002, PrivMode_MouseBtnEvent },
3610 { 1003, PrivMode_MouseAnyEvent }, 3708 { 1003, PrivMode_MouseAnyEvent },
3709#if ENABLE_FRILLS
3710 { 1004, PrivMode_FocusEvent },
3711 { 1005, PrivMode_ExtMouseUTF8 },
3712 { 1006, PrivMode_ExtMouseSGR },
3713#endif
3611 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3714 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3612 { 1011, PrivMode_Keypress }, // rxvt extension 3715 { 1011, PrivMode_Keypress }, // rxvt extension
3716#if ENABLE_FRILLS
3717 { 1015, PrivMode_ExtMouseUrxvt }, // urxvt extension of 1005
3718#endif
3613 // 1035 enable modifiers for alt, numlock NYI 3719 // 1035 enable modifiers for alt, numlock NYI
3614 // 1036 send ESC for meta keys NYI 3720 // 1036 send ESC for meta keys NYI
3615 // 1037 send DEL for keypad delete NYI 3721 // 1037 send DEL for keypad delete NYI
3616 { 1047, PrivMode_Screen }, 3722 { 1047, PrivMode_Screen },
3617 // 1048 save and restore cursor 3723 // 1048 save and restore cursor, implemented in code
3618 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3724 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3619 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3725 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3726 { 2004, PrivMode_BracketPaste },
3620 }; 3727 };
3621 3728
3622 if (nargs == 0) 3729 if (nargs == 0)
3623 return; 3730 return;
3624 3731
… …
3631 for (i = 0; i < nargs; i++) 3738 for (i = 0; i < nargs; i++)
3632 { 3739 {
3633 state = -1; 3740 state = -1;
3634 3741
3635 /* basic handling */ 3742 /* basic handling */
3636 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3743 for (j = 0; j < ecb_array_length (argtopriv); j++)
3637 if (argtopriv[j].argval == arg[i]) 3744 if (argtopriv[j].argval == arg[i])
3638 { 3745 {
3639 state = privcases (mode, argtopriv[j].bit); 3746 state = privcases (mode, argtopriv[j].bit);
3640 break; 3747 break;
3641 } 3748 }
… …
3649 3756
3650 scr_touch (true); 3757 scr_touch (true);
3651 break; 3758 break;
3652#endif 3759#endif
3653 case 1048: /* alternative cursor save */ 3760 case 1048: /* alternative cursor save */
3654 case 1049:
3655 if (option (Opt_secondaryScreen)) 3761 if (option (Opt_secondaryScreen))
3656 if (mode == 0) 3762 if (mode == 0)
3657 scr_cursor (RESTORE); 3763 scr_cursor (RESTORE);
3658 else if (mode == 1) 3764 else if (mode == 1)
3659 scr_cursor (SAVE); 3765 scr_cursor (SAVE);
… …
3668 case 2: /* VT52 mode */ 3774 case 2: /* VT52 mode */
3669 /* oddball mode. should be set regardless of set/reset 3775 /* oddball mode. should be set regardless of set/reset
3670 * parameter. Return from VT52 mode with an ESC < from 3776 * parameter. Return from VT52 mode with an ESC < from
3671 * within VT52 mode 3777 * within VT52 mode
3672 */ 3778 */
3673 PrivMode (1, PrivMode_vt52); 3779 priv_modes |= PrivMode_vt52;
3674 break; 3780 break;
3675 case 3: /* 80/132 */ 3781 case 3: /* 80/132 */
3676 if (priv_modes & PrivMode_132OK) 3782 if (priv_modes & PrivMode_132OK)
3677 set_widthheight (((state ? 132 : 80) * fwidth), height); 3783 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3678 break; 3784 break;
3679 case 4: /* smooth scrolling */ 3785 case 4: /* smooth scrolling */
3680 set_option (Opt_jumpScroll, !state); 3786 set_option (Opt_jumpScroll, !state);
3681 break; 3787 break;
3682 case 5: /* reverse video */ 3788 case 5: /* reverse video */
… …
3693 if (state) /* orthogonal */ 3799 if (state) /* orthogonal */
3694 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3800 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3695 break; 3801 break;
3696#ifdef scrollBar_esc 3802#ifdef scrollBar_esc
3697 case scrollBar_esc: 3803 case scrollBar_esc:
3698 if (scrollbar_mapping (state)) 3804 scrollBar.map (state);
3699 {
3700 resize_all_windows (0, 0, 0); 3805 resize_all_windows (0, 0, 0);
3701 scr_touch (true); 3806 scr_touch (true);
3702 } 3807 break;
3808#endif
3809#ifdef CURSOR_BLINK
3810 case 12:
3811 cursor_blink_reset ();
3703 break; 3812 break;
3704#endif 3813#endif
3705 case 25: /* visible/invisible cursor */ 3814 case 25: /* visible/invisible cursor */
3706 scr_cursor_visible (state); 3815 scr_cursor_visible (state);
3707 break; 3816 break;
… …
3720 case 1003: 3829 case 1003:
3721 if (state) 3830 if (state)
3722 { 3831 {
3723 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3832 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3724 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3833 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3834 mouse_row = mouse_col = 0;
3725 vt_emask_mouse = PointerMotionMask; 3835 vt_emask_mouse = PointerMotionMask;
3726 } 3836 }
3727 else 3837 else
3728 vt_emask_mouse = NoEventMask; 3838 vt_emask_mouse = NoEventMask;
3839
3729 vt_select_input (); 3840 vt_select_input ();
3730 break; 3841 break;
3731 case 1010: /* scroll to bottom on TTY output inhibit */ 3842 case 1010: /* scroll to bottom on TTY output inhibit */
3732 set_option (Opt_scrollTtyOutput, !state); 3843 set_option (Opt_scrollTtyOutput, !state);
3733 break; 3844 break;
3734 case 1011: /* scroll to bottom on key press */ 3845 case 1011: /* scroll to bottom on key press */
3735 set_option (Opt_scrollTtyKeypress, state); 3846 set_option (Opt_scrollTtyKeypress, state);
3736 break; 3847 break;
3737 case 1047: /* secondary screen w/ clearing last */ 3848 case 1047: /* secondary screen w/ clearing last */
3738 if (option (Opt_secondaryScreen)) 3849 if (option (Opt_secondaryScreen))
3739 if (current_screen != PRIMARY) 3850 if (!state)
3740 scr_erase_screen (2); 3851 scr_erase_screen (2);
3852
3741 scr_change_screen (state); 3853 scr_change_screen (state);
3742 break; 3854 break;
3743 case 1049: /* secondary screen w/ clearing first */ 3855 case 1049: /* secondary screen w/ clearing first */
3856 if (option (Opt_secondaryScreen))
3857 if (state)
3858 scr_cursor (SAVE);
3859
3744 scr_change_screen (state); 3860 scr_change_screen (state);
3861
3745 if (option (Opt_secondaryScreen)) 3862 if (option (Opt_secondaryScreen))
3746 if (current_screen != PRIMARY) 3863 if (state)
3747 scr_erase_screen (2); 3864 scr_erase_screen (2);
3865 else
3866 scr_cursor (RESTORE);
3748 break; 3867 break;
3749 default: 3868 default:
3750 break; 3869 break;
3751 } 3870 }
3752 } 3871 }
3753} 3872}
3754/*}}} */ 3873/*}}} */
3755 3874
3756/*{{{ process sgr sequences */ 3875/*{{{ process sgr sequences */
3757void 3876void ecb_hot
3758rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3877rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3759{ 3878{
3760 unsigned int i; 3879 unsigned int i;
3761 short rendset; 3880 short rendset;
3762 int rendstyle; 3881 int rendstyle;
… …
3804 //case 19: // ninth alt font 3923 //case 19: // ninth alt font
3805 //case 20: // gothic 3924 //case 20: // gothic
3806 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613) 3925 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3807 rendset = 0, rendstyle = RS_Bold; 3926 rendset = 0, rendstyle = RS_Bold;
3808 break; 3927 break;
3809 case 22: // normal intensity 3928 case 22: // bold off (vt220)
3810 rendset = 0, rendstyle = RS_Bold; 3929 rendset = 0, rendstyle = RS_Bold;
3811 break; 3930 break;
3812 case 23: // disable italic 3931 case 23: // disable italic
3813 rendset = 0, rendstyle = RS_Italic; 3932 rendset = 0, rendstyle = RS_Italic;
3814 break; 3933 break;
3815 case 24: 3934 case 24: // underline off (vt220)
3816 rendset = 0, rendstyle = RS_Uline; 3935 rendset = 0, rendstyle = RS_Uline;
3817 break; 3936 break;
3818 case 25: 3937 case 25: // blink off (vt220)
3819 rendset = 0, rendstyle = RS_Blink; 3938 rendset = 0, rendstyle = RS_Blink;
3820 break; 3939 break;
3821 case 26: // variable spacing (iso 8613) 3940 case 26: // variable spacing (iso 8613)
3822 rendset = 0, rendstyle = RS_Blink; 3941 rendset = 0, rendstyle = RS_Blink;
3823 break; 3942 break;
3824 case 27: 3943 case 27: // reverse off (vt220)
3825 rendset = 0, rendstyle = RS_RVid; 3944 rendset = 0, rendstyle = RS_RVid;
3826 break; 3945 break;
3827 //case 28: // visible. NYI 3946 //case 28: // visible. NYI
3828 //case 29: // not crossed-out 3947 //case 29: // not crossed-out
3829 } 3948 }
… …
3844 case 35: 3963 case 35:
3845 case 36: 3964 case 36:
3846 case 37: 3965 case 37:
3847 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 3966 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3848 break; 3967 break;
3849 case 38: // set fg color, ISO 8613-6
3850 if (nargs > i + 2 && arg[i + 1] == 5)
3851 {
3852 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3853 i += 2;
3854 }
3855 break;
3856 case 39: /* default fg */ 3968 case 39: /* default fg */
3857 scr_color (Color_fg, Color_fg); 3969 scr_color (Color_fg, Color_fg);
3858 break; 3970 break;
3859 3971
3860 case 40: 3972 case 40:
… …
3865 case 45: 3977 case 45:
3866 case 46: 3978 case 46:
3867 case 47: 3979 case 47:
3868 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 3980 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3869 break; 3981 break;
3870 case 48: // set bg color, ISO 8613-6
3871 if (nargs > i + 2 && arg[i + 1] == 5)
3872 {
3873 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3874 i += 2;
3875 }
3876 break;
3877 case 49: /* default bg */ 3982 case 49: /* default bg */
3878 scr_color (Color_bg, Color_bg); 3983 scr_color (Color_bg, Color_bg);
3984 break;
3985
3986 case 38: // set fg color, ISO 8613-6
3987 case 48: // set bg color, ISO 8613-6
3988 {
3989 unsigned int fgbg = arg[i] == 38 ? Color_fg : Color_bg;
3990 unsigned int idx;
3991
3992 if (nargs > i + 2 && arg[i + 1] == 5)
3993 {
3994 idx = minCOLOR + arg[i + 2];
3995 i += 2;
3996
3997 scr_color (idx, fgbg);
3998 }
3999 else if (nargs > i + 4 && arg[i + 1] == 2)
4000 {
4001 unsigned int r = arg[i + 2];
4002 unsigned int g = arg[i + 3];
4003 unsigned int b = arg[i + 4];
4004 unsigned int a = 0xff;
4005
4006 idx = map_rgb24_color (r, g, b, a);
4007
4008 i += 4;
4009
4010 scr_color (idx, fgbg);
4011 }
4012 }
3879 break; 4013 break;
3880 4014
3881 //case 50: // not variable spacing 4015 //case 50: // not variable spacing
3882 4016
3883#if !ENABLE_MINIMAL 4017#if !ENABLE_MINIMAL
… …
3903 break; 4037 break;
3904#endif 4038#endif
3905 } 4039 }
3906 } 4040 }
3907} 4041}
4042
4043void
4044rxvt_term::set_cursor_style (int style)
4045{
4046 if (!IN_RANGE_INC (style, 0, 6))
4047 return;
4048
4049 if (style == 0)
4050 style = 1;
4051
4052 cursor_type = (style - 1) / 2;
4053 set_option (Opt_cursorUnderline, cursor_type == 1);
4054
4055#ifdef CURSOR_BLINK
4056 set_option (Opt_cursorBlink, style & 1);
4057 cursor_blink_reset ();
4058#endif
4059
4060 want_refresh = 1;
4061}
3908/*}}} */ 4062/*}}} */
3909 4063
3910/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3911void
3912rxvt_term::process_graphics ()
3913{
3914 unicode_t ch, cmd = cmd_getc ();
3915
3916 if (cmd == 'Q')
3917 {
3918 /* query graphics */
3919 tt_printf ("\033G0\012"); /* no graphics */
3920 return;
3921 }
3922 /* swallow other graphics sequences until terminating ':' */
3923 do
3924 ch = cmd_getc ();
3925 while (ch != ':');
3926}
3927/*}}} */
3928
3929/* ------------------------------------------------------------------------- */ 4064/* ---------------------------------------------------------------------- */
4065/* Write data to the pty as typed by the user, pasted with the mouse,
4066 * or generated by us in response to a query ESC sequence.
4067 */
3930 4068
3931/* 4069/*
3932 * Send printf () formatted output to the command. 4070 * Send printf () formatted output to the command.
3933 * Only use for small amounts of data. 4071 * Only use for small amounts of data.
3934 */ 4072 */
… …
3942 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4080 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3943 va_end (arg_ptr); 4081 va_end (arg_ptr);
3944 tt_write (buf, strlen (buf)); 4082 tt_write (buf, strlen (buf));
3945} 4083}
3946 4084
3947/* ---------------------------------------------------------------------- */
3948/* Write data to the pty as typed by the user, pasted with the mouse, 4085/* Write data to the pty as typed by the user. */
3949 * or generated by us in response to a query ESC sequence. 4086void
3950 */ 4087rxvt_term::tt_write_user_input (const char *data, unsigned int len)
3951const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4088{
4089 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4090 return;
4091
4092 if (option (Opt_scrollTtyKeypress))
4093 if (view_start)
4094 {
4095 view_start = 0;
4096 want_refresh = 1;
4097 }
4098
4099 tt_write_ (data, len);
4100}
3952 4101
3953void 4102void
3954rxvt_term::tt_write (const char *data, unsigned int len) 4103rxvt_term::tt_write (const char *data, unsigned int len)
3955{ 4104{
3956 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4105 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3957 return; 4106 return;
3958 4107
4108 tt_write_ (data, len);
4109}
4110
4111static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4112
4113void
4114rxvt_term::tt_write_ (const char *data, unsigned int len)
4115{
3959 if (pty->pty < 0) 4116 if (pty->pty < 0)
3960 return; 4117 return;
3961 4118
3962 if (v_buflen == 0) 4119 if (v_buflen == 0)
3963 { 4120 {
3964 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4121 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3965 4122
4123 max_it (written, 0);
4124
3966 if ((unsigned int)written == len) 4125 if (written == len)
3967 return; 4126 return;
3968 4127
3969 data += written; 4128 data += written;
3970 len -= written; 4129 len -= written;
3971 } 4130 }
3972 4131
3973 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4132 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
3974 4133
3975 memcpy (v_buffer + v_buflen, data, len); 4134 memcpy (v_buffer + v_buflen, data, len);
3976 v_buflen += len; 4135 v_buflen += len;
3977 4136
3978 pty_ev.set (ev::READ | ev::WRITE); 4137 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

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