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.473 by sf-exg, Thu Jan 27 17:37:19 2011 UTC vs.
Revision 1.552 by sf-exg, Fri Jul 25 17:03:38 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 = NoSymbol;
409 int valid_keysym;
410 char kbuf[KBUFSZ]; 419 char rkbuf[KBUFSZ + 1];
420 char *kbuf = rkbuf + 1;
411 421
412#if ISO_14755 422#if ISO_14755
413 if (iso14755buf & ISO_14755_52) 423 if (iso14755buf & ISO_14755_52)
414 return; 424 return;
415#endif 425#endif
… …
424 ctrl = ev.state & ControlMask; 434 ctrl = ev.state & ControlMask;
425 meta = ev.state & ModMetaMask; 435 meta = ev.state & ModMetaMask;
426 436
427 kbuf[0] = 0; 437 kbuf[0] = 0;
428 438
429#ifdef USE_XIM 439#if USE_XIM
430 if (Input_Context) 440 if (Input_Context)
431 { 441 {
432 Status status_return; 442 Status status_return;
433 443
434#if 0 444#if 0
… …
472 } 482 }
473 } 483 }
474 else 484 else
475 len = 0; 485 len = 0;
476 } 486 }
477
478 valid_keysym = status_return == XLookupKeySym
479 || status_return == XLookupBoth;
480 } 487 }
481 else 488 else
482#endif 489#endif
483 { 490 {
484 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose); 491 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
485 valid_keysym = keysym != NoSymbol; 492 }
493
494 if (keysym != NoSymbol)
486 } 495 {
496 KeySym orig_keysym = keysym;
487 497
488 if (valid_keysym) 498 /* Shift + F1 - F10 generates F11 - F20 */
499 if (shft && keysym >= XK_F1 && keysym <= XK_F10)
500 {
501 keysym += (XK_F11 - XK_F1);
502 shft = 0; /* turn off Shift */
503 }
504
505 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
506 {
507 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
508 unsigned int newlen = 1;
509
510 if (ev.state & ModNumLockMask)
511 kp = false;
512
513 keysym = translate_keypad (keysym, kp);
514
515 switch (keysym)
516 {
517#ifndef NO_BACKSPACE_KEY
518 case XK_BackSpace:
519 if (priv_modes & PrivMode_HaveBackSpace)
520 {
521 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
522 ^ !!ctrl) ? '\b' : '\177';
523 kbuf[1] = '\0';
524 }
525 else
526 strcpy (kbuf, rs[Rs_backspace_key]);
527 break;
528#endif
529#ifndef NO_DELETE_KEY
530 case XK_Delete:
531 strcpy (kbuf, rs[Rs_delete_key]);
532 break;
533#endif
534 case XK_Tab:
535 if (shft)
536 strcpy (kbuf, "\033[Z");
537 else
538 {
539#ifdef CTRL_TAB_MAKES_META
540 if (ctrl)
541 meta = 1;
542#endif
543#ifdef MOD4_TAB_MAKES_META
544 if (ev.state & Mod4Mask)
545 meta = 1;
546#endif
547 newlen = 0;
548 }
549 break;
550
551 case XK_Up: /* "\033[A" */
552 case XK_Down: /* "\033[B" */
553 case XK_Right: /* "\033[C" */
554 case XK_Left: /* "\033[D" */
555 strcpy (kbuf, "\033[Z");
556 kbuf[2] = "DACB"[keysym - XK_Left];
557 /* do Shift first */
558 if (shft)
559 kbuf[2] = "dacb"[keysym - XK_Left];
560 else if (ctrl)
561 {
562 kbuf[1] = 'O';
563 kbuf[2] = "dacb"[keysym - XK_Left];
564 }
565 else if (priv_modes & PrivMode_aplCUR)
566 kbuf[1] = 'O';
567 break;
568
569 case XK_KP_Enter:
570 /* allow shift to override */
571 if (kp)
572 {
573 strcpy (kbuf, "\033OM");
574 break;
575 }
576
577 /* FALLTHROUGH */
578
579 case XK_Return:
580 if (priv_modes & PrivMode_LFNL)
581 {
582 kbuf[0] = '\015';
583 kbuf[1] = '\012';
584 kbuf[2] = '\0';
585 }
586 else
587 {
588 kbuf[0] = '\015';
589 kbuf[1] = '\0';
590 }
591 break;
592
593 case XK_KP_F1: /* "\033OP" */
594 case XK_KP_F2: /* "\033OQ" */
595 case XK_KP_F3: /* "\033OR" */
596 case XK_KP_F4: /* "\033OS" */
597 strcpy (kbuf, "\033OP");
598 kbuf[2] += (keysym - XK_KP_F1);
599 break;
600
601 case XK_KP_Multiply: /* "\033Oj" : "*" */
602 case XK_KP_Add: /* "\033Ok" : "+" */
603 case XK_KP_Separator: /* "\033Ol" : "," */
604 case XK_KP_Subtract: /* "\033Om" : "-" */
605 case XK_KP_Decimal: /* "\033On" : "." */
606 case XK_KP_Divide: /* "\033Oo" : "/" */
607 case XK_KP_0: /* "\033Op" : "0" */
608 case XK_KP_1: /* "\033Oq" : "1" */
609 case XK_KP_2: /* "\033Or" : "2" */
610 case XK_KP_3: /* "\033Os" : "3" */
611 case XK_KP_4: /* "\033Ot" : "4" */
612 case XK_KP_5: /* "\033Ou" : "5" */
613 case XK_KP_6: /* "\033Ov" : "6" */
614 case XK_KP_7: /* "\033Ow" : "7" */
615 case XK_KP_8: /* "\033Ox" : "8" */
616 case XK_KP_9: /* "\033Oy" : "9" */
617 /* allow shift to override */
618 if (kp)
619 {
620 strcpy (kbuf, "\033Oj");
621 kbuf[2] += (keysym - XK_KP_Multiply);
622 }
623 else
624 {
625 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
626 kbuf[1] = '\0';
627 }
628 break;
629
630 default:
631 {
632 int param = map_function_key (keysym);
633 if (param > 0)
634 sprintf (kbuf,"\033[%d~", param);
635 else
636 newlen = 0;
637 }
638 break;
639 }
640
641 if (newlen)
642 len = strlen (kbuf);
643
644 if (len > 0)
645 {
646 /*
647 * pass Shift/Control indicators for function keys ending with `~'
648 *
649 * eg,
650 * Prior = "ESC[5~"
651 * Shift+Prior = "ESC[5$"
652 * Ctrl+Prior = "ESC[5^"
653 * Ctrl+Shift+Prior = "ESC[5@"
654 */
655 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
656 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
657
658 /*
659 * Pass meta for all function keys, if 'meta' option set
660 */
661#ifdef META8_OPTION
662 if (meta && (meta_char == 0x80))
663 kbuf[len - 1] |= 0x80;
664#endif
665 }
666
667 }
668 else if (ctrl && keysym == XK_minus)
669 {
670 len = 1;
671 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
672 }
673 else if (keysym == XK_ISO_Left_Tab)
674 {
675 strcpy (kbuf, "\033[Z");
676 len = 3;
677 }
678 else
679 {
680#ifdef META8_OPTION
681 /* set 8-bit on */
682 if (meta && (meta_char == 0x80))
683 {
684 char *ch;
685
686 for (ch = kbuf; ch < kbuf + len; ch++)
687 *ch |= 0x80;
688
689 meta = 0;
690 }
691#endif
692 /* nil */ ;
693 }
694
695 keysym = orig_keysym;
696 }
697
698 /* escape prefix */
699 if (len && meta
700#ifdef META8_OPTION
701 && meta_char == C0_ESC
702#endif
703 )
704 {
705 *--kbuf = C0_ESC;
706 len++;
707 }
708
709 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
710 return;
711
712 if (keysym != NoSymbol)
489 { 713 {
490#ifdef KEYSYM_RESOURCE 714#ifdef KEYSYM_RESOURCE
491 if (keyboard->dispatch (this, keysym, ev.state)) 715 if (keyboard->dispatch (this, keysym, ev.state, kbuf, len))
492 return; 716 return;
493#endif 717#endif
494 718
495 if (saveLines) 719 if (saveLines)
496 { 720 {
… …
509#endif 733#endif
510 max_it (lnsppg, 1); 734 max_it (lnsppg, 1);
511 735
512 if (keysym == XK_Prior) 736 if (keysym == XK_Prior)
513 { 737 {
514 scr_page (UP, lnsppg); 738 scr_page (lnsppg);
515 return; 739 return;
516 } 740 }
517 else if (keysym == XK_Next) 741 else if (keysym == XK_Next)
518 { 742 {
519 scr_page (DN, lnsppg); 743 scr_page (-lnsppg);
520 return; 744 return;
521 } 745 }
522 } 746 }
523#ifdef SCROLL_ON_UPDOWN_KEYS 747#ifdef SCROLL_ON_UPDOWN_KEYS
524 if (IS_SCROLL_MOD) 748 if (IS_SCROLL_MOD)
525 { 749 {
526 if (keysym == XK_Up) 750 if (keysym == XK_Up)
527 { 751 {
528 scr_page (UP, 1); 752 scr_page (1);
529 return; 753 return;
530 } 754 }
531 else if (keysym == XK_Down) 755 else if (keysym == XK_Down)
532 { 756 {
533 scr_page (DN, 1); 757 scr_page (-1);
534 return; 758 return;
535 } 759 }
536 } 760 }
537#endif 761#endif
538#ifdef SCROLL_ON_HOMEEND_KEYS 762#ifdef SCROLL_ON_HOMEEND_KEYS
539 if (IS_SCROLL_MOD) 763 if (IS_SCROLL_MOD)
540 { 764 {
541 if (keysym == XK_Home) 765 if (keysym == XK_Home)
542 { 766 {
543 scr_move_to (0, 1); 767 scr_changeview (top_row);
544 return; 768 return;
545 } 769 }
546 else if (keysym == XK_End) 770 else if (keysym == XK_End)
547 { 771 {
548 scr_move_to (1, 1); 772 scr_changeview (0);
549 return; 773 return;
550 } 774 }
551 } 775 }
552#endif 776#endif
553 } 777 }
554 778
555 if (shft) 779 if (shft)
556 { 780 {
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)) 781 if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
564 { 782 {
565 switch (keysym) 783 switch (keysym)
566 { 784 {
567 /* normal XTerm key bindings */ 785 /* normal XTerm key bindings */
568 case XK_Insert: /* Shift+Insert = paste mouse selection */ 786 case XK_Insert: /* Shift+Insert = paste mouse selection */
569 selection_request (ev.time); 787 selection_request (ev.time);
570 return; 788 return;
571#if TODO 789#if TODO
572 /* rxvt extras */ 790 /* rxvt extras */
573 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 791 case XK_KP_Add: /* Shift+KP_Add = bigger font */
574 change_font (FONT_UP);
575 return; 792 return;
576 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 793 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
577 change_font (FONT_DN);
578 return; 794 return;
579#endif 795#endif
580 } 796 }
581 } 797 }
798 }
799
800 if (ctrl && meta && (keysym == XK_c || keysym == XK_v))
801 {
802 if (keysym == XK_v)
803 selection_request (ev.time, Sel_Clipboard);
804 else if (selection.len > 0)
805 {
806 free (selection.clip_text);
807 selection.clip_text = rxvt_wcsdup (selection.text, selection.len);
808 selection.clip_len = selection.len;
809 selection_grab (CurrentTime, true);
810 }
811
812 return;
582 } 813 }
583 814
584#if ENABLE_FRILLS || ISO_14755 815#if ENABLE_FRILLS || ISO_14755
585 // ISO 14755 support 816 // ISO 14755 support
586 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51)) 817 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
… …
641 { 872 {
642 scr_printscreen (ctrl | shft); 873 scr_printscreen (ctrl | shft);
643 return; 874 return;
644 } 875 }
645#endif 876#endif
646
647 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
648 {
649 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
650 unsigned int newlen = 1;
651
652 if (ev.state & ModNumLockMask)
653 kp = false;
654
655 keysym = translate_keypad (keysym, kp);
656
657 switch (keysym)
658 {
659#ifndef NO_BACKSPACE_KEY
660 case XK_BackSpace:
661 if (priv_modes & PrivMode_HaveBackSpace)
662 {
663 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
664 ^ !!ctrl) ? '\b' : '\177';
665 kbuf[1] = '\0';
666 }
667 else
668 strcpy (kbuf, rs[Rs_backspace_key]);
669 break;
670#endif
671#ifndef NO_DELETE_KEY
672 case XK_Delete:
673 strcpy (kbuf, rs[Rs_delete_key]);
674 break;
675#endif
676 case XK_Tab:
677 if (shft)
678 strcpy (kbuf, "\033[Z");
679 else
680 {
681#ifdef CTRL_TAB_MAKES_META
682 if (ctrl)
683 meta = 1;
684#endif
685#ifdef MOD4_TAB_MAKES_META
686 if (ev.state & Mod4Mask)
687 meta = 1;
688#endif
689 newlen = 0;
690 }
691 break;
692
693 case XK_Up: /* "\033[A" */
694 case XK_Down: /* "\033[B" */
695 case XK_Right: /* "\033[C" */
696 case XK_Left: /* "\033[D" */
697 strcpy (kbuf, "\033[Z");
698 kbuf[2] = "DACB"[keysym - XK_Left];
699 /* do Shift first */
700 if (shft)
701 kbuf[2] = "dacb"[keysym - XK_Left];
702 else if (ctrl)
703 {
704 kbuf[1] = 'O';
705 kbuf[2] = "dacb"[keysym - XK_Left];
706 }
707 else if (priv_modes & PrivMode_aplCUR)
708 kbuf[1] = 'O';
709 break;
710
711 case XK_KP_Enter:
712 /* allow shift to override */
713 if (kp)
714 {
715 strcpy (kbuf, "\033OM");
716 break;
717 }
718
719 /* FALLTHROUGH */
720
721 case XK_Return:
722 if (priv_modes & PrivMode_LFNL)
723 {
724 kbuf[0] = '\015';
725 kbuf[1] = '\012';
726 kbuf[2] = '\0';
727 }
728 else
729 {
730 kbuf[0] = '\015';
731 kbuf[1] = '\0';
732 }
733 break;
734
735 case XK_KP_F1: /* "\033OP" */
736 case XK_KP_F2: /* "\033OQ" */
737 case XK_KP_F3: /* "\033OR" */
738 case XK_KP_F4: /* "\033OS" */
739 strcpy (kbuf, "\033OP");
740 kbuf[2] += (keysym - XK_KP_F1);
741 break;
742
743 case XK_KP_Multiply: /* "\033Oj" : "*" */
744 case XK_KP_Add: /* "\033Ok" : "+" */
745 case XK_KP_Separator: /* "\033Ol" : "," */
746 case XK_KP_Subtract: /* "\033Om" : "-" */
747 case XK_KP_Decimal: /* "\033On" : "." */
748 case XK_KP_Divide: /* "\033Oo" : "/" */
749 case XK_KP_0: /* "\033Op" : "0" */
750 case XK_KP_1: /* "\033Oq" : "1" */
751 case XK_KP_2: /* "\033Or" : "2" */
752 case XK_KP_3: /* "\033Os" : "3" */
753 case XK_KP_4: /* "\033Ot" : "4" */
754 case XK_KP_5: /* "\033Ou" : "5" */
755 case XK_KP_6: /* "\033Ov" : "6" */
756 case XK_KP_7: /* "\033Ow" : "7" */
757 case XK_KP_8: /* "\033Ox" : "8" */
758 case XK_KP_9: /* "\033Oy" : "9" */
759 /* allow shift to override */
760 if (kp)
761 {
762 strcpy (kbuf, "\033Oj");
763 kbuf[2] += (keysym - XK_KP_Multiply);
764 }
765 else
766 {
767 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
768 kbuf[1] = '\0';
769 }
770 break;
771
772 default:
773 {
774 int param = map_function_key (keysym);
775 if (param > 0)
776 sprintf (kbuf,"\033[%d~", param);
777 else
778 newlen = 0;
779 }
780 break;
781 }
782
783 if (newlen)
784 len = strlen (kbuf);
785
786 /*
787 * Pass meta for all function keys, if 'meta' option set
788 */
789#ifdef META8_OPTION
790 if (meta && (meta_char == 0x80) && len > 0)
791 kbuf[len - 1] |= 0x80;
792#endif
793
794 }
795 else if (ctrl && keysym == XK_minus)
796 {
797 len = 1;
798 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
799 }
800 else if (keysym == XK_ISO_Left_Tab)
801 {
802 strcpy (kbuf, "\033[Z");
803 len = 3;
804 }
805 else
806 {
807#ifdef META8_OPTION
808 /* set 8-bit on */
809 if (meta && (meta_char == 0x80))
810 {
811 char *ch;
812
813 for (ch = kbuf; ch < kbuf + len; ch++)
814 *ch |= 0x80;
815
816 meta = 0;
817 }
818#endif
819 /* nil */ ;
820 }
821 } 877 }
822
823 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
824 return;
825 878
826 if (len <= 0) 879 if (len <= 0)
827 return; /* not mapped */ 880 return; /* not mapped */
828 881
829 if (option (Opt_scrollTtyKeypress))
830 if (view_start)
831 {
832 view_start = 0;
833 want_refresh = 1;
834 }
835
836 /*
837 * these modifications only affect the static keybuffer
838 * pass Shift/Control indicators for function keys ending with `~'
839 *
840 * eg,
841 * Prior = "ESC[5~"
842 * Shift+Prior = "ESC[5$"
843 * Ctrl+Prior = "ESC[5^"
844 * Ctrl+Shift+Prior = "ESC[5@"
845 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
846 */
847 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
848 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
849
850 /* escape prefix */
851 if (meta
852#ifdef META8_OPTION
853 && meta_char == C0_ESC
854#endif
855 )
856 {
857 const char ch = C0_ESC;
858 tt_write (&ch, 1);
859 }
860
861 tt_write (kbuf, (unsigned int)len); 882 tt_write_user_input (kbuf, (unsigned int)len);
862} 883}
863 884
864void 885void ecb_cold
865rxvt_term::key_release (XKeyEvent &ev) 886rxvt_term::key_release (XKeyEvent &ev)
866{ 887{
867#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL 888#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
868 KeySym keysym; 889 KeySym keysym;
869 890
… …
936 else if (keysym == XK_Control_L || keysym == XK_Control_R) 957 else if (keysym == XK_Control_L || keysym == XK_Control_R)
937 mouse_slip_wheel_speed = 0; 958 mouse_slip_wheel_speed = 0;
938#endif 959#endif
939} 960}
940 961
941#if defined (KEYSYM_RESOURCE)
942unsigned int
943rxvt_term::cmd_write (const char *str, unsigned int count)
944{
945 unsigned int n, s;
946
947 n = cmdbuf_ptr - cmdbuf_base;
948 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
949
950 if (n > 0 && s < count)
951 {
952 memmove (cmdbuf_base, cmdbuf_ptr,
953 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
954 cmdbuf_ptr = cmdbuf_base;
955 cmdbuf_endp -= n;
956 s += n;
957 }
958
959 if (count > s)
960 {
961 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
962 count = s;
963 }
964
965 for (; count--;)
966 *cmdbuf_endp++ = *str++;
967
968 cmd_parse ();
969
970 return 0;
971}
972#endif
973
974void 962void
975rxvt_term::flush () 963rxvt_term::flush ()
976{ 964{
977 flush_ev.stop (); 965 flush_ev.stop ();
978 966
979#ifdef HAVE_BG_PIXMAP 967#ifdef HAVE_IMG
980 if (bg_flags & hasChanged) 968 if (bg_flags & BG_NEEDS_REFRESH)
981 { 969 {
982 bg_flags &= ~hasChanged; 970 bg_flags &= ~BG_NEEDS_REFRESH;
983 scr_touch (false); 971 scr_touch (false);
984 } 972 }
985#endif 973#endif
986 974
987 if (want_refresh) 975 if (want_refresh)
… …
1024 while (row < end_row); 1012 while (row < end_row);
1025 } 1013 }
1026 1014
1027 scr_refresh (); 1015 scr_refresh ();
1028 scrollBar.show (1); 1016 scrollBar.show (1);
1029#ifdef USE_XIM 1017#if USE_XIM
1030 IMSendSpot (); 1018 im_send_spot ();
1031#endif 1019#endif
1032 } 1020 }
1033 1021
1034 display->flush (); 1022 display->flush ();
1035} 1023}
… …
1053 flush (); 1041 flush ();
1054} 1042}
1055 1043
1056#ifdef CURSOR_BLINK 1044#ifdef CURSOR_BLINK
1057void 1045void
1046rxvt_term::cursor_blink_reset ()
1047{
1048 if (hidden_cursor)
1049 {
1050 hidden_cursor = 0;
1051 want_refresh = 1;
1052 }
1053
1054 if (option (Opt_cursorBlink))
1055 cursor_blink_ev.again ();
1056 else
1057 cursor_blink_ev.stop ();
1058}
1059
1060void
1058rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 1061rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1059{ 1062{
1060 hidden_cursor = !hidden_cursor; 1063 hidden_cursor = !hidden_cursor;
1061 want_refresh = 1; 1064 want_refresh = 1;
1062 refresh_check (); 1065 refresh_check ();
… …
1080 1083
1081#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1084#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1082void 1085void
1083rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1086rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1084{ 1087{
1085 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 1088 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1086 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1)) 1089 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1087 { 1090 {
1088 want_refresh = 1; 1091 want_refresh = 1;
1089 refresh_check (); 1092 refresh_check ();
1090 } 1093 }
1091 else 1094 else
… …
1095 1098
1096#ifdef SELECTION_SCROLLING 1099#ifdef SELECTION_SCROLLING
1097void 1100void
1098rxvt_term::sel_scroll_cb (ev::timer &w, int revents) 1101rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1099{ 1102{
1100 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1103 if (scr_page (scroll_selection_lines))
1101 { 1104 {
1102 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1105 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1103 want_refresh = 1; 1106 want_refresh = 1;
1104 refresh_check (); 1107 refresh_check ();
1105 } 1108 }
… …
1110 1113
1111#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1114#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1112void 1115void
1113rxvt_term::slip_wheel_cb (ev::timer &w, int revents) 1116rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1114{ 1117{
1115 if (scr_changeview (view_start - mouse_slip_wheel_speed)) 1118 if (scr_page (mouse_slip_wheel_speed))
1116 { 1119 {
1117 want_refresh = 1; 1120 want_refresh = 1;
1118 refresh_check (); 1121 refresh_check ();
1119 } 1122 }
1120 1123
… …
1152 { 1155 {
1153 } 1156 }
1154} event_handler; 1157} event_handler;
1155#endif 1158#endif
1156 1159
1160/* make sure all the cmd data is at beginning of cmdbuf */
1161void
1162rxvt_term::cmdbuf_reify ()
1163{
1164 if (cmdbuf_ptr == cmdbuf_base)
1165 return;
1166
1167 ssize_t used = cmdbuf_endp - cmdbuf_ptr;
1168
1169 memmove (cmdbuf_base, cmdbuf_ptr, used);
1170 cmdbuf_ptr = cmdbuf_base;
1171 cmdbuf_endp = cmdbuf_ptr + used;
1172
1173}
1174
1175#if defined (KEYSYM_RESOURCE)
1176void
1177rxvt_term::cmdbuf_append (const char *str, size_t count)
1178{
1179 cmdbuf_reify ();
1180
1181 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1182
1183 if (count > avail)
1184 return;
1185
1186 memcpy (cmdbuf_endp, str, count);
1187 cmdbuf_endp += count;
1188
1189 cmd_parse ();
1190}
1191#endif
1192
1157bool 1193bool
1158rxvt_term::pty_fill () 1194rxvt_term::pty_fill ()
1159{ 1195{
1160 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1196 cmdbuf_reify ();
1161 1197
1162 if (CBUFSIZ == n) 1198 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1163 { 1199
1164 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1200 if (!avail)
1165 n = 0;
1166 } 1201 {
1167 1202 // 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; 1203 cmdbuf_ptr = cmdbuf_base;
1170 cmdbuf_endp = cmdbuf_ptr + n; 1204 cmdbuf_endp = cmdbuf_ptr;
1205 avail = CBUFSIZ;
1206 }
1171 1207
1172 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1208 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1173 1209
1174 if (r > 0) 1210 if (r > 0)
1175 { 1211 {
1176 cmdbuf_endp += r; 1212 cmdbuf_endp += r;
1177 return true; 1213 return true;
… …
1208 pty_write (); 1244 pty_write ();
1209 1245
1210 refresh_check (); 1246 refresh_check ();
1211} 1247}
1212 1248
1213void 1249void ecb_cold
1214rxvt_term::pointer_unblank () 1250rxvt_term::pointer_unblank ()
1215{ 1251{
1216 XDefineCursor (dpy, vt, TermWin_cursor); 1252 XDefineCursor (dpy, vt, TermWin_cursor);
1217 recolour_cursor (); 1253 recolour_cursor ();
1218 1254
… …
1223 pointer_ev.start (pointerBlankDelay); 1259 pointer_ev.start (pointerBlankDelay);
1224#endif 1260#endif
1225} 1261}
1226 1262
1227#ifdef POINTER_BLANK 1263#ifdef POINTER_BLANK
1228void 1264void ecb_cold
1229rxvt_term::pointer_blank () 1265rxvt_term::pointer_blank ()
1230{ 1266{
1231 if (!option (Opt_pointerBlank)) 1267 if (!option (Opt_pointerBlank))
1232 return; 1268 return;
1233 1269
… …
1235 XFlush (dpy); 1271 XFlush (dpy);
1236 1272
1237 hidden_pointer = 1; 1273 hidden_pointer = 1;
1238} 1274}
1239 1275
1240void 1276void ecb_cold
1241rxvt_term::pointer_cb (ev::timer &w, int revents) 1277rxvt_term::pointer_cb (ev::timer &w, int revents)
1242{ 1278{
1243 make_current (); 1279 make_current ();
1244 1280
1245 pointer_blank (); 1281 pointer_blank ();
… …
1337 32 + x, 1373 32 + x,
1338 32 + y); 1374 32 + y);
1339} 1375}
1340 1376
1341/*{{{ process an X event */ 1377/*{{{ process an X event */
1342void 1378void ecb_hot
1343rxvt_term::x_cb (XEvent &ev) 1379rxvt_term::x_cb (XEvent &ev)
1344{ 1380{
1345 make_current (); 1381 make_current ();
1346 1382
1347 dLocal (Display *, dpy); 1383 dLocal (Display *, dpy);
… …
1445 && ev.xfocus.mode != NotifyGrab) 1481 && ev.xfocus.mode != NotifyGrab)
1446 focus_out (); 1482 focus_out ();
1447 break; 1483 break;
1448 1484
1449 case ConfigureNotify: 1485 case ConfigureNotify:
1450 if (ev.xconfigure.window == parent[0]) 1486 if (ev.xconfigure.window == parent)
1451 { 1487 {
1452 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1488 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1453 ; 1489 ;
1454 1490
1491 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1492
1493 bool moved = false;
1455#ifdef HAVE_BG_PIXMAP 1494#ifdef HAVE_BG_PIXMAP
1456 bool moved = false;
1457 if (bg_window_position_sensitive ()) 1495 if (bg_window_position_sensitive ())
1458 { 1496 {
1497 want_position_change = true;
1498 if (bg_img == 0)
1499 moved = true;
1500 }
1501#endif
1502
1503 if (want_position_change)
1504 {
1459 int x, y; 1505 int x, y;
1506
1460 if (ev.xconfigure.send_event) 1507 if (ev.xconfigure.send_event)
1461 { 1508 {
1462 x = ev.xconfigure.x; 1509 x = ev.xconfigure.x;
1463 y = ev.xconfigure.y; 1510 y = ev.xconfigure.y;
1464 } 1511 }
1465 else 1512 else
1466 get_window_origin (x, y); 1513 get_window_origin (x, y);
1467 1514
1468 if (bg_set_position (x, y) 1515 if (x != parent_x || y != parent_y)
1469 || !(bg_flags & isValid)) 1516 {
1517 parent_x = x;
1518 parent_y = y;
1519 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1470 moved = true; 1520 moved = true;
1521 }
1471 } 1522 }
1472#endif
1473 1523
1474 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1524 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1475 { 1525 {
1476 seen_resize = 1; 1526 seen_resize = 1;
1477 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1527 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1478 } 1528 }
1479 else 1529 else
1480 { 1530 {
1481#ifdef HAVE_BG_PIXMAP 1531#ifdef HAVE_BG_PIXMAP
1482 if (moved) 1532 if (moved)
1483 {
1484 if (mapped)
1485 update_background (); 1533 update_background ();
1486 else
1487 bg_invalidate ();
1488 }
1489#endif 1534#endif
1490 } 1535 }
1491 1536
1492 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1537 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1493 } 1538 }
1494 break; 1539 break;
1495 1540
1496 case PropertyNotify: 1541 case PropertyNotify:
1497 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1542 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1498 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1499 && ev.xproperty.state == PropertyNewValue)
1500 selection_property (ev.xproperty.window, ev.xproperty.atom);
1501
1502 break; 1543 break;
1503 1544
1504 case SelectionClear: 1545 case SelectionClear:
1505 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]); 1546 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1506 break; 1547 break;
1507 1548
1508 case SelectionNotify:
1509 if (selection_wait == Sel_normal)
1510 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1511 break;
1512
1513 case SelectionRequest: 1549 case SelectionRequest:
1514 selection_send (ev.xselectionrequest); 1550 selection_send (ev.xselectionrequest);
1515 break; 1551 break;
1516 1552
1517 case MapNotify: 1553 case MapNotify:
1518#ifdef HAVE_BG_PIXMAP 1554#ifdef HAVE_BG_PIXMAP
1519 /* This is needed specifically to fix the case of no window manager or a 1555 // This is needed at startup for the case of no window manager
1520 * non-reparenting window manager. In those cases we never get first 1556 // or a non-reparenting window manager and also because we
1521 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1557 // defer bg image updates if the window is not mapped. The
1522 * care of multiplicity of ConfigureNotify events arriving while WM does 1558 // short delay is to optimize for multiple ConfigureNotify
1523 * reparenting. 1559 // events at startup when the window manager reparents the
1524 * We should not render background immediately, as there could be several 1560 // window, so as to perform the computation after we have
1525 * ConfigureNotify's to follow. Lets take care of all of them in one scoop 1561 // received all of them.
1526 * by scheduling background redraw as soon as we can, but giving a short 1562 if (bg_img == 0)
1527 * bit of time for ConfigureNotifies to arrive.
1528 * We should render background PRIOR to drawing any text, but AFTER all
1529 * of ConfigureNotifys for the best results.
1530 */
1531 if (!(bg_flags & isValid))
1532 update_background_ev.start (0.025); 1563 update_background_ev.start (0.025);
1533#endif 1564#endif
1534 mapped = 1; 1565 mapped = 1;
1535#ifdef TEXT_BLINK 1566#ifdef TEXT_BLINK
1536 text_blink_ev.start (); 1567 text_blink_ev.start ();
… …
1551 if (ev.xany.window == vt) 1582 if (ev.xany.window == vt)
1552 { 1583 {
1553 do 1584 do
1554 { 1585 {
1555 scr_expose (ev.xexpose.x, ev.xexpose.y, 1586 scr_expose (ev.xexpose.x, ev.xexpose.y,
1556 ev.xexpose.width, ev.xexpose.height, False); 1587 ev.xexpose.width, ev.xexpose.height, false);
1557 } 1588 }
1558 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1589 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1559 1590
1560 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1591 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1561 1592
1562 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1593 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1563 { 1594 {
1564 scr_expose (ev.xexpose.x, ev.xexpose.y, 1595 scr_expose (ev.xexpose.x, ev.xexpose.y,
1565 ev.xexpose.width, ev.xexpose.height, False); 1596 ev.xexpose.width, ev.xexpose.height, false);
1566 } 1597 }
1567 1598
1568 want_refresh = 1; 1599 want_refresh = 1;
1569 } 1600 }
1570 else 1601 else
… …
1576 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1607 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1577 ; 1608 ;
1578 1609
1579 if (scrollBar.state && ev.xany.window == scrollBar.win) 1610 if (scrollBar.state && ev.xany.window == scrollBar.win)
1580 { 1611 {
1581 scrollBar.state = STATE_IDLE; 1612 scrollBar.state = SB_STATE_IDLE;
1582 scrollBar.show (0); 1613 scrollBar.show (0);
1583 } 1614 }
1584 } 1615 }
1585 break; 1616 break;
1586 1617
… …
1628 1659
1629#ifdef SELECTION_SCROLLING 1660#ifdef SELECTION_SCROLLING
1630 if (ev.xbutton.y < int_bwidth 1661 if (ev.xbutton.y < int_bwidth
1631 || Pixel2Row (ev.xbutton.y) > (nrow-1)) 1662 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1632 { 1663 {
1664 page_dirn scroll_selection_dir;
1633 int dist; 1665 int dist;
1634 1666
1635 /* don't clobber the current delay if we are 1667 /* don't clobber the current delay if we are
1636 * already in the middle of scrolling. 1668 * already in the middle of scrolling.
1637 */ 1669 */
… …
1652 dist = int_bwidth - ev.xbutton.y; 1684 dist = int_bwidth - ev.xbutton.y;
1653 } 1685 }
1654 else 1686 else
1655 { 1687 {
1656 scroll_selection_dir = DN; 1688 scroll_selection_dir = DN;
1657 dist = ev.xbutton.y - (int_bwidth + height); 1689 dist = ev.xbutton.y - (int_bwidth + vt_height);
1658 } 1690 }
1659 1691
1660 scroll_selection_lines = Pixel2Height (dist) 1692 scroll_selection_lines = Pixel2Height (dist)
1661 / SELECTION_SCROLL_LINE_SPEEDUP 1693 / SELECTION_SCROLL_LINE_SPEEDUP
1662 + 1; 1694 + 1;
1663 min_it (scroll_selection_lines, 1695 min_it (scroll_selection_lines,
1664 SELECTION_SCROLL_MAX_LINES); 1696 SELECTION_SCROLL_MAX_LINES);
1697 scroll_selection_lines *= scroll_selection_dir;
1665 } 1698 }
1666 else 1699 else
1667 { 1700 {
1668 /* we are within the text window, so we 1701 /* we are within the text window, so we
1669 * shouldn't be scrolling 1702 * shouldn't be scrolling
… …
1674#ifdef MOUSE_THRESHOLD 1707#ifdef MOUSE_THRESHOLD
1675 } 1708 }
1676#endif 1709#endif
1677 } 1710 }
1678 } 1711 }
1679 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win) 1712 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1680 { 1713 {
1681 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1714 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1682 MotionNotify, &ev)) 1715 MotionNotify, &ev))
1683 ; 1716 ;
1684 1717
1685 XQueryPointer (dpy, scrollBar.win, 1718 XQueryPointer (dpy, scrollBar.win,
1686 &unused_root, &unused_child, 1719 &unused_root, &unused_child,
1687 &unused_root_x, &unused_root_y, 1720 &unused_root_x, &unused_root_y,
1688 &ev.xbutton.x, &ev.xbutton.y, 1721 &ev.xbutton.x, &ev.xbutton.y,
1689 &unused_mask); 1722 &unused_mask);
1690 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1723 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1691 scrollBar.size ()); 1724 scrollBar.size ());
1692 want_refresh = 1; 1725 want_refresh = 1;
1693 scrollBar.show (1); 1726 scrollBar.show (1);
1694 } 1727 }
1695 break; 1728 break;
1696 } 1729 }
1697 1730
1698#if defined(CURSOR_BLINK) 1731#if defined(CURSOR_BLINK)
1699 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1732 if (ev.type == KeyPress)
1700 {
1701 if (hidden_cursor)
1702 {
1703 hidden_cursor = 0;
1704 want_refresh = 1;
1705 }
1706
1707 cursor_blink_ev.again (); 1733 cursor_blink_reset ();
1708 }
1709#endif 1734#endif
1710 1735
1711#if defined(POINTER_BLANK) 1736#if defined(POINTER_BLANK)
1712 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1737 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1713 { 1738 {
… …
1724 1749
1725 refresh_check (); 1750 refresh_check ();
1726} 1751}
1727 1752
1728#if ENABLE_FRILLS 1753#if ENABLE_FRILLS
1729void 1754void ecb_cold
1730rxvt_term::set_urgency (bool enable) 1755rxvt_term::set_urgency (bool enable)
1731{ 1756{
1732 if (enable == urgency_hint) 1757 if (enable == urgency_hint)
1733 return; 1758 return;
1734 1759
1735 if (XWMHints *h = XGetWMHints (dpy, parent[0])) 1760 if (XWMHints *h = XGetWMHints (dpy, parent))
1736 { 1761 {
1737 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1762 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1738 XSetWMHints (dpy, parent[0], h); 1763 XSetWMHints (dpy, parent, h);
1739 urgency_hint = enable; 1764 urgency_hint = enable;
1765 XFree (h);
1740 } 1766 }
1741} 1767}
1742#endif 1768#endif
1743 1769
1744void 1770void ecb_cold
1745rxvt_term::focus_in () 1771rxvt_term::focus_in ()
1746{ 1772{
1747 if (!focus) 1773 if (!focus)
1748 { 1774 {
1749 focus = 1; 1775 focus = 1;
1750 want_refresh = 1; 1776 want_refresh = 1;
1751 1777
1752#if USE_XIM 1778#if USE_XIM
1753 if (Input_Context != NULL) 1779 if (Input_Context != NULL)
1754 { 1780 {
1755 IMSetPosition (); 1781 im_set_position ();
1756 XSetICFocus (Input_Context); 1782 XSetICFocus (Input_Context);
1757 } 1783 }
1758#endif 1784#endif
1759#if CURSOR_BLINK 1785#if CURSOR_BLINK
1760 if (option (Opt_cursorBlink)) 1786 if (option (Opt_cursorBlink))
… …
1774 1800
1775 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END)); 1801 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1776 } 1802 }
1777} 1803}
1778 1804
1779void 1805void ecb_cold
1780rxvt_term::focus_out () 1806rxvt_term::focus_out ()
1781{ 1807{
1782 if (focus) 1808 if (focus)
1783 { 1809 {
1784 focus = 0; 1810 focus = 0;
… …
1817 1843
1818 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1844 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1819 } 1845 }
1820} 1846}
1821 1847
1822void 1848void ecb_cold
1823rxvt_term::update_fade_color (unsigned int idx) 1849rxvt_term::update_fade_color (unsigned int idx)
1824{ 1850{
1825#if OFF_FOCUS_FADING 1851#if OFF_FOCUS_FADING
1826 if (rs[Rs_fade]) 1852 if (rs[Rs_fade])
1827 { 1853 {
… …
1830 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1856 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1831 } 1857 }
1832#endif 1858#endif
1833} 1859}
1834 1860
1835#if ENABLE_TRANSPARENCY || ENABLE_PERL 1861#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
1836void 1862void ecb_hot
1837rxvt_term::rootwin_cb (XEvent &ev) 1863rxvt_term::rootwin_cb (XEvent &ev)
1838{ 1864{
1839 make_current (); 1865 make_current ();
1840 1866
1841 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1867 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1842 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1868 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1843 return; 1869 return;
1844 1870
1845# if ENABLE_TRANSPARENCY
1846 switch (ev.type) 1871 switch (ev.type)
1847 { 1872 {
1848 case PropertyNotify: 1873 case PropertyNotify:
1849 /* 1874 /*
1850 * if user used some Esetroot compatible prog to set the root bg, 1875 * if user used some Esetroot compatible prog to set the root bg,
1851 * use the property to determine the pixmap. We use it later on. 1876 * use the property to determine the pixmap. We use it later on.
1852 */ 1877 */
1853 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1878 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1854 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1879 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1855 { 1880 {
1856 bg_set_root_pixmap (); 1881#if BG_IMAGE_FROM_ROOT
1882 if (option (Opt_transparent))
1883 {
1884 rxvt_img::new_from_root (this)->replace (root_img);
1857 update_background (); 1885 update_background ();
1886 }
1887#endif
1888 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1858 } 1889 }
1859 1890
1860 break; 1891 break;
1861 } 1892 }
1862# endif
1863 1893
1864 refresh_check (); 1894 refresh_check ();
1865} 1895}
1866#endif 1896#endif
1867 1897
… …
1991 if (scrollBar.upButton (ev.y)) 2021 if (scrollBar.upButton (ev.y))
1992 direction = UP; /* up */ 2022 direction = UP; /* up */
1993 else if (scrollBar.dnButton (ev.y)) 2023 else if (scrollBar.dnButton (ev.y))
1994 direction = DN; /* down */ 2024 direction = DN; /* down */
1995 2025
1996 scrollBar.state = STATE_IDLE; 2026 scrollBar.state = SB_STATE_IDLE;
1997 /* 2027 /*
1998 * Rxvt-style scrollbar: 2028 * Rxvt-style scrollbar:
1999 * move up if mouse is above slider 2029 * move up if mouse is above slider
2000 * move dn if mouse is below slider 2030 * move dn if mouse is below slider
2001 * 2031 *
… …
2040 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2070 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2041#endif 2071#endif
2042 if (scr_page (direction, 1)) 2072 if (scr_page (direction, 1))
2043 { 2073 {
2044 if (direction == UP) 2074 if (direction == UP)
2045 scrollBar.state = STATE_UP; 2075 scrollBar.state = SB_STATE_UP;
2046 else 2076 else
2047 scrollBar.state = STATE_DOWN; 2077 scrollBar.state = SB_STATE_DOWN;
2048 } 2078 }
2049 } 2079 }
2050 else 2080 else
2051 switch (ev.button) 2081 switch (ev.button)
2052 { 2082 {
2053 case Button2: 2083 case Button2:
2054 switch (scrollBar.align) 2084 switch (scrollBar.align)
2055 { 2085 {
2056 case R_SB_ALIGN_TOP: 2086 case SB_ALIGN_TOP:
2057 csrO = 0; 2087 csrO = 0;
2058 break; 2088 break;
2059 case R_SB_ALIGN_CENTRE: 2089 case SB_ALIGN_CENTRE:
2060 csrO = (scrollBar.bot - scrollBar.top) / 2; 2090 csrO = (scrollBar.bot - scrollBar.top) / 2;
2061 break; 2091 break;
2062 case R_SB_ALIGN_BOTTOM: 2092 case SB_ALIGN_BOTTOM:
2063 csrO = scrollBar.bot - scrollBar.top; 2093 csrO = scrollBar.bot - scrollBar.top;
2064 break; 2094 break;
2065 } 2095 }
2066 2096
2067 if (scrollBar.style == R_SB_XTERM 2097 if (scrollBar.style == SB_STYLE_XTERM
2068 || scrollbar_above_slider (ev.y) 2098 || scrollBar.above_slider (ev.y)
2069 || scrollbar_below_slider (ev.y)) 2099 || scrollBar.below_slider (ev.y))
2070 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ()); 2100 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2071 2101
2072 scrollBar.state = STATE_MOTION; 2102 scrollBar.state = SB_STATE_MOTION;
2073 break; 2103 break;
2074 2104
2075 case Button1: 2105 case Button1:
2076 if (scrollBar.align == R_SB_ALIGN_CENTRE) 2106 if (scrollBar.align == SB_ALIGN_CENTRE)
2077 csrO = ev.y - scrollBar.top; 2107 csrO = ev.y - scrollBar.top;
2078 /* FALLTHROUGH */ 2108 /* FALLTHROUGH */
2079 2109
2080 case Button3: 2110 case Button3:
2081 if (scrollBar.style != R_SB_XTERM) 2111 if (scrollBar.style != SB_STYLE_XTERM)
2082 { 2112 {
2083 if (scrollbar_above_slider (ev.y)) 2113 if (scrollBar.above_slider (ev.y))
2084# ifdef RXVT_SCROLL_FULL 2114# ifdef RXVT_SCROLL_FULL
2085 scr_page (UP, nrow - 1); 2115 scr_page (UP, nrow - 1);
2086# else 2116# else
2087 scr_page (UP, nrow / 4); 2117 scr_page (UP, nrow / 4);
2088# endif 2118# endif
2089 else if (scrollbar_below_slider (ev.y)) 2119 else if (scrollBar.below_slider (ev.y))
2090# ifdef RXVT_SCROLL_FULL 2120# ifdef RXVT_SCROLL_FULL
2091 scr_page (DN, nrow - 1); 2121 scr_page (DN, nrow - 1);
2092# else 2122# else
2093 scr_page (DN, nrow / 4); 2123 scr_page (DN, nrow / 4);
2094# endif 2124# endif
2095 else 2125 else
2096 scrollBar.state = STATE_MOTION; 2126 scrollBar.state = SB_STATE_MOTION;
2097 } 2127 }
2098 else 2128 else
2099 { 2129 {
2100 scr_page ((ev.button == Button1 ? DN : UP), 2130 scr_page ((ev.button == Button1 ? DN : UP),
2101 (nrow 2131 (nrow
2102 * scrollbar_position (ev.y) 2132 * scrollBar.position (ev.y)
2103 / scrollBar.size ())); 2133 / scrollBar.size ()));
2104 } 2134 }
2105 2135
2106 break; 2136 break;
2107 } 2137 }
… …
2118 2148
2119 csrO = 0; /* reset csr Offset */ 2149 csrO = 0; /* reset csr Offset */
2120 if (!bypass_keystate) 2150 if (!bypass_keystate)
2121 reportmode = !! (priv_modes & PrivMode_mouse_report); 2151 reportmode = !! (priv_modes & PrivMode_mouse_report);
2122 2152
2123 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2153 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2124 { 2154 {
2125 scrollBar.state = STATE_IDLE; 2155 scrollBar.state = SB_STATE_IDLE;
2126 scrollBar.show (0); 2156 scrollBar.show (0);
2127 } 2157 }
2128 2158
2129#ifdef SELECTION_SCROLLING 2159#ifdef SELECTION_SCROLLING
2130 sel_scroll_ev.stop(); 2160 sel_scroll_ev.stop();
… …
2180 case Button3: 2210 case Button3:
2181 selection_make (ev.time); 2211 selection_make (ev.time);
2182 break; 2212 break;
2183 2213
2184 case Button2: 2214 case Button2:
2185 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2215 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2186 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2216 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2187 break; 2217 break;
2188 2218
2189#ifdef MOUSE_WHEEL 2219#ifdef MOUSE_WHEEL
2190 case Button4: 2220 case Button4:
2191 case Button5: 2221 case Button5:
2192 { 2222 {
2193 int i; 2223 int lines;
2194 page_dirn v; 2224 page_dirn dirn;
2195 2225
2196 v = ev.button == Button4 ? UP : DN; 2226 dirn = ev.button == Button4 ? UP : DN;
2197 2227
2198 if (ev.state & ShiftMask) 2228 if (ev.state & ShiftMask)
2199 i = 1; 2229 lines = 1;
2200 else if (option (Opt_mouseWheelScrollPage)) 2230 else if (option (Opt_mouseWheelScrollPage))
2201 i = nrow - 1; 2231 lines = nrow - 1;
2202 else 2232 else
2203 i = 5; 2233 lines = 5;
2204 2234
2205# ifdef MOUSE_SLIP_WHEELING 2235# ifdef MOUSE_SLIP_WHEELING
2206 if (ev.state & ControlMask) 2236 if (ev.state & ControlMask)
2207 { 2237 {
2208 mouse_slip_wheel_speed += v ? -1 : 1; 2238 mouse_slip_wheel_speed += dirn;
2209 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2239 clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2210 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2211 2240
2212 if (!slip_wheel_ev.is_active ()) 2241 if (!slip_wheel_ev.is_active ())
2213 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2242 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2214 } 2243 }
2215 else 2244 else
2216# endif 2245# endif
2217 { 2246 {
2218 scr_page (v, i); 2247 scr_page (dirn, lines);
2219 scrollBar.show (1); 2248 scrollBar.show (1);
2220 } 2249 }
2221 } 2250 }
2222 break; 2251 break;
2223#endif 2252#endif
… …
2225 } 2254 }
2226} 2255}
2227 2256
2228/*}}} */ 2257/*}}} */
2229 2258
2230void 2259void ecb_hot
2231rxvt_term::cmd_parse () 2260rxvt_term::cmd_parse ()
2232{ 2261{
2233 wchar_t ch = NOCHAR; 2262 wchar_t ch = NOCHAR;
2234 char *seq_begin; // remember start of esc-sequence here 2263 char *seq_begin; // remember start of esc-sequence here
2235 2264
2236 for (;;) 2265 for (;;)
2237 { 2266 {
2238 if (expect_false (ch == NOCHAR)) 2267 if (ecb_unlikely (ch == NOCHAR))
2239 { 2268 {
2240 seq_begin = cmdbuf_ptr; 2269 seq_begin = cmdbuf_ptr;
2241 ch = next_char (); 2270 ch = next_char ();
2242 2271
2243 if (ch == NOCHAR) 2272 if (ch == NOCHAR)
2244 break; 2273 break;
2245 } 2274 }
2246 2275
2247 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)) 2276 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2248 { 2277 {
2249 if (expect_false (!seen_input)) 2278 if (ecb_unlikely (!seen_input))
2250 { 2279 {
2251 seen_input = 1; 2280 seen_input = 1;
2252 // many badly-written programs (e.g. jed) contain a race condition: 2281 // many badly-written programs (e.g. jed) contain a race condition:
2253 // they first read the screensize and then install a SIGWINCH handler. 2282 // they first read the screensize and then install a SIGWINCH handler.
2254 // some window managers resize the window early, and these programs 2283 // some window managers resize the window early, and these programs
… …
2267 wchar_t *str = buf; 2296 wchar_t *str = buf;
2268 wchar_t *eol = str + min (ncol, UBUFSIZ); 2297 wchar_t *eol = str + min (ncol, UBUFSIZ);
2269 2298
2270 for (;;) 2299 for (;;)
2271 { 2300 {
2272 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))) 2301 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2273 break; 2302 break;
2274 2303
2275 *str++ = ch; 2304 *str++ = ch;
2276 2305
2277 if (expect_false (ch == C0_LF || str >= eol)) 2306 if (ecb_unlikely (ch == C0_LF || str >= eol))
2278 { 2307 {
2279 if (ch == C0_LF) 2308 if (ch == C0_LF)
2280 nlines++; 2309 nlines++;
2281 2310
2282 refresh_count++; 2311 refresh_count++;
… …
2354 } 2383 }
2355 } 2384 }
2356} 2385}
2357 2386
2358// read the next character 2387// read the next character
2359wchar_t 2388wchar_t ecb_hot
2360rxvt_term::next_char () NOTHROW 2389rxvt_term::next_char () NOTHROW
2361{ 2390{
2362 while (cmdbuf_ptr < cmdbuf_endp) 2391 while (cmdbuf_ptr < cmdbuf_endp)
2363 { 2392 {
2364 // assume 7-bit to be ascii ALWAYS 2393 // assume 7-bit to be ascii ALWAYS
2365 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)) 2394 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2366 return *cmdbuf_ptr++; 2395 return *cmdbuf_ptr++;
2367 2396
2368 wchar_t wc; 2397 wchar_t wc;
2369 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2398 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2370 2399
… …
2376 } 2405 }
2377 2406
2378 if (len == (size_t)-1) 2407 if (len == (size_t)-1)
2379 { 2408 {
2380 mbstate.reset (); // reset now undefined conversion state 2409 mbstate.reset (); // reset now undefined conversion state
2410 // a -1 might indicate that a previous incomplete char is invalid (previous return -2)
2411 // in which case we "erroneously" return the next byte which might be valid.
2381 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2412 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2382 } 2413 }
2383 2414
2384 // assume wchar == unicode 2415 // assume wchar == unicode
2385 cmdbuf_ptr += len; 2416 cmdbuf_ptr += len;
… …
2388 2419
2389 return NOCHAR; 2420 return NOCHAR;
2390} 2421}
2391 2422
2392// read the next octet 2423// read the next octet
2393uint32_t 2424uint32_t ecb_hot
2394rxvt_term::next_octet () NOTHROW 2425rxvt_term::next_octet () NOTHROW
2395{ 2426{
2396 return cmdbuf_ptr < cmdbuf_endp 2427 return cmdbuf_ptr < cmdbuf_endp
2397 ? (unsigned char)*cmdbuf_ptr++ 2428 ? (unsigned char)*cmdbuf_ptr++
2398 : NOCHAR; 2429 : NOCHAR;
2399} 2430}
2400 2431
2401static class out_of_input out_of_input; 2432static class out_of_input out_of_input;
2402 2433
2403/* rxvt_cmd_getc () - Return next input character */ 2434wchar_t ecb_hot
2404/*
2405 * Return the next input character after first passing any keyboard input
2406 * to the command.
2407 */
2408wchar_t
2409rxvt_term::cmd_getc () THROW ((class out_of_input)) 2435rxvt_term::cmd_getc () THROW ((class out_of_input))
2410{ 2436{
2411 wchar_t c = next_char (); 2437 wchar_t c = next_char ();
2412 2438
2413 if (c == NOCHAR) 2439 if (c == NOCHAR)
2414 throw out_of_input; 2440 throw out_of_input;
2415 2441
2416 return c; 2442 return c;
2417} 2443}
2418 2444
2419uint32_t 2445uint32_t ecb_hot
2420rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2446rxvt_term::cmd_get8 () THROW ((class out_of_input))
2421{ 2447{
2422 uint32_t c = next_octet (); 2448 uint32_t c = next_octet ();
2423 2449
2424 if (c == NOCHAR) 2450 if (c == NOCHAR)
… …
2428} 2454}
2429 2455
2430/*{{{ print pipe */ 2456/*{{{ print pipe */
2431/*----------------------------------------------------------------------*/ 2457/*----------------------------------------------------------------------*/
2432#ifdef PRINTPIPE 2458#ifdef PRINTPIPE
2433FILE * 2459FILE * ecb_cold
2434rxvt_term::popen_printer () 2460rxvt_term::popen_printer ()
2435{ 2461{
2436 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w"); 2462 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2437 2463
2438 if (stream == NULL) 2464 if (stream == NULL)
2439 rxvt_warn ("can't open printer pipe, not printing.\n"); 2465 rxvt_warn ("can't open printer pipe, not printing.\n");
2440 2466
2441 return stream; 2467 return stream;
2442} 2468}
2443 2469
2444int 2470int ecb_cold
2445rxvt_term::pclose_printer (FILE *stream) 2471rxvt_term::pclose_printer (FILE *stream)
2446{ 2472{
2447 fflush (stream); 2473 fflush (stream);
2448 return pclose (stream); 2474 return pclose (stream);
2449} 2475}
2450 2476
2451/* 2477/*
2452 * simulate attached vt100 printer 2478 * simulate attached vt100 printer
2453 */ 2479 */
2454void 2480void ecb_cold
2455rxvt_term::process_print_pipe () 2481rxvt_term::process_print_pipe ()
2456{ 2482{
2457 FILE *fd = popen_printer (); 2483 FILE *fd = popen_printer ();
2458 2484
2459 if (!fd) 2485 if (!fd)
… …
2505 pclose_printer (fd); 2531 pclose_printer (fd);
2506} 2532}
2507#endif /* PRINTPIPE */ 2533#endif /* PRINTPIPE */
2508/*}}} */ 2534/*}}} */
2509 2535
2510/* *INDENT-OFF* */
2511enum { 2536enum {
2512 C1_40 = 0x40, 2537 C1_40 = 0x40,
2513 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2538 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2514 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2539 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2515 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2540 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2516 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2541 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2517}; 2542};
2518/* *INDENT-ON* */
2519 2543
2520/*{{{ process non-printing single characters */ 2544/*{{{ process non-printing single characters */
2521void 2545void ecb_hot
2522rxvt_term::process_nonprinting (unicode_t ch) 2546rxvt_term::process_nonprinting (unicode_t ch)
2523{ 2547{
2524 switch (ch) 2548 switch (ch)
2525 { 2549 {
2526 case C0_ESC: 2550 case C0_ESC:
… …
2572} 2596}
2573/*}}} */ 2597/*}}} */
2574 2598
2575 2599
2576/*{{{ process VT52 escape sequences */ 2600/*{{{ process VT52 escape sequences */
2577void 2601void ecb_cold
2578rxvt_term::process_escape_vt52 (unicode_t ch) 2602rxvt_term::process_escape_vt52 (unicode_t ch)
2579{ 2603{
2580 int row, col; 2604 int row, col;
2581 2605
2582 switch (ch) 2606 switch (ch)
… …
2616 break; 2640 break;
2617 case 'Z': /* identify the terminal type */ 2641 case 'Z': /* identify the terminal type */
2618 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2642 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2619 break; 2643 break;
2620 case '<': /* turn off VT52 mode */ 2644 case '<': /* turn off VT52 mode */
2621 set_privmode (PrivMode_vt52, 0); 2645 priv_modes &= ~PrivMode_vt52;
2622 break; 2646 break;
2623 case 'F': /* use special graphics character set */ 2647 case 'F': /* use special graphics character set */
2624 case 'G': /* use regular character set */ 2648 case 'G': /* use regular character set */
2625 /* unimplemented */ 2649 /* unimplemented */
2626 break; 2650 break;
… …
2632} 2656}
2633/*}}} */ 2657/*}}} */
2634 2658
2635 2659
2636/*{{{ process escape sequences */ 2660/*{{{ process escape sequences */
2637void 2661void ecb_hot
2638rxvt_term::process_escape_seq () 2662rxvt_term::process_escape_seq ()
2639{ 2663{
2640 unicode_t ch = cmd_getc (); 2664 unicode_t ch = cmd_getc ();
2641 2665
2642 if (priv_modes & PrivMode_vt52) 2666 if (priv_modes & PrivMode_vt52)
… …
2645 return; 2669 return;
2646 } 2670 }
2647 2671
2648 switch (ch) 2672 switch (ch)
2649 { 2673 {
2650 /* case 1: do_tek_mode (); break; */
2651 case '#': 2674 case '#':
2652 if (cmd_getc () == '8') 2675 if (cmd_getc () == '8')
2653 scr_E (); 2676 scr_E ();
2654 break; 2677 break;
2655 case '(': 2678 case '(':
… …
2678#if !ENABLE_MINIMAL 2701#if !ENABLE_MINIMAL
2679 case '9': 2702 case '9':
2680 scr_forwardindex (); 2703 scr_forwardindex ();
2681 break; 2704 break;
2682#endif 2705#endif
2706 // DECPAM/DECPNM
2683 case '=': 2707 case '=':
2708 priv_modes |= PrivMode_aplKP;
2709 break;
2684 case '>': 2710 case '>':
2685 set_privmode (PrivMode_aplKP, ch == '='); 2711 priv_modes &= ~PrivMode_aplKP;
2686 break; 2712 break;
2687 2713
2688 case C1_40: 2714 case C1_40:
2689 cmd_getc (); 2715 cmd_getc ();
2690 break; 2716 break;
… …
2694 2720
2695 /* 8.3.87: NEXT LINE */ 2721 /* 8.3.87: NEXT LINE */
2696 case C1_NEL: /* ESC E */ 2722 case C1_NEL: /* ESC E */
2697 { 2723 {
2698 wchar_t nlcr[] = { C0_LF, C0_CR }; 2724 wchar_t nlcr[] = { C0_LF, C0_CR };
2699 scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1); 2725 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2700 } 2726 }
2701 break; 2727 break;
2702 2728
2703 /* kidnapped escape sequence: Should be 8.3.48 */ 2729 /* kidnapped escape sequence: Should be 8.3.48 */
2704 case C1_ESA: /* ESC G */ 2730 case C1_ESA: /* ESC G */
2705 process_graphics (); 2731 // used by original rxvt for rob nations own graphics mode
2732 if (cmd_getc () == 'Q')
2733 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2706 break; 2734 break;
2707 2735
2708 /* 8.3.63: CHARACTER TABULATION SET */ 2736 /* 8.3.63: CHARACTER TABULATION SET */
2709 case C1_HTS: /* ESC H */ 2737 case C1_HTS: /* ESC H */
2710 scr_set_tab (1); 2738 scr_set_tab (1);
… …
2714 case C1_RI: /* ESC M */ 2742 case C1_RI: /* ESC M */
2715 scr_index (DN); 2743 scr_index (DN);
2716 break; 2744 break;
2717 2745
2718 /* 8.3.142: SINGLE-SHIFT TWO */ 2746 /* 8.3.142: SINGLE-SHIFT TWO */
2719 /*case C1_SS2: scr_single_shift (2); break; */ 2747 /* case C1_SS2: break; */
2720 2748
2721 /* 8.3.143: SINGLE-SHIFT THREE */ 2749 /* 8.3.143: SINGLE-SHIFT THREE */
2722 /*case C1_SS3: scr_single_shift (3); break; */ 2750 /* case C1_SS3: break; */
2723 2751
2724 /* 8.3.27: DEVICE CONTROL STRING */ 2752 /* 8.3.27: DEVICE CONTROL STRING */
2725 case C1_DCS: /* ESC P */ 2753 case C1_DCS: /* ESC P */
2726 process_dcs_seq (); 2754 process_dcs_seq ();
2727 break; 2755 break;
… …
2760 } 2788 }
2761} 2789}
2762/*}}} */ 2790/*}}} */
2763 2791
2764/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2792/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2765/* *INDENT-OFF* */
2766enum { 2793enum {
2767 CSI_ICH = 0x40, 2794 CSI_ICH = 0x40,
2768 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2795 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2769 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2796 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2770 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2797 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
2790 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2817 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2791 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2818 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2792 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2819 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2793 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2820 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2794 }; 2821 };
2795/* *INDENT-ON* */
2796 2822
2797void 2823void ecb_hot
2798rxvt_term::process_csi_seq () 2824rxvt_term::process_csi_seq ()
2799{ 2825{
2800 unicode_t ch, priv, i; 2826 unicode_t ch, priv, prev_ch, i;
2801 unsigned int nargs, p; 2827 unsigned int nargs, p;
2802 int n, ndef; 2828 int n, ndef;
2803 int arg[ESC_ARGS] = { }; 2829 int arg[ESC_ARGS] = { };
2804 2830
2805 nargs = 0; 2831 nargs = 0;
… …
2811 /* '<' '=' '>' '?' '!' */ 2837 /* '<' '=' '>' '?' '!' */
2812 priv = ch; 2838 priv = ch;
2813 ch = cmd_getc (); 2839 ch = cmd_getc ();
2814 } 2840 }
2815 2841
2842 prev_ch = 0;
2816 /* read any numerical arguments */ 2843 /* read any numerical arguments */
2817 for (n = -1; ch < CSI_ICH; ) 2844 for (n = -1; ch < CSI_ICH; )
2818 { 2845 {
2819 if (isdigit (ch)) 2846 if (isdigit (ch))
2820 { 2847 {
… …
2830 n = -1; 2857 n = -1;
2831 } 2858 }
2832 else if (IS_CONTROL (ch)) 2859 else if (IS_CONTROL (ch))
2833 process_nonprinting (ch); 2860 process_nonprinting (ch);
2834 2861
2862 prev_ch = ch;
2835 ch = cmd_getc (); 2863 ch = cmd_getc ();
2836 } 2864 }
2837 2865
2838 if (ch > CSI_7F) 2866 if (ch > CSI_7F)
2839 return; 2867 return;
… …
2880 scr_soft_reset (); 2908 scr_soft_reset ();
2881 2909
2882 static const int pm_h[] = { 7, 25 }; 2910 static const int pm_h[] = { 7, 25 };
2883 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 }; 2911 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2884 2912
2885 process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h); 2913 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2886 process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l); 2914 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2887 } 2915 }
2888 break; 2916 break;
2889 } 2917 }
2890 2918
2891 return; 2919 return;
… …
2909 } 2937 }
2910 break; 2938 break;
2911#endif 2939#endif
2912 2940
2913 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2941 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2914 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2942 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2915 arg[0] = -arg[0]; 2943 arg[0] = -arg[0];
2916 /* FALLTHROUGH */ 2944 /* FALLTHROUGH */
2917 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2945 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2918 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2946 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2919 scr_gotorc (arg[0], 0, RELATIVE); 2947 scr_gotorc (arg[0], 0, RELATIVE);
2920 break; 2948 break;
2921 2949
2922 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2950 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2923 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2951 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3073 scr_insert_mode (1); 3101 scr_insert_mode (1);
3074 else if (arg[0] == 20) 3102 else if (arg[0] == 20)
3075 priv_modes |= PrivMode_LFNL; 3103 priv_modes |= PrivMode_LFNL;
3076 break; 3104 break;
3077 3105
3106 case CSI_71: // DESCUSR: set cursor style
3107 if (prev_ch == ' ')
3108 set_cursor_style (arg[0]);
3109 break;
3110
3078 /* 3111 /*
3079 * PRIVATE USE beyond this point. All CSI_7? sequences here 3112 * PRIVATE USE beyond this point. All CSI_7? sequences here
3080 */ 3113 */
3081 case CSI_72: /* DECSTBM: set top and bottom margins */ 3114 case CSI_72: /* DECSTBM: set top and bottom margins */
3082 if (nargs == 1) 3115 if (nargs == 1)
… …
3110 } 3143 }
3111} 3144}
3112/*}}} */ 3145/*}}} */
3113 3146
3114#if !ENABLE_MINIMAL 3147#if !ENABLE_MINIMAL
3115/* ARGSUSED */
3116void 3148void
3117rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3149rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3118{ 3150{
3119 int x, y; 3151 int x, y;
3120 XWindowAttributes wattr; 3152 XWindowAttributes wattr;
… …
3129 { 3161 {
3130 /* 3162 /*
3131 * commands 3163 * commands
3132 */ 3164 */
3133 case 1: /* deiconify window */ 3165 case 1: /* deiconify window */
3134 XMapWindow (dpy, parent[0]); 3166 XMapWindow (dpy, parent);
3135 break; 3167 break;
3136 case 2: /* iconify window */ 3168 case 2: /* iconify window */
3137 XIconifyWindow (dpy, parent[0], display->screen); 3169 XIconifyWindow (dpy, parent, display->screen);
3138 break; 3170 break;
3139 case 3: /* set position (pixels) */ 3171 case 3: /* set position (pixels) */
3140 XMoveWindow (dpy, parent[0], args[1], args[2]); 3172 XMoveWindow (dpy, parent, args[1], args[2]);
3141 break; 3173 break;
3142 case 4: /* set size (pixels) */ 3174 case 4: /* set size (pixels) */
3143 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3175 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3144 break; 3176 break;
3145 case 5: /* raise window */ 3177 case 5: /* raise window */
3146 XRaiseWindow (dpy, parent[0]); 3178 XRaiseWindow (dpy, parent);
3147 break; 3179 break;
3148 case 6: /* lower window */ 3180 case 6: /* lower window */
3149 XLowerWindow (dpy, parent[0]); 3181 XLowerWindow (dpy, parent);
3150 break; 3182 break;
3151 case 7: /* refresh window */ 3183 case 7: /* refresh window */
3152 scr_touch (true); 3184 scr_touch (true);
3153 break; 3185 break;
3154 case 8: /* set size (chars) */ 3186 case 8: /* set size (chars) */
… …
3157 break; 3189 break;
3158 3190
3159 //case 9: NYI, TODO, restore maximized window or maximize window 3191 //case 9: NYI, TODO, restore maximized window or maximize window
3160 default: 3192 default:
3161 if (args[0] >= 24) /* set height (chars) */ 3193 if (args[0] >= 24) /* set height (chars) */
3162 set_widthheight ((unsigned int)width, 3194 set_widthheight ((unsigned int)vt_width,
3163 (unsigned int) (args[1] * fheight)); 3195 (unsigned int) (args[1] * fheight));
3164 break; 3196 break;
3165 3197
3166 /* 3198 /*
3167 * reports - some output format copied from XTerm 3199 * reports - some output format copied from XTerm
3168 */ 3200 */
3169 case 11: /* report window state */ 3201 case 11: /* report window state */
3170 XGetWindowAttributes (dpy, parent[0], &wattr); 3202 XGetWindowAttributes (dpy, parent, &wattr);
3171 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3203 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3172 break; 3204 break;
3173 case 13: /* report window position */ 3205 case 13: /* report window position */
3174 XGetWindowAttributes (dpy, parent[0], &wattr); 3206 XGetWindowAttributes (dpy, parent, &wattr);
3175 XTranslateCoordinates (dpy, parent[0], wattr.root, 3207 XTranslateCoordinates (dpy, parent, wattr.root,
3176 -wattr.border_width, -wattr.border_width, 3208 -wattr.border_width, -wattr.border_width,
3177 &x, &y, &wdummy); 3209 &x, &y, &wdummy);
3178 tt_printf ("\033[3;%d;%dt", x, y); 3210 tt_printf ("\033[3;%d;%dt", x, y);
3179 break; 3211 break;
3180 case 14: /* report window size (pixels) */ 3212 case 14: /* report window size (pixels) */
3181 XGetWindowAttributes (dpy, parent[0], &wattr); 3213 XGetWindowAttributes (dpy, parent, &wattr);
3182 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3214 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3183 break; 3215 break;
3184 case 18: /* report text area size (chars) */ 3216 case 18: /* report text area size (chars) */
3185 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3217 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3186 break; 3218 break;
… …
3188 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3220 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3189 break; 3221 break;
3190 case 20: /* report icon label */ 3222 case 20: /* report icon label */
3191 { 3223 {
3192 char *s; 3224 char *s;
3193 XGetIconName (dpy, parent[0], &s); 3225 XGetIconName (dpy, parent, &s);
3194 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3226 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3195 XFree (s); 3227 XFree (s);
3196 } 3228 }
3197 break; 3229 break;
3198 case 21: /* report window title */ 3230 case 21: /* report window title */
3199 { 3231 {
3200 char *s; 3232 char *s;
3201 XFetchName (dpy, parent[0], &s); 3233 XFetchName (dpy, parent, &s);
3202 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3234 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3203 XFree (s); 3235 XFree (s);
3204 } 3236 }
3205 break; 3237 break;
3206 } 3238 }
… …
3216rxvt_term::get_to_st (unicode_t &ends_how) 3248rxvt_term::get_to_st (unicode_t &ends_how)
3217{ 3249{
3218 unicode_t ch; 3250 unicode_t ch;
3219 bool seen_esc = false; 3251 bool seen_esc = false;
3220 unsigned int n = 0; 3252 unsigned int n = 0;
3221 wchar_t string[STRING_MAX]; 3253 wchar_t string[CBUFSIZ];
3222 3254
3223 while ((ch = cmd_getc ()) != NOCHAR) 3255 while ((ch = cmd_getc ()) != NOCHAR)
3224 { 3256 {
3225 if (seen_esc) 3257 if (seen_esc)
3226 { 3258 {
… …
3241 else if (ch < 0x20) 3273 else if (ch < 0x20)
3242 return NULL; /* other control character - exit */ 3274 return NULL; /* other control character - exit */
3243 3275
3244 seen_esc = false; 3276 seen_esc = false;
3245 3277
3246 if (n >= STRING_MAX - 1) 3278 if (n >= sizeof (string) - 1)
3247 // stop at some sane length 3279 // stop at some sane length
3248 return NULL; 3280 return NULL;
3249 3281
3250 string[n++] = ch; 3282 string[n++] = ch;
3251 } 3283 }
… …
3360 unsigned long bytes_after; 3392 unsigned long bytes_after;
3361 unsigned char *value = 0; 3393 unsigned char *value = 0;
3362 const char *str = ""; 3394 const char *str = "";
3363 3395
3364 if (prop 3396 if (prop
3365 && XGetWindowProperty (dpy, parent[0], 3397 && XGetWindowProperty (dpy, parent,
3366 prop, 0, 1<<16, 0, AnyPropertyType, 3398 prop, 0, 1<<16, 0, AnyPropertyType,
3367 &actual_type, &actual_format, 3399 &actual_type, &actual_format,
3368 &nitems, &bytes_after, &value) == Success 3400 &nitems, &bytes_after, &value) == Success
3369 && actual_type != None 3401 && actual_type != None
3370 && actual_format == 8) 3402 && actual_format == 8)
3371 str = (const char *)(value); 3403 str = (const char *)(value);
3372 3404
3373 tt_printf ("\033]%d;%s%c", op, str, resp); 3405 tt_printf ("\033]%d;%s%c", op, option (Opt_insecure) ? str : "", resp);
3374 3406
3375 XFree (value); 3407 XFree (value);
3376 } 3408 }
3377 else 3409 else
3378 { 3410 {
… …
3382 { 3414 {
3383 *eq = 0; 3415 *eq = 0;
3384 set_utf8_property (display->atom (str), eq + 1); 3416 set_utf8_property (display->atom (str), eq + 1);
3385 } 3417 }
3386 else 3418 else
3387 XDeleteProperty (dpy, parent[0], 3419 XDeleteProperty (dpy, parent,
3388 display->atom (str)); 3420 display->atom (str));
3389 } 3421 }
3390 break; 3422 break;
3391 3423
3392 case XTerm_Color: 3424 case XTerm_Color:
… …
3446 break; 3478 break;
3447#endif 3479#endif
3448 case URxvt_Color_border: 3480 case URxvt_Color_border:
3449 process_color_seq (op, Color_border, str, resp); 3481 process_color_seq (op, Color_border, str, resp);
3450 break; 3482 break;
3451#if ENABLE_TRANSPARENCY 3483
3484#if BG_IMAGE_FROM_ROOT
3452 case URxvt_Color_tint: 3485 case URxvt_Color_tint:
3453 process_color_seq (op, Color_tint, str, resp); 3486 process_color_seq (op, Color_tint, str, resp);
3454 { 3487 {
3455 bool changed = false; 3488 bool changed = false;
3456 3489
3457 if (ISSET_PIXCOLOR (Color_tint)) 3490 if (ISSET_PIXCOLOR (Color_tint))
3458 changed = bg_set_tint (pix_colors_focused [Color_tint]); 3491 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3459 3492
3460 if (changed) 3493 if (changed)
3461 update_background (); 3494 update_background ();
3462 } 3495 }
3463 3496
… …
3467#if BG_IMAGE_FROM_FILE 3500#if BG_IMAGE_FROM_FILE
3468 case Rxvt_Pixmap: 3501 case Rxvt_Pixmap:
3469 if (!strcmp (str, "?")) 3502 if (!strcmp (str, "?"))
3470 { 3503 {
3471 char str[256]; 3504 char str[256];
3505 int h_scale = fimage.h_scale;
3506 int v_scale = fimage.v_scale;
3507 int h_align = fimage.h_align;
3508 int v_align = fimage.v_align;
3472 3509
3473 sprintf (str, "[%dx%d+%d+%d]", 3510 sprintf (str, "[%dx%d+%d+%d]",
3474 min (h_scale, 32767), min (v_scale, 32767), 3511 h_scale, v_scale,
3475 min (h_align, 32767), min (v_align, 32767)); 3512 h_align, v_align);
3476 process_xterm_seq (XTerm_title, str, CHAR_ST); 3513 process_xterm_seq (XTerm_title, str, CHAR_ST);
3477 } 3514 }
3478 else 3515 else
3479 { 3516 {
3480 int changed = 0; 3517 bool changed = false;
3481 3518
3482 if (*str != ';') 3519 if (*str != ';')
3483 { 3520 {
3484 if (bg_set_file (str)) /* change pixmap */ 3521 try
3485 { 3522 {
3523 fimage.set_file_geometry (this, str);
3486 changed++; 3524 changed = true;
3487 str = strchr (str, ';');
3488 if (str == NULL)
3489 bg_set_default_geometry ();
3490 else 3525 }
3491 bg_set_geometry (str+1); 3526 catch (const class rxvt_failure_exception &e)
3527 {
3492 } 3528 }
3493 } 3529 }
3494 else 3530 else
3495 { 3531 {
3496 str++; 3532 str++;
3497 if (bg_set_geometry (str, true)) 3533 if (fimage.set_geometry (str, true))
3498 changed++; 3534 changed = true;
3499 } 3535 }
3500 3536
3501 if (changed) 3537 if (changed)
3502 { 3538 {
3503 if (bg_window_position_sensitive ()) 3539 if (bg_window_position_sensitive ())
3504 { 3540 {
3505 int x, y; 3541 int x, y;
3506 get_window_origin (x, y); 3542 get_window_origin (x, y);
3507 bg_set_position (x, y); 3543 parent_x = x;
3544 parent_y = y;
3508 } 3545 }
3509 update_background (); 3546 update_background ();
3510 } 3547 }
3511 } 3548 }
3512 break; 3549 break;
… …
3602 * 's' = save 3639 * 's' = save
3603 * 'r' = restore 3640 * 'r' = restore
3604 * 't' = toggle 3641 * 't' = toggle
3605 * so no need for fancy checking 3642 * so no need for fancy checking
3606 */ 3643 */
3607int 3644int ecb_cold
3608rxvt_term::privcases (int mode, unsigned long bit) 3645rxvt_term::privcases (int mode, unsigned long bit)
3609{ 3646{
3610 int state; 3647 int state;
3611 3648
3612 if (mode == 's') 3649 if (mode == 's')
3613 { 3650 {
3614 SavedModes |= (priv_modes & bit); 3651 if (priv_modes & bit)
3652 SavedModes |= bit;
3653 else
3654 SavedModes &= ~bit;
3615 return -1; 3655 return -1;
3616 } 3656 }
3617 else 3657 else
3618 { 3658 {
3619 if (mode == 'r') 3659 if (mode == 'r')
3620 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3660 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3621 else 3661 else
3622 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3662 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3623 3663
3624 set_privmode (bit, state); 3664 if (state)
3665 priv_modes |= bit;
3666 else
3667 priv_modes &= ~bit;
3625 } 3668 }
3626 3669
3627 return state; 3670 return state;
3628} 3671}
3629 3672
3630/* we're not using priv _yet_ */ 3673/* we're not using priv _yet_ */
3631void 3674void
3632rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3675rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3633{ 3676{
3634 unsigned int i, j; 3677 unsigned int i, j;
3635 int state; 3678 int state;
3636 3679
3637 static const struct 3680 static const struct
3638 { 3681 {
3639 const int argval; 3682 const int argval;
3640 const unsigned long bit; 3683 const unsigned long bit;
3641 } argtopriv[] = { 3684 } argtopriv[] = {
3642 { 1, PrivMode_aplCUR }, // DECCKM 3685 { 1, PrivMode_aplCUR }, // DECCKM
3643 { 2, PrivMode_vt52 }, 3686 { 2, PrivMode_vt52 }, // DECANM
3644 { 3, PrivMode_132 }, // DECCOLM 3687 { 3, PrivMode_132 }, // DECCOLM
3645 { 4, PrivMode_smoothScroll }, // DECSCLM 3688 { 4, PrivMode_smoothScroll }, // DECSCLM
3646 { 5, PrivMode_rVideo }, // DECSCNM 3689 { 5, PrivMode_rVideo }, // DECSCNM
3647 { 6, PrivMode_relOrigin }, // DECOM 3690 { 6, PrivMode_relOrigin }, // DECOM
3648 { 7, PrivMode_Autowrap }, // DECAWM 3691 { 7, PrivMode_Autowrap }, // DECAWM
3649 // 8, auto-repeat keys // DECARM 3692 // 8, auto-repeat keys // DECARM
3650 { 9, PrivMode_MouseX10 }, 3693 { 9, PrivMode_MouseX10 },
3651 // 18 end FF to printer after print screen 3694 // 18 end FF to printer after print screen
3652 // 19 Print screen prints full screen/scroll region 3695 // 19 Print screen prints full screen/scroll region
3653 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis 3696 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3654#ifdef scrollBar_esc 3697#ifdef scrollBar_esc
3655 { scrollBar_esc, PrivMode_scrollBar }, 3698 { scrollBar_esc, PrivMode_scrollBar },
3656#endif 3699#endif
3657 { 35, PrivMode_ShiftKeys }, // rxvt extension 3700 { 35, PrivMode_ShiftKeys }, // rxvt extension
3658 // 38, tektronix mode // DECTEK 3701 // 38, tektronix mode // DECTEK
3659 { 40, PrivMode_132OK }, 3702 { 40, PrivMode_132OK },
3660 // 41 xterm more fixes NYI 3703 // 41 xterm more fixes NYI
3661 // 45 margin bell NYI 3704 // 45 margin bell NYI
3662 // 46 start logging 3705 // 46 start logging
3663 { 47, PrivMode_Screen }, 3706 { 47, PrivMode_Screen },
3664 { 66, PrivMode_aplKP }, // DECPAM/DECPNM 3707 { 66, PrivMode_aplKP }, // DECNKM
3665#ifndef NO_BACKSPACE_KEY 3708#ifndef NO_BACKSPACE_KEY
3666 { 67, PrivMode_BackSpace }, // DECBKM 3709 { 67, PrivMode_BackSpace }, // DECBKM
3667#endif 3710#endif
3668 { 1000, PrivMode_MouseX11 }, 3711 { 1000, PrivMode_MouseX11 },
3669 { 1002, PrivMode_MouseBtnEvent }, 3712 { 1002, PrivMode_MouseBtnEvent },
… …
3698 for (i = 0; i < nargs; i++) 3741 for (i = 0; i < nargs; i++)
3699 { 3742 {
3700 state = -1; 3743 state = -1;
3701 3744
3702 /* basic handling */ 3745 /* basic handling */
3703 for (j = 0; j < ARRAY_LENGTH(argtopriv); j++) 3746 for (j = 0; j < ecb_array_length (argtopriv); j++)
3704 if (argtopriv[j].argval == arg[i]) 3747 if (argtopriv[j].argval == arg[i])
3705 { 3748 {
3706 state = privcases (mode, argtopriv[j].bit); 3749 state = privcases (mode, argtopriv[j].bit);
3707 break; 3750 break;
3708 } 3751 }
… …
3734 case 2: /* VT52 mode */ 3777 case 2: /* VT52 mode */
3735 /* oddball mode. should be set regardless of set/reset 3778 /* oddball mode. should be set regardless of set/reset
3736 * parameter. Return from VT52 mode with an ESC < from 3779 * parameter. Return from VT52 mode with an ESC < from
3737 * within VT52 mode 3780 * within VT52 mode
3738 */ 3781 */
3739 set_privmode (PrivMode_vt52, 1); 3782 priv_modes |= PrivMode_vt52;
3740 break; 3783 break;
3741 case 3: /* 80/132 */ 3784 case 3: /* 80/132 */
3742 if (priv_modes & PrivMode_132OK) 3785 if (priv_modes & PrivMode_132OK)
3743 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight); 3786 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3744 break; 3787 break;
… …
3759 if (state) /* orthogonal */ 3802 if (state) /* orthogonal */
3760 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3803 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3761 break; 3804 break;
3762#ifdef scrollBar_esc 3805#ifdef scrollBar_esc
3763 case scrollBar_esc: 3806 case scrollBar_esc:
3764 if (scrollBar.map (state)) 3807 scrollBar.map (state);
3765 {
3766 resize_all_windows (0, 0, 0); 3808 resize_all_windows (0, 0, 0);
3767 scr_touch (true); 3809 scr_touch (true);
3768 }
3769 break; 3810 break;
3770#endif 3811#endif
3771 case 25: /* visible/invisible cursor */ 3812 case 25: /* visible/invisible cursor */
3772 scr_cursor_visible (state); 3813 scr_cursor_visible (state);
3773 break; 3814 break;
… …
3828 } 3869 }
3829} 3870}
3830/*}}} */ 3871/*}}} */
3831 3872
3832/*{{{ process sgr sequences */ 3873/*{{{ process sgr sequences */
3833void 3874void ecb_hot
3834rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3875rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3835{ 3876{
3836 unsigned int i; 3877 unsigned int i;
3837 short rendset; 3878 short rendset;
3838 int rendstyle; 3879 int rendstyle;
… …
3979 break; 4020 break;
3980#endif 4021#endif
3981 } 4022 }
3982 } 4023 }
3983} 4024}
4025
4026void
4027rxvt_term::set_cursor_style (int style)
4028{
4029 if (!IN_RANGE_INC (style, 0, 4))
4030 return;
4031
4032 set_option (Opt_cursorUnderline, style >= 3);
4033
4034#ifdef CURSOR_BLINK
4035 set_option (Opt_cursorBlink, !style || (style & 1));
4036 cursor_blink_reset ();
4037#endif
4038
4039 want_refresh = 1;
4040}
3984/*}}} */ 4041/*}}} */
3985 4042
3986/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3987void
3988rxvt_term::process_graphics ()
3989{
3990 unicode_t ch, cmd = cmd_getc ();
3991
3992 if (cmd == 'Q')
3993 {
3994 /* query graphics */
3995 tt_printf ("\033G0\012"); /* no graphics */
3996 return;
3997 }
3998 /* swallow other graphics sequences until terminating ':' */
3999 do
4000 ch = cmd_getc ();
4001 while (ch != ':');
4002}
4003/*}}} */
4004
4005/* ------------------------------------------------------------------------- */ 4043/* ---------------------------------------------------------------------- */
4044/* Write data to the pty as typed by the user, pasted with the mouse,
4045 * or generated by us in response to a query ESC sequence.
4046 */
4006 4047
4007/* 4048/*
4008 * Send printf () formatted output to the command. 4049 * Send printf () formatted output to the command.
4009 * Only use for small amounts of data. 4050 * Only use for small amounts of data.
4010 */ 4051 */
… …
4018 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4059 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4019 va_end (arg_ptr); 4060 va_end (arg_ptr);
4020 tt_write (buf, strlen (buf)); 4061 tt_write (buf, strlen (buf));
4021} 4062}
4022 4063
4023/* ---------------------------------------------------------------------- */
4024/* Write data to the pty as typed by the user, pasted with the mouse, 4064/* Write data to the pty as typed by the user. */
4025 * or generated by us in response to a query ESC sequence. 4065void
4026 */ 4066rxvt_term::tt_write_user_input (const char *data, unsigned int len)
4027static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4067{
4068 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4069 return;
4070
4071 if (option (Opt_scrollTtyKeypress))
4072 if (view_start)
4073 {
4074 view_start = 0;
4075 want_refresh = 1;
4076 }
4077
4078 tt_write_ (data, len);
4079}
4028 4080
4029void 4081void
4030rxvt_term::tt_write (const char *data, unsigned int len) 4082rxvt_term::tt_write (const char *data, unsigned int len)
4031{ 4083{
4032 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4084 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4033 return; 4085 return;
4034 4086
4087 tt_write_ (data, len);
4088}
4089
4090static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4091
4092void
4093rxvt_term::tt_write_ (const char *data, unsigned int len)
4094{
4035 if (pty->pty < 0) 4095 if (pty->pty < 0)
4036 return; 4096 return;
4037 4097
4038 if (v_buflen == 0) 4098 if (v_buflen == 0)
4039 { 4099 {
4040 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4100 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4041 4101
4102 max_it (written, 0);
4103
4042 if ((unsigned int)written == len) 4104 if (written == len)
4043 return; 4105 return;
4044 4106
4045 data += written; 4107 data += written;
4046 len -= written; 4108 len -= written;
4047 } 4109 }

Diff Legend

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