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.460 by sf-exg, Fri Nov 19 23:29:30 2010 UTC vs.
Revision 1.549 by root, Sun May 11 06:38:39 2014 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 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 2 of the License, or
… …
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 wchar_t *chr, *alloc, ch2, **fname; 167 wchar_t *chr, *alloc, ch2, **fname;
168 int len; 168 int len;
169 169
… …
181 181
182 alloc = 0; 182 alloc = 0;
183 chr = &ch2; 183 chr = &ch2;
184 len = 1; 184 len = 1;
185 } 185 }
186
187 char rowcol[40];
188 snprintf (rowcol, sizeof rowcol, "col %d row %d @%d", x, y, y2);
186 189
187 char attr[80]; // plenty 190 char attr[80]; // plenty
188 191
189 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",
190 (int)r, 193 (int)r,
… …
203 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])]; 206 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])];
204 fname[i] = rxvt_utf8towcs (f->name); 207 fname[i] = rxvt_utf8towcs (f->name);
205 max_it (width, wcswidth (fname[i], wcslen (fname[i]))); 208 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
206 } 209 }
207 210
208 max_it (width, 8+5); // for char + hex
209 max_it (width, strlen (attr)); 211 max_it (width, strlen (attr));
210 212
211 if (y >= 0) 213 if (y >= 0)
212 { 214 {
213 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 215 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
214 x = 0; 216 x = 0;
215 } 217 }
216 218
217 scr_overlay_new (x, y, width, len * 2 + 1); 219 scr_overlay_new (x, y, width, len * 2 + 2);
220
221 scr_overlay_set (0, 0, rowcol);
218 222
219 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 223 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
220 224
221 for (int y = 0; y < len; y++) 225 for (int y = 0; y < len; y++)
222 { 226 {
223 char buf[9]; 227 char buf[9];
224 228
225 ch = *chr++; 229 ch = *chr++;
226 230
227 sprintf (buf, "%8x", ch); 231 sprintf (buf, "%8x", ch);
228 scr_overlay_set (0, y, buf); 232 scr_overlay_set (0, y + 1, buf);
229 scr_overlay_set (9, y, '='); 233 scr_overlay_set (9, y + 1, '=');
230# if !UNICODE_3 234# if !UNICODE_3
231 if (ch >= 0x10000) 235 if (ch >= 0x10000)
232 ch = 0xfffd; 236 ch = 0xfffd;
233# endif 237# endif
234 scr_overlay_set (11, y, ch, r); 238 scr_overlay_set (11, y + 1, ch, r);
235 239
236 if (WCWIDTH (ch) >= 2) 240 if (WCWIDTH (ch) >= 2)
237 scr_overlay_set (12, y, NOCHAR, r); 241 scr_overlay_set (12, y + 1, NOCHAR, r);
238 } 242 }
239 243
240// { 244// {
241// char buf[4+4+3+1]; 245// char buf[4+4+3+1];
242// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y); 246// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
243// scr_overlay_set (0, 0, buf); 247// scr_overlay_set (0, 0, buf);
244// } 248// }
245 scr_overlay_set (0, len , attr); 249 scr_overlay_set (0, len + 1, attr);
246 for (int i = 0; i < len; i++) 250 for (int i = 0; i < len; i++)
247 { 251 {
248 scr_overlay_set (0, len + 1 + i, fname[i]); 252 scr_overlay_set (0, len + 2 + i, fname[i]);
249 free (fname[i]); 253 free (fname[i]);
250 } 254 }
251 255
252# if ENABLE_COMBINING 256# if ENABLE_COMBINING
253 if (alloc) 257 if (alloc)
254 delete [] alloc; 258 delete [] alloc;
255# endif 259# endif
256} 260}
257#endif 261#endif
258 262
259void 263void ecb_cold
260rxvt_term::commit_iso14755 () 264rxvt_term::commit_iso14755 ()
261{ 265{
262 wchar_t ch[2];
263
264 ch[0] = iso14755buf & ISO_14755_MASK; 266 wchar_t ch = iso14755buf & ISO_14755_MASK;
265 ch[1] = 0;
266 267
267 if (iso14755buf & ISO_14755_51) 268 if (iso14755buf & ISO_14755_51)
268 { 269 {
269 char mb[16]; 270 char mb[MB_LEN_MAX];
270 int len; 271 int len;
271 272
272 // allow verbatim 0-bytes and control-bytes to be entered 273 // allow verbatim 0-bytes and control-bytes to be entered
273 if (ch[0] >= 0x20) 274 if (ch >= 0x20)
274 len = wcstombs (mb, ch, 16); 275 len = wctomb (mb, ch);
275 else 276 else
276 { 277 {
277 mb[0] = ch[0]; 278 mb[0] = ch;
278 len = 1; 279 len = 1;
279 } 280 }
280 281
281 if (len > 0) 282 if (len > 0)
282 tt_write (mb, len); 283 tt_write (mb, len);
… …
285 } 286 }
286 287
287 iso14755buf = 0; 288 iso14755buf = 0;
288} 289}
289 290
290static int 291static int ecb_cold
291hex_keyval (XKeyEvent &ev) 292hex_keyval (XKeyEvent &ev)
292{ 293{
293 // check whether this event corresponds to a hex digit 294 // check whether this event corresponds to a hex digit
294 // if the modifiers had not been pressed. 295 // if the modifiers had not been pressed.
295 for (int index = 0; index < 8; index++) 296 for (int index = 0; index < 8; index++)
… …
304 305
305 return -1; 306 return -1;
306} 307}
307#endif 308#endif
308 309
309static inline KeySym 310static inline KeySym ecb_cold
310translate_keypad (KeySym keysym, bool kp) 311translate_keypad (KeySym keysym, bool kp)
311{ 312{
312#ifdef XK_KP_Home 313#ifdef XK_KP_Home
313 static const KeySym keypadtrans[] = { 314 static const KeySym keypadtrans[] = {
314 XK_KP_7, // XK_KP_Home 315 XK_KP_7, // XK_KP_Home
… …
340# endif 341# endif
341#endif 342#endif
342 return keysym; 343 return keysym;
343} 344}
344 345
345static inline int 346static inline int ecb_cold
346map_function_key (KeySym keysym) 347map_function_key (KeySym keysym)
347{ 348{
348 int param = 0; 349 int param = 0;
349 350
350 if (IN_RANGE_INC (keysym, XK_F1, XK_F35)) 351 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
… …
399 break; 400 break;
400 } 401 }
401 return param; 402 return param;
402} 403}
403 404
404void 405static inline wchar_t *
406rxvt_wcsdup (const wchar_t *str, int len)
407{
408 wchar_t *r = (wchar_t *)rxvt_malloc ((len + 1) * sizeof (wchar_t));
409 memcpy (r, str, len * sizeof (wchar_t));
410 r[len] = 0;
411 return r;
412}
413
414void ecb_cold
405rxvt_term::key_press (XKeyEvent &ev) 415rxvt_term::key_press (XKeyEvent &ev)
406{ 416{
407 int ctrl, meta, shft, len; 417 int ctrl, meta, shft, len;
408 KeySym keysym; 418 KeySym keysym;
409 int valid_keysym; 419 int valid_keysym;
410 char kbuf[KBUFSZ]; 420 char rkbuf[KBUFSZ + 1];
421 char *kbuf = rkbuf + 1;
411 422
412#if ISO_14755 423#if ISO_14755
413 if (iso14755buf & ISO_14755_52) 424 if (iso14755buf & ISO_14755_52)
414 return; 425 return;
415#endif 426#endif
… …
424 ctrl = ev.state & ControlMask; 435 ctrl = ev.state & ControlMask;
425 meta = ev.state & ModMetaMask; 436 meta = ev.state & ModMetaMask;
426 437
427 kbuf[0] = 0; 438 kbuf[0] = 0;
428 439
429#ifdef USE_XIM 440#if USE_XIM
430 if (Input_Context) 441 if (Input_Context)
431 { 442 {
432 Status status_return; 443 Status status_return;
433 444
434#if 0 445#if 0
… …
485 valid_keysym = keysym != NoSymbol; 496 valid_keysym = keysym != NoSymbol;
486 } 497 }
487 498
488 if (valid_keysym) 499 if (valid_keysym)
489 { 500 {
501 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
502 {
503 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
504 unsigned int newlen = 1;
505
506 if (ev.state & ModNumLockMask)
507 kp = false;
508
509 keysym = translate_keypad (keysym, kp);
510
511 switch (keysym)
512 {
513#ifndef NO_BACKSPACE_KEY
514 case XK_BackSpace:
515 if (priv_modes & PrivMode_HaveBackSpace)
516 {
517 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
518 ^ !!ctrl) ? '\b' : '\177';
519 kbuf[1] = '\0';
520 }
521 else
522 strcpy (kbuf, rs[Rs_backspace_key]);
523 break;
524#endif
525#ifndef NO_DELETE_KEY
526 case XK_Delete:
527 strcpy (kbuf, rs[Rs_delete_key]);
528 break;
529#endif
530 case XK_Tab:
531 if (shft)
532 strcpy (kbuf, "\033[Z");
533 else
534 {
535#ifdef CTRL_TAB_MAKES_META
536 if (ctrl)
537 meta = 1;
538#endif
539#ifdef MOD4_TAB_MAKES_META
540 if (ev.state & Mod4Mask)
541 meta = 1;
542#endif
543 newlen = 0;
544 }
545 break;
546
547 case XK_Up: /* "\033[A" */
548 case XK_Down: /* "\033[B" */
549 case XK_Right: /* "\033[C" */
550 case XK_Left: /* "\033[D" */
551 strcpy (kbuf, "\033[Z");
552 kbuf[2] = "DACB"[keysym - XK_Left];
553 /* do Shift first */
554 if (shft)
555 kbuf[2] = "dacb"[keysym - XK_Left];
556 else if (ctrl)
557 {
558 kbuf[1] = 'O';
559 kbuf[2] = "dacb"[keysym - XK_Left];
560 }
561 else if (priv_modes & PrivMode_aplCUR)
562 kbuf[1] = 'O';
563 break;
564
565 case XK_KP_Enter:
566 /* allow shift to override */
567 if (kp)
568 {
569 strcpy (kbuf, "\033OM");
570 break;
571 }
572
573 /* FALLTHROUGH */
574
575 case XK_Return:
576 if (priv_modes & PrivMode_LFNL)
577 {
578 kbuf[0] = '\015';
579 kbuf[1] = '\012';
580 kbuf[2] = '\0';
581 }
582 else
583 {
584 kbuf[0] = '\015';
585 kbuf[1] = '\0';
586 }
587 break;
588
589 case XK_KP_F1: /* "\033OP" */
590 case XK_KP_F2: /* "\033OQ" */
591 case XK_KP_F3: /* "\033OR" */
592 case XK_KP_F4: /* "\033OS" */
593 strcpy (kbuf, "\033OP");
594 kbuf[2] += (keysym - XK_KP_F1);
595 break;
596
597 case XK_KP_Multiply: /* "\033Oj" : "*" */
598 case XK_KP_Add: /* "\033Ok" : "+" */
599 case XK_KP_Separator: /* "\033Ol" : "," */
600 case XK_KP_Subtract: /* "\033Om" : "-" */
601 case XK_KP_Decimal: /* "\033On" : "." */
602 case XK_KP_Divide: /* "\033Oo" : "/" */
603 case XK_KP_0: /* "\033Op" : "0" */
604 case XK_KP_1: /* "\033Oq" : "1" */
605 case XK_KP_2: /* "\033Or" : "2" */
606 case XK_KP_3: /* "\033Os" : "3" */
607 case XK_KP_4: /* "\033Ot" : "4" */
608 case XK_KP_5: /* "\033Ou" : "5" */
609 case XK_KP_6: /* "\033Ov" : "6" */
610 case XK_KP_7: /* "\033Ow" : "7" */
611 case XK_KP_8: /* "\033Ox" : "8" */
612 case XK_KP_9: /* "\033Oy" : "9" */
613 /* allow shift to override */
614 if (kp)
615 {
616 strcpy (kbuf, "\033Oj");
617 kbuf[2] += (keysym - XK_KP_Multiply);
618 }
619 else
620 {
621 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
622 kbuf[1] = '\0';
623 }
624 break;
625
626 default:
627 {
628 int param = map_function_key (keysym);
629 if (param > 0)
630 sprintf (kbuf,"\033[%d~", param);
631 else
632 newlen = 0;
633 }
634 break;
635 }
636
637 if (newlen)
638 len = strlen (kbuf);
639
640 if (len > 0)
641 {
642 /*
643 * pass Shift/Control indicators for function keys ending with `~'
644 *
645 * eg,
646 * Prior = "ESC[5~"
647 * Shift+Prior = "ESC[5$"
648 * Ctrl+Prior = "ESC[5^"
649 * Ctrl+Shift+Prior = "ESC[5@"
650 */
651 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
652 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
653
654 /*
655 * Pass meta for all function keys, if 'meta' option set
656 */
657#ifdef META8_OPTION
658 if (meta && (meta_char == 0x80))
659 kbuf[len - 1] |= 0x80;
660#endif
661 }
662
663 }
664 else if (ctrl && keysym == XK_minus)
665 {
666 len = 1;
667 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
668 }
669 else if (keysym == XK_ISO_Left_Tab)
670 {
671 strcpy (kbuf, "\033[Z");
672 len = 3;
673 }
674 else
675 {
676#ifdef META8_OPTION
677 /* set 8-bit on */
678 if (meta && (meta_char == 0x80))
679 {
680 char *ch;
681
682 for (ch = kbuf; ch < kbuf + len; ch++)
683 *ch |= 0x80;
684
685 meta = 0;
686 }
687#endif
688 /* nil */ ;
689 }
690 }
691
692 /* escape prefix */
693 if (len && meta
694#ifdef META8_OPTION
695 && meta_char == C0_ESC
696#endif
697 )
698 {
699 *--kbuf = C0_ESC;
700 len++;
701 }
702
703 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
704 return;
705
706 if (valid_keysym)
707 {
490#ifdef KEYSYM_RESOURCE 708#ifdef KEYSYM_RESOURCE
491 if (keyboard->dispatch (this, keysym, ev.state)) 709 if (keyboard->dispatch (this, keysym, ev.state, kbuf, len))
492 return; 710 return;
493#endif 711#endif
494 712
495 if (saveLines) 713 if (saveLines)
496 { 714 {
… …
509#endif 727#endif
510 max_it (lnsppg, 1); 728 max_it (lnsppg, 1);
511 729
512 if (keysym == XK_Prior) 730 if (keysym == XK_Prior)
513 { 731 {
514 scr_page (UP, lnsppg); 732 scr_page (lnsppg);
515 return; 733 return;
516 } 734 }
517 else if (keysym == XK_Next) 735 else if (keysym == XK_Next)
518 { 736 {
519 scr_page (DN, lnsppg); 737 scr_page (-lnsppg);
520 return; 738 return;
521 } 739 }
522 } 740 }
523#ifdef SCROLL_ON_UPDOWN_KEYS 741#ifdef SCROLL_ON_UPDOWN_KEYS
524 if (IS_SCROLL_MOD) 742 if (IS_SCROLL_MOD)
525 { 743 {
526 if (keysym == XK_Up) 744 if (keysym == XK_Up)
527 { 745 {
528 scr_page (UP, 1); 746 scr_page (1);
529 return; 747 return;
530 } 748 }
531 else if (keysym == XK_Down) 749 else if (keysym == XK_Down)
532 { 750 {
533 scr_page (DN, 1); 751 scr_page (-1);
534 return; 752 return;
535 } 753 }
536 } 754 }
537#endif 755#endif
538#ifdef SCROLL_ON_HOMEEND_KEYS 756#ifdef SCROLL_ON_HOMEEND_KEYS
539 if (IS_SCROLL_MOD) 757 if (IS_SCROLL_MOD)
540 { 758 {
541 if (keysym == XK_Home) 759 if (keysym == XK_Home)
542 { 760 {
543 scr_move_to (0, 1); 761 scr_changeview (top_row);
544 return; 762 return;
545 } 763 }
546 else if (keysym == XK_End) 764 else if (keysym == XK_End)
547 { 765 {
548 scr_move_to (1, 1); 766 scr_changeview (0);
549 return; 767 return;
550 } 768 }
551 } 769 }
552#endif 770#endif
553 } 771 }
… …
569 selection_request (ev.time); 787 selection_request (ev.time);
570 return; 788 return;
571#if TODO 789#if TODO
572 /* rxvt extras */ 790 /* rxvt extras */
573 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 791 case XK_KP_Add: /* Shift+KP_Add = bigger font */
574 change_font (FONT_UP);
575 return; 792 return;
576 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 793 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
577 change_font (FONT_DN);
578 return; 794 return;
579#endif 795#endif
580 } 796 }
581 } 797 }
798 }
799
800 if (ctrl && meta && (keysym == XK_c || keysym == XK_v))
801 {
802 if (keysym == XK_v)
803 selection_request (ev.time, Sel_Clipboard);
804 else if (selection.len > 0)
805 {
806 free (selection.clip_text);
807 selection.clip_text = rxvt_wcsdup (selection.text, selection.len);
808 selection.clip_len = selection.len;
809 selection_grab (CurrentTime, true);
810 }
811
812 return;
582 } 813 }
583 814
584#if ENABLE_FRILLS || ISO_14755 815#if ENABLE_FRILLS || ISO_14755
585 // ISO 14755 support 816 // ISO 14755 support
586 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51)) 817 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
… …
641 { 872 {
642 scr_printscreen (ctrl | shft); 873 scr_printscreen (ctrl | shft);
643 return; 874 return;
644 } 875 }
645#endif 876#endif
646
647 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
648 {
649 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
650 unsigned int newlen = 1;
651
652 if (ev.state & ModNumLockMask)
653 kp = false;
654
655 keysym = translate_keypad (keysym, kp);
656
657 switch (keysym)
658 {
659#ifndef NO_BACKSPACE_KEY
660 case XK_BackSpace:
661 if (priv_modes & PrivMode_HaveBackSpace)
662 {
663 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
664 ^ !!ctrl) ? '\b' : '\177';
665 kbuf[1] = '\0';
666 }
667 else
668 strcpy (kbuf, rs[Rs_backspace_key]);
669 break;
670#endif
671#ifndef NO_DELETE_KEY
672 case XK_Delete:
673 strcpy (kbuf, rs[Rs_delete_key]);
674 break;
675#endif
676 case XK_Tab:
677 if (shft)
678 strcpy (kbuf, "\033[Z");
679 else
680 {
681#ifdef CTRL_TAB_MAKES_META
682 if (ctrl)
683 meta = 1;
684#endif
685#ifdef MOD4_TAB_MAKES_META
686 if (ev.state & Mod4Mask)
687 meta = 1;
688#endif
689 newlen = 0;
690 }
691 break;
692
693 case XK_Up: /* "\033[A" */
694 case XK_Down: /* "\033[B" */
695 case XK_Right: /* "\033[C" */
696 case XK_Left: /* "\033[D" */
697 strcpy (kbuf, "\033[Z");
698 kbuf[2] = "DACB"[keysym - XK_Left];
699 /* do Shift first */
700 if (shft)
701 kbuf[2] = "dacb"[keysym - XK_Left];
702 else if (ctrl)
703 {
704 kbuf[1] = 'O';
705 kbuf[2] = "dacb"[keysym - XK_Left];
706 }
707 else if (priv_modes & PrivMode_aplCUR)
708 kbuf[1] = 'O';
709 break;
710
711 case XK_KP_Enter:
712 /* allow shift to override */
713 if (kp)
714 {
715 strcpy (kbuf, "\033OM");
716 break;
717 }
718
719 /* FALLTHROUGH */
720
721 case XK_Return:
722 if (priv_modes & PrivMode_LFNL)
723 {
724 kbuf[0] = '\015';
725 kbuf[1] = '\012';
726 kbuf[2] = '\0';
727 }
728 else
729 {
730 kbuf[0] = '\015';
731 kbuf[1] = '\0';
732 }
733 break;
734
735 case XK_KP_F1: /* "\033OP" */
736 case XK_KP_F2: /* "\033OQ" */
737 case XK_KP_F3: /* "\033OR" */
738 case XK_KP_F4: /* "\033OS" */
739 strcpy (kbuf, "\033OP");
740 kbuf[2] += (keysym - XK_KP_F1);
741 break;
742
743 case XK_KP_Multiply: /* "\033Oj" : "*" */
744 case XK_KP_Add: /* "\033Ok" : "+" */
745 case XK_KP_Separator: /* "\033Ol" : "," */
746 case XK_KP_Subtract: /* "\033Om" : "-" */
747 case XK_KP_Decimal: /* "\033On" : "." */
748 case XK_KP_Divide: /* "\033Oo" : "/" */
749 case XK_KP_0: /* "\033Op" : "0" */
750 case XK_KP_1: /* "\033Oq" : "1" */
751 case XK_KP_2: /* "\033Or" : "2" */
752 case XK_KP_3: /* "\033Os" : "3" */
753 case XK_KP_4: /* "\033Ot" : "4" */
754 case XK_KP_5: /* "\033Ou" : "5" */
755 case XK_KP_6: /* "\033Ov" : "6" */
756 case XK_KP_7: /* "\033Ow" : "7" */
757 case XK_KP_8: /* "\033Ox" : "8" */
758 case XK_KP_9: /* "\033Oy" : "9" */
759 /* allow shift to override */
760 if (kp)
761 {
762 strcpy (kbuf, "\033Oj");
763 kbuf[2] += (keysym - XK_KP_Multiply);
764 }
765 else
766 {
767 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
768 kbuf[1] = '\0';
769 }
770 break;
771
772 default:
773 {
774 int param = map_function_key (keysym);
775 if (param > 0)
776 sprintf (kbuf,"\033[%d~", param);
777 else
778 newlen = 0;
779 }
780 break;
781 }
782
783 if (newlen)
784 len = strlen (kbuf);
785
786 /*
787 * Pass meta for all function keys, if 'meta' option set
788 */
789#ifdef META8_OPTION
790 if (meta && (meta_char == 0x80) && len > 0)
791 kbuf[len - 1] |= 0x80;
792#endif
793
794 }
795 else if (ctrl && keysym == XK_minus)
796 {
797 len = 1;
798 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
799 }
800 else if (keysym == XK_ISO_Left_Tab)
801 {
802 strcpy (kbuf, "\033[Z");
803 len = 3;
804 }
805 else
806 {
807#ifdef META8_OPTION
808 /* set 8-bit on */
809 if (meta && (meta_char == 0x80))
810 {
811 char *ch;
812
813 for (ch = kbuf; ch < kbuf + len; ch++)
814 *ch |= 0x80;
815
816 meta = 0;
817 }
818#endif
819 /* nil */ ;
820 }
821 } 877 }
822
823 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
824 return;
825 878
826 if (len <= 0) 879 if (len <= 0)
827 return; /* not mapped */ 880 return; /* not mapped */
828 881
829 if (option (Opt_scrollTtyKeypress))
830 if (view_start)
831 {
832 view_start = 0;
833 want_refresh = 1;
834 }
835
836 /*
837 * these modifications only affect the static keybuffer
838 * pass Shift/Control indicators for function keys ending with `~'
839 *
840 * eg,
841 * Prior = "ESC[5~"
842 * Shift+Prior = "ESC[5$"
843 * Ctrl+Prior = "ESC[5^"
844 * Ctrl+Shift+Prior = "ESC[5@"
845 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
846 */
847 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
848 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
849
850 /* escape prefix */
851 if (meta
852#ifdef META8_OPTION
853 && meta_char == C0_ESC
854#endif
855 )
856 {
857 const char ch = C0_ESC;
858 tt_write (&ch, 1);
859 }
860
861 tt_write (kbuf, (unsigned int)len); 882 tt_write_user_input (kbuf, (unsigned int)len);
862} 883}
863 884
864void 885void ecb_cold
865rxvt_term::key_release (XKeyEvent &ev) 886rxvt_term::key_release (XKeyEvent &ev)
866{ 887{
867#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL 888#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
868 KeySym keysym; 889 KeySym keysym;
869 890
… …
889 commit_iso14755 (); 910 commit_iso14755 ();
890 911
891 return; 912 return;
892 } 913 }
893 914
894 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 915 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
895 if (i[0] == keysym) 916 if (i[0] == keysym)
896 { 917 {
897 iso14755buf = ISO_14755_51 | i[1]; 918 iso14755buf = ISO_14755_51 | i[1];
898 commit_iso14755 (); 919 commit_iso14755 ();
899 920
… …
936 else if (keysym == XK_Control_L || keysym == XK_Control_R) 957 else if (keysym == XK_Control_L || keysym == XK_Control_R)
937 mouse_slip_wheel_speed = 0; 958 mouse_slip_wheel_speed = 0;
938#endif 959#endif
939} 960}
940 961
941#if defined (KEYSYM_RESOURCE)
942unsigned int
943rxvt_term::cmd_write (const char *str, unsigned int count)
944{
945 unsigned int n, s;
946
947 n = cmdbuf_ptr - cmdbuf_base;
948 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
949
950 if (n > 0 && s < count)
951 {
952 memmove (cmdbuf_base, cmdbuf_ptr,
953 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
954 cmdbuf_ptr = cmdbuf_base;
955 cmdbuf_endp -= n;
956 s += n;
957 }
958
959 if (count > s)
960 {
961 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
962 count = s;
963 }
964
965 for (; count--;)
966 *cmdbuf_endp++ = *str++;
967
968 cmd_parse ();
969
970 return 0;
971}
972#endif
973
974void 962void
975rxvt_term::flush () 963rxvt_term::flush ()
976{ 964{
977 flush_ev.stop (); 965 flush_ev.stop ();
978 966
979#ifdef HAVE_BG_PIXMAP 967#ifdef HAVE_IMG
980 if (bgPixmap.flags & bgPixmap_t::hasChanged) 968 if (bg_flags & BG_NEEDS_REFRESH)
981 { 969 {
982 bgPixmap.flags &= ~bgPixmap_t::hasChanged; 970 bg_flags &= ~BG_NEEDS_REFRESH;
983// scr_clear (true); This needs to be researched further!
984 scr_touch (false); 971 scr_touch (false);
985 } 972 }
986#endif 973#endif
987 974
988 if (want_refresh) 975 if (want_refresh)
… …
1025 while (row < end_row); 1012 while (row < end_row);
1026 } 1013 }
1027 1014
1028 scr_refresh (); 1015 scr_refresh ();
1029 scrollBar.show (1); 1016 scrollBar.show (1);
1030#ifdef USE_XIM 1017#if USE_XIM
1031 IMSendSpot (); 1018 im_send_spot ();
1032#endif 1019#endif
1033 } 1020 }
1034 1021
1035 display->flush (); 1022 display->flush ();
1036} 1023}
… …
1054 flush (); 1041 flush ();
1055} 1042}
1056 1043
1057#ifdef CURSOR_BLINK 1044#ifdef CURSOR_BLINK
1058void 1045void
1046rxvt_term::cursor_blink_reset ()
1047{
1048 if (hidden_cursor)
1049 {
1050 hidden_cursor = 0;
1051 want_refresh = 1;
1052 }
1053
1054 if (option (Opt_cursorBlink))
1055 cursor_blink_ev.again ();
1056 else
1057 cursor_blink_ev.stop ();
1058}
1059
1060void
1059rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 1061rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1060{ 1062{
1061 hidden_cursor = !hidden_cursor; 1063 hidden_cursor = !hidden_cursor;
1062 want_refresh = 1; 1064 want_refresh = 1;
1063 refresh_check (); 1065 refresh_check ();
… …
1081 1083
1082#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1084#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1083void 1085void
1084rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1086rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1085{ 1087{
1086 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 1088 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1087 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1)) 1089 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1088 { 1090 {
1089 want_refresh = 1; 1091 want_refresh = 1;
1090 refresh_check (); 1092 refresh_check ();
1091 } 1093 }
1092 else 1094 else
… …
1096 1098
1097#ifdef SELECTION_SCROLLING 1099#ifdef SELECTION_SCROLLING
1098void 1100void
1099rxvt_term::sel_scroll_cb (ev::timer &w, int revents) 1101rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1100{ 1102{
1101 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1103 if (scr_page (scroll_selection_lines))
1102 { 1104 {
1103 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1105 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1104 want_refresh = 1; 1106 want_refresh = 1;
1105 refresh_check (); 1107 refresh_check ();
1106 } 1108 }
… …
1111 1113
1112#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1114#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1113void 1115void
1114rxvt_term::slip_wheel_cb (ev::timer &w, int revents) 1116rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1115{ 1117{
1116 if (scr_changeview (view_start - mouse_slip_wheel_speed)) 1118 if (scr_page (mouse_slip_wheel_speed))
1117 { 1119 {
1118 want_refresh = 1; 1120 want_refresh = 1;
1119 refresh_check (); 1121 refresh_check ();
1120 } 1122 }
1121 1123
… …
1153 { 1155 {
1154 } 1156 }
1155} event_handler; 1157} event_handler;
1156#endif 1158#endif
1157 1159
1160/* make sure all the cmd data is at beginning of cmdbuf */
1161void
1162rxvt_term::cmdbuf_reify ()
1163{
1164 if (cmdbuf_ptr == cmdbuf_base)
1165 return;
1166
1167 ssize_t used = cmdbuf_endp - cmdbuf_ptr;
1168
1169 memmove (cmdbuf_base, cmdbuf_ptr, used);
1170 cmdbuf_ptr = cmdbuf_base;
1171 cmdbuf_endp = cmdbuf_ptr + used;
1172
1173}
1174
1175#if defined (KEYSYM_RESOURCE)
1176void
1177rxvt_term::cmdbuf_append (const char *str, size_t count)
1178{
1179 cmdbuf_reify ();
1180
1181 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1182
1183 if (count > avail)
1184 return;
1185
1186 memcpy (cmdbuf_endp, str, count);
1187 cmdbuf_endp += count;
1188
1189 cmd_parse ();
1190}
1191#endif
1192
1158bool 1193bool
1159rxvt_term::pty_fill () 1194rxvt_term::pty_fill ()
1160{ 1195{
1161 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1196 cmdbuf_reify ();
1162 1197
1163 if (CBUFSIZ == n) 1198 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1164 { 1199
1165 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1200 if (!avail)
1166 n = 0;
1167 } 1201 {
1168 1202 // normally this indicates a "too long" command sequence - just drop the data we have
1169 memmove (cmdbuf_base, cmdbuf_ptr, n);
1170 cmdbuf_ptr = cmdbuf_base; 1203 cmdbuf_ptr = cmdbuf_base;
1171 cmdbuf_endp = cmdbuf_ptr + n; 1204 cmdbuf_endp = cmdbuf_ptr;
1205 avail = CBUFSIZ;
1206 }
1172 1207
1173 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1208 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1174 1209
1175 if (r > 0) 1210 if (r > 0)
1176 { 1211 {
1177 cmdbuf_endp += r; 1212 cmdbuf_endp += r;
1178 return true; 1213 return true;
… …
1209 pty_write (); 1244 pty_write ();
1210 1245
1211 refresh_check (); 1246 refresh_check ();
1212} 1247}
1213 1248
1214void 1249void ecb_cold
1215rxvt_term::pointer_unblank () 1250rxvt_term::pointer_unblank ()
1216{ 1251{
1217 XDefineCursor (dpy, vt, TermWin_cursor); 1252 XDefineCursor (dpy, vt, TermWin_cursor);
1218 recolour_cursor (); 1253 recolour_cursor ();
1219 1254
… …
1224 pointer_ev.start (pointerBlankDelay); 1259 pointer_ev.start (pointerBlankDelay);
1225#endif 1260#endif
1226} 1261}
1227 1262
1228#ifdef POINTER_BLANK 1263#ifdef POINTER_BLANK
1229void 1264void ecb_cold
1230rxvt_term::pointer_blank () 1265rxvt_term::pointer_blank ()
1231{ 1266{
1232 if (!option (Opt_pointerBlank)) 1267 if (!option (Opt_pointerBlank))
1233 return; 1268 return;
1234 1269
… …
1236 XFlush (dpy); 1271 XFlush (dpy);
1237 1272
1238 hidden_pointer = 1; 1273 hidden_pointer = 1;
1239} 1274}
1240 1275
1241void 1276void ecb_cold
1242rxvt_term::pointer_cb (ev::timer &w, int revents) 1277rxvt_term::pointer_cb (ev::timer &w, int revents)
1243{ 1278{
1244 make_current (); 1279 make_current ();
1245 1280
1246 pointer_blank (); 1281 pointer_blank ();
… …
1252{ 1287{
1253 int button_number, key_state = 0; 1288 int button_number, key_state = 0;
1254 int x, y; 1289 int x, y;
1255 int code = 32; 1290 int code = 32;
1256 1291
1257 x = Pixel2Col (ev.x); 1292 x = Pixel2Col (ev.x) + 1;
1258 y = Pixel2Row (ev.y); 1293 y = Pixel2Row (ev.y) + 1;
1294
1259 if (ev.type == MotionNotify) 1295 if (ev.type == MotionNotify)
1260 { 1296 {
1261 if (x == mouse_row && y == mouse_col) 1297 if (x == mouse_row && y == mouse_col)
1262 return; 1298 return;
1299
1263 mouse_row = x; 1300 mouse_row = x;
1264 mouse_col = y; 1301 mouse_col = y;
1265 code += 32; 1302 code += 32;
1266 } 1303 }
1267 1304
… …
1270 else 1307 else
1271 { 1308 {
1272 button_number = MEvent.button - Button1; 1309 button_number = MEvent.button - Button1;
1273 /* add 0x3D for wheel events, like xterm does */ 1310 /* add 0x3D for wheel events, like xterm does */
1274 if (button_number >= 3) 1311 if (button_number >= 3)
1275 button_number += (64 - 3); 1312 button_number += 64 - 3;
1276 } 1313 }
1277 1314
1278 if (priv_modes & PrivMode_MouseX10) 1315 if (priv_modes & PrivMode_MouseX10)
1279 { 1316 {
1280 /* 1317 /*
… …
1312 fputc ('A', stderr); 1349 fputc ('A', stderr);
1313 if (key_state & 32) 1350 if (key_state & 32)
1314 fputc ('2', stderr); 1351 fputc ('2', stderr);
1315 fprintf (stderr, "]: <%d>, %d/%d\n", 1352 fprintf (stderr, "]: <%d>, %d/%d\n",
1316 button_number, 1353 button_number,
1317 x + 1, 1354 x,
1318 y + 1); 1355 y);
1319#endif 1356#endif
1320 1357
1358#if ENABLE_FRILLS
1359 if (priv_modes & PrivMode_ExtMouseRight)
1360 tt_printf ("\033[%d;%d;%dM",
1361 code + button_number + key_state,
1362 x,
1363 y);
1364 else if (priv_modes & PrivMode_ExtModeMouse)
1365 tt_printf ("\033[M%c%lc%lc",
1366 code + button_number + key_state,
1367 wint_t (32 + x),
1368 wint_t (32 + y));
1369 else
1370#endif
1321 tt_printf ("\033[M%c%c%c", 1371 tt_printf ("\033[M%c%c%c",
1322 (code + button_number + key_state), 1372 code + button_number + key_state,
1323 (32 + x + 1), 1373 32 + x,
1324 (32 + y + 1)); 1374 32 + y);
1325} 1375}
1326 1376
1327/*{{{ process an X event */ 1377/*{{{ process an X event */
1328void 1378void ecb_hot
1329rxvt_term::x_cb (XEvent &ev) 1379rxvt_term::x_cb (XEvent &ev)
1330{ 1380{
1331 make_current (); 1381 make_current ();
1332 1382
1333 dLocal (Display *, dpy); 1383 dLocal (Display *, dpy);
… …
1431 && ev.xfocus.mode != NotifyGrab) 1481 && ev.xfocus.mode != NotifyGrab)
1432 focus_out (); 1482 focus_out ();
1433 break; 1483 break;
1434 1484
1435 case ConfigureNotify: 1485 case ConfigureNotify:
1436 if (ev.xconfigure.window == parent[0]) 1486 if (ev.xconfigure.window == parent)
1437 { 1487 {
1438 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1488 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1439 ; 1489 ;
1440 1490
1491 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1492
1493 bool moved = false;
1441#ifdef HAVE_BG_PIXMAP 1494#ifdef HAVE_BG_PIXMAP
1442 bool moved = false;
1443 if (bgPixmap.window_position_sensitive ()) 1495 if (bg_window_position_sensitive ())
1496 {
1497 want_position_change = true;
1498 if (bg_img == 0)
1499 moved = true;
1500 }
1501#endif
1502
1503 if (want_position_change)
1444 { 1504 {
1445 int x, y; 1505 int x, y;
1506
1446 if (ev.xconfigure.send_event) 1507 if (ev.xconfigure.send_event)
1447 { 1508 {
1448 x = ev.xconfigure.x; 1509 x = ev.xconfigure.x;
1449 y = ev.xconfigure.y; 1510 y = ev.xconfigure.y;
1450 } 1511 }
1451 else 1512 else
1452 get_window_origin (x, y); 1513 get_window_origin (x, y);
1453 1514
1454 if (bgPixmap.set_position (x, y) 1515 if (x != parent_x || y != parent_y)
1455 || (bgPixmap.flags & bgPixmap_t::isInvalid)) 1516 {
1517 parent_x = x;
1518 parent_y = y;
1519 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1456 moved = true; 1520 moved = true;
1521 }
1457 } 1522 }
1458#endif
1459 1523
1460 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1524 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1461 { 1525 {
1462 seen_resize = 1; 1526 seen_resize = 1;
1463 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1527 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1464 } 1528 }
1465 else 1529 else
1466 { 1530 {
1467#ifdef HAVE_BG_PIXMAP 1531#ifdef HAVE_BG_PIXMAP
1468 if (moved) 1532 if (moved)
1469 {
1470 if (mapped)
1471 update_background (); 1533 update_background ();
1472 else
1473 bgPixmap.invalidate ();
1474 }
1475#endif 1534#endif
1476 } 1535 }
1477 1536
1478 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1537 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1479 } 1538 }
1480 break; 1539 break;
1481 1540
1482 case PropertyNotify: 1541 case PropertyNotify:
1483 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1542 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1484 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1485 && ev.xproperty.state == PropertyNewValue)
1486 selection_property (ev.xproperty.window, ev.xproperty.atom);
1487
1488 break; 1543 break;
1489 1544
1490 case SelectionClear: 1545 case SelectionClear:
1491 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]); 1546 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1492 break; 1547 break;
1493 1548
1494 case SelectionNotify:
1495 if (selection_wait == Sel_normal)
1496 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1497 break;
1498
1499 case SelectionRequest: 1549 case SelectionRequest:
1500 selection_send (ev.xselectionrequest); 1550 selection_send (ev.xselectionrequest);
1501 break; 1551 break;
1502 1552
1503 case MapNotify: 1553 case MapNotify:
1504#ifdef HAVE_BG_PIXMAP 1554#ifdef HAVE_BG_PIXMAP
1505 /* This is needed specifically to fix the case of no window manager or a 1555 // This is needed at startup for the case of no window manager
1506 * non-reparenting window manager. In those cases we never get first 1556 // or a non-reparenting window manager and also because we
1507 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1557 // defer bg image updates if the window is not mapped. The
1508 * care of multiplicity of ConfigureNotify events arriving while WM does 1558 // short delay is to optimize for multiple ConfigureNotify
1509 * reparenting. 1559 // events at startup when the window manager reparents the
1510 * We should not render background immediately, as there could be several 1560 // window, so as to perform the computation after we have
1511 * ConfigureNotify's to follow. Lets take care of all of them in one scoop 1561 // received all of them.
1512 * by scheduling background redraw as soon as we can, but giving a short 1562 if (bg_img == 0)
1513 * bit of time for ConfigureNotifies to arrive.
1514 * We should render background PRIOR to drawing any text, but AFTER all
1515 * of ConfigureNotifys for the best results.
1516 */
1517 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1518 update_background_ev.start (0.025); 1563 update_background_ev.start (0.025);
1519#endif 1564#endif
1520 mapped = 1; 1565 mapped = 1;
1521#ifdef TEXT_BLINK 1566#ifdef TEXT_BLINK
1522 text_blink_ev.start (); 1567 text_blink_ev.start ();
… …
1537 if (ev.xany.window == vt) 1582 if (ev.xany.window == vt)
1538 { 1583 {
1539 do 1584 do
1540 { 1585 {
1541 scr_expose (ev.xexpose.x, ev.xexpose.y, 1586 scr_expose (ev.xexpose.x, ev.xexpose.y,
1542 ev.xexpose.width, ev.xexpose.height, False); 1587 ev.xexpose.width, ev.xexpose.height, false);
1543 } 1588 }
1544 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1589 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1545 1590
1546 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1591 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1547 1592
1548 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1593 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1549 { 1594 {
1550 scr_expose (ev.xexpose.x, ev.xexpose.y, 1595 scr_expose (ev.xexpose.x, ev.xexpose.y,
1551 ev.xexpose.width, ev.xexpose.height, False); 1596 ev.xexpose.width, ev.xexpose.height, false);
1552 } 1597 }
1553 1598
1554 want_refresh = 1; 1599 want_refresh = 1;
1555 } 1600 }
1556 else 1601 else
… …
1562 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1607 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1563 ; 1608 ;
1564 1609
1565 if (scrollBar.state && ev.xany.window == scrollBar.win) 1610 if (scrollBar.state && ev.xany.window == scrollBar.win)
1566 { 1611 {
1567 scrollBar.state = STATE_IDLE; 1612 scrollBar.state = SB_STATE_IDLE;
1568 scrollBar.show (0); 1613 scrollBar.show (0);
1569 } 1614 }
1570 } 1615 }
1571 break; 1616 break;
1572 1617
… …
1614 1659
1615#ifdef SELECTION_SCROLLING 1660#ifdef SELECTION_SCROLLING
1616 if (ev.xbutton.y < int_bwidth 1661 if (ev.xbutton.y < int_bwidth
1617 || Pixel2Row (ev.xbutton.y) > (nrow-1)) 1662 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1618 { 1663 {
1664 page_dirn scroll_selection_dir;
1619 int dist; 1665 int dist;
1620 1666
1621 /* don't clobber the current delay if we are 1667 /* don't clobber the current delay if we are
1622 * already in the middle of scrolling. 1668 * already in the middle of scrolling.
1623 */ 1669 */
… …
1638 dist = int_bwidth - ev.xbutton.y; 1684 dist = int_bwidth - ev.xbutton.y;
1639 } 1685 }
1640 else 1686 else
1641 { 1687 {
1642 scroll_selection_dir = DN; 1688 scroll_selection_dir = DN;
1643 dist = ev.xbutton.y - (int_bwidth + height); 1689 dist = ev.xbutton.y - (int_bwidth + vt_height);
1644 } 1690 }
1645 1691
1646 scroll_selection_lines = Pixel2Height (dist) 1692 scroll_selection_lines = Pixel2Height (dist)
1647 / SELECTION_SCROLL_LINE_SPEEDUP 1693 / SELECTION_SCROLL_LINE_SPEEDUP
1648 + 1; 1694 + 1;
1649 min_it (scroll_selection_lines, 1695 min_it (scroll_selection_lines,
1650 SELECTION_SCROLL_MAX_LINES); 1696 SELECTION_SCROLL_MAX_LINES);
1697 scroll_selection_lines *= scroll_selection_dir;
1651 } 1698 }
1652 else 1699 else
1653 { 1700 {
1654 /* we are within the text window, so we 1701 /* we are within the text window, so we
1655 * shouldn't be scrolling 1702 * shouldn't be scrolling
… …
1660#ifdef MOUSE_THRESHOLD 1707#ifdef MOUSE_THRESHOLD
1661 } 1708 }
1662#endif 1709#endif
1663 } 1710 }
1664 } 1711 }
1665 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win) 1712 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1666 { 1713 {
1667 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1714 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1668 MotionNotify, &ev)) 1715 MotionNotify, &ev))
1669 ; 1716 ;
1670 1717
1671 XQueryPointer (dpy, scrollBar.win, 1718 XQueryPointer (dpy, scrollBar.win,
1672 &unused_root, &unused_child, 1719 &unused_root, &unused_child,
1673 &unused_root_x, &unused_root_y, 1720 &unused_root_x, &unused_root_y,
1674 &ev.xbutton.x, &ev.xbutton.y, 1721 &ev.xbutton.x, &ev.xbutton.y,
1675 &unused_mask); 1722 &unused_mask);
1676 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1723 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1677 scrollBar.size ()); 1724 scrollBar.size ());
1678 want_refresh = 1; 1725 want_refresh = 1;
1679 scrollBar.show (1); 1726 scrollBar.show (1);
1680 } 1727 }
1681 break; 1728 break;
1682 } 1729 }
1683 1730
1684#if defined(CURSOR_BLINK) 1731#if defined(CURSOR_BLINK)
1685 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1732 if (ev.type == KeyPress)
1686 {
1687 if (hidden_cursor)
1688 {
1689 hidden_cursor = 0;
1690 want_refresh = 1;
1691 }
1692
1693 cursor_blink_ev.again (); 1733 cursor_blink_reset ();
1694 }
1695#endif 1734#endif
1696 1735
1697#if defined(POINTER_BLANK) 1736#if defined(POINTER_BLANK)
1698 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1737 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1699 { 1738 {
… …
1710 1749
1711 refresh_check (); 1750 refresh_check ();
1712} 1751}
1713 1752
1714#if ENABLE_FRILLS 1753#if ENABLE_FRILLS
1715void 1754void ecb_cold
1716rxvt_term::set_urgency (bool enable) 1755rxvt_term::set_urgency (bool enable)
1717{ 1756{
1718 if (enable == urgency_hint) 1757 if (enable == urgency_hint)
1719 return; 1758 return;
1720 1759
1721 if (XWMHints *h = XGetWMHints (dpy, parent[0])) 1760 if (XWMHints *h = XGetWMHints (dpy, parent))
1722 { 1761 {
1723 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1762 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1724 XSetWMHints (dpy, parent[0], h); 1763 XSetWMHints (dpy, parent, h);
1725 urgency_hint = enable; 1764 urgency_hint = enable;
1765 XFree (h);
1726 } 1766 }
1727} 1767}
1728#endif 1768#endif
1729 1769
1730void 1770void ecb_cold
1731rxvt_term::focus_in () 1771rxvt_term::focus_in ()
1732{ 1772{
1733 if (!focus) 1773 if (!focus)
1734 { 1774 {
1735 focus = 1; 1775 focus = 1;
1736 want_refresh = 1; 1776 want_refresh = 1;
1737 1777
1738#if USE_XIM 1778#if USE_XIM
1739 if (Input_Context != NULL) 1779 if (Input_Context != NULL)
1740 { 1780 {
1741 IMSetPosition (); 1781 im_set_position ();
1742 XSetICFocus (Input_Context); 1782 XSetICFocus (Input_Context);
1743 } 1783 }
1744#endif 1784#endif
1745#if CURSOR_BLINK 1785#if CURSOR_BLINK
1746 if (option (Opt_cursorBlink)) 1786 if (option (Opt_cursorBlink))
… …
1760 1800
1761 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END)); 1801 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1762 } 1802 }
1763} 1803}
1764 1804
1765void 1805void ecb_cold
1766rxvt_term::focus_out () 1806rxvt_term::focus_out ()
1767{ 1807{
1768 if (focus) 1808 if (focus)
1769 { 1809 {
1770 focus = 0; 1810 focus = 0;
… …
1803 1843
1804 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1844 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1805 } 1845 }
1806} 1846}
1807 1847
1808void 1848void ecb_cold
1809rxvt_term::update_fade_color (unsigned int idx) 1849rxvt_term::update_fade_color (unsigned int idx)
1810{ 1850{
1811#if OFF_FOCUS_FADING 1851#if OFF_FOCUS_FADING
1812 if (rs[Rs_fade]) 1852 if (rs[Rs_fade])
1813 { 1853 {
… …
1816 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1856 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1817 } 1857 }
1818#endif 1858#endif
1819} 1859}
1820 1860
1821#if ENABLE_TRANSPARENCY || ENABLE_PERL 1861#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
1822void 1862void ecb_hot
1823rxvt_term::rootwin_cb (XEvent &ev) 1863rxvt_term::rootwin_cb (XEvent &ev)
1824{ 1864{
1825 make_current (); 1865 make_current ();
1826 1866
1827 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1867 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1828 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1868 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1829 return; 1869 return;
1830 1870
1831# if ENABLE_TRANSPARENCY
1832 switch (ev.type) 1871 switch (ev.type)
1833 { 1872 {
1834 case PropertyNotify: 1873 case PropertyNotify:
1835 /* 1874 /*
1836 * if user used some Esetroot compatible prog to set the root bg, 1875 * if user used some Esetroot compatible prog to set the root bg,
1837 * use the property to determine the pixmap. We use it later on. 1876 * use the property to determine the pixmap. We use it later on.
1838 */ 1877 */
1839 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1878 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1840 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1879 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1841 { 1880 {
1842 bgPixmap.set_root_pixmap (); 1881#if BG_IMAGE_FROM_ROOT
1882 if (option (Opt_transparent))
1883 {
1884 rxvt_img::new_from_root (this)->replace (root_img);
1843 update_background (); 1885 update_background ();
1886 }
1887#endif
1888 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1844 } 1889 }
1845 1890
1846 break; 1891 break;
1847 } 1892 }
1848# endif
1849 1893
1850 refresh_check (); 1894 refresh_check ();
1851} 1895}
1852#endif 1896#endif
1853 1897
… …
1977 if (scrollBar.upButton (ev.y)) 2021 if (scrollBar.upButton (ev.y))
1978 direction = UP; /* up */ 2022 direction = UP; /* up */
1979 else if (scrollBar.dnButton (ev.y)) 2023 else if (scrollBar.dnButton (ev.y))
1980 direction = DN; /* down */ 2024 direction = DN; /* down */
1981 2025
1982 scrollBar.state = STATE_IDLE; 2026 scrollBar.state = SB_STATE_IDLE;
1983 /* 2027 /*
1984 * Rxvt-style scrollbar: 2028 * Rxvt-style scrollbar:
1985 * move up if mouse is above slider 2029 * move up if mouse is above slider
1986 * move dn if mouse is below slider 2030 * move dn if mouse is below slider
1987 * 2031 *
… …
2026 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2070 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2027#endif 2071#endif
2028 if (scr_page (direction, 1)) 2072 if (scr_page (direction, 1))
2029 { 2073 {
2030 if (direction == UP) 2074 if (direction == UP)
2031 scrollBar.state = STATE_UP; 2075 scrollBar.state = SB_STATE_UP;
2032 else 2076 else
2033 scrollBar.state = STATE_DOWN; 2077 scrollBar.state = SB_STATE_DOWN;
2034 } 2078 }
2035 } 2079 }
2036 else 2080 else
2037 switch (ev.button) 2081 switch (ev.button)
2038 { 2082 {
2039 case Button2: 2083 case Button2:
2040 switch (scrollBar.align) 2084 switch (scrollBar.align)
2041 { 2085 {
2042 case R_SB_ALIGN_TOP: 2086 case SB_ALIGN_TOP:
2043 csrO = 0; 2087 csrO = 0;
2044 break; 2088 break;
2045 case R_SB_ALIGN_CENTRE: 2089 case SB_ALIGN_CENTRE:
2046 csrO = (scrollBar.bot - scrollBar.top) / 2; 2090 csrO = (scrollBar.bot - scrollBar.top) / 2;
2047 break; 2091 break;
2048 case R_SB_ALIGN_BOTTOM: 2092 case SB_ALIGN_BOTTOM:
2049 csrO = scrollBar.bot - scrollBar.top; 2093 csrO = scrollBar.bot - scrollBar.top;
2050 break; 2094 break;
2051 } 2095 }
2052 2096
2053 if (scrollBar.style == R_SB_XTERM 2097 if (scrollBar.style == SB_STYLE_XTERM
2054 || scrollbar_above_slider (ev.y) 2098 || scrollBar.above_slider (ev.y)
2055 || scrollbar_below_slider (ev.y)) 2099 || scrollBar.below_slider (ev.y))
2056 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ()); 2100 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2057 2101
2058 scrollBar.state = STATE_MOTION; 2102 scrollBar.state = SB_STATE_MOTION;
2059 break; 2103 break;
2060 2104
2061 case Button1: 2105 case Button1:
2062 if (scrollBar.align == R_SB_ALIGN_CENTRE) 2106 if (scrollBar.align == SB_ALIGN_CENTRE)
2063 csrO = ev.y - scrollBar.top; 2107 csrO = ev.y - scrollBar.top;
2064 /* FALLTHROUGH */ 2108 /* FALLTHROUGH */
2065 2109
2066 case Button3: 2110 case Button3:
2067 if (scrollBar.style != R_SB_XTERM) 2111 if (scrollBar.style != SB_STYLE_XTERM)
2068 { 2112 {
2069 if (scrollbar_above_slider (ev.y)) 2113 if (scrollBar.above_slider (ev.y))
2070# ifdef RXVT_SCROLL_FULL 2114# ifdef RXVT_SCROLL_FULL
2071 scr_page (UP, nrow - 1); 2115 scr_page (UP, nrow - 1);
2072# else 2116# else
2073 scr_page (UP, nrow / 4); 2117 scr_page (UP, nrow / 4);
2074# endif 2118# endif
2075 else if (scrollbar_below_slider (ev.y)) 2119 else if (scrollBar.below_slider (ev.y))
2076# ifdef RXVT_SCROLL_FULL 2120# ifdef RXVT_SCROLL_FULL
2077 scr_page (DN, nrow - 1); 2121 scr_page (DN, nrow - 1);
2078# else 2122# else
2079 scr_page (DN, nrow / 4); 2123 scr_page (DN, nrow / 4);
2080# endif 2124# endif
2081 else 2125 else
2082 scrollBar.state = STATE_MOTION; 2126 scrollBar.state = SB_STATE_MOTION;
2083 } 2127 }
2084 else 2128 else
2085 { 2129 {
2086 scr_page ((ev.button == Button1 ? DN : UP), 2130 scr_page ((ev.button == Button1 ? DN : UP),
2087 (nrow 2131 (nrow
2088 * scrollbar_position (ev.y) 2132 * scrollBar.position (ev.y)
2089 / scrollBar.size ())); 2133 / scrollBar.size ()));
2090 } 2134 }
2091 2135
2092 break; 2136 break;
2093 } 2137 }
… …
2104 2148
2105 csrO = 0; /* reset csr Offset */ 2149 csrO = 0; /* reset csr Offset */
2106 if (!bypass_keystate) 2150 if (!bypass_keystate)
2107 reportmode = !! (priv_modes & PrivMode_mouse_report); 2151 reportmode = !! (priv_modes & PrivMode_mouse_report);
2108 2152
2109 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2153 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2110 { 2154 {
2111 scrollBar.state = STATE_IDLE; 2155 scrollBar.state = SB_STATE_IDLE;
2112 scrollBar.show (0); 2156 scrollBar.show (0);
2113 } 2157 }
2114 2158
2115#ifdef SELECTION_SCROLLING 2159#ifdef SELECTION_SCROLLING
2116 sel_scroll_ev.stop(); 2160 sel_scroll_ev.stop();
… …
2166 case Button3: 2210 case Button3:
2167 selection_make (ev.time); 2211 selection_make (ev.time);
2168 break; 2212 break;
2169 2213
2170 case Button2: 2214 case Button2:
2171 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2215 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2172 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2216 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2173 break; 2217 break;
2174 2218
2175#ifdef MOUSE_WHEEL 2219#ifdef MOUSE_WHEEL
2176 case Button4: 2220 case Button4:
2177 case Button5: 2221 case Button5:
2178 { 2222 {
2179 int i; 2223 int lines;
2180 page_dirn v; 2224 page_dirn dirn;
2181 2225
2182 v = ev.button == Button4 ? UP : DN; 2226 dirn = ev.button == Button4 ? UP : DN;
2183 2227
2184 if (ev.state & ShiftMask) 2228 if (ev.state & ShiftMask)
2185 i = 1; 2229 lines = 1;
2186 else if (option (Opt_mouseWheelScrollPage)) 2230 else if (option (Opt_mouseWheelScrollPage))
2187 i = nrow - 1; 2231 lines = nrow - 1;
2188 else 2232 else
2189 i = 5; 2233 lines = 5;
2190 2234
2191# ifdef MOUSE_SLIP_WHEELING 2235# ifdef MOUSE_SLIP_WHEELING
2192 if (ev.state & ControlMask) 2236 if (ev.state & ControlMask)
2193 { 2237 {
2194 mouse_slip_wheel_speed += v ? -1 : 1; 2238 mouse_slip_wheel_speed += dirn;
2195 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2239 clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2196 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2197 2240
2198 if (!slip_wheel_ev.is_active ()) 2241 if (!slip_wheel_ev.is_active ())
2199 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2242 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2200 } 2243 }
2201 else 2244 else
2202# endif 2245# endif
2203 { 2246 {
2204 scr_page (v, i); 2247 scr_page (dirn, lines);
2205 scrollBar.show (1); 2248 scrollBar.show (1);
2206 } 2249 }
2207 } 2250 }
2208 break; 2251 break;
2209#endif 2252#endif
… …
2211 } 2254 }
2212} 2255}
2213 2256
2214/*}}} */ 2257/*}}} */
2215 2258
2216void 2259void ecb_hot
2217rxvt_term::cmd_parse () 2260rxvt_term::cmd_parse ()
2218{ 2261{
2219 wchar_t ch = NOCHAR; 2262 wchar_t ch = NOCHAR;
2220 char *seq_begin; // remember start of esc-sequence here 2263 char *seq_begin; // remember start of esc-sequence here
2221 2264
2222 for (;;) 2265 for (;;)
2223 { 2266 {
2224 if (expect_false (ch == NOCHAR)) 2267 if (ecb_unlikely (ch == NOCHAR))
2225 { 2268 {
2226 seq_begin = cmdbuf_ptr; 2269 seq_begin = cmdbuf_ptr;
2227 ch = next_char (); 2270 ch = next_char ();
2228 2271
2229 if (ch == NOCHAR) 2272 if (ch == NOCHAR)
2230 break; 2273 break;
2231 } 2274 }
2232 2275
2233 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)) 2276 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2234 { 2277 {
2235 if (expect_false (!seen_input)) 2278 if (ecb_unlikely (!seen_input))
2236 { 2279 {
2237 seen_input = 1; 2280 seen_input = 1;
2238 // many badly-written programs (e.g. jed) contain a race condition: 2281 // many badly-written programs (e.g. jed) contain a race condition:
2239 // they first read the screensize and then install a SIGWINCH handler. 2282 // they first read the screensize and then install a SIGWINCH handler.
2240 // some window managers resize the window early, and these programs 2283 // some window managers resize the window early, and these programs
… …
2253 wchar_t *str = buf; 2296 wchar_t *str = buf;
2254 wchar_t *eol = str + min (ncol, UBUFSIZ); 2297 wchar_t *eol = str + min (ncol, UBUFSIZ);
2255 2298
2256 for (;;) 2299 for (;;)
2257 { 2300 {
2258 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))) 2301 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2259 break; 2302 break;
2260 2303
2261 *str++ = ch; 2304 *str++ = ch;
2262 2305
2263 if (expect_false (ch == C0_LF || str >= eol)) 2306 if (ecb_unlikely (ch == C0_LF || str >= eol))
2264 { 2307 {
2265 if (ch == C0_LF) 2308 if (ch == C0_LF)
2266 nlines++; 2309 nlines++;
2267 2310
2268 refresh_count++; 2311 refresh_count++;
… …
2340 } 2383 }
2341 } 2384 }
2342} 2385}
2343 2386
2344// read the next character 2387// read the next character
2345wchar_t 2388wchar_t ecb_hot
2346rxvt_term::next_char () NOTHROW 2389rxvt_term::next_char () NOTHROW
2347{ 2390{
2348 while (cmdbuf_ptr < cmdbuf_endp) 2391 while (cmdbuf_ptr < cmdbuf_endp)
2349 { 2392 {
2350 // assume 7-bit to be ascii ALWAYS 2393 // assume 7-bit to be ascii ALWAYS
2351 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)) 2394 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2352 return *cmdbuf_ptr++; 2395 return *cmdbuf_ptr++;
2353 2396
2354 wchar_t wc; 2397 wchar_t wc;
2355 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2398 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2356 2399
… …
2362 } 2405 }
2363 2406
2364 if (len == (size_t)-1) 2407 if (len == (size_t)-1)
2365 { 2408 {
2366 mbstate.reset (); // reset now undefined conversion state 2409 mbstate.reset (); // reset now undefined conversion state
2410 // a -1 might indicate that a previous incomplete char is invalid (previous return -2)
2411 // in which case we "erroneously" return the next byte which might be valid.
2367 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2412 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2368 } 2413 }
2369 2414
2370 // assume wchar == unicode 2415 // assume wchar == unicode
2371 cmdbuf_ptr += len; 2416 cmdbuf_ptr += len;
… …
2374 2419
2375 return NOCHAR; 2420 return NOCHAR;
2376} 2421}
2377 2422
2378// read the next octet 2423// read the next octet
2379uint32_t 2424uint32_t ecb_hot
2380rxvt_term::next_octet () NOTHROW 2425rxvt_term::next_octet () NOTHROW
2381{ 2426{
2382 return cmdbuf_ptr < cmdbuf_endp 2427 return cmdbuf_ptr < cmdbuf_endp
2383 ? (unsigned char)*cmdbuf_ptr++ 2428 ? (unsigned char)*cmdbuf_ptr++
2384 : NOCHAR; 2429 : NOCHAR;
2385} 2430}
2386 2431
2387static class out_of_input out_of_input; 2432static class out_of_input out_of_input;
2388 2433
2389/* rxvt_cmd_getc () - Return next input character */ 2434wchar_t ecb_hot
2390/*
2391 * Return the next input character after first passing any keyboard input
2392 * to the command.
2393 */
2394wchar_t
2395rxvt_term::cmd_getc () THROW ((class out_of_input)) 2435rxvt_term::cmd_getc () THROW ((class out_of_input))
2396{ 2436{
2397 wchar_t c = next_char (); 2437 wchar_t c = next_char ();
2398 2438
2399 if (c == NOCHAR) 2439 if (c == NOCHAR)
2400 throw out_of_input; 2440 throw out_of_input;
2401 2441
2402 return c; 2442 return c;
2403} 2443}
2404 2444
2405uint32_t 2445uint32_t ecb_hot
2406rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2446rxvt_term::cmd_get8 () THROW ((class out_of_input))
2407{ 2447{
2408 uint32_t c = next_octet (); 2448 uint32_t c = next_octet ();
2409 2449
2410 if (c == NOCHAR) 2450 if (c == NOCHAR)
… …
2414} 2454}
2415 2455
2416/*{{{ print pipe */ 2456/*{{{ print pipe */
2417/*----------------------------------------------------------------------*/ 2457/*----------------------------------------------------------------------*/
2418#ifdef PRINTPIPE 2458#ifdef PRINTPIPE
2419FILE * 2459FILE * ecb_cold
2420rxvt_term::popen_printer () 2460rxvt_term::popen_printer ()
2421{ 2461{
2422 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w"); 2462 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2423 2463
2424 if (stream == NULL) 2464 if (stream == NULL)
2425 rxvt_warn ("can't open printer pipe, not printing.\n"); 2465 rxvt_warn ("can't open printer pipe, not printing.\n");
2426 2466
2427 return stream; 2467 return stream;
2428} 2468}
2429 2469
2430int 2470int ecb_cold
2431rxvt_term::pclose_printer (FILE *stream) 2471rxvt_term::pclose_printer (FILE *stream)
2432{ 2472{
2433 fflush (stream); 2473 fflush (stream);
2434 return pclose (stream); 2474 return pclose (stream);
2435} 2475}
2436 2476
2437/* 2477/*
2438 * simulate attached vt100 printer 2478 * simulate attached vt100 printer
2439 */ 2479 */
2440void 2480void ecb_cold
2441rxvt_term::process_print_pipe () 2481rxvt_term::process_print_pipe ()
2442{ 2482{
2443 FILE *fd = popen_printer (); 2483 FILE *fd = popen_printer ();
2444 2484
2445 if (!fd) 2485 if (!fd)
… …
2491 pclose_printer (fd); 2531 pclose_printer (fd);
2492} 2532}
2493#endif /* PRINTPIPE */ 2533#endif /* PRINTPIPE */
2494/*}}} */ 2534/*}}} */
2495 2535
2496/* *INDENT-OFF* */
2497enum { 2536enum {
2498 C1_40 = 0x40, 2537 C1_40 = 0x40,
2499 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2538 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2500 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2539 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2501 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2540 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2502 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2541 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2503}; 2542};
2504/* *INDENT-ON* */
2505 2543
2506/*{{{ process non-printing single characters */ 2544/*{{{ process non-printing single characters */
2507void 2545void ecb_hot
2508rxvt_term::process_nonprinting (unicode_t ch) 2546rxvt_term::process_nonprinting (unicode_t ch)
2509{ 2547{
2510 switch (ch) 2548 switch (ch)
2511 { 2549 {
2512 case C0_ESC: 2550 case C0_ESC:
… …
2558} 2596}
2559/*}}} */ 2597/*}}} */
2560 2598
2561 2599
2562/*{{{ process VT52 escape sequences */ 2600/*{{{ process VT52 escape sequences */
2563void 2601void ecb_cold
2564rxvt_term::process_escape_vt52 (unicode_t ch) 2602rxvt_term::process_escape_vt52 (unicode_t ch)
2565{ 2603{
2566 int row, col; 2604 int row, col;
2567 2605
2568 switch (ch) 2606 switch (ch)
… …
2602 break; 2640 break;
2603 case 'Z': /* identify the terminal type */ 2641 case 'Z': /* identify the terminal type */
2604 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2642 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2605 break; 2643 break;
2606 case '<': /* turn off VT52 mode */ 2644 case '<': /* turn off VT52 mode */
2607 set_privmode (PrivMode_vt52, 0); 2645 priv_modes &= ~PrivMode_vt52;
2608 break; 2646 break;
2609 case 'F': /* use special graphics character set */ 2647 case 'F': /* use special graphics character set */
2610 case 'G': /* use regular character set */ 2648 case 'G': /* use regular character set */
2611 /* unimplemented */ 2649 /* unimplemented */
2612 break; 2650 break;
… …
2618} 2656}
2619/*}}} */ 2657/*}}} */
2620 2658
2621 2659
2622/*{{{ process escape sequences */ 2660/*{{{ process escape sequences */
2623void 2661void ecb_hot
2624rxvt_term::process_escape_seq () 2662rxvt_term::process_escape_seq ()
2625{ 2663{
2626 unicode_t ch = cmd_getc (); 2664 unicode_t ch = cmd_getc ();
2627 2665
2628 if (priv_modes & PrivMode_vt52) 2666 if (priv_modes & PrivMode_vt52)
… …
2631 return; 2669 return;
2632 } 2670 }
2633 2671
2634 switch (ch) 2672 switch (ch)
2635 { 2673 {
2636 /* case 1: do_tek_mode (); break; */
2637 case '#': 2674 case '#':
2638 if (cmd_getc () == '8') 2675 if (cmd_getc () == '8')
2639 scr_E (); 2676 scr_E ();
2640 break; 2677 break;
2641 case '(': 2678 case '(':
… …
2664#if !ENABLE_MINIMAL 2701#if !ENABLE_MINIMAL
2665 case '9': 2702 case '9':
2666 scr_forwardindex (); 2703 scr_forwardindex ();
2667 break; 2704 break;
2668#endif 2705#endif
2706 // DECPAM/DECPNM
2669 case '=': 2707 case '=':
2708 priv_modes |= PrivMode_aplKP;
2709 break;
2670 case '>': 2710 case '>':
2671 set_privmode (PrivMode_aplKP, ch == '='); 2711 priv_modes &= ~PrivMode_aplKP;
2672 break; 2712 break;
2673 2713
2674 case C1_40: 2714 case C1_40:
2675 cmd_getc (); 2715 cmd_getc ();
2676 break; 2716 break;
… …
2680 2720
2681 /* 8.3.87: NEXT LINE */ 2721 /* 8.3.87: NEXT LINE */
2682 case C1_NEL: /* ESC E */ 2722 case C1_NEL: /* ESC E */
2683 { 2723 {
2684 wchar_t nlcr[] = { C0_LF, C0_CR }; 2724 wchar_t nlcr[] = { C0_LF, C0_CR };
2685 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2725 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2686 } 2726 }
2687 break; 2727 break;
2688 2728
2689 /* kidnapped escape sequence: Should be 8.3.48 */ 2729 /* kidnapped escape sequence: Should be 8.3.48 */
2690 case C1_ESA: /* ESC G */ 2730 case C1_ESA: /* ESC G */
2691 process_graphics (); 2731 // used by original rxvt for rob nations own graphics mode
2732 if (cmd_getc () == 'Q')
2733 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2692 break; 2734 break;
2693 2735
2694 /* 8.3.63: CHARACTER TABULATION SET */ 2736 /* 8.3.63: CHARACTER TABULATION SET */
2695 case C1_HTS: /* ESC H */ 2737 case C1_HTS: /* ESC H */
2696 scr_set_tab (1); 2738 scr_set_tab (1);
… …
2700 case C1_RI: /* ESC M */ 2742 case C1_RI: /* ESC M */
2701 scr_index (DN); 2743 scr_index (DN);
2702 break; 2744 break;
2703 2745
2704 /* 8.3.142: SINGLE-SHIFT TWO */ 2746 /* 8.3.142: SINGLE-SHIFT TWO */
2705 /*case C1_SS2: scr_single_shift (2); break; */ 2747 /* case C1_SS2: break; */
2706 2748
2707 /* 8.3.143: SINGLE-SHIFT THREE */ 2749 /* 8.3.143: SINGLE-SHIFT THREE */
2708 /*case C1_SS3: scr_single_shift (3); break; */ 2750 /* case C1_SS3: break; */
2709 2751
2710 /* 8.3.27: DEVICE CONTROL STRING */ 2752 /* 8.3.27: DEVICE CONTROL STRING */
2711 case C1_DCS: /* ESC P */ 2753 case C1_DCS: /* ESC P */
2712 process_dcs_seq (); 2754 process_dcs_seq ();
2713 break; 2755 break;
… …
2746 } 2788 }
2747} 2789}
2748/*}}} */ 2790/*}}} */
2749 2791
2750/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2792/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2751/* *INDENT-OFF* */
2752enum { 2793enum {
2753 CSI_ICH = 0x40, 2794 CSI_ICH = 0x40,
2754 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2795 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2755 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2796 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2756 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2797 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
2759 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2800 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2760 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2801 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2761 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2802 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2762}; 2803};
2763 2804
2764#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2805#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2765 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2806 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2766 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2807 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2767#define get_byte_array_bit(array, bit) \ 2808#define get_byte_array_bit(array, bit) \
2768 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2809 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2769 2810
2770const unsigned char csi_defaults[] = 2811static const unsigned char csi_defaults[] =
2771 { 2812 {
2772 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2813 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2773 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2814 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2774 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2815 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2775 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2816 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2776 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2817 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2777 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2818 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2778 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2819 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2779 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2820 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2780 }; 2821 };
2781/* *INDENT-ON* */
2782 2822
2783void 2823void ecb_hot
2784rxvt_term::process_csi_seq () 2824rxvt_term::process_csi_seq ()
2785{ 2825{
2786 unicode_t ch, priv, i; 2826 unicode_t ch, priv, prev_ch, i;
2787 unsigned int nargs, p; 2827 unsigned int nargs, p;
2788 int n, ndef; 2828 int n, ndef;
2789 int arg[ESC_ARGS] = { }; 2829 int arg[ESC_ARGS] = { };
2790 2830
2791 nargs = 0; 2831 nargs = 0;
… …
2797 /* '<' '=' '>' '?' '!' */ 2837 /* '<' '=' '>' '?' '!' */
2798 priv = ch; 2838 priv = ch;
2799 ch = cmd_getc (); 2839 ch = cmd_getc ();
2800 } 2840 }
2801 2841
2842 prev_ch = 0;
2802 /* read any numerical arguments */ 2843 /* read any numerical arguments */
2803 for (n = -1; ch < CSI_ICH; ) 2844 for (n = -1; ch < CSI_ICH; )
2804 { 2845 {
2805 if (isdigit (ch)) 2846 if (isdigit (ch))
2806 { 2847 {
… …
2816 n = -1; 2857 n = -1;
2817 } 2858 }
2818 else if (IS_CONTROL (ch)) 2859 else if (IS_CONTROL (ch))
2819 process_nonprinting (ch); 2860 process_nonprinting (ch);
2820 2861
2862 prev_ch = ch;
2821 ch = cmd_getc (); 2863 ch = cmd_getc ();
2822 } 2864 }
2823 2865
2824 if (ch > CSI_7F) 2866 if (ch > CSI_7F)
2825 return; 2867 return;
… …
2864 { 2906 {
2865 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */ 2907 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2866 scr_soft_reset (); 2908 scr_soft_reset ();
2867 2909
2868 static const int pm_h[] = { 7, 25 }; 2910 static const int pm_h[] = { 7, 25 };
2869 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 }; 2911 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2870 2912
2871 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h); 2913 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2872 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l); 2914 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2873 } 2915 }
2874 break; 2916 break;
2875 } 2917 }
2876 2918
2877 return; 2919 return;
… …
2895 } 2937 }
2896 break; 2938 break;
2897#endif 2939#endif
2898 2940
2899 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2941 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2900 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2942 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2901 arg[0] = -arg[0]; 2943 arg[0] = -arg[0];
2902 /* FALLTHROUGH */ 2944 /* FALLTHROUGH */
2903 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2945 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2904 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2946 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2905 scr_gotorc (arg[0], 0, RELATIVE); 2947 scr_gotorc (arg[0], 0, RELATIVE);
2906 break; 2948 break;
2907 2949
2908 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2950 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2909 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2951 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3059 scr_insert_mode (1); 3101 scr_insert_mode (1);
3060 else if (arg[0] == 20) 3102 else if (arg[0] == 20)
3061 priv_modes |= PrivMode_LFNL; 3103 priv_modes |= PrivMode_LFNL;
3062 break; 3104 break;
3063 3105
3106 case CSI_71: // DESCUSR: set cursor style
3107 if (prev_ch == ' ')
3108 set_cursor_style (arg[0]);
3109 break;
3110
3064 /* 3111 /*
3065 * PRIVATE USE beyond this point. All CSI_7? sequences here 3112 * PRIVATE USE beyond this point. All CSI_7? sequences here
3066 */ 3113 */
3067 case CSI_72: /* DECSTBM: set top and bottom margins */ 3114 case CSI_72: /* DECSTBM: set top and bottom margins */
3068 if (nargs == 1) 3115 if (nargs == 1)
… …
3096 } 3143 }
3097} 3144}
3098/*}}} */ 3145/*}}} */
3099 3146
3100#if !ENABLE_MINIMAL 3147#if !ENABLE_MINIMAL
3101/* ARGSUSED */
3102void 3148void
3103rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3149rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3104{ 3150{
3105 int x, y; 3151 int x, y;
3106 XWindowAttributes wattr; 3152 XWindowAttributes wattr;
… …
3115 { 3161 {
3116 /* 3162 /*
3117 * commands 3163 * commands
3118 */ 3164 */
3119 case 1: /* deiconify window */ 3165 case 1: /* deiconify window */
3120 XMapWindow (dpy, parent[0]); 3166 XMapWindow (dpy, parent);
3121 break; 3167 break;
3122 case 2: /* iconify window */ 3168 case 2: /* iconify window */
3123 XIconifyWindow (dpy, parent[0], display->screen); 3169 XIconifyWindow (dpy, parent, display->screen);
3124 break; 3170 break;
3125 case 3: /* set position (pixels) */ 3171 case 3: /* set position (pixels) */
3126 XMoveWindow (dpy, parent[0], args[1], args[2]); 3172 XMoveWindow (dpy, parent, args[1], args[2]);
3127 break; 3173 break;
3128 case 4: /* set size (pixels) */ 3174 case 4: /* set size (pixels) */
3129 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3175 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3130 break; 3176 break;
3131 case 5: /* raise window */ 3177 case 5: /* raise window */
3132 XRaiseWindow (dpy, parent[0]); 3178 XRaiseWindow (dpy, parent);
3133 break; 3179 break;
3134 case 6: /* lower window */ 3180 case 6: /* lower window */
3135 XLowerWindow (dpy, parent[0]); 3181 XLowerWindow (dpy, parent);
3136 break; 3182 break;
3137 case 7: /* refresh window */ 3183 case 7: /* refresh window */
3138 scr_touch (true); 3184 scr_touch (true);
3139 break; 3185 break;
3140 case 8: /* set size (chars) */ 3186 case 8: /* set size (chars) */
… …
3143 break; 3189 break;
3144 3190
3145 //case 9: NYI, TODO, restore maximized window or maximize window 3191 //case 9: NYI, TODO, restore maximized window or maximize window
3146 default: 3192 default:
3147 if (args[0] >= 24) /* set height (chars) */ 3193 if (args[0] >= 24) /* set height (chars) */
3148 set_widthheight ((unsigned int)width, 3194 set_widthheight ((unsigned int)vt_width,
3149 (unsigned int) (args[1] * fheight)); 3195 (unsigned int) (args[1] * fheight));
3150 break; 3196 break;
3151 3197
3152 /* 3198 /*
3153 * reports - some output format copied from XTerm 3199 * reports - some output format copied from XTerm
3154 */ 3200 */
3155 case 11: /* report window state */ 3201 case 11: /* report window state */
3156 XGetWindowAttributes (dpy, parent[0], &wattr); 3202 XGetWindowAttributes (dpy, parent, &wattr);
3157 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3203 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3158 break; 3204 break;
3159 case 13: /* report window position */ 3205 case 13: /* report window position */
3160 XGetWindowAttributes (dpy, parent[0], &wattr); 3206 XGetWindowAttributes (dpy, parent, &wattr);
3161 XTranslateCoordinates (dpy, parent[0], wattr.root, 3207 XTranslateCoordinates (dpy, parent, wattr.root,
3162 -wattr.border_width, -wattr.border_width, 3208 -wattr.border_width, -wattr.border_width,
3163 &x, &y, &wdummy); 3209 &x, &y, &wdummy);
3164 tt_printf ("\033[3;%d;%dt", x, y); 3210 tt_printf ("\033[3;%d;%dt", x, y);
3165 break; 3211 break;
3166 case 14: /* report window size (pixels) */ 3212 case 14: /* report window size (pixels) */
3167 XGetWindowAttributes (dpy, parent[0], &wattr); 3213 XGetWindowAttributes (dpy, parent, &wattr);
3168 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3214 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3169 break; 3215 break;
3170 case 18: /* report text area size (chars) */ 3216 case 18: /* report text area size (chars) */
3171 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3217 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3172 break; 3218 break;
… …
3174 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3220 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3175 break; 3221 break;
3176 case 20: /* report icon label */ 3222 case 20: /* report icon label */
3177 { 3223 {
3178 char *s; 3224 char *s;
3179 XGetIconName (dpy, parent[0], &s); 3225 XGetIconName (dpy, parent, &s);
3180 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3226 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3181 XFree (s); 3227 XFree (s);
3182 } 3228 }
3183 break; 3229 break;
3184 case 21: /* report window title */ 3230 case 21: /* report window title */
3185 { 3231 {
3186 char *s; 3232 char *s;
3187 XFetchName (dpy, parent[0], &s); 3233 XFetchName (dpy, parent, &s);
3188 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3234 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3189 XFree (s); 3235 XFree (s);
3190 } 3236 }
3191 break; 3237 break;
3192 } 3238 }
… …
3202rxvt_term::get_to_st (unicode_t &ends_how) 3248rxvt_term::get_to_st (unicode_t &ends_how)
3203{ 3249{
3204 unicode_t ch; 3250 unicode_t ch;
3205 bool seen_esc = false; 3251 bool seen_esc = false;
3206 unsigned int n = 0; 3252 unsigned int n = 0;
3207 wchar_t string[STRING_MAX]; 3253 wchar_t string[CBUFSIZ];
3208 3254
3209 while ((ch = cmd_getc ()) != NOCHAR) 3255 while ((ch = cmd_getc ()) != NOCHAR)
3210 { 3256 {
3211 if (seen_esc) 3257 if (seen_esc)
3212 { 3258 {
… …
3227 else if (ch < 0x20) 3273 else if (ch < 0x20)
3228 return NULL; /* other control character - exit */ 3274 return NULL; /* other control character - exit */
3229 3275
3230 seen_esc = false; 3276 seen_esc = false;
3231 3277
3232 if (n >= STRING_MAX - 1) 3278 if (n >= sizeof (string) - 1)
3233 // stop at some sane length 3279 // stop at some sane length
3234 return NULL; 3280 return NULL;
3235 3281
3236 string[n++] = ch; 3282 string[n++] = ch;
3237 } 3283 }
… …
3346 unsigned long bytes_after; 3392 unsigned long bytes_after;
3347 unsigned char *value = 0; 3393 unsigned char *value = 0;
3348 const char *str = ""; 3394 const char *str = "";
3349 3395
3350 if (prop 3396 if (prop
3351 && XGetWindowProperty (dpy, parent[0], 3397 && XGetWindowProperty (dpy, parent,
3352 prop, 0, 1<<16, 0, AnyPropertyType, 3398 prop, 0, 1<<16, 0, AnyPropertyType,
3353 &actual_type, &actual_format, 3399 &actual_type, &actual_format,
3354 &nitems, &bytes_after, &value) == Success 3400 &nitems, &bytes_after, &value) == Success
3355 && actual_type != None 3401 && actual_type != None
3356 && actual_format == 8) 3402 && actual_format == 8)
3357 str = (const char *)(value); 3403 str = (const char *)(value);
3358 3404
3359 tt_printf ("\033]%d;%s%c", op, str, resp); 3405 tt_printf ("\033]%d;%s%c", op, option (Opt_insecure) ? str : "", resp);
3360 3406
3361 XFree (value); 3407 XFree (value);
3362 } 3408 }
3363 else 3409 else
3364 { 3410 {
… …
3368 { 3414 {
3369 *eq = 0; 3415 *eq = 0;
3370 set_utf8_property (display->atom (str), eq + 1); 3416 set_utf8_property (display->atom (str), eq + 1);
3371 } 3417 }
3372 else 3418 else
3373 XDeleteProperty (dpy, parent[0], 3419 XDeleteProperty (dpy, parent,
3374 display->atom (str)); 3420 display->atom (str));
3375 } 3421 }
3376 break; 3422 break;
3377 3423
3378 case XTerm_Color: 3424 case XTerm_Color:
… …
3432 break; 3478 break;
3433#endif 3479#endif
3434 case URxvt_Color_border: 3480 case URxvt_Color_border:
3435 process_color_seq (op, Color_border, str, resp); 3481 process_color_seq (op, Color_border, str, resp);
3436 break; 3482 break;
3437#if ENABLE_TRANSPARENCY 3483
3484#if BG_IMAGE_FROM_ROOT
3438 case URxvt_Color_tint: 3485 case URxvt_Color_tint:
3439 process_color_seq (op, Color_tint, str, resp); 3486 process_color_seq (op, Color_tint, str, resp);
3440 { 3487 {
3441 bool changed = false; 3488 bool changed = false;
3442 3489
3443 if (ISSET_PIXCOLOR (Color_tint)) 3490 if (ISSET_PIXCOLOR (Color_tint))
3444 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3491 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3445 else
3446 changed = bgPixmap.unset_tint ();
3447 3492
3448 if (changed) 3493 if (changed)
3449 update_background (); 3494 update_background ();
3450 } 3495 }
3451 3496
… …
3455#if BG_IMAGE_FROM_FILE 3500#if BG_IMAGE_FROM_FILE
3456 case Rxvt_Pixmap: 3501 case Rxvt_Pixmap:
3457 if (!strcmp (str, "?")) 3502 if (!strcmp (str, "?"))
3458 { 3503 {
3459 char str[256]; 3504 char str[256];
3505 int h_scale = fimage.h_scale;
3506 int v_scale = fimage.v_scale;
3507 int h_align = fimage.h_align;
3508 int v_align = fimage.v_align;
3460 3509
3461 sprintf (str, "[%dx%d+%d+%d]", 3510 sprintf (str, "[%dx%d+%d+%d]",
3462 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3511 h_scale, v_scale,
3463 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3512 h_align, v_align);
3464 process_xterm_seq (XTerm_title, str, CHAR_ST); 3513 process_xterm_seq (XTerm_title, str, CHAR_ST);
3465 } 3514 }
3466 else 3515 else
3467 { 3516 {
3468 int changed = 0; 3517 bool changed = false;
3469 3518
3470 if (*str != ';') 3519 if (*str != ';')
3471 { 3520 {
3472 if (bgPixmap.set_file (str)) /* change pixmap */ 3521 try
3473 { 3522 {
3523 fimage.set_file_geometry (this, str);
3474 changed++; 3524 changed = true;
3475 str = strchr (str, ';');
3476 if (str == NULL)
3477 bgPixmap.set_defaultGeometry ();
3478 else 3525 }
3479 bgPixmap.set_geometry (str+1); 3526 catch (const class rxvt_failure_exception &e)
3527 {
3480 } 3528 }
3481 } 3529 }
3482 else 3530 else
3483 { 3531 {
3484 str++; 3532 str++;
3485 if (bgPixmap.set_geometry (str, true)) 3533 if (fimage.set_geometry (str, true))
3486 changed++; 3534 changed = true;
3487 } 3535 }
3488 3536
3489 if (changed) 3537 if (changed)
3490 { 3538 {
3491 if (bgPixmap.window_position_sensitive ()) 3539 if (bg_window_position_sensitive ())
3492 { 3540 {
3493 int x, y; 3541 int x, y;
3494 get_window_origin (x, y); 3542 get_window_origin (x, y);
3495 bgPixmap.set_position (x, y); 3543 parent_x = x;
3544 parent_y = y;
3496 } 3545 }
3497 update_background (); 3546 update_background ();
3498 } 3547 }
3499 } 3548 }
3500 break; 3549 break;
… …
3590 * 's' = save 3639 * 's' = save
3591 * 'r' = restore 3640 * 'r' = restore
3592 * 't' = toggle 3641 * 't' = toggle
3593 * so no need for fancy checking 3642 * so no need for fancy checking
3594 */ 3643 */
3595int 3644int ecb_cold
3596rxvt_term::privcases (int mode, unsigned long bit) 3645rxvt_term::privcases (int mode, unsigned long bit)
3597{ 3646{
3598 int state; 3647 int state;
3599 3648
3600 if (mode == 's') 3649 if (mode == 's')
3601 { 3650 {
3602 SavedModes |= (priv_modes & bit); 3651 if (priv_modes & bit)
3652 SavedModes |= bit;
3653 else
3654 SavedModes &= ~bit;
3603 return -1; 3655 return -1;
3604 } 3656 }
3605 else 3657 else
3606 { 3658 {
3607 if (mode == 'r') 3659 if (mode == 'r')
3608 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3660 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3609 else 3661 else
3610 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3662 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3611 3663
3612 set_privmode (bit, state); 3664 if (state)
3665 priv_modes |= bit;
3666 else
3667 priv_modes &= ~bit;
3613 } 3668 }
3614 3669
3615 return state; 3670 return state;
3616} 3671}
3617 3672
3618/* we're not using priv _yet_ */ 3673/* we're not using priv _yet_ */
3619void 3674void
3620rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3675rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3621{ 3676{
3622 unsigned int i, j; 3677 unsigned int i, j;
3623 int state; 3678 int state;
3624 3679
3625 static const struct 3680 static const struct
3626 { 3681 {
3627 const int argval; 3682 const int argval;
3628 const unsigned long bit; 3683 const unsigned long bit;
3629 } argtopriv[] = { 3684 } argtopriv[] = {
3630 { 1, PrivMode_aplCUR }, // DECCKM 3685 { 1, PrivMode_aplCUR }, // DECCKM
3631 { 2, PrivMode_vt52 }, 3686 { 2, PrivMode_vt52 }, // DECANM
3632 { 3, PrivMode_132 }, // DECCOLM 3687 { 3, PrivMode_132 }, // DECCOLM
3633 { 4, PrivMode_smoothScroll }, // DECSCLM 3688 { 4, PrivMode_smoothScroll }, // DECSCLM
3634 { 5, PrivMode_rVideo }, // DECSCNM 3689 { 5, PrivMode_rVideo }, // DECSCNM
3635 { 6, PrivMode_relOrigin }, // DECOM 3690 { 6, PrivMode_relOrigin }, // DECOM
3636 { 7, PrivMode_Autowrap }, // DECAWM 3691 { 7, PrivMode_Autowrap }, // DECAWM
3637 // 8, auto-repeat keys // DECARM 3692 // 8, auto-repeat keys // DECARM
3638 { 9, PrivMode_MouseX10 }, 3693 { 9, PrivMode_MouseX10 },
3639 // 18 end FF to printer after print screen 3694 // 18 end FF to printer after print screen
3640 // 19 Print screen prints full screen/scroll region 3695 // 19 Print screen prints full screen/scroll region
3641 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis 3696 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3642#ifdef scrollBar_esc 3697#ifdef scrollBar_esc
3643 { scrollBar_esc, PrivMode_scrollBar }, 3698 { scrollBar_esc, PrivMode_scrollBar },
3644#endif 3699#endif
3645 { 35, PrivMode_ShiftKeys }, // rxvt extension 3700 { 35, PrivMode_ShiftKeys }, // rxvt extension
3646 // 38, tektronix mode // DECTEK 3701 // 38, tektronix mode // DECTEK
3647 { 40, PrivMode_132OK }, 3702 { 40, PrivMode_132OK },
3648 // 41 xterm more fixes NYI 3703 // 41 xterm more fixes NYI
3649 // 45 margin bell NYI 3704 // 45 margin bell NYI
3650 // 46 start logging 3705 // 46 start logging
3651 { 47, PrivMode_Screen }, 3706 { 47, PrivMode_Screen },
3652 { 66, PrivMode_aplKP }, // DECPAM/DECPNM 3707 { 66, PrivMode_aplKP }, // DECNKM
3653#ifndef NO_BACKSPACE_KEY 3708#ifndef NO_BACKSPACE_KEY
3654 { 67, PrivMode_BackSpace }, // DECBKM 3709 { 67, PrivMode_BackSpace }, // DECBKM
3655#endif 3710#endif
3656 { 1000, PrivMode_MouseX11 }, 3711 { 1000, PrivMode_MouseX11 },
3657 { 1002, PrivMode_MouseBtnEvent }, 3712 { 1002, PrivMode_MouseBtnEvent },
3658 { 1003, PrivMode_MouseAnyEvent }, 3713 { 1003, PrivMode_MouseAnyEvent },
3714#if ENABLE_FRILLS
3715 { 1005, PrivMode_ExtModeMouse },
3716#endif
3659 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3717 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3660 { 1011, PrivMode_Keypress }, // rxvt extension 3718 { 1011, PrivMode_Keypress }, // rxvt extension
3719#if ENABLE_FRILLS
3720 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3721#endif
3661 // 1035 enable modifiers for alt, numlock NYI 3722 // 1035 enable modifiers for alt, numlock NYI
3662 // 1036 send ESC for meta keys NYI 3723 // 1036 send ESC for meta keys NYI
3663 // 1037 send DEL for keypad delete NYI 3724 // 1037 send DEL for keypad delete NYI
3664 { 1047, PrivMode_Screen }, 3725 { 1047, PrivMode_Screen },
3665 // 1048 save and restore cursor 3726 // 1048 save and restore cursor, implemented in code
3666 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3727 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3667 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3728 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3668 { 2004, PrivMode_BracketPaste }, 3729 { 2004, PrivMode_BracketPaste },
3669 }; 3730 };
3670 3731
… …
3680 for (i = 0; i < nargs; i++) 3741 for (i = 0; i < nargs; i++)
3681 { 3742 {
3682 state = -1; 3743 state = -1;
3683 3744
3684 /* basic handling */ 3745 /* basic handling */
3685 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3746 for (j = 0; j < ecb_array_length (argtopriv); j++)
3686 if (argtopriv[j].argval == arg[i]) 3747 if (argtopriv[j].argval == arg[i])
3687 { 3748 {
3688 state = privcases (mode, argtopriv[j].bit); 3749 state = privcases (mode, argtopriv[j].bit);
3689 break; 3750 break;
3690 } 3751 }
… …
3716 case 2: /* VT52 mode */ 3777 case 2: /* VT52 mode */
3717 /* oddball mode. should be set regardless of set/reset 3778 /* oddball mode. should be set regardless of set/reset
3718 * parameter. Return from VT52 mode with an ESC < from 3779 * parameter. Return from VT52 mode with an ESC < from
3719 * within VT52 mode 3780 * within VT52 mode
3720 */ 3781 */
3721 set_privmode (PrivMode_vt52, 1); 3782 priv_modes |= PrivMode_vt52;
3722 break; 3783 break;
3723 case 3: /* 80/132 */ 3784 case 3: /* 80/132 */
3724 if (priv_modes & PrivMode_132OK) 3785 if (priv_modes & PrivMode_132OK)
3725 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight); 3786 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3726 break; 3787 break;
… …
3741 if (state) /* orthogonal */ 3802 if (state) /* orthogonal */
3742 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3803 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3743 break; 3804 break;
3744#ifdef scrollBar_esc 3805#ifdef scrollBar_esc
3745 case scrollBar_esc: 3806 case scrollBar_esc:
3746 if (scrollBar.map (state)) 3807 scrollBar.map (state);
3747 {
3748 resize_all_windows (0, 0, 0); 3808 resize_all_windows (0, 0, 0);
3749 scr_touch (true); 3809 scr_touch (true);
3750 }
3751 break; 3810 break;
3752#endif 3811#endif
3753 case 25: /* visible/invisible cursor */ 3812 case 25: /* visible/invisible cursor */
3754 scr_cursor_visible (state); 3813 scr_cursor_visible (state);
3755 break; 3814 break;
… …
3768 case 1003: 3827 case 1003:
3769 if (state) 3828 if (state)
3770 { 3829 {
3771 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3830 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3772 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3831 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3832 mouse_row = mouse_col = 0;
3773 vt_emask_mouse = PointerMotionMask; 3833 vt_emask_mouse = PointerMotionMask;
3774 } 3834 }
3775 else 3835 else
3776 vt_emask_mouse = NoEventMask; 3836 vt_emask_mouse = NoEventMask;
3777 3837
… …
3809 } 3869 }
3810} 3870}
3811/*}}} */ 3871/*}}} */
3812 3872
3813/*{{{ process sgr sequences */ 3873/*{{{ process sgr sequences */
3814void 3874void ecb_hot
3815rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3875rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3816{ 3876{
3817 unsigned int i; 3877 unsigned int i;
3818 short rendset; 3878 short rendset;
3819 int rendstyle; 3879 int rendstyle;
… …
3960 break; 4020 break;
3961#endif 4021#endif
3962 } 4022 }
3963 } 4023 }
3964} 4024}
4025
4026void
4027rxvt_term::set_cursor_style (int style)
4028{
4029 if (!IN_RANGE_INC (style, 0, 4))
4030 return;
4031
4032 set_option (Opt_cursorUnderline, style >= 3);
4033
4034#ifdef CURSOR_BLINK
4035 set_option (Opt_cursorBlink, !style || (style & 1));
4036 cursor_blink_reset ();
4037#endif
4038
4039 want_refresh = 1;
4040}
3965/*}}} */ 4041/*}}} */
3966 4042
3967/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3968void
3969rxvt_term::process_graphics ()
3970{
3971 unicode_t ch, cmd = cmd_getc ();
3972
3973 if (cmd == 'Q')
3974 {
3975 /* query graphics */
3976 tt_printf ("\033G0\012"); /* no graphics */
3977 return;
3978 }
3979 /* swallow other graphics sequences until terminating ':' */
3980 do
3981 ch = cmd_getc ();
3982 while (ch != ':');
3983}
3984/*}}} */
3985
3986/* ------------------------------------------------------------------------- */ 4043/* ---------------------------------------------------------------------- */
4044/* Write data to the pty as typed by the user, pasted with the mouse,
4045 * or generated by us in response to a query ESC sequence.
4046 */
3987 4047
3988/* 4048/*
3989 * Send printf () formatted output to the command. 4049 * Send printf () formatted output to the command.
3990 * Only use for small amounts of data. 4050 * Only use for small amounts of data.
3991 */ 4051 */
… …
3999 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4059 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4000 va_end (arg_ptr); 4060 va_end (arg_ptr);
4001 tt_write (buf, strlen (buf)); 4061 tt_write (buf, strlen (buf));
4002} 4062}
4003 4063
4004/* ---------------------------------------------------------------------- */
4005/* Write data to the pty as typed by the user, pasted with the mouse, 4064/* Write data to the pty as typed by the user. */
4006 * or generated by us in response to a query ESC sequence. 4065void
4007 */ 4066rxvt_term::tt_write_user_input (const char *data, unsigned int len)
4008const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4067{
4068 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4069 return;
4070
4071 if (option (Opt_scrollTtyKeypress))
4072 if (view_start)
4073 {
4074 view_start = 0;
4075 want_refresh = 1;
4076 }
4077
4078 tt_write_ (data, len);
4079}
4009 4080
4010void 4081void
4011rxvt_term::tt_write (const char *data, unsigned int len) 4082rxvt_term::tt_write (const char *data, unsigned int len)
4012{ 4083{
4013 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4084 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4014 return; 4085 return;
4015 4086
4087 tt_write_ (data, len);
4088}
4089
4090static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4091
4092void
4093rxvt_term::tt_write_ (const char *data, unsigned int len)
4094{
4016 if (pty->pty < 0) 4095 if (pty->pty < 0)
4017 return; 4096 return;
4018 4097
4019 if (v_buflen == 0) 4098 if (v_buflen == 0)
4020 { 4099 {
4021 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4100 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4022 4101
4102 max_it (written, 0);
4103
4023 if ((unsigned int)written == len) 4104 if (written == len)
4024 return; 4105 return;
4025 4106
4026 data += written; 4107 data += written;
4027 len -= written; 4108 len -= written;
4028 } 4109 }
4029 4110
4030 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4111 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
4031 4112
4032 memcpy (v_buffer + v_buflen, data, len); 4113 memcpy (v_buffer + v_buflen, data, len);
4033 v_buflen += len; 4114 v_buflen += len;
4034 4115
4035 pty_ev.set (ev::READ | ev::WRITE); 4116 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

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