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.456 by sf-exg, Fri Oct 22 16:49:26 2010 UTC vs.
Revision 1.551 by sf-exg, Wed Jul 16 14:29:23 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 3 of the License, or
36 * (at your option) any later version. 36 * (at your option) any later version.
37 * 37 *
38 * This program is distributed in the hope that it will be useful, 38 * This program is distributed in the hope that it will be useful,
39 * but WITHOUT ANY WARRANTY; without even the implied warranty of 39 * but WITHOUT ANY WARRANTY; without even the implied warranty of
40 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 40 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
54 54
55#ifdef KEYSYM_RESOURCE 55#ifdef KEYSYM_RESOURCE
56# include "keyboard.h" 56# include "keyboard.h"
57#endif 57#endif
58 58
59#include <csignal> 59#include <signal.h>
60 60
61#if LINUX_YIELD_HACK 61#if LINUX_YIELD_HACK
62# include <ctime> 62# include <time.h>
63#endif 63#endif
64 64
65/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
66 66
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
… …
131 XK_KP_Space, 0x2422, 131 XK_KP_Space, 0x2422,
132#endif 132#endif
133 0, 133 0,
134}; 134};
135 135
136void 136void ecb_cold
137rxvt_term::iso14755_54 (int x, int y) 137rxvt_term::iso14755_54 (int x, int y)
138{ 138{
139 x = Pixel2Col (x); 139 x = Pixel2Col (x);
140 y = Pixel2Row (y); 140 y = Pixel2Row (y);
141 141
… …
149 149
150 text_t t = l.t[x]; 150 text_t t = l.t[x];
151 151
152 if (t != NOCHAR || !x) 152 if (t != NOCHAR || !x)
153 { 153 {
154 iso14755_51 (l.t[x], l.r[x], x, y); 154 iso14755_51 (l.t[x], l.r[x], x, y, view_start);
155 iso14755buf = ISO_14755_54; 155 iso14755buf = ISO_14755_54;
156 break; 156 break;
157 } 157 }
158 158
159 x--; 159 x--;
160 } 160 }
161} 161}
162 162
163void 163void ecb_cold
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y) 164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y, int y2)
165{ 165{
166 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
167 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 KeySym orig_keysym = keysym;
502
503 /* Shift + F1 - F10 generates F11 - F20 */
504 if (shft && keysym >= XK_F1 && keysym <= XK_F10)
505 {
506 keysym += (XK_F11 - XK_F1);
507 shft = 0; /* turn off Shift */
508 }
509
510 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
511 {
512 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
513 unsigned int newlen = 1;
514
515 if (ev.state & ModNumLockMask)
516 kp = false;
517
518 keysym = translate_keypad (keysym, kp);
519
520 switch (keysym)
521 {
522#ifndef NO_BACKSPACE_KEY
523 case XK_BackSpace:
524 if (priv_modes & PrivMode_HaveBackSpace)
525 {
526 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
527 ^ !!ctrl) ? '\b' : '\177';
528 kbuf[1] = '\0';
529 }
530 else
531 strcpy (kbuf, rs[Rs_backspace_key]);
532 break;
533#endif
534#ifndef NO_DELETE_KEY
535 case XK_Delete:
536 strcpy (kbuf, rs[Rs_delete_key]);
537 break;
538#endif
539 case XK_Tab:
540 if (shft)
541 strcpy (kbuf, "\033[Z");
542 else
543 {
544#ifdef CTRL_TAB_MAKES_META
545 if (ctrl)
546 meta = 1;
547#endif
548#ifdef MOD4_TAB_MAKES_META
549 if (ev.state & Mod4Mask)
550 meta = 1;
551#endif
552 newlen = 0;
553 }
554 break;
555
556 case XK_Up: /* "\033[A" */
557 case XK_Down: /* "\033[B" */
558 case XK_Right: /* "\033[C" */
559 case XK_Left: /* "\033[D" */
560 strcpy (kbuf, "\033[Z");
561 kbuf[2] = "DACB"[keysym - XK_Left];
562 /* do Shift first */
563 if (shft)
564 kbuf[2] = "dacb"[keysym - XK_Left];
565 else if (ctrl)
566 {
567 kbuf[1] = 'O';
568 kbuf[2] = "dacb"[keysym - XK_Left];
569 }
570 else if (priv_modes & PrivMode_aplCUR)
571 kbuf[1] = 'O';
572 break;
573
574 case XK_KP_Enter:
575 /* allow shift to override */
576 if (kp)
577 {
578 strcpy (kbuf, "\033OM");
579 break;
580 }
581
582 /* FALLTHROUGH */
583
584 case XK_Return:
585 if (priv_modes & PrivMode_LFNL)
586 {
587 kbuf[0] = '\015';
588 kbuf[1] = '\012';
589 kbuf[2] = '\0';
590 }
591 else
592 {
593 kbuf[0] = '\015';
594 kbuf[1] = '\0';
595 }
596 break;
597
598 case XK_KP_F1: /* "\033OP" */
599 case XK_KP_F2: /* "\033OQ" */
600 case XK_KP_F3: /* "\033OR" */
601 case XK_KP_F4: /* "\033OS" */
602 strcpy (kbuf, "\033OP");
603 kbuf[2] += (keysym - XK_KP_F1);
604 break;
605
606 case XK_KP_Multiply: /* "\033Oj" : "*" */
607 case XK_KP_Add: /* "\033Ok" : "+" */
608 case XK_KP_Separator: /* "\033Ol" : "," */
609 case XK_KP_Subtract: /* "\033Om" : "-" */
610 case XK_KP_Decimal: /* "\033On" : "." */
611 case XK_KP_Divide: /* "\033Oo" : "/" */
612 case XK_KP_0: /* "\033Op" : "0" */
613 case XK_KP_1: /* "\033Oq" : "1" */
614 case XK_KP_2: /* "\033Or" : "2" */
615 case XK_KP_3: /* "\033Os" : "3" */
616 case XK_KP_4: /* "\033Ot" : "4" */
617 case XK_KP_5: /* "\033Ou" : "5" */
618 case XK_KP_6: /* "\033Ov" : "6" */
619 case XK_KP_7: /* "\033Ow" : "7" */
620 case XK_KP_8: /* "\033Ox" : "8" */
621 case XK_KP_9: /* "\033Oy" : "9" */
622 /* allow shift to override */
623 if (kp)
624 {
625 strcpy (kbuf, "\033Oj");
626 kbuf[2] += (keysym - XK_KP_Multiply);
627 }
628 else
629 {
630 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
631 kbuf[1] = '\0';
632 }
633 break;
634
635 default:
636 {
637 int param = map_function_key (keysym);
638 if (param > 0)
639 sprintf (kbuf,"\033[%d~", param);
640 else
641 newlen = 0;
642 }
643 break;
644 }
645
646 if (newlen)
647 len = strlen (kbuf);
648
649 if (len > 0)
650 {
651 /*
652 * pass Shift/Control indicators for function keys ending with `~'
653 *
654 * eg,
655 * Prior = "ESC[5~"
656 * Shift+Prior = "ESC[5$"
657 * Ctrl+Prior = "ESC[5^"
658 * Ctrl+Shift+Prior = "ESC[5@"
659 */
660 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
661 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
662
663 /*
664 * Pass meta for all function keys, if 'meta' option set
665 */
666#ifdef META8_OPTION
667 if (meta && (meta_char == 0x80))
668 kbuf[len - 1] |= 0x80;
669#endif
670 }
671
672 }
673 else if (ctrl && keysym == XK_minus)
674 {
675 len = 1;
676 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
677 }
678 else if (keysym == XK_ISO_Left_Tab)
679 {
680 strcpy (kbuf, "\033[Z");
681 len = 3;
682 }
683 else
684 {
685#ifdef META8_OPTION
686 /* set 8-bit on */
687 if (meta && (meta_char == 0x80))
688 {
689 char *ch;
690
691 for (ch = kbuf; ch < kbuf + len; ch++)
692 *ch |= 0x80;
693
694 meta = 0;
695 }
696#endif
697 /* nil */ ;
698 }
699
700 keysym = orig_keysym;
701 }
702
703 /* escape prefix */
704 if (len && meta
705#ifdef META8_OPTION
706 && meta_char == C0_ESC
707#endif
708 )
709 {
710 *--kbuf = C0_ESC;
711 len++;
712 }
713
714 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
715 return;
716
717 if (valid_keysym)
718 {
490#ifdef KEYSYM_RESOURCE 719#ifdef KEYSYM_RESOURCE
491 if (keyboard->dispatch (this, keysym, ev.state)) 720 if (keyboard->dispatch (this, keysym, ev.state, kbuf, len))
492 return; 721 return;
493#endif 722#endif
494 723
495 if (saveLines) 724 if (saveLines)
496 { 725 {
… …
509#endif 738#endif
510 max_it (lnsppg, 1); 739 max_it (lnsppg, 1);
511 740
512 if (keysym == XK_Prior) 741 if (keysym == XK_Prior)
513 { 742 {
514 scr_page (UP, lnsppg); 743 scr_page (lnsppg);
515 return; 744 return;
516 } 745 }
517 else if (keysym == XK_Next) 746 else if (keysym == XK_Next)
518 { 747 {
519 scr_page (DN, lnsppg); 748 scr_page (-lnsppg);
520 return; 749 return;
521 } 750 }
522 } 751 }
523#ifdef SCROLL_ON_UPDOWN_KEYS 752#ifdef SCROLL_ON_UPDOWN_KEYS
524 if (IS_SCROLL_MOD) 753 if (IS_SCROLL_MOD)
525 { 754 {
526 if (keysym == XK_Up) 755 if (keysym == XK_Up)
527 { 756 {
528 scr_page (UP, 1); 757 scr_page (1);
529 return; 758 return;
530 } 759 }
531 else if (keysym == XK_Down) 760 else if (keysym == XK_Down)
532 { 761 {
533 scr_page (DN, 1); 762 scr_page (-1);
534 return; 763 return;
535 } 764 }
536 } 765 }
537#endif 766#endif
538#ifdef SCROLL_ON_HOMEEND_KEYS 767#ifdef SCROLL_ON_HOMEEND_KEYS
539 if (IS_SCROLL_MOD) 768 if (IS_SCROLL_MOD)
540 { 769 {
541 if (keysym == XK_Home) 770 if (keysym == XK_Home)
542 { 771 {
543 scr_move_to (0, 1); 772 scr_changeview (top_row);
544 return; 773 return;
545 } 774 }
546 else if (keysym == XK_End) 775 else if (keysym == XK_End)
547 { 776 {
548 scr_move_to (1, 1); 777 scr_changeview (0);
549 return; 778 return;
550 } 779 }
551 } 780 }
552#endif 781#endif
553 } 782 }
554 783
555 if (shft) 784 if (shft)
556 { 785 {
557 /* Shift + F1 - F10 generates F11 - F20 */
558 if (keysym >= XK_F1 && keysym <= XK_F10)
559 {
560 keysym += (XK_F11 - XK_F1);
561 shft = 0; /* turn off Shift */
562 }
563 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys)) 786 if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
564 { 787 {
565 switch (keysym) 788 switch (keysym)
566 { 789 {
567 /* normal XTerm key bindings */ 790 /* normal XTerm key bindings */
568 case XK_Insert: /* Shift+Insert = paste mouse selection */ 791 case XK_Insert: /* Shift+Insert = paste mouse selection */
569 selection_request (ev.time); 792 selection_request (ev.time);
570 return; 793 return;
571#if TODO 794#if TODO
572 /* rxvt extras */ 795 /* rxvt extras */
573 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 796 case XK_KP_Add: /* Shift+KP_Add = bigger font */
574 change_font (FONT_UP);
575 return; 797 return;
576 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 798 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
577 change_font (FONT_DN);
578 return; 799 return;
579#endif 800#endif
580 } 801 }
581 } 802 }
803 }
804
805 if (ctrl && meta && (keysym == XK_c || keysym == XK_v))
806 {
807 if (keysym == XK_v)
808 selection_request (ev.time, Sel_Clipboard);
809 else if (selection.len > 0)
810 {
811 free (selection.clip_text);
812 selection.clip_text = rxvt_wcsdup (selection.text, selection.len);
813 selection.clip_len = selection.len;
814 selection_grab (CurrentTime, true);
815 }
816
817 return;
582 } 818 }
583 819
584#if ENABLE_FRILLS || ISO_14755 820#if ENABLE_FRILLS || ISO_14755
585 // ISO 14755 support 821 // ISO 14755 support
586 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51)) 822 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
… …
641 { 877 {
642 scr_printscreen (ctrl | shft); 878 scr_printscreen (ctrl | shft);
643 return; 879 return;
644 } 880 }
645#endif 881#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 } 882 }
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 883
826 if (len <= 0) 884 if (len <= 0)
827 return; /* not mapped */ 885 return; /* not mapped */
828 886
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); 887 tt_write_user_input (kbuf, (unsigned int)len);
862} 888}
863 889
864void 890void ecb_cold
865rxvt_term::key_release (XKeyEvent &ev) 891rxvt_term::key_release (XKeyEvent &ev)
866{ 892{
867#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL 893#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
868 KeySym keysym; 894 KeySym keysym;
869 895
… …
889 commit_iso14755 (); 915 commit_iso14755 ();
890 916
891 return; 917 return;
892 } 918 }
893 919
894 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 920 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
895 if (i[0] == keysym) 921 if (i[0] == keysym)
896 { 922 {
897 iso14755buf = ISO_14755_51 | i[1]; 923 iso14755buf = ISO_14755_51 | i[1];
898 commit_iso14755 (); 924 commit_iso14755 ();
899 925
… …
936 else if (keysym == XK_Control_L || keysym == XK_Control_R) 962 else if (keysym == XK_Control_L || keysym == XK_Control_R)
937 mouse_slip_wheel_speed = 0; 963 mouse_slip_wheel_speed = 0;
938#endif 964#endif
939} 965}
940 966
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 967void
975rxvt_term::flush () 968rxvt_term::flush ()
976{ 969{
977 flush_ev.stop (); 970 flush_ev.stop ();
978 971
979#ifdef HAVE_BG_PIXMAP 972#ifdef HAVE_IMG
980 if (bgPixmap.check_clearChanged ()) 973 if (bg_flags & BG_NEEDS_REFRESH)
981 { 974 {
982// scr_clear (true); This needs to be researched further! 975 bg_flags &= ~BG_NEEDS_REFRESH;
983 scr_touch (false); 976 scr_touch (false);
984 } 977 }
985#endif 978#endif
986 979
987 if (want_refresh) 980 if (want_refresh)
… …
1024 while (row < end_row); 1017 while (row < end_row);
1025 } 1018 }
1026 1019
1027 scr_refresh (); 1020 scr_refresh ();
1028 scrollBar.show (1); 1021 scrollBar.show (1);
1029#ifdef USE_XIM 1022#if USE_XIM
1030 IMSendSpot (); 1023 im_send_spot ();
1031#endif 1024#endif
1032 } 1025 }
1033 1026
1034 display->flush (); 1027 display->flush ();
1035} 1028}
… …
1053 flush (); 1046 flush ();
1054} 1047}
1055 1048
1056#ifdef CURSOR_BLINK 1049#ifdef CURSOR_BLINK
1057void 1050void
1051rxvt_term::cursor_blink_reset ()
1052{
1053 if (hidden_cursor)
1054 {
1055 hidden_cursor = 0;
1056 want_refresh = 1;
1057 }
1058
1059 if (option (Opt_cursorBlink))
1060 cursor_blink_ev.again ();
1061 else
1062 cursor_blink_ev.stop ();
1063}
1064
1065void
1058rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 1066rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1059{ 1067{
1060 hidden_cursor = !hidden_cursor; 1068 hidden_cursor = !hidden_cursor;
1061 want_refresh = 1; 1069 want_refresh = 1;
1062 refresh_check (); 1070 refresh_check ();
… …
1080 1088
1081#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1089#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1082void 1090void
1083rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1091rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1084{ 1092{
1085 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 1093 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1086 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1)) 1094 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1087 { 1095 {
1088 want_refresh = 1; 1096 want_refresh = 1;
1089 refresh_check (); 1097 refresh_check ();
1090 } 1098 }
1091 else 1099 else
… …
1095 1103
1096#ifdef SELECTION_SCROLLING 1104#ifdef SELECTION_SCROLLING
1097void 1105void
1098rxvt_term::sel_scroll_cb (ev::timer &w, int revents) 1106rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1099{ 1107{
1100 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1108 if (scr_page (scroll_selection_lines))
1101 { 1109 {
1102 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1110 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1103 want_refresh = 1; 1111 want_refresh = 1;
1104 refresh_check (); 1112 refresh_check ();
1105 } 1113 }
… …
1110 1118
1111#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1119#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1112void 1120void
1113rxvt_term::slip_wheel_cb (ev::timer &w, int revents) 1121rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1114{ 1122{
1115 if (scr_changeview (view_start - mouse_slip_wheel_speed)) 1123 if (scr_page (mouse_slip_wheel_speed))
1116 { 1124 {
1117 want_refresh = 1; 1125 want_refresh = 1;
1118 refresh_check (); 1126 refresh_check ();
1119 } 1127 }
1120 1128
… …
1152 { 1160 {
1153 } 1161 }
1154} event_handler; 1162} event_handler;
1155#endif 1163#endif
1156 1164
1165/* make sure all the cmd data is at beginning of cmdbuf */
1166void
1167rxvt_term::cmdbuf_reify ()
1168{
1169 if (cmdbuf_ptr == cmdbuf_base)
1170 return;
1171
1172 ssize_t used = cmdbuf_endp - cmdbuf_ptr;
1173
1174 memmove (cmdbuf_base, cmdbuf_ptr, used);
1175 cmdbuf_ptr = cmdbuf_base;
1176 cmdbuf_endp = cmdbuf_ptr + used;
1177
1178}
1179
1180#if defined (KEYSYM_RESOURCE)
1181void
1182rxvt_term::cmdbuf_append (const char *str, size_t count)
1183{
1184 cmdbuf_reify ();
1185
1186 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1187
1188 if (count > avail)
1189 return;
1190
1191 memcpy (cmdbuf_endp, str, count);
1192 cmdbuf_endp += count;
1193
1194 cmd_parse ();
1195}
1196#endif
1197
1157bool 1198bool
1158rxvt_term::pty_fill () 1199rxvt_term::pty_fill ()
1159{ 1200{
1160 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1201 cmdbuf_reify ();
1161 1202
1162 if (CBUFSIZ == n) 1203 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1163 { 1204
1164 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1205 if (!avail)
1165 n = 0;
1166 } 1206 {
1167 1207 // normally this indicates a "too long" command sequence - just drop the data we have
1168 memmove (cmdbuf_base, cmdbuf_ptr, n);
1169 cmdbuf_ptr = cmdbuf_base; 1208 cmdbuf_ptr = cmdbuf_base;
1170 cmdbuf_endp = cmdbuf_ptr + n; 1209 cmdbuf_endp = cmdbuf_ptr;
1210 avail = CBUFSIZ;
1211 }
1171 1212
1172 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1213 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1173 1214
1174 if (r > 0) 1215 if (r > 0)
1175 { 1216 {
1176 cmdbuf_endp += r; 1217 cmdbuf_endp += r;
1177 return true; 1218 return true;
… …
1208 pty_write (); 1249 pty_write ();
1209 1250
1210 refresh_check (); 1251 refresh_check ();
1211} 1252}
1212 1253
1213void 1254void ecb_cold
1214rxvt_term::pointer_unblank () 1255rxvt_term::pointer_unblank ()
1215{ 1256{
1216 XDefineCursor (dpy, vt, TermWin_cursor); 1257 XDefineCursor (dpy, vt, TermWin_cursor);
1217 recolour_cursor (); 1258 recolour_cursor ();
1218 1259
… …
1223 pointer_ev.start (pointerBlankDelay); 1264 pointer_ev.start (pointerBlankDelay);
1224#endif 1265#endif
1225} 1266}
1226 1267
1227#ifdef POINTER_BLANK 1268#ifdef POINTER_BLANK
1228void 1269void ecb_cold
1229rxvt_term::pointer_blank () 1270rxvt_term::pointer_blank ()
1230{ 1271{
1231 if (!option (Opt_pointerBlank)) 1272 if (!option (Opt_pointerBlank))
1232 return; 1273 return;
1233 1274
… …
1235 XFlush (dpy); 1276 XFlush (dpy);
1236 1277
1237 hidden_pointer = 1; 1278 hidden_pointer = 1;
1238} 1279}
1239 1280
1240void 1281void ecb_cold
1241rxvt_term::pointer_cb (ev::timer &w, int revents) 1282rxvt_term::pointer_cb (ev::timer &w, int revents)
1242{ 1283{
1243 make_current (); 1284 make_current ();
1244 1285
1245 pointer_blank (); 1286 pointer_blank ();
… …
1251{ 1292{
1252 int button_number, key_state = 0; 1293 int button_number, key_state = 0;
1253 int x, y; 1294 int x, y;
1254 int code = 32; 1295 int code = 32;
1255 1296
1256 x = Pixel2Col (ev.x); 1297 x = Pixel2Col (ev.x) + 1;
1257 y = Pixel2Row (ev.y); 1298 y = Pixel2Row (ev.y) + 1;
1299
1258 if (ev.type == MotionNotify) 1300 if (ev.type == MotionNotify)
1259 { 1301 {
1260 if (x == mouse_row && y == mouse_col) 1302 if (x == mouse_row && y == mouse_col)
1261 return; 1303 return;
1304
1262 mouse_row = x; 1305 mouse_row = x;
1263 mouse_col = y; 1306 mouse_col = y;
1264 code += 32; 1307 code += 32;
1265 } 1308 }
1266 1309
… …
1269 else 1312 else
1270 { 1313 {
1271 button_number = MEvent.button - Button1; 1314 button_number = MEvent.button - Button1;
1272 /* add 0x3D for wheel events, like xterm does */ 1315 /* add 0x3D for wheel events, like xterm does */
1273 if (button_number >= 3) 1316 if (button_number >= 3)
1274 button_number += (64 - 3); 1317 button_number += 64 - 3;
1275 } 1318 }
1276 1319
1277 if (priv_modes & PrivMode_MouseX10) 1320 if (priv_modes & PrivMode_MouseX10)
1278 { 1321 {
1279 /* 1322 /*
… …
1311 fputc ('A', stderr); 1354 fputc ('A', stderr);
1312 if (key_state & 32) 1355 if (key_state & 32)
1313 fputc ('2', stderr); 1356 fputc ('2', stderr);
1314 fprintf (stderr, "]: <%d>, %d/%d\n", 1357 fprintf (stderr, "]: <%d>, %d/%d\n",
1315 button_number, 1358 button_number,
1316 x + 1, 1359 x,
1317 y + 1); 1360 y);
1318#endif 1361#endif
1319 1362
1363#if ENABLE_FRILLS
1364 if (priv_modes & PrivMode_ExtMouseRight)
1365 tt_printf ("\033[%d;%d;%dM",
1366 code + button_number + key_state,
1367 x,
1368 y);
1369 else if (priv_modes & PrivMode_ExtModeMouse)
1370 tt_printf ("\033[M%c%lc%lc",
1371 code + button_number + key_state,
1372 wint_t (32 + x),
1373 wint_t (32 + y));
1374 else
1375#endif
1320 tt_printf ("\033[M%c%c%c", 1376 tt_printf ("\033[M%c%c%c",
1321 (code + button_number + key_state), 1377 code + button_number + key_state,
1322 (32 + x + 1), 1378 32 + x,
1323 (32 + y + 1)); 1379 32 + y);
1324} 1380}
1325 1381
1326/*{{{ process an X event */ 1382/*{{{ process an X event */
1327void 1383void ecb_hot
1328rxvt_term::x_cb (XEvent &ev) 1384rxvt_term::x_cb (XEvent &ev)
1329{ 1385{
1330 make_current (); 1386 make_current ();
1331 1387
1332 dLocal (Display *, dpy); 1388 dLocal (Display *, dpy);
… …
1430 && ev.xfocus.mode != NotifyGrab) 1486 && ev.xfocus.mode != NotifyGrab)
1431 focus_out (); 1487 focus_out ();
1432 break; 1488 break;
1433 1489
1434 case ConfigureNotify: 1490 case ConfigureNotify:
1435 if (ev.xconfigure.window == parent[0]) 1491 if (ev.xconfigure.window == parent)
1436 { 1492 {
1437 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1493 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1438 ; 1494 ;
1495
1496 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1497
1498 bool moved = false;
1499#ifdef HAVE_BG_PIXMAP
1500 if (bg_window_position_sensitive ())
1501 {
1502 want_position_change = true;
1503 if (bg_img == 0)
1504 moved = true;
1505 }
1506#endif
1507
1508 if (want_position_change)
1509 {
1510 int x, y;
1511
1512 if (ev.xconfigure.send_event)
1513 {
1514 x = ev.xconfigure.x;
1515 y = ev.xconfigure.y;
1516 }
1517 else
1518 get_window_origin (x, y);
1519
1520 if (x != parent_x || y != parent_y)
1521 {
1522 parent_x = x;
1523 parent_y = y;
1524 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1525 moved = true;
1526 }
1527 }
1439 1528
1440 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1529 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1441 { 1530 {
1442 seen_resize = 1; 1531 seen_resize = 1;
1443 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1532 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1444 } 1533 }
1445 else 1534 else
1446 { 1535 {
1447#ifdef HAVE_BG_PIXMAP 1536#ifdef HAVE_BG_PIXMAP
1448 if (bgPixmap.window_position_sensitive ())
1449 {
1450 if (mapped) 1537 if (moved)
1451 update_background (); 1538 update_background ();
1452 else
1453 bgPixmap.invalidate ();
1454 }
1455#endif 1539#endif
1456 } 1540 }
1457 1541
1458 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1542 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1459 } 1543 }
1460 break; 1544 break;
1461 1545
1462 case PropertyNotify: 1546 case PropertyNotify:
1463 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1547 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1464 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1465 && ev.xproperty.state == PropertyNewValue)
1466 selection_property (ev.xproperty.window, ev.xproperty.atom);
1467
1468 break; 1548 break;
1469 1549
1470 case SelectionClear: 1550 case SelectionClear:
1471 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]); 1551 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1472 break; 1552 break;
1473 1553
1474 case SelectionNotify:
1475 if (selection_wait == Sel_normal)
1476 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1477 break;
1478
1479 case SelectionRequest: 1554 case SelectionRequest:
1480 selection_send (ev.xselectionrequest); 1555 selection_send (ev.xselectionrequest);
1481 break; 1556 break;
1482 1557
1483 case MapNotify: 1558 case MapNotify:
1484#ifdef HAVE_BG_PIXMAP 1559#ifdef HAVE_BG_PIXMAP
1485 /* This is needed specifically to fix the case of no window manager or a 1560 // This is needed at startup for the case of no window manager
1486 * non-reparenting window manager. In those cases we never get first 1561 // or a non-reparenting window manager and also because we
1487 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1562 // defer bg image updates if the window is not mapped. The
1488 * care of multiplicity of ConfigureNotify events arriving while WM does 1563 // short delay is to optimize for multiple ConfigureNotify
1489 * reparenting. 1564 // events at startup when the window manager reparents the
1490 * We should not render background immediately, as there could be several 1565 // window, so as to perform the computation after we have
1491 * ConfigureNotify's to follow. Lets take care of all of them in one scoop 1566 // received all of them.
1492 * by scheduling background redraw as soon as we can, but giving a short 1567 if (bg_img == 0)
1493 * bit of time for ConfigureNotifies to arrive.
1494 * We should render background PRIOR to drawing any text, but AFTER all
1495 * of ConfigureNotifys for the best results.
1496 */
1497 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1498 update_background_ev.start (0.025); 1568 update_background_ev.start (0.025);
1499#endif 1569#endif
1500 mapped = 1; 1570 mapped = 1;
1501#ifdef TEXT_BLINK 1571#ifdef TEXT_BLINK
1502 text_blink_ev.start (); 1572 text_blink_ev.start ();
… …
1517 if (ev.xany.window == vt) 1587 if (ev.xany.window == vt)
1518 { 1588 {
1519 do 1589 do
1520 { 1590 {
1521 scr_expose (ev.xexpose.x, ev.xexpose.y, 1591 scr_expose (ev.xexpose.x, ev.xexpose.y,
1522 ev.xexpose.width, ev.xexpose.height, False); 1592 ev.xexpose.width, ev.xexpose.height, false);
1523 } 1593 }
1524 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1594 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1525 1595
1526 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1596 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1527 1597
1528 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1598 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1529 { 1599 {
1530 scr_expose (ev.xexpose.x, ev.xexpose.y, 1600 scr_expose (ev.xexpose.x, ev.xexpose.y,
1531 ev.xexpose.width, ev.xexpose.height, False); 1601 ev.xexpose.width, ev.xexpose.height, false);
1532 } 1602 }
1533 1603
1534 want_refresh = 1; 1604 want_refresh = 1;
1535 } 1605 }
1536 else 1606 else
… …
1542 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1612 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1543 ; 1613 ;
1544 1614
1545 if (scrollBar.state && ev.xany.window == scrollBar.win) 1615 if (scrollBar.state && ev.xany.window == scrollBar.win)
1546 { 1616 {
1547 scrollBar.state = STATE_IDLE; 1617 scrollBar.state = SB_STATE_IDLE;
1548 scrollBar.show (0); 1618 scrollBar.show (0);
1549 } 1619 }
1550 } 1620 }
1551 break; 1621 break;
1552 1622
… …
1594 1664
1595#ifdef SELECTION_SCROLLING 1665#ifdef SELECTION_SCROLLING
1596 if (ev.xbutton.y < int_bwidth 1666 if (ev.xbutton.y < int_bwidth
1597 || Pixel2Row (ev.xbutton.y) > (nrow-1)) 1667 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1598 { 1668 {
1669 page_dirn scroll_selection_dir;
1599 int dist; 1670 int dist;
1600 1671
1601 /* don't clobber the current delay if we are 1672 /* don't clobber the current delay if we are
1602 * already in the middle of scrolling. 1673 * already in the middle of scrolling.
1603 */ 1674 */
… …
1618 dist = int_bwidth - ev.xbutton.y; 1689 dist = int_bwidth - ev.xbutton.y;
1619 } 1690 }
1620 else 1691 else
1621 { 1692 {
1622 scroll_selection_dir = DN; 1693 scroll_selection_dir = DN;
1623 dist = ev.xbutton.y - (int_bwidth + height); 1694 dist = ev.xbutton.y - (int_bwidth + vt_height);
1624 } 1695 }
1625 1696
1626 scroll_selection_lines = Pixel2Height (dist) 1697 scroll_selection_lines = Pixel2Height (dist)
1627 / SELECTION_SCROLL_LINE_SPEEDUP 1698 / SELECTION_SCROLL_LINE_SPEEDUP
1628 + 1; 1699 + 1;
1629 min_it (scroll_selection_lines, 1700 min_it (scroll_selection_lines,
1630 SELECTION_SCROLL_MAX_LINES); 1701 SELECTION_SCROLL_MAX_LINES);
1702 scroll_selection_lines *= scroll_selection_dir;
1631 } 1703 }
1632 else 1704 else
1633 { 1705 {
1634 /* we are within the text window, so we 1706 /* we are within the text window, so we
1635 * shouldn't be scrolling 1707 * shouldn't be scrolling
… …
1640#ifdef MOUSE_THRESHOLD 1712#ifdef MOUSE_THRESHOLD
1641 } 1713 }
1642#endif 1714#endif
1643 } 1715 }
1644 } 1716 }
1645 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win) 1717 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1646 { 1718 {
1647 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1719 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1648 MotionNotify, &ev)) 1720 MotionNotify, &ev))
1649 ; 1721 ;
1650 1722
1651 XQueryPointer (dpy, scrollBar.win, 1723 XQueryPointer (dpy, scrollBar.win,
1652 &unused_root, &unused_child, 1724 &unused_root, &unused_child,
1653 &unused_root_x, &unused_root_y, 1725 &unused_root_x, &unused_root_y,
1654 &ev.xbutton.x, &ev.xbutton.y, 1726 &ev.xbutton.x, &ev.xbutton.y,
1655 &unused_mask); 1727 &unused_mask);
1656 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1728 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1657 scrollBar.size ()); 1729 scrollBar.size ());
1658 want_refresh = 1; 1730 want_refresh = 1;
1659 scrollBar.show (1); 1731 scrollBar.show (1);
1660 } 1732 }
1661 break; 1733 break;
1662 } 1734 }
1663 1735
1664#if defined(CURSOR_BLINK) 1736#if defined(CURSOR_BLINK)
1665 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1737 if (ev.type == KeyPress)
1666 {
1667 if (hidden_cursor)
1668 {
1669 hidden_cursor = 0;
1670 want_refresh = 1;
1671 }
1672
1673 cursor_blink_ev.again (); 1738 cursor_blink_reset ();
1674 }
1675#endif 1739#endif
1676 1740
1677#if defined(POINTER_BLANK) 1741#if defined(POINTER_BLANK)
1678 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1742 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1679 { 1743 {
… …
1690 1754
1691 refresh_check (); 1755 refresh_check ();
1692} 1756}
1693 1757
1694#if ENABLE_FRILLS 1758#if ENABLE_FRILLS
1695void 1759void ecb_cold
1696rxvt_term::set_urgency (bool enable) 1760rxvt_term::set_urgency (bool enable)
1697{ 1761{
1698 if (enable == urgency_hint) 1762 if (enable == urgency_hint)
1699 return; 1763 return;
1700 1764
1701 if (XWMHints *h = XGetWMHints (dpy, parent[0])) 1765 if (XWMHints *h = XGetWMHints (dpy, parent))
1702 { 1766 {
1703 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1767 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1704 XSetWMHints (dpy, parent[0], h); 1768 XSetWMHints (dpy, parent, h);
1705 urgency_hint = enable; 1769 urgency_hint = enable;
1770 XFree (h);
1706 } 1771 }
1707} 1772}
1708#endif 1773#endif
1709 1774
1710void 1775void ecb_cold
1711rxvt_term::focus_in () 1776rxvt_term::focus_in ()
1712{ 1777{
1713 if (!focus) 1778 if (!focus)
1714 { 1779 {
1715 focus = 1; 1780 focus = 1;
1716 want_refresh = 1; 1781 want_refresh = 1;
1717 1782
1718#if USE_XIM 1783#if USE_XIM
1719 if (Input_Context != NULL) 1784 if (Input_Context != NULL)
1720 { 1785 {
1721 IMSetPosition (); 1786 im_set_position ();
1722 XSetICFocus (Input_Context); 1787 XSetICFocus (Input_Context);
1723 } 1788 }
1724#endif 1789#endif
1725#if CURSOR_BLINK 1790#if CURSOR_BLINK
1726 if (option (Opt_cursorBlink)) 1791 if (option (Opt_cursorBlink))
… …
1740 1805
1741 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END)); 1806 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1742 } 1807 }
1743} 1808}
1744 1809
1745void 1810void ecb_cold
1746rxvt_term::focus_out () 1811rxvt_term::focus_out ()
1747{ 1812{
1748 if (focus) 1813 if (focus)
1749 { 1814 {
1750 focus = 0; 1815 focus = 0;
… …
1783 1848
1784 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1849 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1785 } 1850 }
1786} 1851}
1787 1852
1788void 1853void ecb_cold
1789rxvt_term::update_fade_color (unsigned int idx) 1854rxvt_term::update_fade_color (unsigned int idx)
1790{ 1855{
1791#if OFF_FOCUS_FADING 1856#if OFF_FOCUS_FADING
1792 if (rs[Rs_fade]) 1857 if (rs[Rs_fade])
1793 { 1858 {
… …
1796 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1861 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1797 } 1862 }
1798#endif 1863#endif
1799} 1864}
1800 1865
1801#if ENABLE_TRANSPARENCY || ENABLE_PERL 1866#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
1802void 1867void ecb_hot
1803rxvt_term::rootwin_cb (XEvent &ev) 1868rxvt_term::rootwin_cb (XEvent &ev)
1804{ 1869{
1805 make_current (); 1870 make_current ();
1806 1871
1807 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1872 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1808 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1873 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1809 return; 1874 return;
1810 1875
1811# if ENABLE_TRANSPARENCY
1812 switch (ev.type) 1876 switch (ev.type)
1813 { 1877 {
1814 case PropertyNotify: 1878 case PropertyNotify:
1815 /* 1879 /*
1816 * if user used some Esetroot compatible prog to set the root bg, 1880 * if user used some Esetroot compatible prog to set the root bg,
1817 * use the property to determine the pixmap. We use it later on. 1881 * use the property to determine the pixmap. We use it later on.
1818 */ 1882 */
1819 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1883 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1820 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1884 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1821 { 1885 {
1822 bgPixmap.set_root_pixmap (); 1886#if BG_IMAGE_FROM_ROOT
1887 if (option (Opt_transparent))
1888 {
1889 rxvt_img::new_from_root (this)->replace (root_img);
1823 update_background (); 1890 update_background ();
1891 }
1892#endif
1893 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1824 } 1894 }
1825 1895
1826 break; 1896 break;
1827 } 1897 }
1828# endif
1829 1898
1830 refresh_check (); 1899 refresh_check ();
1831} 1900}
1832#endif 1901#endif
1833 1902
… …
1957 if (scrollBar.upButton (ev.y)) 2026 if (scrollBar.upButton (ev.y))
1958 direction = UP; /* up */ 2027 direction = UP; /* up */
1959 else if (scrollBar.dnButton (ev.y)) 2028 else if (scrollBar.dnButton (ev.y))
1960 direction = DN; /* down */ 2029 direction = DN; /* down */
1961 2030
1962 scrollBar.state = STATE_IDLE; 2031 scrollBar.state = SB_STATE_IDLE;
1963 /* 2032 /*
1964 * Rxvt-style scrollbar: 2033 * Rxvt-style scrollbar:
1965 * move up if mouse is above slider 2034 * move up if mouse is above slider
1966 * move dn if mouse is below slider 2035 * move dn if mouse is below slider
1967 * 2036 *
… …
2006 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2075 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2007#endif 2076#endif
2008 if (scr_page (direction, 1)) 2077 if (scr_page (direction, 1))
2009 { 2078 {
2010 if (direction == UP) 2079 if (direction == UP)
2011 scrollBar.state = STATE_UP; 2080 scrollBar.state = SB_STATE_UP;
2012 else 2081 else
2013 scrollBar.state = STATE_DOWN; 2082 scrollBar.state = SB_STATE_DOWN;
2014 } 2083 }
2015 } 2084 }
2016 else 2085 else
2017 switch (ev.button) 2086 switch (ev.button)
2018 { 2087 {
2019 case Button2: 2088 case Button2:
2020 switch (scrollBar.align) 2089 switch (scrollBar.align)
2021 { 2090 {
2022 case R_SB_ALIGN_TOP: 2091 case SB_ALIGN_TOP:
2023 csrO = 0; 2092 csrO = 0;
2024 break; 2093 break;
2025 case R_SB_ALIGN_CENTRE: 2094 case SB_ALIGN_CENTRE:
2026 csrO = (scrollBar.bot - scrollBar.top) / 2; 2095 csrO = (scrollBar.bot - scrollBar.top) / 2;
2027 break; 2096 break;
2028 case R_SB_ALIGN_BOTTOM: 2097 case SB_ALIGN_BOTTOM:
2029 csrO = scrollBar.bot - scrollBar.top; 2098 csrO = scrollBar.bot - scrollBar.top;
2030 break; 2099 break;
2031 } 2100 }
2032 2101
2033 if (scrollBar.style == R_SB_XTERM 2102 if (scrollBar.style == SB_STYLE_XTERM
2034 || scrollbar_above_slider (ev.y) 2103 || scrollBar.above_slider (ev.y)
2035 || scrollbar_below_slider (ev.y)) 2104 || scrollBar.below_slider (ev.y))
2036 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ()); 2105 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2037 2106
2038 scrollBar.state = STATE_MOTION; 2107 scrollBar.state = SB_STATE_MOTION;
2039 break; 2108 break;
2040 2109
2041 case Button1: 2110 case Button1:
2042 if (scrollBar.align == R_SB_ALIGN_CENTRE) 2111 if (scrollBar.align == SB_ALIGN_CENTRE)
2043 csrO = ev.y - scrollBar.top; 2112 csrO = ev.y - scrollBar.top;
2044 /* FALLTHROUGH */ 2113 /* FALLTHROUGH */
2045 2114
2046 case Button3: 2115 case Button3:
2047 if (scrollBar.style != R_SB_XTERM) 2116 if (scrollBar.style != SB_STYLE_XTERM)
2048 { 2117 {
2049 if (scrollbar_above_slider (ev.y)) 2118 if (scrollBar.above_slider (ev.y))
2050# ifdef RXVT_SCROLL_FULL 2119# ifdef RXVT_SCROLL_FULL
2051 scr_page (UP, nrow - 1); 2120 scr_page (UP, nrow - 1);
2052# else 2121# else
2053 scr_page (UP, nrow / 4); 2122 scr_page (UP, nrow / 4);
2054# endif 2123# endif
2055 else if (scrollbar_below_slider (ev.y)) 2124 else if (scrollBar.below_slider (ev.y))
2056# ifdef RXVT_SCROLL_FULL 2125# ifdef RXVT_SCROLL_FULL
2057 scr_page (DN, nrow - 1); 2126 scr_page (DN, nrow - 1);
2058# else 2127# else
2059 scr_page (DN, nrow / 4); 2128 scr_page (DN, nrow / 4);
2060# endif 2129# endif
2061 else 2130 else
2062 scrollBar.state = STATE_MOTION; 2131 scrollBar.state = SB_STATE_MOTION;
2063 } 2132 }
2064 else 2133 else
2065 { 2134 {
2066 scr_page ((ev.button == Button1 ? DN : UP), 2135 scr_page ((ev.button == Button1 ? DN : UP),
2067 (nrow 2136 (nrow
2068 * scrollbar_position (ev.y) 2137 * scrollBar.position (ev.y)
2069 / scrollBar.size ())); 2138 / scrollBar.size ()));
2070 } 2139 }
2071 2140
2072 break; 2141 break;
2073 } 2142 }
… …
2084 2153
2085 csrO = 0; /* reset csr Offset */ 2154 csrO = 0; /* reset csr Offset */
2086 if (!bypass_keystate) 2155 if (!bypass_keystate)
2087 reportmode = !! (priv_modes & PrivMode_mouse_report); 2156 reportmode = !! (priv_modes & PrivMode_mouse_report);
2088 2157
2089 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2158 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2090 { 2159 {
2091 scrollBar.state = STATE_IDLE; 2160 scrollBar.state = SB_STATE_IDLE;
2092 scrollBar.show (0); 2161 scrollBar.show (0);
2093 } 2162 }
2094 2163
2095#ifdef SELECTION_SCROLLING 2164#ifdef SELECTION_SCROLLING
2096 sel_scroll_ev.stop(); 2165 sel_scroll_ev.stop();
… …
2146 case Button3: 2215 case Button3:
2147 selection_make (ev.time); 2216 selection_make (ev.time);
2148 break; 2217 break;
2149 2218
2150 case Button2: 2219 case Button2:
2151 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2220 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2152 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2221 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2153 break; 2222 break;
2154 2223
2155#ifdef MOUSE_WHEEL 2224#ifdef MOUSE_WHEEL
2156 case Button4: 2225 case Button4:
2157 case Button5: 2226 case Button5:
2158 { 2227 {
2159 int i; 2228 int lines;
2160 page_dirn v; 2229 page_dirn dirn;
2161 2230
2162 v = ev.button == Button4 ? UP : DN; 2231 dirn = ev.button == Button4 ? UP : DN;
2163 2232
2164 if (ev.state & ShiftMask) 2233 if (ev.state & ShiftMask)
2165 i = 1; 2234 lines = 1;
2166 else if (option (Opt_mouseWheelScrollPage)) 2235 else if (option (Opt_mouseWheelScrollPage))
2167 i = nrow - 1; 2236 lines = nrow - 1;
2168 else 2237 else
2169 i = 5; 2238 lines = 5;
2170 2239
2171# ifdef MOUSE_SLIP_WHEELING 2240# ifdef MOUSE_SLIP_WHEELING
2172 if (ev.state & ControlMask) 2241 if (ev.state & ControlMask)
2173 { 2242 {
2174 mouse_slip_wheel_speed += v ? -1 : 1; 2243 mouse_slip_wheel_speed += dirn;
2175 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2244 clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2176 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2177 2245
2178 if (!slip_wheel_ev.is_active ()) 2246 if (!slip_wheel_ev.is_active ())
2179 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2247 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2180 } 2248 }
2181 else 2249 else
2182# endif 2250# endif
2183 { 2251 {
2184 scr_page (v, i); 2252 scr_page (dirn, lines);
2185 scrollBar.show (1); 2253 scrollBar.show (1);
2186 } 2254 }
2187 } 2255 }
2188 break; 2256 break;
2189#endif 2257#endif
… …
2191 } 2259 }
2192} 2260}
2193 2261
2194/*}}} */ 2262/*}}} */
2195 2263
2196void 2264void ecb_hot
2197rxvt_term::cmd_parse () 2265rxvt_term::cmd_parse ()
2198{ 2266{
2199 wchar_t ch = NOCHAR; 2267 wchar_t ch = NOCHAR;
2200 char *seq_begin; // remember start of esc-sequence here 2268 char *seq_begin; // remember start of esc-sequence here
2201 2269
2202 for (;;) 2270 for (;;)
2203 { 2271 {
2204 if (expect_false (ch == NOCHAR)) 2272 if (ecb_unlikely (ch == NOCHAR))
2205 { 2273 {
2206 seq_begin = cmdbuf_ptr; 2274 seq_begin = cmdbuf_ptr;
2207 ch = next_char (); 2275 ch = next_char ();
2208 2276
2209 if (ch == NOCHAR) 2277 if (ch == NOCHAR)
2210 break; 2278 break;
2211 } 2279 }
2212 2280
2213 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)) 2281 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2214 { 2282 {
2215 if (expect_false (!seen_input)) 2283 if (ecb_unlikely (!seen_input))
2216 { 2284 {
2217 seen_input = 1; 2285 seen_input = 1;
2218 // many badly-written programs (e.g. jed) contain a race condition: 2286 // many badly-written programs (e.g. jed) contain a race condition:
2219 // they first read the screensize and then install a SIGWINCH handler. 2287 // they first read the screensize and then install a SIGWINCH handler.
2220 // some window managers resize the window early, and these programs 2288 // some window managers resize the window early, and these programs
… …
2233 wchar_t *str = buf; 2301 wchar_t *str = buf;
2234 wchar_t *eol = str + min (ncol, UBUFSIZ); 2302 wchar_t *eol = str + min (ncol, UBUFSIZ);
2235 2303
2236 for (;;) 2304 for (;;)
2237 { 2305 {
2238 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))) 2306 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2239 break; 2307 break;
2240 2308
2241 *str++ = ch; 2309 *str++ = ch;
2242 2310
2243 if (expect_false (ch == C0_LF || str >= eol)) 2311 if (ecb_unlikely (ch == C0_LF || str >= eol))
2244 { 2312 {
2245 if (ch == C0_LF) 2313 if (ch == C0_LF)
2246 nlines++; 2314 nlines++;
2247 2315
2248 refresh_count++; 2316 refresh_count++;
… …
2320 } 2388 }
2321 } 2389 }
2322} 2390}
2323 2391
2324// read the next character 2392// read the next character
2325wchar_t 2393wchar_t ecb_hot
2326rxvt_term::next_char () NOTHROW 2394rxvt_term::next_char () NOTHROW
2327{ 2395{
2328 while (cmdbuf_ptr < cmdbuf_endp) 2396 while (cmdbuf_ptr < cmdbuf_endp)
2329 { 2397 {
2330 // assume 7-bit to be ascii ALWAYS 2398 // assume 7-bit to be ascii ALWAYS
2331 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)) 2399 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2332 return *cmdbuf_ptr++; 2400 return *cmdbuf_ptr++;
2333 2401
2334 wchar_t wc; 2402 wchar_t wc;
2335 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2403 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2336 2404
… …
2342 } 2410 }
2343 2411
2344 if (len == (size_t)-1) 2412 if (len == (size_t)-1)
2345 { 2413 {
2346 mbstate.reset (); // reset now undefined conversion state 2414 mbstate.reset (); // reset now undefined conversion state
2415 // a -1 might indicate that a previous incomplete char is invalid (previous return -2)
2416 // in which case we "erroneously" return the next byte which might be valid.
2347 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2417 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2348 } 2418 }
2349 2419
2350 // assume wchar == unicode 2420 // assume wchar == unicode
2351 cmdbuf_ptr += len; 2421 cmdbuf_ptr += len;
… …
2354 2424
2355 return NOCHAR; 2425 return NOCHAR;
2356} 2426}
2357 2427
2358// read the next octet 2428// read the next octet
2359uint32_t 2429uint32_t ecb_hot
2360rxvt_term::next_octet () NOTHROW 2430rxvt_term::next_octet () NOTHROW
2361{ 2431{
2362 return cmdbuf_ptr < cmdbuf_endp 2432 return cmdbuf_ptr < cmdbuf_endp
2363 ? (unsigned char)*cmdbuf_ptr++ 2433 ? (unsigned char)*cmdbuf_ptr++
2364 : NOCHAR; 2434 : NOCHAR;
2365} 2435}
2366 2436
2367static class out_of_input out_of_input; 2437static class out_of_input out_of_input;
2368 2438
2369/* rxvt_cmd_getc () - Return next input character */ 2439wchar_t ecb_hot
2370/*
2371 * Return the next input character after first passing any keyboard input
2372 * to the command.
2373 */
2374wchar_t
2375rxvt_term::cmd_getc () THROW ((class out_of_input)) 2440rxvt_term::cmd_getc () THROW ((class out_of_input))
2376{ 2441{
2377 wchar_t c = next_char (); 2442 wchar_t c = next_char ();
2378 2443
2379 if (c == NOCHAR) 2444 if (c == NOCHAR)
2380 throw out_of_input; 2445 throw out_of_input;
2381 2446
2382 return c; 2447 return c;
2383} 2448}
2384 2449
2385uint32_t 2450uint32_t ecb_hot
2386rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2451rxvt_term::cmd_get8 () THROW ((class out_of_input))
2387{ 2452{
2388 uint32_t c = next_octet (); 2453 uint32_t c = next_octet ();
2389 2454
2390 if (c == NOCHAR) 2455 if (c == NOCHAR)
… …
2394} 2459}
2395 2460
2396/*{{{ print pipe */ 2461/*{{{ print pipe */
2397/*----------------------------------------------------------------------*/ 2462/*----------------------------------------------------------------------*/
2398#ifdef PRINTPIPE 2463#ifdef PRINTPIPE
2399FILE * 2464FILE * ecb_cold
2400rxvt_term::popen_printer () 2465rxvt_term::popen_printer ()
2401{ 2466{
2402 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w"); 2467 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2403 2468
2404 if (stream == NULL) 2469 if (stream == NULL)
2405 rxvt_warn ("can't open printer pipe, not printing.\n"); 2470 rxvt_warn ("can't open printer pipe, not printing.\n");
2406 2471
2407 return stream; 2472 return stream;
2408} 2473}
2409 2474
2410int 2475int ecb_cold
2411rxvt_term::pclose_printer (FILE *stream) 2476rxvt_term::pclose_printer (FILE *stream)
2412{ 2477{
2413 fflush (stream); 2478 fflush (stream);
2414 return pclose (stream); 2479 return pclose (stream);
2415} 2480}
2416 2481
2417/* 2482/*
2418 * simulate attached vt100 printer 2483 * simulate attached vt100 printer
2419 */ 2484 */
2420void 2485void ecb_cold
2421rxvt_term::process_print_pipe () 2486rxvt_term::process_print_pipe ()
2422{ 2487{
2423 FILE *fd = popen_printer (); 2488 FILE *fd = popen_printer ();
2424 2489
2425 if (!fd) 2490 if (!fd)
… …
2471 pclose_printer (fd); 2536 pclose_printer (fd);
2472} 2537}
2473#endif /* PRINTPIPE */ 2538#endif /* PRINTPIPE */
2474/*}}} */ 2539/*}}} */
2475 2540
2476/* *INDENT-OFF* */
2477enum { 2541enum {
2478 C1_40 = 0x40, 2542 C1_40 = 0x40,
2479 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2543 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2480 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2544 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2481 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2545 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2482 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2546 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2483}; 2547};
2484/* *INDENT-ON* */
2485 2548
2486/*{{{ process non-printing single characters */ 2549/*{{{ process non-printing single characters */
2487void 2550void ecb_hot
2488rxvt_term::process_nonprinting (unicode_t ch) 2551rxvt_term::process_nonprinting (unicode_t ch)
2489{ 2552{
2490 switch (ch) 2553 switch (ch)
2491 { 2554 {
2492 case C0_ESC: 2555 case C0_ESC:
… …
2538} 2601}
2539/*}}} */ 2602/*}}} */
2540 2603
2541 2604
2542/*{{{ process VT52 escape sequences */ 2605/*{{{ process VT52 escape sequences */
2543void 2606void ecb_cold
2544rxvt_term::process_escape_vt52 (unicode_t ch) 2607rxvt_term::process_escape_vt52 (unicode_t ch)
2545{ 2608{
2546 int row, col; 2609 int row, col;
2547 2610
2548 switch (ch) 2611 switch (ch)
… …
2582 break; 2645 break;
2583 case 'Z': /* identify the terminal type */ 2646 case 'Z': /* identify the terminal type */
2584 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2647 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2585 break; 2648 break;
2586 case '<': /* turn off VT52 mode */ 2649 case '<': /* turn off VT52 mode */
2587 set_privmode (PrivMode_vt52, 0); 2650 priv_modes &= ~PrivMode_vt52;
2588 break; 2651 break;
2589 case 'F': /* use special graphics character set */ 2652 case 'F': /* use special graphics character set */
2590 case 'G': /* use regular character set */ 2653 case 'G': /* use regular character set */
2591 /* unimplemented */ 2654 /* unimplemented */
2592 break; 2655 break;
… …
2598} 2661}
2599/*}}} */ 2662/*}}} */
2600 2663
2601 2664
2602/*{{{ process escape sequences */ 2665/*{{{ process escape sequences */
2603void 2666void ecb_hot
2604rxvt_term::process_escape_seq () 2667rxvt_term::process_escape_seq ()
2605{ 2668{
2606 unicode_t ch = cmd_getc (); 2669 unicode_t ch = cmd_getc ();
2607 2670
2608 if (priv_modes & PrivMode_vt52) 2671 if (priv_modes & PrivMode_vt52)
… …
2611 return; 2674 return;
2612 } 2675 }
2613 2676
2614 switch (ch) 2677 switch (ch)
2615 { 2678 {
2616 /* case 1: do_tek_mode (); break; */
2617 case '#': 2679 case '#':
2618 if (cmd_getc () == '8') 2680 if (cmd_getc () == '8')
2619 scr_E (); 2681 scr_E ();
2620 break; 2682 break;
2621 case '(': 2683 case '(':
… …
2644#if !ENABLE_MINIMAL 2706#if !ENABLE_MINIMAL
2645 case '9': 2707 case '9':
2646 scr_forwardindex (); 2708 scr_forwardindex ();
2647 break; 2709 break;
2648#endif 2710#endif
2711 // DECPAM/DECPNM
2649 case '=': 2712 case '=':
2713 priv_modes |= PrivMode_aplKP;
2714 break;
2650 case '>': 2715 case '>':
2651 set_privmode (PrivMode_aplKP, ch == '='); 2716 priv_modes &= ~PrivMode_aplKP;
2652 break; 2717 break;
2653 2718
2654 case C1_40: 2719 case C1_40:
2655 cmd_getc (); 2720 cmd_getc ();
2656 break; 2721 break;
… …
2660 2725
2661 /* 8.3.87: NEXT LINE */ 2726 /* 8.3.87: NEXT LINE */
2662 case C1_NEL: /* ESC E */ 2727 case C1_NEL: /* ESC E */
2663 { 2728 {
2664 wchar_t nlcr[] = { C0_LF, C0_CR }; 2729 wchar_t nlcr[] = { C0_LF, C0_CR };
2665 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2730 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2666 } 2731 }
2667 break; 2732 break;
2668 2733
2669 /* kidnapped escape sequence: Should be 8.3.48 */ 2734 /* kidnapped escape sequence: Should be 8.3.48 */
2670 case C1_ESA: /* ESC G */ 2735 case C1_ESA: /* ESC G */
2671 process_graphics (); 2736 // used by original rxvt for rob nations own graphics mode
2737 if (cmd_getc () == 'Q')
2738 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2672 break; 2739 break;
2673 2740
2674 /* 8.3.63: CHARACTER TABULATION SET */ 2741 /* 8.3.63: CHARACTER TABULATION SET */
2675 case C1_HTS: /* ESC H */ 2742 case C1_HTS: /* ESC H */
2676 scr_set_tab (1); 2743 scr_set_tab (1);
… …
2680 case C1_RI: /* ESC M */ 2747 case C1_RI: /* ESC M */
2681 scr_index (DN); 2748 scr_index (DN);
2682 break; 2749 break;
2683 2750
2684 /* 8.3.142: SINGLE-SHIFT TWO */ 2751 /* 8.3.142: SINGLE-SHIFT TWO */
2685 /*case C1_SS2: scr_single_shift (2); break; */ 2752 /* case C1_SS2: break; */
2686 2753
2687 /* 8.3.143: SINGLE-SHIFT THREE */ 2754 /* 8.3.143: SINGLE-SHIFT THREE */
2688 /*case C1_SS3: scr_single_shift (3); break; */ 2755 /* case C1_SS3: break; */
2689 2756
2690 /* 8.3.27: DEVICE CONTROL STRING */ 2757 /* 8.3.27: DEVICE CONTROL STRING */
2691 case C1_DCS: /* ESC P */ 2758 case C1_DCS: /* ESC P */
2692 process_dcs_seq (); 2759 process_dcs_seq ();
2693 break; 2760 break;
… …
2726 } 2793 }
2727} 2794}
2728/*}}} */ 2795/*}}} */
2729 2796
2730/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2797/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2731/* *INDENT-OFF* */
2732enum { 2798enum {
2733 CSI_ICH = 0x40, 2799 CSI_ICH = 0x40,
2734 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2800 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2735 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2801 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2736 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2802 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
2739 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2805 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2740 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2806 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2741 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2807 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2742}; 2808};
2743 2809
2744#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2810#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2745 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2811 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2746 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2812 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2747#define get_byte_array_bit(array, bit) \ 2813#define get_byte_array_bit(array, bit) \
2748 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2814 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2749 2815
2750const unsigned char csi_defaults[] = 2816static const unsigned char csi_defaults[] =
2751 { 2817 {
2752 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2818 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2753 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2819 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2754 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2820 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2755 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2821 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2756 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2822 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2757 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2823 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2758 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2824 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2759 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2825 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2760 }; 2826 };
2761/* *INDENT-ON* */
2762 2827
2763void 2828void ecb_hot
2764rxvt_term::process_csi_seq () 2829rxvt_term::process_csi_seq ()
2765{ 2830{
2766 unicode_t ch, priv, i; 2831 unicode_t ch, priv, prev_ch, i;
2767 unsigned int nargs, p; 2832 unsigned int nargs, p;
2768 int n, ndef; 2833 int n, ndef;
2769 int arg[ESC_ARGS] = { }; 2834 int arg[ESC_ARGS] = { };
2770 2835
2771 nargs = 0; 2836 nargs = 0;
… …
2777 /* '<' '=' '>' '?' '!' */ 2842 /* '<' '=' '>' '?' '!' */
2778 priv = ch; 2843 priv = ch;
2779 ch = cmd_getc (); 2844 ch = cmd_getc ();
2780 } 2845 }
2781 2846
2847 prev_ch = 0;
2782 /* read any numerical arguments */ 2848 /* read any numerical arguments */
2783 for (n = -1; ch < CSI_ICH; ) 2849 for (n = -1; ch < CSI_ICH; )
2784 { 2850 {
2785 if (isdigit (ch)) 2851 if (isdigit (ch))
2786 { 2852 {
… …
2796 n = -1; 2862 n = -1;
2797 } 2863 }
2798 else if (IS_CONTROL (ch)) 2864 else if (IS_CONTROL (ch))
2799 process_nonprinting (ch); 2865 process_nonprinting (ch);
2800 2866
2867 prev_ch = ch;
2801 ch = cmd_getc (); 2868 ch = cmd_getc ();
2802 } 2869 }
2803 2870
2804 if (ch > CSI_7F) 2871 if (ch > CSI_7F)
2805 return; 2872 return;
… …
2844 { 2911 {
2845 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */ 2912 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2846 scr_soft_reset (); 2913 scr_soft_reset ();
2847 2914
2848 static const int pm_h[] = { 7, 25 }; 2915 static const int pm_h[] = { 7, 25 };
2849 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 }; 2916 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2850 2917
2851 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h); 2918 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2852 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l); 2919 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2853 } 2920 }
2854 break; 2921 break;
2855 } 2922 }
2856 2923
2857 return; 2924 return;
… …
2875 } 2942 }
2876 break; 2943 break;
2877#endif 2944#endif
2878 2945
2879 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2946 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2880 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2947 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2881 arg[0] = -arg[0]; 2948 arg[0] = -arg[0];
2882 /* FALLTHROUGH */ 2949 /* FALLTHROUGH */
2883 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2950 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2884 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2951 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2885 scr_gotorc (arg[0], 0, RELATIVE); 2952 scr_gotorc (arg[0], 0, RELATIVE);
2886 break; 2953 break;
2887 2954
2888 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2955 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2889 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2956 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3039 scr_insert_mode (1); 3106 scr_insert_mode (1);
3040 else if (arg[0] == 20) 3107 else if (arg[0] == 20)
3041 priv_modes |= PrivMode_LFNL; 3108 priv_modes |= PrivMode_LFNL;
3042 break; 3109 break;
3043 3110
3111 case CSI_71: // DESCUSR: set cursor style
3112 if (prev_ch == ' ')
3113 set_cursor_style (arg[0]);
3114 break;
3115
3044 /* 3116 /*
3045 * PRIVATE USE beyond this point. All CSI_7? sequences here 3117 * PRIVATE USE beyond this point. All CSI_7? sequences here
3046 */ 3118 */
3047 case CSI_72: /* DECSTBM: set top and bottom margins */ 3119 case CSI_72: /* DECSTBM: set top and bottom margins */
3048 if (nargs == 1) 3120 if (nargs == 1)
… …
3076 } 3148 }
3077} 3149}
3078/*}}} */ 3150/*}}} */
3079 3151
3080#if !ENABLE_MINIMAL 3152#if !ENABLE_MINIMAL
3081/* ARGSUSED */
3082void 3153void
3083rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3154rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3084{ 3155{
3085 int x, y; 3156 int x, y;
3086 XWindowAttributes wattr; 3157 XWindowAttributes wattr;
… …
3095 { 3166 {
3096 /* 3167 /*
3097 * commands 3168 * commands
3098 */ 3169 */
3099 case 1: /* deiconify window */ 3170 case 1: /* deiconify window */
3100 XMapWindow (dpy, parent[0]); 3171 XMapWindow (dpy, parent);
3101 break; 3172 break;
3102 case 2: /* iconify window */ 3173 case 2: /* iconify window */
3103 XIconifyWindow (dpy, parent[0], display->screen); 3174 XIconifyWindow (dpy, parent, display->screen);
3104 break; 3175 break;
3105 case 3: /* set position (pixels) */ 3176 case 3: /* set position (pixels) */
3106 XMoveWindow (dpy, parent[0], args[1], args[2]); 3177 XMoveWindow (dpy, parent, args[1], args[2]);
3107 break; 3178 break;
3108 case 4: /* set size (pixels) */ 3179 case 4: /* set size (pixels) */
3109 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3180 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3110 break; 3181 break;
3111 case 5: /* raise window */ 3182 case 5: /* raise window */
3112 XRaiseWindow (dpy, parent[0]); 3183 XRaiseWindow (dpy, parent);
3113 break; 3184 break;
3114 case 6: /* lower window */ 3185 case 6: /* lower window */
3115 XLowerWindow (dpy, parent[0]); 3186 XLowerWindow (dpy, parent);
3116 break; 3187 break;
3117 case 7: /* refresh window */ 3188 case 7: /* refresh window */
3118 scr_touch (true); 3189 scr_touch (true);
3119 break; 3190 break;
3120 case 8: /* set size (chars) */ 3191 case 8: /* set size (chars) */
… …
3123 break; 3194 break;
3124 3195
3125 //case 9: NYI, TODO, restore maximized window or maximize window 3196 //case 9: NYI, TODO, restore maximized window or maximize window
3126 default: 3197 default:
3127 if (args[0] >= 24) /* set height (chars) */ 3198 if (args[0] >= 24) /* set height (chars) */
3128 set_widthheight ((unsigned int)width, 3199 set_widthheight ((unsigned int)vt_width,
3129 (unsigned int) (args[1] * fheight)); 3200 (unsigned int) (args[1] * fheight));
3130 break; 3201 break;
3131 3202
3132 /* 3203 /*
3133 * reports - some output format copied from XTerm 3204 * reports - some output format copied from XTerm
3134 */ 3205 */
3135 case 11: /* report window state */ 3206 case 11: /* report window state */
3136 XGetWindowAttributes (dpy, parent[0], &wattr); 3207 XGetWindowAttributes (dpy, parent, &wattr);
3137 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3208 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3138 break; 3209 break;
3139 case 13: /* report window position */ 3210 case 13: /* report window position */
3140 XGetWindowAttributes (dpy, parent[0], &wattr); 3211 XGetWindowAttributes (dpy, parent, &wattr);
3141 XTranslateCoordinates (dpy, parent[0], wattr.root, 3212 XTranslateCoordinates (dpy, parent, wattr.root,
3142 -wattr.border_width, -wattr.border_width, 3213 -wattr.border_width, -wattr.border_width,
3143 &x, &y, &wdummy); 3214 &x, &y, &wdummy);
3144 tt_printf ("\033[3;%d;%dt", x, y); 3215 tt_printf ("\033[3;%d;%dt", x, y);
3145 break; 3216 break;
3146 case 14: /* report window size (pixels) */ 3217 case 14: /* report window size (pixels) */
3147 XGetWindowAttributes (dpy, parent[0], &wattr); 3218 XGetWindowAttributes (dpy, parent, &wattr);
3148 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3219 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3149 break; 3220 break;
3150 case 18: /* report text area size (chars) */ 3221 case 18: /* report text area size (chars) */
3151 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3222 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3152 break; 3223 break;
… …
3154 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3225 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3155 break; 3226 break;
3156 case 20: /* report icon label */ 3227 case 20: /* report icon label */
3157 { 3228 {
3158 char *s; 3229 char *s;
3159 XGetIconName (dpy, parent[0], &s); 3230 XGetIconName (dpy, parent, &s);
3160 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3231 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3161 XFree (s); 3232 XFree (s);
3162 } 3233 }
3163 break; 3234 break;
3164 case 21: /* report window title */ 3235 case 21: /* report window title */
3165 { 3236 {
3166 char *s; 3237 char *s;
3167 XFetchName (dpy, parent[0], &s); 3238 XFetchName (dpy, parent, &s);
3168 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3239 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3169 XFree (s); 3240 XFree (s);
3170 } 3241 }
3171 break; 3242 break;
3172 } 3243 }
… …
3182rxvt_term::get_to_st (unicode_t &ends_how) 3253rxvt_term::get_to_st (unicode_t &ends_how)
3183{ 3254{
3184 unicode_t ch; 3255 unicode_t ch;
3185 bool seen_esc = false; 3256 bool seen_esc = false;
3186 unsigned int n = 0; 3257 unsigned int n = 0;
3187 wchar_t string[STRING_MAX]; 3258 wchar_t string[CBUFSIZ];
3188 3259
3189 while ((ch = cmd_getc ()) != NOCHAR) 3260 while ((ch = cmd_getc ()) != NOCHAR)
3190 { 3261 {
3191 if (seen_esc) 3262 if (seen_esc)
3192 { 3263 {
… …
3207 else if (ch < 0x20) 3278 else if (ch < 0x20)
3208 return NULL; /* other control character - exit */ 3279 return NULL; /* other control character - exit */
3209 3280
3210 seen_esc = false; 3281 seen_esc = false;
3211 3282
3212 if (n >= STRING_MAX - 1) 3283 if (n >= sizeof (string) - 1)
3213 // stop at some sane length 3284 // stop at some sane length
3214 return NULL; 3285 return NULL;
3215 3286
3216 string[n++] = ch; 3287 string[n++] = ch;
3217 } 3288 }
… …
3326 unsigned long bytes_after; 3397 unsigned long bytes_after;
3327 unsigned char *value = 0; 3398 unsigned char *value = 0;
3328 const char *str = ""; 3399 const char *str = "";
3329 3400
3330 if (prop 3401 if (prop
3331 && XGetWindowProperty (dpy, parent[0], 3402 && XGetWindowProperty (dpy, parent,
3332 prop, 0, 1<<16, 0, AnyPropertyType, 3403 prop, 0, 1<<16, 0, AnyPropertyType,
3333 &actual_type, &actual_format, 3404 &actual_type, &actual_format,
3334 &nitems, &bytes_after, &value) == Success 3405 &nitems, &bytes_after, &value) == Success
3335 && actual_type != None 3406 && actual_type != None
3336 && actual_format == 8) 3407 && actual_format == 8)
3337 str = (const char *)(value); 3408 str = (const char *)(value);
3338 3409
3339 tt_printf ("\033]%d;%s%c", op, str, resp); 3410 tt_printf ("\033]%d;%s%c", op, option (Opt_insecure) ? str : "", resp);
3340 3411
3341 XFree (value); 3412 XFree (value);
3342 } 3413 }
3343 else 3414 else
3344 { 3415 {
… …
3348 { 3419 {
3349 *eq = 0; 3420 *eq = 0;
3350 set_utf8_property (display->atom (str), eq + 1); 3421 set_utf8_property (display->atom (str), eq + 1);
3351 } 3422 }
3352 else 3423 else
3353 XDeleteProperty (dpy, parent[0], 3424 XDeleteProperty (dpy, parent,
3354 display->atom (str)); 3425 display->atom (str));
3355 } 3426 }
3356 break; 3427 break;
3357 3428
3358 case XTerm_Color: 3429 case XTerm_Color:
… …
3412 break; 3483 break;
3413#endif 3484#endif
3414 case URxvt_Color_border: 3485 case URxvt_Color_border:
3415 process_color_seq (op, Color_border, str, resp); 3486 process_color_seq (op, Color_border, str, resp);
3416 break; 3487 break;
3417#if ENABLE_TRANSPARENCY 3488
3489#if BG_IMAGE_FROM_ROOT
3418 case URxvt_Color_tint: 3490 case URxvt_Color_tint:
3419 process_color_seq (op, Color_tint, str, resp); 3491 process_color_seq (op, Color_tint, str, resp);
3420 { 3492 {
3421 bool changed = false; 3493 bool changed = false;
3422 3494
3423 if (ISSET_PIXCOLOR (Color_tint)) 3495 if (ISSET_PIXCOLOR (Color_tint))
3424 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3496 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3425 else
3426 changed = bgPixmap.unset_tint ();
3427 3497
3428 if (changed) 3498 if (changed)
3429 update_background (); 3499 update_background ();
3430 } 3500 }
3431 3501
… …
3435#if BG_IMAGE_FROM_FILE 3505#if BG_IMAGE_FROM_FILE
3436 case Rxvt_Pixmap: 3506 case Rxvt_Pixmap:
3437 if (!strcmp (str, "?")) 3507 if (!strcmp (str, "?"))
3438 { 3508 {
3439 char str[256]; 3509 char str[256];
3510 int h_scale = fimage.h_scale;
3511 int v_scale = fimage.v_scale;
3512 int h_align = fimage.h_align;
3513 int v_align = fimage.v_align;
3440 3514
3441 sprintf (str, "[%dx%d+%d+%d]", 3515 sprintf (str, "[%dx%d+%d+%d]",
3442 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3516 h_scale, v_scale,
3443 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3517 h_align, v_align);
3444 process_xterm_seq (XTerm_title, str, CHAR_ST); 3518 process_xterm_seq (XTerm_title, str, CHAR_ST);
3445 } 3519 }
3446 else 3520 else
3447 { 3521 {
3448 int changed = 0; 3522 bool changed = false;
3449 3523
3450 if (*str != ';') 3524 if (*str != ';')
3451 { 3525 {
3452 /* reset to default scaling :*/ 3526 try
3453 bgPixmap.unset_geometry (); 3527 {
3454 if (bgPixmap.set_file (str)) /* change pixmap */ 3528 fimage.set_file_geometry (this, str);
3455 changed++; 3529 changed = true;
3456 str = strchr (str, ';'); 3530 }
3457 if (str == NULL) 3531 catch (const class rxvt_failure_exception &e)
3458 bgPixmap.set_defaultGeometry (); 3532 {
3533 }
3459 } 3534 }
3460 3535 else
3461 while (str)
3462 { 3536 {
3463 str++; 3537 str++;
3464 if (bgPixmap.set_geometry (str)) 3538 if (fimage.set_geometry (str, true))
3465 changed++; 3539 changed = true;
3466 str = strchr (str, ';');
3467 } 3540 }
3468 3541
3469 if (changed) 3542 if (changed)
3543 {
3544 if (bg_window_position_sensitive ())
3545 {
3546 int x, y;
3547 get_window_origin (x, y);
3548 parent_x = x;
3549 parent_y = y;
3550 }
3470 update_background (); 3551 update_background ();
3552 }
3471 } 3553 }
3472 break; 3554 break;
3473#endif 3555#endif
3474 3556
3475 case XTerm_logfile: 3557 case XTerm_logfile:
… …
3562 * 's' = save 3644 * 's' = save
3563 * 'r' = restore 3645 * 'r' = restore
3564 * 't' = toggle 3646 * 't' = toggle
3565 * so no need for fancy checking 3647 * so no need for fancy checking
3566 */ 3648 */
3567int 3649int ecb_cold
3568rxvt_term::privcases (int mode, unsigned long bit) 3650rxvt_term::privcases (int mode, unsigned long bit)
3569{ 3651{
3570 int state; 3652 int state;
3571 3653
3572 if (mode == 's') 3654 if (mode == 's')
3573 { 3655 {
3574 SavedModes |= (priv_modes & bit); 3656 if (priv_modes & bit)
3657 SavedModes |= bit;
3658 else
3659 SavedModes &= ~bit;
3575 return -1; 3660 return -1;
3576 } 3661 }
3577 else 3662 else
3578 { 3663 {
3579 if (mode == 'r') 3664 if (mode == 'r')
3580 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3665 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3581 else 3666 else
3582 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3667 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3583 3668
3584 set_privmode (bit, state); 3669 if (state)
3670 priv_modes |= bit;
3671 else
3672 priv_modes &= ~bit;
3585 } 3673 }
3586 3674
3587 return state; 3675 return state;
3588} 3676}
3589 3677
3590/* we're not using priv _yet_ */ 3678/* we're not using priv _yet_ */
3591void 3679void
3592rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3680rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3593{ 3681{
3594 unsigned int i, j; 3682 unsigned int i, j;
3595 int state; 3683 int state;
3596 3684
3597 static const struct 3685 static const struct
3598 { 3686 {
3599 const int argval; 3687 const int argval;
3600 const unsigned long bit; 3688 const unsigned long bit;
3601 } argtopriv[] = { 3689 } argtopriv[] = {
3602 { 1, PrivMode_aplCUR }, // DECCKM 3690 { 1, PrivMode_aplCUR }, // DECCKM
3603 { 2, PrivMode_vt52 }, 3691 { 2, PrivMode_vt52 }, // DECANM
3604 { 3, PrivMode_132 }, // DECCOLM 3692 { 3, PrivMode_132 }, // DECCOLM
3605 { 4, PrivMode_smoothScroll }, // DECSCLM 3693 { 4, PrivMode_smoothScroll }, // DECSCLM
3606 { 5, PrivMode_rVideo }, // DECSCNM 3694 { 5, PrivMode_rVideo }, // DECSCNM
3607 { 6, PrivMode_relOrigin }, // DECOM 3695 { 6, PrivMode_relOrigin }, // DECOM
3608 { 7, PrivMode_Autowrap }, // DECAWM 3696 { 7, PrivMode_Autowrap }, // DECAWM
3609 // 8, auto-repeat keys // DECARM 3697 // 8, auto-repeat keys // DECARM
3610 { 9, PrivMode_MouseX10 }, 3698 { 9, PrivMode_MouseX10 },
3611 // 18 end FF to printer after print screen 3699 // 18 end FF to printer after print screen
3612 // 19 Print screen prints full screen/scroll region 3700 // 19 Print screen prints full screen/scroll region
3613 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis 3701 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3614#ifdef scrollBar_esc 3702#ifdef scrollBar_esc
3615 { scrollBar_esc, PrivMode_scrollBar }, 3703 { scrollBar_esc, PrivMode_scrollBar },
3616#endif 3704#endif
3617 { 35, PrivMode_ShiftKeys }, // rxvt extension 3705 { 35, PrivMode_ShiftKeys }, // rxvt extension
3618 // 38, tektronix mode // DECTEK 3706 // 38, tektronix mode // DECTEK
3619 { 40, PrivMode_132OK }, 3707 { 40, PrivMode_132OK },
3620 // 41 xterm more fixes NYI 3708 // 41 xterm more fixes NYI
3621 // 45 margin bell NYI 3709 // 45 margin bell NYI
3622 // 46 start logging 3710 // 46 start logging
3623 { 47, PrivMode_Screen }, 3711 { 47, PrivMode_Screen },
3624 { 66, PrivMode_aplKP }, // DECPAM/DECPNM 3712 { 66, PrivMode_aplKP }, // DECNKM
3625#ifndef NO_BACKSPACE_KEY 3713#ifndef NO_BACKSPACE_KEY
3626 { 67, PrivMode_BackSpace }, // DECBKM 3714 { 67, PrivMode_BackSpace }, // DECBKM
3627#endif 3715#endif
3628 { 1000, PrivMode_MouseX11 }, 3716 { 1000, PrivMode_MouseX11 },
3629 { 1002, PrivMode_MouseBtnEvent }, 3717 { 1002, PrivMode_MouseBtnEvent },
3630 { 1003, PrivMode_MouseAnyEvent }, 3718 { 1003, PrivMode_MouseAnyEvent },
3719#if ENABLE_FRILLS
3720 { 1005, PrivMode_ExtModeMouse },
3721#endif
3631 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3722 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3632 { 1011, PrivMode_Keypress }, // rxvt extension 3723 { 1011, PrivMode_Keypress }, // rxvt extension
3724#if ENABLE_FRILLS
3725 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3726#endif
3633 // 1035 enable modifiers for alt, numlock NYI 3727 // 1035 enable modifiers for alt, numlock NYI
3634 // 1036 send ESC for meta keys NYI 3728 // 1036 send ESC for meta keys NYI
3635 // 1037 send DEL for keypad delete NYI 3729 // 1037 send DEL for keypad delete NYI
3636 { 1047, PrivMode_Screen }, 3730 { 1047, PrivMode_Screen },
3637 // 1048 save and restore cursor 3731 // 1048 save and restore cursor, implemented in code
3638 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3732 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3639 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3733 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3640 { 2004, PrivMode_BracketPaste }, 3734 { 2004, PrivMode_BracketPaste },
3641 }; 3735 };
3642 3736
… …
3652 for (i = 0; i < nargs; i++) 3746 for (i = 0; i < nargs; i++)
3653 { 3747 {
3654 state = -1; 3748 state = -1;
3655 3749
3656 /* basic handling */ 3750 /* basic handling */
3657 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3751 for (j = 0; j < ecb_array_length (argtopriv); j++)
3658 if (argtopriv[j].argval == arg[i]) 3752 if (argtopriv[j].argval == arg[i])
3659 { 3753 {
3660 state = privcases (mode, argtopriv[j].bit); 3754 state = privcases (mode, argtopriv[j].bit);
3661 break; 3755 break;
3662 } 3756 }
… …
3688 case 2: /* VT52 mode */ 3782 case 2: /* VT52 mode */
3689 /* oddball mode. should be set regardless of set/reset 3783 /* oddball mode. should be set regardless of set/reset
3690 * parameter. Return from VT52 mode with an ESC < from 3784 * parameter. Return from VT52 mode with an ESC < from
3691 * within VT52 mode 3785 * within VT52 mode
3692 */ 3786 */
3693 set_privmode (PrivMode_vt52, 1); 3787 priv_modes |= PrivMode_vt52;
3694 break; 3788 break;
3695 case 3: /* 80/132 */ 3789 case 3: /* 80/132 */
3696 if (priv_modes & PrivMode_132OK) 3790 if (priv_modes & PrivMode_132OK)
3697 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight); 3791 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3698 break; 3792 break;
… …
3713 if (state) /* orthogonal */ 3807 if (state) /* orthogonal */
3714 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3808 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3715 break; 3809 break;
3716#ifdef scrollBar_esc 3810#ifdef scrollBar_esc
3717 case scrollBar_esc: 3811 case scrollBar_esc:
3718 if (scrollBar.map (state)) 3812 scrollBar.map (state);
3719 {
3720 resize_all_windows (0, 0, 0); 3813 resize_all_windows (0, 0, 0);
3721 scr_touch (true); 3814 scr_touch (true);
3722 }
3723 break; 3815 break;
3724#endif 3816#endif
3725 case 25: /* visible/invisible cursor */ 3817 case 25: /* visible/invisible cursor */
3726 scr_cursor_visible (state); 3818 scr_cursor_visible (state);
3727 break; 3819 break;
… …
3740 case 1003: 3832 case 1003:
3741 if (state) 3833 if (state)
3742 { 3834 {
3743 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3835 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3744 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3836 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3837 mouse_row = mouse_col = 0;
3745 vt_emask_mouse = PointerMotionMask; 3838 vt_emask_mouse = PointerMotionMask;
3746 } 3839 }
3747 else 3840 else
3748 vt_emask_mouse = NoEventMask; 3841 vt_emask_mouse = NoEventMask;
3749 3842
… …
3781 } 3874 }
3782} 3875}
3783/*}}} */ 3876/*}}} */
3784 3877
3785/*{{{ process sgr sequences */ 3878/*{{{ process sgr sequences */
3786void 3879void ecb_hot
3787rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3880rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3788{ 3881{
3789 unsigned int i; 3882 unsigned int i;
3790 short rendset; 3883 short rendset;
3791 int rendstyle; 3884 int rendstyle;
… …
3932 break; 4025 break;
3933#endif 4026#endif
3934 } 4027 }
3935 } 4028 }
3936} 4029}
4030
4031void
4032rxvt_term::set_cursor_style (int style)
4033{
4034 if (!IN_RANGE_INC (style, 0, 4))
4035 return;
4036
4037 set_option (Opt_cursorUnderline, style >= 3);
4038
4039#ifdef CURSOR_BLINK
4040 set_option (Opt_cursorBlink, !style || (style & 1));
4041 cursor_blink_reset ();
4042#endif
4043
4044 want_refresh = 1;
4045}
3937/*}}} */ 4046/*}}} */
3938 4047
3939/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3940void
3941rxvt_term::process_graphics ()
3942{
3943 unicode_t ch, cmd = cmd_getc ();
3944
3945 if (cmd == 'Q')
3946 {
3947 /* query graphics */
3948 tt_printf ("\033G0\012"); /* no graphics */
3949 return;
3950 }
3951 /* swallow other graphics sequences until terminating ':' */
3952 do
3953 ch = cmd_getc ();
3954 while (ch != ':');
3955}
3956/*}}} */
3957
3958/* ------------------------------------------------------------------------- */ 4048/* ---------------------------------------------------------------------- */
4049/* Write data to the pty as typed by the user, pasted with the mouse,
4050 * or generated by us in response to a query ESC sequence.
4051 */
3959 4052
3960/* 4053/*
3961 * Send printf () formatted output to the command. 4054 * Send printf () formatted output to the command.
3962 * Only use for small amounts of data. 4055 * Only use for small amounts of data.
3963 */ 4056 */
… …
3971 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4064 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3972 va_end (arg_ptr); 4065 va_end (arg_ptr);
3973 tt_write (buf, strlen (buf)); 4066 tt_write (buf, strlen (buf));
3974} 4067}
3975 4068
3976/* ---------------------------------------------------------------------- */
3977/* Write data to the pty as typed by the user, pasted with the mouse, 4069/* Write data to the pty as typed by the user. */
3978 * or generated by us in response to a query ESC sequence. 4070void
3979 */ 4071rxvt_term::tt_write_user_input (const char *data, unsigned int len)
3980const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4072{
4073 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4074 return;
4075
4076 if (option (Opt_scrollTtyKeypress))
4077 if (view_start)
4078 {
4079 view_start = 0;
4080 want_refresh = 1;
4081 }
4082
4083 tt_write_ (data, len);
4084}
3981 4085
3982void 4086void
3983rxvt_term::tt_write (const char *data, unsigned int len) 4087rxvt_term::tt_write (const char *data, unsigned int len)
3984{ 4088{
3985 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4089 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3986 return; 4090 return;
3987 4091
4092 tt_write_ (data, len);
4093}
4094
4095static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4096
4097void
4098rxvt_term::tt_write_ (const char *data, unsigned int len)
4099{
3988 if (pty->pty < 0) 4100 if (pty->pty < 0)
3989 return; 4101 return;
3990 4102
3991 if (v_buflen == 0) 4103 if (v_buflen == 0)
3992 { 4104 {
3993 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4105 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3994 4106
4107 max_it (written, 0);
4108
3995 if ((unsigned int)written == len) 4109 if (written == len)
3996 return; 4110 return;
3997 4111
3998 data += written; 4112 data += written;
3999 len -= written; 4113 len -= written;
4000 } 4114 }
4001 4115
4002 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4116 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
4003 4117
4004 memcpy (v_buffer + v_buflen, data, len); 4118 memcpy (v_buffer + v_buflen, data, len);
4005 v_buflen += len; 4119 v_buflen += len;
4006 4120
4007 pty_ev.set (ev::READ | ev::WRITE); 4121 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

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