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.465 by sf-exg, Sat Dec 18 14:00:43 2010 UTC vs.
Revision 1.547 by sf-exg, Tue Apr 29 12:51:41 2014 UTC

… …
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7 * - original version 7 * - original version
8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
9 * - extensive modifications 9 * - extensive modifications
10 * Copyright (c) 1995 Garrett D'Amore <garrett@netcom.com> 10 * Copyright (c) 1995 Garrett D'Amore <garrett@netcom.com>
11 * - vt100 printing 11 * - vt100 printing
12 * Copyright (c) 1995 Steven Hirsch <hirsch@emba.uvm.edu> 12 * Copyright (c) 1995 Steven Hirsch <hirsch@emba.uvm.edu>
13 * - X11 mouse report mode and support for 13 * - X11 mouse report mode and support for
14 * DEC "private mode" save/restore functions. 14 * DEC "private mode" save/restore functions.
… …
20 * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es> 20 * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es>
21 * - modification and cleanups for Solaris 2.x 21 * - modification and cleanups for Solaris 2.x
22 * and Linux 1.2.x 22 * and Linux 1.2.x
23 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 23 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
24 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 24 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2014 Marc Lehmann <schmorp@schmorp.de>
31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it> 31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
32 * 32 *
33 * This program is free software; you can redistribute it and/or modify 33 * This program is free software; you can redistribute it and/or modify
34 * it under the terms of the GNU General Public License as published by 34 * it under the terms of the GNU General Public License as published by
35 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 2 of the License, or
… …
54 54
55#ifdef KEYSYM_RESOURCE 55#ifdef KEYSYM_RESOURCE
56# include "keyboard.h" 56# include "keyboard.h"
57#endif 57#endif
58 58
59#include <csignal> 59#include <signal.h>
60 60
61#if LINUX_YIELD_HACK 61#if LINUX_YIELD_HACK
62# include <ctime> 62# include <time.h>
63#endif 63#endif
64 64
65/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
66 66
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
… …
131 XK_KP_Space, 0x2422, 131 XK_KP_Space, 0x2422,
132#endif 132#endif
133 0, 133 0,
134}; 134};
135 135
136void 136void ecb_cold
137rxvt_term::iso14755_54 (int x, int y) 137rxvt_term::iso14755_54 (int x, int y)
138{ 138{
139 x = Pixel2Col (x); 139 x = Pixel2Col (x);
140 y = Pixel2Row (y); 140 y = Pixel2Row (y);
141 141
… …
149 149
150 text_t t = l.t[x]; 150 text_t t = l.t[x];
151 151
152 if (t != NOCHAR || !x) 152 if (t != NOCHAR || !x)
153 { 153 {
154 iso14755_51 (l.t[x], l.r[x], x, y); 154 iso14755_51 (l.t[x], l.r[x], x, y, view_start);
155 iso14755buf = ISO_14755_54; 155 iso14755buf = ISO_14755_54;
156 break; 156 break;
157 } 157 }
158 158
159 x--; 159 x--;
160 } 160 }
161} 161}
162 162
163void 163void ecb_cold
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y) 164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y, int y2)
165{ 165{
166 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
167 wchar_t *chr, *alloc, ch2, **fname; 167 wchar_t *chr, *alloc, ch2, **fname;
168 int len; 168 int len;
169 169
… …
181 181
182 alloc = 0; 182 alloc = 0;
183 chr = &ch2; 183 chr = &ch2;
184 len = 1; 184 len = 1;
185 } 185 }
186
187 char rowcol[40];
188 snprintf (rowcol, sizeof rowcol, "col %d row %d @%d", x, y, y2);
186 189
187 char attr[80]; // plenty 190 char attr[80]; // plenty
188 191
189 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s", 192 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
190 (int)r, 193 (int)r,
… …
203 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])]; 206 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])];
204 fname[i] = rxvt_utf8towcs (f->name); 207 fname[i] = rxvt_utf8towcs (f->name);
205 max_it (width, wcswidth (fname[i], wcslen (fname[i]))); 208 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
206 } 209 }
207 210
208 max_it (width, 8+5); // for char + hex
209 max_it (width, strlen (attr)); 211 max_it (width, strlen (attr));
210 212
211 if (y >= 0) 213 if (y >= 0)
212 { 214 {
213 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 215 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
214 x = 0; 216 x = 0;
215 } 217 }
216 218
217 scr_overlay_new (x, y, width, len * 2 + 1); 219 scr_overlay_new (x, y, width, len * 2 + 2);
220
221 scr_overlay_set (0, 0, rowcol);
218 222
219 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 223 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
220 224
221 for (int y = 0; y < len; y++) 225 for (int y = 0; y < len; y++)
222 { 226 {
223 char buf[9]; 227 char buf[9];
224 228
225 ch = *chr++; 229 ch = *chr++;
226 230
227 sprintf (buf, "%8x", ch); 231 sprintf (buf, "%8x", ch);
228 scr_overlay_set (0, y, buf); 232 scr_overlay_set (0, y + 1, buf);
229 scr_overlay_set (9, y, '='); 233 scr_overlay_set (9, y + 1, '=');
230# if !UNICODE_3 234# if !UNICODE_3
231 if (ch >= 0x10000) 235 if (ch >= 0x10000)
232 ch = 0xfffd; 236 ch = 0xfffd;
233# endif 237# endif
234 scr_overlay_set (11, y, ch, r); 238 scr_overlay_set (11, y + 1, ch, r);
235 239
236 if (WCWIDTH (ch) >= 2) 240 if (WCWIDTH (ch) >= 2)
237 scr_overlay_set (12, y, NOCHAR, r); 241 scr_overlay_set (12, y + 1, NOCHAR, r);
238 } 242 }
239 243
240// { 244// {
241// char buf[4+4+3+1]; 245// char buf[4+4+3+1];
242// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y); 246// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
243// scr_overlay_set (0, 0, buf); 247// scr_overlay_set (0, 0, buf);
244// } 248// }
245 scr_overlay_set (0, len , attr); 249 scr_overlay_set (0, len + 1, attr);
246 for (int i = 0; i < len; i++) 250 for (int i = 0; i < len; i++)
247 { 251 {
248 scr_overlay_set (0, len + 1 + i, fname[i]); 252 scr_overlay_set (0, len + 2 + i, fname[i]);
249 free (fname[i]); 253 free (fname[i]);
250 } 254 }
251 255
252# if ENABLE_COMBINING 256# if ENABLE_COMBINING
253 if (alloc) 257 if (alloc)
254 delete [] alloc; 258 delete [] alloc;
255# endif 259# endif
256} 260}
257#endif 261#endif
258 262
259void 263void ecb_cold
260rxvt_term::commit_iso14755 () 264rxvt_term::commit_iso14755 ()
261{ 265{
262 wchar_t ch[2];
263
264 ch[0] = iso14755buf & ISO_14755_MASK; 266 wchar_t ch = iso14755buf & ISO_14755_MASK;
265 ch[1] = 0;
266 267
267 if (iso14755buf & ISO_14755_51) 268 if (iso14755buf & ISO_14755_51)
268 { 269 {
269 char mb[16]; 270 char mb[MB_LEN_MAX];
270 int len; 271 int len;
271 272
272 // allow verbatim 0-bytes and control-bytes to be entered 273 // allow verbatim 0-bytes and control-bytes to be entered
273 if (ch[0] >= 0x20) 274 if (ch >= 0x20)
274 len = wcstombs (mb, ch, 16); 275 len = wctomb (mb, ch);
275 else 276 else
276 { 277 {
277 mb[0] = ch[0]; 278 mb[0] = ch;
278 len = 1; 279 len = 1;
279 } 280 }
280 281
281 if (len > 0) 282 if (len > 0)
282 tt_write (mb, len); 283 tt_write (mb, len);
… …
285 } 286 }
286 287
287 iso14755buf = 0; 288 iso14755buf = 0;
288} 289}
289 290
290static int 291static int ecb_cold
291hex_keyval (XKeyEvent &ev) 292hex_keyval (XKeyEvent &ev)
292{ 293{
293 // check whether this event corresponds to a hex digit 294 // check whether this event corresponds to a hex digit
294 // if the modifiers had not been pressed. 295 // if the modifiers had not been pressed.
295 for (int index = 0; index < 8; index++) 296 for (int index = 0; index < 8; index++)
… …
304 305
305 return -1; 306 return -1;
306} 307}
307#endif 308#endif
308 309
309static inline KeySym 310static inline KeySym ecb_cold
310translate_keypad (KeySym keysym, bool kp) 311translate_keypad (KeySym keysym, bool kp)
311{ 312{
312#ifdef XK_KP_Home 313#ifdef XK_KP_Home
313 static const KeySym keypadtrans[] = { 314 static const KeySym keypadtrans[] = {
314 XK_KP_7, // XK_KP_Home 315 XK_KP_7, // XK_KP_Home
… …
340# endif 341# endif
341#endif 342#endif
342 return keysym; 343 return keysym;
343} 344}
344 345
345static inline int 346static inline int ecb_cold
346map_function_key (KeySym keysym) 347map_function_key (KeySym keysym)
347{ 348{
348 int param = 0; 349 int param = 0;
349 350
350 if (IN_RANGE_INC (keysym, XK_F1, XK_F35)) 351 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
… …
399 break; 400 break;
400 } 401 }
401 return param; 402 return param;
402} 403}
403 404
404void 405static inline wchar_t *
406rxvt_wcsdup (const wchar_t *str, int len)
407{
408 wchar_t *r = (wchar_t *)rxvt_malloc ((len + 1) * sizeof (wchar_t));
409 memcpy (r, str, len * sizeof (wchar_t));
410 r[len] = 0;
411 return r;
412}
413
414void ecb_cold
405rxvt_term::key_press (XKeyEvent &ev) 415rxvt_term::key_press (XKeyEvent &ev)
406{ 416{
407 int ctrl, meta, shft, len; 417 int ctrl, meta, shft, len;
408 KeySym keysym; 418 KeySym keysym;
409 int valid_keysym; 419 int valid_keysym;
410 char kbuf[KBUFSZ]; 420 char rkbuf[KBUFSZ + 1];
421 char *kbuf = rkbuf + 1;
411 422
412#if ISO_14755 423#if ISO_14755
413 if (iso14755buf & ISO_14755_52) 424 if (iso14755buf & ISO_14755_52)
414 return; 425 return;
415#endif 426#endif
… …
424 ctrl = ev.state & ControlMask; 435 ctrl = ev.state & ControlMask;
425 meta = ev.state & ModMetaMask; 436 meta = ev.state & ModMetaMask;
426 437
427 kbuf[0] = 0; 438 kbuf[0] = 0;
428 439
429#ifdef USE_XIM 440#if USE_XIM
430 if (Input_Context) 441 if (Input_Context)
431 { 442 {
432 Status status_return; 443 Status status_return;
433 444
434#if 0 445#if 0
… …
485 valid_keysym = keysym != NoSymbol; 496 valid_keysym = keysym != NoSymbol;
486 } 497 }
487 498
488 if (valid_keysym) 499 if (valid_keysym)
489 { 500 {
501 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
502 {
503 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
504 unsigned int newlen = 1;
505
506 if (ev.state & ModNumLockMask)
507 kp = false;
508
509 keysym = translate_keypad (keysym, kp);
510
511 switch (keysym)
512 {
513#ifndef NO_BACKSPACE_KEY
514 case XK_BackSpace:
515 if (priv_modes & PrivMode_HaveBackSpace)
516 {
517 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
518 ^ !!ctrl) ? '\b' : '\177';
519 kbuf[1] = '\0';
520 }
521 else
522 strcpy (kbuf, rs[Rs_backspace_key]);
523 break;
524#endif
525#ifndef NO_DELETE_KEY
526 case XK_Delete:
527 strcpy (kbuf, rs[Rs_delete_key]);
528 break;
529#endif
530 case XK_Tab:
531 if (shft)
532 strcpy (kbuf, "\033[Z");
533 else
534 {
535#ifdef CTRL_TAB_MAKES_META
536 if (ctrl)
537 meta = 1;
538#endif
539#ifdef MOD4_TAB_MAKES_META
540 if (ev.state & Mod4Mask)
541 meta = 1;
542#endif
543 newlen = 0;
544 }
545 break;
546
547 case XK_Up: /* "\033[A" */
548 case XK_Down: /* "\033[B" */
549 case XK_Right: /* "\033[C" */
550 case XK_Left: /* "\033[D" */
551 strcpy (kbuf, "\033[Z");
552 kbuf[2] = "DACB"[keysym - XK_Left];
553 /* do Shift first */
554 if (shft)
555 kbuf[2] = "dacb"[keysym - XK_Left];
556 else if (ctrl)
557 {
558 kbuf[1] = 'O';
559 kbuf[2] = "dacb"[keysym - XK_Left];
560 }
561 else if (priv_modes & PrivMode_aplCUR)
562 kbuf[1] = 'O';
563 break;
564
565 case XK_KP_Enter:
566 /* allow shift to override */
567 if (kp)
568 {
569 strcpy (kbuf, "\033OM");
570 break;
571 }
572
573 /* FALLTHROUGH */
574
575 case XK_Return:
576 if (priv_modes & PrivMode_LFNL)
577 {
578 kbuf[0] = '\015';
579 kbuf[1] = '\012';
580 kbuf[2] = '\0';
581 }
582 else
583 {
584 kbuf[0] = '\015';
585 kbuf[1] = '\0';
586 }
587 break;
588
589 case XK_KP_F1: /* "\033OP" */
590 case XK_KP_F2: /* "\033OQ" */
591 case XK_KP_F3: /* "\033OR" */
592 case XK_KP_F4: /* "\033OS" */
593 strcpy (kbuf, "\033OP");
594 kbuf[2] += (keysym - XK_KP_F1);
595 break;
596
597 case XK_KP_Multiply: /* "\033Oj" : "*" */
598 case XK_KP_Add: /* "\033Ok" : "+" */
599 case XK_KP_Separator: /* "\033Ol" : "," */
600 case XK_KP_Subtract: /* "\033Om" : "-" */
601 case XK_KP_Decimal: /* "\033On" : "." */
602 case XK_KP_Divide: /* "\033Oo" : "/" */
603 case XK_KP_0: /* "\033Op" : "0" */
604 case XK_KP_1: /* "\033Oq" : "1" */
605 case XK_KP_2: /* "\033Or" : "2" */
606 case XK_KP_3: /* "\033Os" : "3" */
607 case XK_KP_4: /* "\033Ot" : "4" */
608 case XK_KP_5: /* "\033Ou" : "5" */
609 case XK_KP_6: /* "\033Ov" : "6" */
610 case XK_KP_7: /* "\033Ow" : "7" */
611 case XK_KP_8: /* "\033Ox" : "8" */
612 case XK_KP_9: /* "\033Oy" : "9" */
613 /* allow shift to override */
614 if (kp)
615 {
616 strcpy (kbuf, "\033Oj");
617 kbuf[2] += (keysym - XK_KP_Multiply);
618 }
619 else
620 {
621 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
622 kbuf[1] = '\0';
623 }
624 break;
625
626 default:
627 {
628 int param = map_function_key (keysym);
629 if (param > 0)
630 sprintf (kbuf,"\033[%d~", param);
631 else
632 newlen = 0;
633 }
634 break;
635 }
636
637 if (newlen)
638 len = strlen (kbuf);
639
640 if (len > 0)
641 {
642 /*
643 * pass Shift/Control indicators for function keys ending with `~'
644 *
645 * eg,
646 * Prior = "ESC[5~"
647 * Shift+Prior = "ESC[5$"
648 * Ctrl+Prior = "ESC[5^"
649 * Ctrl+Shift+Prior = "ESC[5@"
650 */
651 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
652 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
653
654 /*
655 * Pass meta for all function keys, if 'meta' option set
656 */
657#ifdef META8_OPTION
658 if (meta && (meta_char == 0x80))
659 kbuf[len - 1] |= 0x80;
660#endif
661 }
662
663 }
664 else if (ctrl && keysym == XK_minus)
665 {
666 len = 1;
667 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
668 }
669 else if (keysym == XK_ISO_Left_Tab)
670 {
671 strcpy (kbuf, "\033[Z");
672 len = 3;
673 }
674 else
675 {
676#ifdef META8_OPTION
677 /* set 8-bit on */
678 if (meta && (meta_char == 0x80))
679 {
680 char *ch;
681
682 for (ch = kbuf; ch < kbuf + len; ch++)
683 *ch |= 0x80;
684
685 meta = 0;
686 }
687#endif
688 /* nil */ ;
689 }
690 }
691
692 /* escape prefix */
693 if (len && meta
694#ifdef META8_OPTION
695 && meta_char == C0_ESC
696#endif
697 )
698 {
699 *--kbuf = C0_ESC;
700 len++;
701 }
702
703 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
704 return;
705
706 if (valid_keysym)
707 {
490#ifdef KEYSYM_RESOURCE 708#ifdef KEYSYM_RESOURCE
491 if (keyboard->dispatch (this, keysym, ev.state)) 709 if (keyboard->dispatch (this, keysym, ev.state, kbuf, len))
492 return; 710 return;
493#endif 711#endif
494 712
495 if (saveLines) 713 if (saveLines)
496 { 714 {
… …
509#endif 727#endif
510 max_it (lnsppg, 1); 728 max_it (lnsppg, 1);
511 729
512 if (keysym == XK_Prior) 730 if (keysym == XK_Prior)
513 { 731 {
514 scr_page (UP, lnsppg); 732 scr_page (lnsppg);
515 return; 733 return;
516 } 734 }
517 else if (keysym == XK_Next) 735 else if (keysym == XK_Next)
518 { 736 {
519 scr_page (DN, lnsppg); 737 scr_page (-lnsppg);
520 return; 738 return;
521 } 739 }
522 } 740 }
523#ifdef SCROLL_ON_UPDOWN_KEYS 741#ifdef SCROLL_ON_UPDOWN_KEYS
524 if (IS_SCROLL_MOD) 742 if (IS_SCROLL_MOD)
525 { 743 {
526 if (keysym == XK_Up) 744 if (keysym == XK_Up)
527 { 745 {
528 scr_page (UP, 1); 746 scr_page (1);
529 return; 747 return;
530 } 748 }
531 else if (keysym == XK_Down) 749 else if (keysym == XK_Down)
532 { 750 {
533 scr_page (DN, 1); 751 scr_page (-1);
534 return; 752 return;
535 } 753 }
536 } 754 }
537#endif 755#endif
538#ifdef SCROLL_ON_HOMEEND_KEYS 756#ifdef SCROLL_ON_HOMEEND_KEYS
539 if (IS_SCROLL_MOD) 757 if (IS_SCROLL_MOD)
540 { 758 {
541 if (keysym == XK_Home) 759 if (keysym == XK_Home)
542 { 760 {
543 scr_move_to (0, 1); 761 scr_changeview (top_row);
544 return; 762 return;
545 } 763 }
546 else if (keysym == XK_End) 764 else if (keysym == XK_End)
547 { 765 {
548 scr_move_to (1, 1); 766 scr_changeview (0);
549 return; 767 return;
550 } 768 }
551 } 769 }
552#endif 770#endif
553 } 771 }
… …
569 selection_request (ev.time); 787 selection_request (ev.time);
570 return; 788 return;
571#if TODO 789#if TODO
572 /* rxvt extras */ 790 /* rxvt extras */
573 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 791 case XK_KP_Add: /* Shift+KP_Add = bigger font */
574 change_font (FONT_UP);
575 return; 792 return;
576 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 793 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
577 change_font (FONT_DN);
578 return; 794 return;
579#endif 795#endif
580 } 796 }
581 } 797 }
798 }
799
800 if (ctrl && meta && (keysym == XK_c || keysym == XK_v))
801 {
802 if (keysym == XK_v)
803 selection_request (ev.time, Sel_Clipboard);
804 else if (selection.len > 0)
805 {
806 free (selection.clip_text);
807 selection.clip_text = rxvt_wcsdup (selection.text, selection.len);
808 selection.clip_len = selection.len;
809 selection_grab (CurrentTime, true);
810 }
811
812 return;
582 } 813 }
583 814
584#if ENABLE_FRILLS || ISO_14755 815#if ENABLE_FRILLS || ISO_14755
585 // ISO 14755 support 816 // ISO 14755 support
586 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51)) 817 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
… …
641 { 872 {
642 scr_printscreen (ctrl | shft); 873 scr_printscreen (ctrl | shft);
643 return; 874 return;
644 } 875 }
645#endif 876#endif
646
647 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
648 {
649 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
650 unsigned int newlen = 1;
651
652 if (ev.state & ModNumLockMask)
653 kp = false;
654
655 keysym = translate_keypad (keysym, kp);
656
657 switch (keysym)
658 {
659#ifndef NO_BACKSPACE_KEY
660 case XK_BackSpace:
661 if (priv_modes & PrivMode_HaveBackSpace)
662 {
663 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
664 ^ !!ctrl) ? '\b' : '\177';
665 kbuf[1] = '\0';
666 }
667 else
668 strcpy (kbuf, rs[Rs_backspace_key]);
669 break;
670#endif
671#ifndef NO_DELETE_KEY
672 case XK_Delete:
673 strcpy (kbuf, rs[Rs_delete_key]);
674 break;
675#endif
676 case XK_Tab:
677 if (shft)
678 strcpy (kbuf, "\033[Z");
679 else
680 {
681#ifdef CTRL_TAB_MAKES_META
682 if (ctrl)
683 meta = 1;
684#endif
685#ifdef MOD4_TAB_MAKES_META
686 if (ev.state & Mod4Mask)
687 meta = 1;
688#endif
689 newlen = 0;
690 }
691 break;
692
693 case XK_Up: /* "\033[A" */
694 case XK_Down: /* "\033[B" */
695 case XK_Right: /* "\033[C" */
696 case XK_Left: /* "\033[D" */
697 strcpy (kbuf, "\033[Z");
698 kbuf[2] = "DACB"[keysym - XK_Left];
699 /* do Shift first */
700 if (shft)
701 kbuf[2] = "dacb"[keysym - XK_Left];
702 else if (ctrl)
703 {
704 kbuf[1] = 'O';
705 kbuf[2] = "dacb"[keysym - XK_Left];
706 }
707 else if (priv_modes & PrivMode_aplCUR)
708 kbuf[1] = 'O';
709 break;
710
711 case XK_KP_Enter:
712 /* allow shift to override */
713 if (kp)
714 {
715 strcpy (kbuf, "\033OM");
716 break;
717 }
718
719 /* FALLTHROUGH */
720
721 case XK_Return:
722 if (priv_modes & PrivMode_LFNL)
723 {
724 kbuf[0] = '\015';
725 kbuf[1] = '\012';
726 kbuf[2] = '\0';
727 }
728 else
729 {
730 kbuf[0] = '\015';
731 kbuf[1] = '\0';
732 }
733 break;
734
735 case XK_KP_F1: /* "\033OP" */
736 case XK_KP_F2: /* "\033OQ" */
737 case XK_KP_F3: /* "\033OR" */
738 case XK_KP_F4: /* "\033OS" */
739 strcpy (kbuf, "\033OP");
740 kbuf[2] += (keysym - XK_KP_F1);
741 break;
742
743 case XK_KP_Multiply: /* "\033Oj" : "*" */
744 case XK_KP_Add: /* "\033Ok" : "+" */
745 case XK_KP_Separator: /* "\033Ol" : "," */
746 case XK_KP_Subtract: /* "\033Om" : "-" */
747 case XK_KP_Decimal: /* "\033On" : "." */
748 case XK_KP_Divide: /* "\033Oo" : "/" */
749 case XK_KP_0: /* "\033Op" : "0" */
750 case XK_KP_1: /* "\033Oq" : "1" */
751 case XK_KP_2: /* "\033Or" : "2" */
752 case XK_KP_3: /* "\033Os" : "3" */
753 case XK_KP_4: /* "\033Ot" : "4" */
754 case XK_KP_5: /* "\033Ou" : "5" */
755 case XK_KP_6: /* "\033Ov" : "6" */
756 case XK_KP_7: /* "\033Ow" : "7" */
757 case XK_KP_8: /* "\033Ox" : "8" */
758 case XK_KP_9: /* "\033Oy" : "9" */
759 /* allow shift to override */
760 if (kp)
761 {
762 strcpy (kbuf, "\033Oj");
763 kbuf[2] += (keysym - XK_KP_Multiply);
764 }
765 else
766 {
767 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
768 kbuf[1] = '\0';
769 }
770 break;
771
772 default:
773 {
774 int param = map_function_key (keysym);
775 if (param > 0)
776 sprintf (kbuf,"\033[%d~", param);
777 else
778 newlen = 0;
779 }
780 break;
781 }
782
783 if (newlen)
784 len = strlen (kbuf);
785
786 /*
787 * Pass meta for all function keys, if 'meta' option set
788 */
789#ifdef META8_OPTION
790 if (meta && (meta_char == 0x80) && len > 0)
791 kbuf[len - 1] |= 0x80;
792#endif
793
794 }
795 else if (ctrl && keysym == XK_minus)
796 {
797 len = 1;
798 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
799 }
800 else if (keysym == XK_ISO_Left_Tab)
801 {
802 strcpy (kbuf, "\033[Z");
803 len = 3;
804 }
805 else
806 {
807#ifdef META8_OPTION
808 /* set 8-bit on */
809 if (meta && (meta_char == 0x80))
810 {
811 char *ch;
812
813 for (ch = kbuf; ch < kbuf + len; ch++)
814 *ch |= 0x80;
815
816 meta = 0;
817 }
818#endif
819 /* nil */ ;
820 }
821 } 877 }
822
823 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
824 return;
825 878
826 if (len <= 0) 879 if (len <= 0)
827 return; /* not mapped */ 880 return; /* not mapped */
828 881
829 if (option (Opt_scrollTtyKeypress)) 882 if (option (Opt_scrollTtyKeypress))
… …
831 { 884 {
832 view_start = 0; 885 view_start = 0;
833 want_refresh = 1; 886 want_refresh = 1;
834 } 887 }
835 888
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); 889 tt_write (kbuf, (unsigned int)len);
862} 890}
863 891
864void 892void ecb_cold
865rxvt_term::key_release (XKeyEvent &ev) 893rxvt_term::key_release (XKeyEvent &ev)
866{ 894{
867#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL 895#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
868 KeySym keysym; 896 KeySym keysym;
869 897
… …
936 else if (keysym == XK_Control_L || keysym == XK_Control_R) 964 else if (keysym == XK_Control_L || keysym == XK_Control_R)
937 mouse_slip_wheel_speed = 0; 965 mouse_slip_wheel_speed = 0;
938#endif 966#endif
939} 967}
940 968
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 969void
975rxvt_term::flush () 970rxvt_term::flush ()
976{ 971{
977 flush_ev.stop (); 972 flush_ev.stop ();
978 973
979#ifdef HAVE_BG_PIXMAP 974#ifdef HAVE_IMG
980 if (bgPixmap.flags & bgPixmap_t::hasChanged) 975 if (bg_flags & BG_NEEDS_REFRESH)
981 { 976 {
982 bgPixmap.flags &= ~bgPixmap_t::hasChanged; 977 bg_flags &= ~BG_NEEDS_REFRESH;
983// scr_clear (true); This needs to be researched further!
984 scr_touch (false); 978 scr_touch (false);
985 } 979 }
986#endif 980#endif
987 981
988 if (want_refresh) 982 if (want_refresh)
… …
1025 while (row < end_row); 1019 while (row < end_row);
1026 } 1020 }
1027 1021
1028 scr_refresh (); 1022 scr_refresh ();
1029 scrollBar.show (1); 1023 scrollBar.show (1);
1030#ifdef USE_XIM 1024#if USE_XIM
1031 IMSendSpot (); 1025 im_send_spot ();
1032#endif 1026#endif
1033 } 1027 }
1034 1028
1035 display->flush (); 1029 display->flush ();
1036} 1030}
… …
1054 flush (); 1048 flush ();
1055} 1049}
1056 1050
1057#ifdef CURSOR_BLINK 1051#ifdef CURSOR_BLINK
1058void 1052void
1053rxvt_term::cursor_blink_reset ()
1054{
1055 if (hidden_cursor)
1056 {
1057 hidden_cursor = 0;
1058 want_refresh = 1;
1059 }
1060
1061 if (option (Opt_cursorBlink))
1062 cursor_blink_ev.again ();
1063 else
1064 cursor_blink_ev.stop ();
1065}
1066
1067void
1059rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 1068rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1060{ 1069{
1061 hidden_cursor = !hidden_cursor; 1070 hidden_cursor = !hidden_cursor;
1062 want_refresh = 1; 1071 want_refresh = 1;
1063 refresh_check (); 1072 refresh_check ();
… …
1081 1090
1082#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1091#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1083void 1092void
1084rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1093rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1085{ 1094{
1086 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 1095 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1087 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1)) 1096 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1088 { 1097 {
1089 want_refresh = 1; 1098 want_refresh = 1;
1090 refresh_check (); 1099 refresh_check ();
1091 } 1100 }
1092 else 1101 else
… …
1096 1105
1097#ifdef SELECTION_SCROLLING 1106#ifdef SELECTION_SCROLLING
1098void 1107void
1099rxvt_term::sel_scroll_cb (ev::timer &w, int revents) 1108rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1100{ 1109{
1101 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1110 if (scr_page (scroll_selection_lines))
1102 { 1111 {
1103 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1112 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1104 want_refresh = 1; 1113 want_refresh = 1;
1105 refresh_check (); 1114 refresh_check ();
1106 } 1115 }
… …
1111 1120
1112#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1121#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1113void 1122void
1114rxvt_term::slip_wheel_cb (ev::timer &w, int revents) 1123rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1115{ 1124{
1116 if (scr_changeview (view_start - mouse_slip_wheel_speed)) 1125 if (scr_page (mouse_slip_wheel_speed))
1117 { 1126 {
1118 want_refresh = 1; 1127 want_refresh = 1;
1119 refresh_check (); 1128 refresh_check ();
1120 } 1129 }
1121 1130
… …
1153 { 1162 {
1154 } 1163 }
1155} event_handler; 1164} event_handler;
1156#endif 1165#endif
1157 1166
1167/* make sure all the cmd data is at beginning of cmdbuf */
1168void
1169rxvt_term::cmdbuf_reify ()
1170{
1171 if (cmdbuf_ptr == cmdbuf_base)
1172 return;
1173
1174 ssize_t used = cmdbuf_endp - cmdbuf_ptr;
1175
1176 memmove (cmdbuf_base, cmdbuf_ptr, used);
1177 cmdbuf_ptr = cmdbuf_base;
1178 cmdbuf_endp = cmdbuf_ptr + used;
1179
1180}
1181
1182#if defined (KEYSYM_RESOURCE)
1183void
1184rxvt_term::cmdbuf_append (const char *str, size_t count)
1185{
1186 cmdbuf_reify ();
1187
1188 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1189
1190 if (count > avail)
1191 return;
1192
1193 memcpy (cmdbuf_endp, str, count);
1194 cmdbuf_endp += count;
1195
1196 cmd_parse ();
1197}
1198#endif
1199
1158bool 1200bool
1159rxvt_term::pty_fill () 1201rxvt_term::pty_fill ()
1160{ 1202{
1161 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1203 cmdbuf_reify ();
1162 1204
1163 if (CBUFSIZ == n) 1205 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1164 { 1206
1165 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1207 if (!avail)
1166 n = 0;
1167 } 1208 {
1168 1209 // normally this indicates a "too long" command sequence - just drop the data we have
1169 memmove (cmdbuf_base, cmdbuf_ptr, n);
1170 cmdbuf_ptr = cmdbuf_base; 1210 cmdbuf_ptr = cmdbuf_base;
1171 cmdbuf_endp = cmdbuf_ptr + n; 1211 cmdbuf_endp = cmdbuf_ptr;
1212 avail = CBUFSIZ;
1213 }
1172 1214
1173 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1215 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1174 1216
1175 if (r > 0) 1217 if (r > 0)
1176 { 1218 {
1177 cmdbuf_endp += r; 1219 cmdbuf_endp += r;
1178 return true; 1220 return true;
… …
1209 pty_write (); 1251 pty_write ();
1210 1252
1211 refresh_check (); 1253 refresh_check ();
1212} 1254}
1213 1255
1214void 1256void ecb_cold
1215rxvt_term::pointer_unblank () 1257rxvt_term::pointer_unblank ()
1216{ 1258{
1217 XDefineCursor (dpy, vt, TermWin_cursor); 1259 XDefineCursor (dpy, vt, TermWin_cursor);
1218 recolour_cursor (); 1260 recolour_cursor ();
1219 1261
… …
1224 pointer_ev.start (pointerBlankDelay); 1266 pointer_ev.start (pointerBlankDelay);
1225#endif 1267#endif
1226} 1268}
1227 1269
1228#ifdef POINTER_BLANK 1270#ifdef POINTER_BLANK
1229void 1271void ecb_cold
1230rxvt_term::pointer_blank () 1272rxvt_term::pointer_blank ()
1231{ 1273{
1232 if (!option (Opt_pointerBlank)) 1274 if (!option (Opt_pointerBlank))
1233 return; 1275 return;
1234 1276
… …
1236 XFlush (dpy); 1278 XFlush (dpy);
1237 1279
1238 hidden_pointer = 1; 1280 hidden_pointer = 1;
1239} 1281}
1240 1282
1241void 1283void ecb_cold
1242rxvt_term::pointer_cb (ev::timer &w, int revents) 1284rxvt_term::pointer_cb (ev::timer &w, int revents)
1243{ 1285{
1244 make_current (); 1286 make_current ();
1245 1287
1246 pointer_blank (); 1288 pointer_blank ();
… …
1338 32 + x, 1380 32 + x,
1339 32 + y); 1381 32 + y);
1340} 1382}
1341 1383
1342/*{{{ process an X event */ 1384/*{{{ process an X event */
1343void 1385void ecb_hot
1344rxvt_term::x_cb (XEvent &ev) 1386rxvt_term::x_cb (XEvent &ev)
1345{ 1387{
1346 make_current (); 1388 make_current ();
1347 1389
1348 dLocal (Display *, dpy); 1390 dLocal (Display *, dpy);
… …
1446 && ev.xfocus.mode != NotifyGrab) 1488 && ev.xfocus.mode != NotifyGrab)
1447 focus_out (); 1489 focus_out ();
1448 break; 1490 break;
1449 1491
1450 case ConfigureNotify: 1492 case ConfigureNotify:
1451 if (ev.xconfigure.window == parent[0]) 1493 if (ev.xconfigure.window == parent)
1452 { 1494 {
1453 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1495 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1454 ; 1496 ;
1455 1497
1498 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1499
1500 bool moved = false;
1456#ifdef HAVE_BG_PIXMAP 1501#ifdef HAVE_BG_PIXMAP
1457 bool moved = false;
1458 if (bgPixmap.window_position_sensitive ()) 1502 if (bg_window_position_sensitive ())
1503 {
1504 want_position_change = true;
1505 if (bg_img == 0)
1506 moved = true;
1507 }
1508#endif
1509
1510 if (want_position_change)
1459 { 1511 {
1460 int x, y; 1512 int x, y;
1513
1461 if (ev.xconfigure.send_event) 1514 if (ev.xconfigure.send_event)
1462 { 1515 {
1463 x = ev.xconfigure.x; 1516 x = ev.xconfigure.x;
1464 y = ev.xconfigure.y; 1517 y = ev.xconfigure.y;
1465 } 1518 }
1466 else 1519 else
1467 get_window_origin (x, y); 1520 get_window_origin (x, y);
1468 1521
1469 if (bgPixmap.set_position (x, y) 1522 if (x != parent_x || y != parent_y)
1470 || (bgPixmap.flags & bgPixmap_t::isInvalid)) 1523 {
1524 parent_x = x;
1525 parent_y = y;
1526 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1471 moved = true; 1527 moved = true;
1528 }
1472 } 1529 }
1473#endif
1474 1530
1475 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1531 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1476 { 1532 {
1477 seen_resize = 1; 1533 seen_resize = 1;
1478 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1534 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1479 } 1535 }
1480 else 1536 else
1481 { 1537 {
1482#ifdef HAVE_BG_PIXMAP 1538#ifdef HAVE_BG_PIXMAP
1483 if (moved) 1539 if (moved)
1484 {
1485 if (mapped)
1486 update_background (); 1540 update_background ();
1487 else
1488 bgPixmap.invalidate ();
1489 }
1490#endif 1541#endif
1491 } 1542 }
1492 1543
1493 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1544 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1494 } 1545 }
1495 break; 1546 break;
1496 1547
1497 case PropertyNotify: 1548 case PropertyNotify:
1498 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1549 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1499 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1500 && ev.xproperty.state == PropertyNewValue)
1501 selection_property (ev.xproperty.window, ev.xproperty.atom);
1502
1503 break; 1550 break;
1504 1551
1505 case SelectionClear: 1552 case SelectionClear:
1506 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]); 1553 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1507 break; 1554 break;
1508 1555
1509 case SelectionNotify:
1510 if (selection_wait == Sel_normal)
1511 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1512 break;
1513
1514 case SelectionRequest: 1556 case SelectionRequest:
1515 selection_send (ev.xselectionrequest); 1557 selection_send (ev.xselectionrequest);
1516 break; 1558 break;
1517 1559
1518 case MapNotify: 1560 case MapNotify:
1519#ifdef HAVE_BG_PIXMAP 1561#ifdef HAVE_BG_PIXMAP
1520 /* This is needed specifically to fix the case of no window manager or a 1562 // This is needed at startup for the case of no window manager
1521 * non-reparenting window manager. In those cases we never get first 1563 // or a non-reparenting window manager and also because we
1522 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1564 // defer bg image updates if the window is not mapped. The
1523 * care of multiplicity of ConfigureNotify events arriving while WM does 1565 // short delay is to optimize for multiple ConfigureNotify
1524 * reparenting. 1566 // events at startup when the window manager reparents the
1525 * We should not render background immediately, as there could be several 1567 // window, so as to perform the computation after we have
1526 * ConfigureNotify's to follow. Lets take care of all of them in one scoop 1568 // received all of them.
1527 * by scheduling background redraw as soon as we can, but giving a short 1569 if (bg_img == 0)
1528 * bit of time for ConfigureNotifies to arrive.
1529 * We should render background PRIOR to drawing any text, but AFTER all
1530 * of ConfigureNotifys for the best results.
1531 */
1532 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1533 update_background_ev.start (0.025); 1570 update_background_ev.start (0.025);
1534#endif 1571#endif
1535 mapped = 1; 1572 mapped = 1;
1536#ifdef TEXT_BLINK 1573#ifdef TEXT_BLINK
1537 text_blink_ev.start (); 1574 text_blink_ev.start ();
… …
1552 if (ev.xany.window == vt) 1589 if (ev.xany.window == vt)
1553 { 1590 {
1554 do 1591 do
1555 { 1592 {
1556 scr_expose (ev.xexpose.x, ev.xexpose.y, 1593 scr_expose (ev.xexpose.x, ev.xexpose.y,
1557 ev.xexpose.width, ev.xexpose.height, False); 1594 ev.xexpose.width, ev.xexpose.height, false);
1558 } 1595 }
1559 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1596 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1560 1597
1561 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1598 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1562 1599
1563 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1600 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1564 { 1601 {
1565 scr_expose (ev.xexpose.x, ev.xexpose.y, 1602 scr_expose (ev.xexpose.x, ev.xexpose.y,
1566 ev.xexpose.width, ev.xexpose.height, False); 1603 ev.xexpose.width, ev.xexpose.height, false);
1567 } 1604 }
1568 1605
1569 want_refresh = 1; 1606 want_refresh = 1;
1570 } 1607 }
1571 else 1608 else
… …
1577 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1614 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1578 ; 1615 ;
1579 1616
1580 if (scrollBar.state && ev.xany.window == scrollBar.win) 1617 if (scrollBar.state && ev.xany.window == scrollBar.win)
1581 { 1618 {
1582 scrollBar.state = STATE_IDLE; 1619 scrollBar.state = SB_STATE_IDLE;
1583 scrollBar.show (0); 1620 scrollBar.show (0);
1584 } 1621 }
1585 } 1622 }
1586 break; 1623 break;
1587 1624
… …
1629 1666
1630#ifdef SELECTION_SCROLLING 1667#ifdef SELECTION_SCROLLING
1631 if (ev.xbutton.y < int_bwidth 1668 if (ev.xbutton.y < int_bwidth
1632 || Pixel2Row (ev.xbutton.y) > (nrow-1)) 1669 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1633 { 1670 {
1671 page_dirn scroll_selection_dir;
1634 int dist; 1672 int dist;
1635 1673
1636 /* don't clobber the current delay if we are 1674 /* don't clobber the current delay if we are
1637 * already in the middle of scrolling. 1675 * already in the middle of scrolling.
1638 */ 1676 */
… …
1653 dist = int_bwidth - ev.xbutton.y; 1691 dist = int_bwidth - ev.xbutton.y;
1654 } 1692 }
1655 else 1693 else
1656 { 1694 {
1657 scroll_selection_dir = DN; 1695 scroll_selection_dir = DN;
1658 dist = ev.xbutton.y - (int_bwidth + height); 1696 dist = ev.xbutton.y - (int_bwidth + vt_height);
1659 } 1697 }
1660 1698
1661 scroll_selection_lines = Pixel2Height (dist) 1699 scroll_selection_lines = Pixel2Height (dist)
1662 / SELECTION_SCROLL_LINE_SPEEDUP 1700 / SELECTION_SCROLL_LINE_SPEEDUP
1663 + 1; 1701 + 1;
1664 min_it (scroll_selection_lines, 1702 min_it (scroll_selection_lines,
1665 SELECTION_SCROLL_MAX_LINES); 1703 SELECTION_SCROLL_MAX_LINES);
1704 scroll_selection_lines *= scroll_selection_dir;
1666 } 1705 }
1667 else 1706 else
1668 { 1707 {
1669 /* we are within the text window, so we 1708 /* we are within the text window, so we
1670 * shouldn't be scrolling 1709 * shouldn't be scrolling
… …
1675#ifdef MOUSE_THRESHOLD 1714#ifdef MOUSE_THRESHOLD
1676 } 1715 }
1677#endif 1716#endif
1678 } 1717 }
1679 } 1718 }
1680 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win) 1719 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1681 { 1720 {
1682 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1721 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1683 MotionNotify, &ev)) 1722 MotionNotify, &ev))
1684 ; 1723 ;
1685 1724
1686 XQueryPointer (dpy, scrollBar.win, 1725 XQueryPointer (dpy, scrollBar.win,
1687 &unused_root, &unused_child, 1726 &unused_root, &unused_child,
1688 &unused_root_x, &unused_root_y, 1727 &unused_root_x, &unused_root_y,
1689 &ev.xbutton.x, &ev.xbutton.y, 1728 &ev.xbutton.x, &ev.xbutton.y,
1690 &unused_mask); 1729 &unused_mask);
1691 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1730 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1692 scrollBar.size ()); 1731 scrollBar.size ());
1693 want_refresh = 1; 1732 want_refresh = 1;
1694 scrollBar.show (1); 1733 scrollBar.show (1);
1695 } 1734 }
1696 break; 1735 break;
1697 } 1736 }
1698 1737
1699#if defined(CURSOR_BLINK) 1738#if defined(CURSOR_BLINK)
1700 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1739 if (ev.type == KeyPress)
1701 {
1702 if (hidden_cursor)
1703 {
1704 hidden_cursor = 0;
1705 want_refresh = 1;
1706 }
1707
1708 cursor_blink_ev.again (); 1740 cursor_blink_reset ();
1709 }
1710#endif 1741#endif
1711 1742
1712#if defined(POINTER_BLANK) 1743#if defined(POINTER_BLANK)
1713 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1744 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1714 { 1745 {
… …
1725 1756
1726 refresh_check (); 1757 refresh_check ();
1727} 1758}
1728 1759
1729#if ENABLE_FRILLS 1760#if ENABLE_FRILLS
1730void 1761void ecb_cold
1731rxvt_term::set_urgency (bool enable) 1762rxvt_term::set_urgency (bool enable)
1732{ 1763{
1733 if (enable == urgency_hint) 1764 if (enable == urgency_hint)
1734 return; 1765 return;
1735 1766
1736 if (XWMHints *h = XGetWMHints (dpy, parent[0])) 1767 if (XWMHints *h = XGetWMHints (dpy, parent))
1737 { 1768 {
1738 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1769 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1739 XSetWMHints (dpy, parent[0], h); 1770 XSetWMHints (dpy, parent, h);
1740 urgency_hint = enable; 1771 urgency_hint = enable;
1772 XFree (h);
1741 } 1773 }
1742} 1774}
1743#endif 1775#endif
1744 1776
1745void 1777void ecb_cold
1746rxvt_term::focus_in () 1778rxvt_term::focus_in ()
1747{ 1779{
1748 if (!focus) 1780 if (!focus)
1749 { 1781 {
1750 focus = 1; 1782 focus = 1;
1751 want_refresh = 1; 1783 want_refresh = 1;
1752 1784
1753#if USE_XIM 1785#if USE_XIM
1754 if (Input_Context != NULL) 1786 if (Input_Context != NULL)
1755 { 1787 {
1756 IMSetPosition (); 1788 im_set_position ();
1757 XSetICFocus (Input_Context); 1789 XSetICFocus (Input_Context);
1758 } 1790 }
1759#endif 1791#endif
1760#if CURSOR_BLINK 1792#if CURSOR_BLINK
1761 if (option (Opt_cursorBlink)) 1793 if (option (Opt_cursorBlink))
… …
1775 1807
1776 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END)); 1808 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1777 } 1809 }
1778} 1810}
1779 1811
1780void 1812void ecb_cold
1781rxvt_term::focus_out () 1813rxvt_term::focus_out ()
1782{ 1814{
1783 if (focus) 1815 if (focus)
1784 { 1816 {
1785 focus = 0; 1817 focus = 0;
… …
1818 1850
1819 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1851 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1820 } 1852 }
1821} 1853}
1822 1854
1823void 1855void ecb_cold
1824rxvt_term::update_fade_color (unsigned int idx) 1856rxvt_term::update_fade_color (unsigned int idx)
1825{ 1857{
1826#if OFF_FOCUS_FADING 1858#if OFF_FOCUS_FADING
1827 if (rs[Rs_fade]) 1859 if (rs[Rs_fade])
1828 { 1860 {
… …
1831 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1863 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1832 } 1864 }
1833#endif 1865#endif
1834} 1866}
1835 1867
1836#if ENABLE_TRANSPARENCY || ENABLE_PERL 1868#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
1837void 1869void ecb_hot
1838rxvt_term::rootwin_cb (XEvent &ev) 1870rxvt_term::rootwin_cb (XEvent &ev)
1839{ 1871{
1840 make_current (); 1872 make_current ();
1841 1873
1842 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1874 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1843 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1875 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1844 return; 1876 return;
1845 1877
1846# if ENABLE_TRANSPARENCY
1847 switch (ev.type) 1878 switch (ev.type)
1848 { 1879 {
1849 case PropertyNotify: 1880 case PropertyNotify:
1850 /* 1881 /*
1851 * if user used some Esetroot compatible prog to set the root bg, 1882 * if user used some Esetroot compatible prog to set the root bg,
1852 * use the property to determine the pixmap. We use it later on. 1883 * use the property to determine the pixmap. We use it later on.
1853 */ 1884 */
1854 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1885 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1855 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1886 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1856 { 1887 {
1857 bgPixmap.set_root_pixmap (); 1888#if BG_IMAGE_FROM_ROOT
1889 if (option (Opt_transparent))
1890 {
1891 rxvt_img::new_from_root (this)->replace (root_img);
1858 update_background (); 1892 update_background ();
1893 }
1894#endif
1895 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1859 } 1896 }
1860 1897
1861 break; 1898 break;
1862 } 1899 }
1863# endif
1864 1900
1865 refresh_check (); 1901 refresh_check ();
1866} 1902}
1867#endif 1903#endif
1868 1904
… …
1992 if (scrollBar.upButton (ev.y)) 2028 if (scrollBar.upButton (ev.y))
1993 direction = UP; /* up */ 2029 direction = UP; /* up */
1994 else if (scrollBar.dnButton (ev.y)) 2030 else if (scrollBar.dnButton (ev.y))
1995 direction = DN; /* down */ 2031 direction = DN; /* down */
1996 2032
1997 scrollBar.state = STATE_IDLE; 2033 scrollBar.state = SB_STATE_IDLE;
1998 /* 2034 /*
1999 * Rxvt-style scrollbar: 2035 * Rxvt-style scrollbar:
2000 * move up if mouse is above slider 2036 * move up if mouse is above slider
2001 * move dn if mouse is below slider 2037 * move dn if mouse is below slider
2002 * 2038 *
… …
2041 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2077 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2042#endif 2078#endif
2043 if (scr_page (direction, 1)) 2079 if (scr_page (direction, 1))
2044 { 2080 {
2045 if (direction == UP) 2081 if (direction == UP)
2046 scrollBar.state = STATE_UP; 2082 scrollBar.state = SB_STATE_UP;
2047 else 2083 else
2048 scrollBar.state = STATE_DOWN; 2084 scrollBar.state = SB_STATE_DOWN;
2049 } 2085 }
2050 } 2086 }
2051 else 2087 else
2052 switch (ev.button) 2088 switch (ev.button)
2053 { 2089 {
2054 case Button2: 2090 case Button2:
2055 switch (scrollBar.align) 2091 switch (scrollBar.align)
2056 { 2092 {
2057 case R_SB_ALIGN_TOP: 2093 case SB_ALIGN_TOP:
2058 csrO = 0; 2094 csrO = 0;
2059 break; 2095 break;
2060 case R_SB_ALIGN_CENTRE: 2096 case SB_ALIGN_CENTRE:
2061 csrO = (scrollBar.bot - scrollBar.top) / 2; 2097 csrO = (scrollBar.bot - scrollBar.top) / 2;
2062 break; 2098 break;
2063 case R_SB_ALIGN_BOTTOM: 2099 case SB_ALIGN_BOTTOM:
2064 csrO = scrollBar.bot - scrollBar.top; 2100 csrO = scrollBar.bot - scrollBar.top;
2065 break; 2101 break;
2066 } 2102 }
2067 2103
2068 if (scrollBar.style == R_SB_XTERM 2104 if (scrollBar.style == SB_STYLE_XTERM
2069 || scrollbar_above_slider (ev.y) 2105 || scrollBar.above_slider (ev.y)
2070 || scrollbar_below_slider (ev.y)) 2106 || scrollBar.below_slider (ev.y))
2071 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ()); 2107 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2072 2108
2073 scrollBar.state = STATE_MOTION; 2109 scrollBar.state = SB_STATE_MOTION;
2074 break; 2110 break;
2075 2111
2076 case Button1: 2112 case Button1:
2077 if (scrollBar.align == R_SB_ALIGN_CENTRE) 2113 if (scrollBar.align == SB_ALIGN_CENTRE)
2078 csrO = ev.y - scrollBar.top; 2114 csrO = ev.y - scrollBar.top;
2079 /* FALLTHROUGH */ 2115 /* FALLTHROUGH */
2080 2116
2081 case Button3: 2117 case Button3:
2082 if (scrollBar.style != R_SB_XTERM) 2118 if (scrollBar.style != SB_STYLE_XTERM)
2083 { 2119 {
2084 if (scrollbar_above_slider (ev.y)) 2120 if (scrollBar.above_slider (ev.y))
2085# ifdef RXVT_SCROLL_FULL 2121# ifdef RXVT_SCROLL_FULL
2086 scr_page (UP, nrow - 1); 2122 scr_page (UP, nrow - 1);
2087# else 2123# else
2088 scr_page (UP, nrow / 4); 2124 scr_page (UP, nrow / 4);
2089# endif 2125# endif
2090 else if (scrollbar_below_slider (ev.y)) 2126 else if (scrollBar.below_slider (ev.y))
2091# ifdef RXVT_SCROLL_FULL 2127# ifdef RXVT_SCROLL_FULL
2092 scr_page (DN, nrow - 1); 2128 scr_page (DN, nrow - 1);
2093# else 2129# else
2094 scr_page (DN, nrow / 4); 2130 scr_page (DN, nrow / 4);
2095# endif 2131# endif
2096 else 2132 else
2097 scrollBar.state = STATE_MOTION; 2133 scrollBar.state = SB_STATE_MOTION;
2098 } 2134 }
2099 else 2135 else
2100 { 2136 {
2101 scr_page ((ev.button == Button1 ? DN : UP), 2137 scr_page ((ev.button == Button1 ? DN : UP),
2102 (nrow 2138 (nrow
2103 * scrollbar_position (ev.y) 2139 * scrollBar.position (ev.y)
2104 / scrollBar.size ())); 2140 / scrollBar.size ()));
2105 } 2141 }
2106 2142
2107 break; 2143 break;
2108 } 2144 }
… …
2119 2155
2120 csrO = 0; /* reset csr Offset */ 2156 csrO = 0; /* reset csr Offset */
2121 if (!bypass_keystate) 2157 if (!bypass_keystate)
2122 reportmode = !! (priv_modes & PrivMode_mouse_report); 2158 reportmode = !! (priv_modes & PrivMode_mouse_report);
2123 2159
2124 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2160 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2125 { 2161 {
2126 scrollBar.state = STATE_IDLE; 2162 scrollBar.state = SB_STATE_IDLE;
2127 scrollBar.show (0); 2163 scrollBar.show (0);
2128 } 2164 }
2129 2165
2130#ifdef SELECTION_SCROLLING 2166#ifdef SELECTION_SCROLLING
2131 sel_scroll_ev.stop(); 2167 sel_scroll_ev.stop();
… …
2181 case Button3: 2217 case Button3:
2182 selection_make (ev.time); 2218 selection_make (ev.time);
2183 break; 2219 break;
2184 2220
2185 case Button2: 2221 case Button2:
2186 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2222 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2187 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2223 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2188 break; 2224 break;
2189 2225
2190#ifdef MOUSE_WHEEL 2226#ifdef MOUSE_WHEEL
2191 case Button4: 2227 case Button4:
2192 case Button5: 2228 case Button5:
2193 { 2229 {
2194 int i; 2230 int lines;
2195 page_dirn v; 2231 page_dirn dirn;
2196 2232
2197 v = ev.button == Button4 ? UP : DN; 2233 dirn = ev.button == Button4 ? UP : DN;
2198 2234
2199 if (ev.state & ShiftMask) 2235 if (ev.state & ShiftMask)
2200 i = 1; 2236 lines = 1;
2201 else if (option (Opt_mouseWheelScrollPage)) 2237 else if (option (Opt_mouseWheelScrollPage))
2202 i = nrow - 1; 2238 lines = nrow - 1;
2203 else 2239 else
2204 i = 5; 2240 lines = 5;
2205 2241
2206# ifdef MOUSE_SLIP_WHEELING 2242# ifdef MOUSE_SLIP_WHEELING
2207 if (ev.state & ControlMask) 2243 if (ev.state & ControlMask)
2208 { 2244 {
2209 mouse_slip_wheel_speed += v ? -1 : 1; 2245 mouse_slip_wheel_speed += dirn;
2210 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2246 clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2211 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2212 2247
2213 if (!slip_wheel_ev.is_active ()) 2248 if (!slip_wheel_ev.is_active ())
2214 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2249 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2215 } 2250 }
2216 else 2251 else
2217# endif 2252# endif
2218 { 2253 {
2219 scr_page (v, i); 2254 scr_page (dirn, lines);
2220 scrollBar.show (1); 2255 scrollBar.show (1);
2221 } 2256 }
2222 } 2257 }
2223 break; 2258 break;
2224#endif 2259#endif
… …
2226 } 2261 }
2227} 2262}
2228 2263
2229/*}}} */ 2264/*}}} */
2230 2265
2231void 2266void ecb_hot
2232rxvt_term::cmd_parse () 2267rxvt_term::cmd_parse ()
2233{ 2268{
2234 wchar_t ch = NOCHAR; 2269 wchar_t ch = NOCHAR;
2235 char *seq_begin; // remember start of esc-sequence here 2270 char *seq_begin; // remember start of esc-sequence here
2236 2271
2237 for (;;) 2272 for (;;)
2238 { 2273 {
2239 if (expect_false (ch == NOCHAR)) 2274 if (ecb_unlikely (ch == NOCHAR))
2240 { 2275 {
2241 seq_begin = cmdbuf_ptr; 2276 seq_begin = cmdbuf_ptr;
2242 ch = next_char (); 2277 ch = next_char ();
2243 2278
2244 if (ch == NOCHAR) 2279 if (ch == NOCHAR)
2245 break; 2280 break;
2246 } 2281 }
2247 2282
2248 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)) 2283 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2249 { 2284 {
2250 if (expect_false (!seen_input)) 2285 if (ecb_unlikely (!seen_input))
2251 { 2286 {
2252 seen_input = 1; 2287 seen_input = 1;
2253 // many badly-written programs (e.g. jed) contain a race condition: 2288 // many badly-written programs (e.g. jed) contain a race condition:
2254 // they first read the screensize and then install a SIGWINCH handler. 2289 // they first read the screensize and then install a SIGWINCH handler.
2255 // some window managers resize the window early, and these programs 2290 // some window managers resize the window early, and these programs
… …
2268 wchar_t *str = buf; 2303 wchar_t *str = buf;
2269 wchar_t *eol = str + min (ncol, UBUFSIZ); 2304 wchar_t *eol = str + min (ncol, UBUFSIZ);
2270 2305
2271 for (;;) 2306 for (;;)
2272 { 2307 {
2273 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))) 2308 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2274 break; 2309 break;
2275 2310
2276 *str++ = ch; 2311 *str++ = ch;
2277 2312
2278 if (expect_false (ch == C0_LF || str >= eol)) 2313 if (ecb_unlikely (ch == C0_LF || str >= eol))
2279 { 2314 {
2280 if (ch == C0_LF) 2315 if (ch == C0_LF)
2281 nlines++; 2316 nlines++;
2282 2317
2283 refresh_count++; 2318 refresh_count++;
… …
2355 } 2390 }
2356 } 2391 }
2357} 2392}
2358 2393
2359// read the next character 2394// read the next character
2360wchar_t 2395wchar_t ecb_hot
2361rxvt_term::next_char () NOTHROW 2396rxvt_term::next_char () NOTHROW
2362{ 2397{
2363 while (cmdbuf_ptr < cmdbuf_endp) 2398 while (cmdbuf_ptr < cmdbuf_endp)
2364 { 2399 {
2365 // assume 7-bit to be ascii ALWAYS 2400 // assume 7-bit to be ascii ALWAYS
2366 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)) 2401 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2367 return *cmdbuf_ptr++; 2402 return *cmdbuf_ptr++;
2368 2403
2369 wchar_t wc; 2404 wchar_t wc;
2370 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2405 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2371 2406
… …
2377 } 2412 }
2378 2413
2379 if (len == (size_t)-1) 2414 if (len == (size_t)-1)
2380 { 2415 {
2381 mbstate.reset (); // reset now undefined conversion state 2416 mbstate.reset (); // reset now undefined conversion state
2417 // a -1 might indicate that a previous incomplete char is invalid (previous return -2)
2418 // in which case we "erroneously" return the next byte which might be valid.
2382 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2419 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2383 } 2420 }
2384 2421
2385 // assume wchar == unicode 2422 // assume wchar == unicode
2386 cmdbuf_ptr += len; 2423 cmdbuf_ptr += len;
… …
2389 2426
2390 return NOCHAR; 2427 return NOCHAR;
2391} 2428}
2392 2429
2393// read the next octet 2430// read the next octet
2394uint32_t 2431uint32_t ecb_hot
2395rxvt_term::next_octet () NOTHROW 2432rxvt_term::next_octet () NOTHROW
2396{ 2433{
2397 return cmdbuf_ptr < cmdbuf_endp 2434 return cmdbuf_ptr < cmdbuf_endp
2398 ? (unsigned char)*cmdbuf_ptr++ 2435 ? (unsigned char)*cmdbuf_ptr++
2399 : NOCHAR; 2436 : NOCHAR;
2400} 2437}
2401 2438
2402static class out_of_input out_of_input; 2439static class out_of_input out_of_input;
2403 2440
2404/* rxvt_cmd_getc () - Return next input character */ 2441wchar_t ecb_hot
2405/*
2406 * Return the next input character after first passing any keyboard input
2407 * to the command.
2408 */
2409wchar_t
2410rxvt_term::cmd_getc () THROW ((class out_of_input)) 2442rxvt_term::cmd_getc () THROW ((class out_of_input))
2411{ 2443{
2412 wchar_t c = next_char (); 2444 wchar_t c = next_char ();
2413 2445
2414 if (c == NOCHAR) 2446 if (c == NOCHAR)
2415 throw out_of_input; 2447 throw out_of_input;
2416 2448
2417 return c; 2449 return c;
2418} 2450}
2419 2451
2420uint32_t 2452uint32_t ecb_hot
2421rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2453rxvt_term::cmd_get8 () THROW ((class out_of_input))
2422{ 2454{
2423 uint32_t c = next_octet (); 2455 uint32_t c = next_octet ();
2424 2456
2425 if (c == NOCHAR) 2457 if (c == NOCHAR)
… …
2429} 2461}
2430 2462
2431/*{{{ print pipe */ 2463/*{{{ print pipe */
2432/*----------------------------------------------------------------------*/ 2464/*----------------------------------------------------------------------*/
2433#ifdef PRINTPIPE 2465#ifdef PRINTPIPE
2434FILE * 2466FILE * ecb_cold
2435rxvt_term::popen_printer () 2467rxvt_term::popen_printer ()
2436{ 2468{
2437 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w"); 2469 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2438 2470
2439 if (stream == NULL) 2471 if (stream == NULL)
2440 rxvt_warn ("can't open printer pipe, not printing.\n"); 2472 rxvt_warn ("can't open printer pipe, not printing.\n");
2441 2473
2442 return stream; 2474 return stream;
2443} 2475}
2444 2476
2445int 2477int ecb_cold
2446rxvt_term::pclose_printer (FILE *stream) 2478rxvt_term::pclose_printer (FILE *stream)
2447{ 2479{
2448 fflush (stream); 2480 fflush (stream);
2449 return pclose (stream); 2481 return pclose (stream);
2450} 2482}
2451 2483
2452/* 2484/*
2453 * simulate attached vt100 printer 2485 * simulate attached vt100 printer
2454 */ 2486 */
2455void 2487void ecb_cold
2456rxvt_term::process_print_pipe () 2488rxvt_term::process_print_pipe ()
2457{ 2489{
2458 FILE *fd = popen_printer (); 2490 FILE *fd = popen_printer ();
2459 2491
2460 if (!fd) 2492 if (!fd)
… …
2506 pclose_printer (fd); 2538 pclose_printer (fd);
2507} 2539}
2508#endif /* PRINTPIPE */ 2540#endif /* PRINTPIPE */
2509/*}}} */ 2541/*}}} */
2510 2542
2511/* *INDENT-OFF* */
2512enum { 2543enum {
2513 C1_40 = 0x40, 2544 C1_40 = 0x40,
2514 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2545 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2515 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2546 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2516 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2547 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2517 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2548 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2518}; 2549};
2519/* *INDENT-ON* */
2520 2550
2521/*{{{ process non-printing single characters */ 2551/*{{{ process non-printing single characters */
2522void 2552void ecb_hot
2523rxvt_term::process_nonprinting (unicode_t ch) 2553rxvt_term::process_nonprinting (unicode_t ch)
2524{ 2554{
2525 switch (ch) 2555 switch (ch)
2526 { 2556 {
2527 case C0_ESC: 2557 case C0_ESC:
… …
2573} 2603}
2574/*}}} */ 2604/*}}} */
2575 2605
2576 2606
2577/*{{{ process VT52 escape sequences */ 2607/*{{{ process VT52 escape sequences */
2578void 2608void ecb_cold
2579rxvt_term::process_escape_vt52 (unicode_t ch) 2609rxvt_term::process_escape_vt52 (unicode_t ch)
2580{ 2610{
2581 int row, col; 2611 int row, col;
2582 2612
2583 switch (ch) 2613 switch (ch)
… …
2617 break; 2647 break;
2618 case 'Z': /* identify the terminal type */ 2648 case 'Z': /* identify the terminal type */
2619 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2649 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2620 break; 2650 break;
2621 case '<': /* turn off VT52 mode */ 2651 case '<': /* turn off VT52 mode */
2622 set_privmode (PrivMode_vt52, 0); 2652 priv_modes &= ~PrivMode_vt52;
2623 break; 2653 break;
2624 case 'F': /* use special graphics character set */ 2654 case 'F': /* use special graphics character set */
2625 case 'G': /* use regular character set */ 2655 case 'G': /* use regular character set */
2626 /* unimplemented */ 2656 /* unimplemented */
2627 break; 2657 break;
… …
2633} 2663}
2634/*}}} */ 2664/*}}} */
2635 2665
2636 2666
2637/*{{{ process escape sequences */ 2667/*{{{ process escape sequences */
2638void 2668void ecb_hot
2639rxvt_term::process_escape_seq () 2669rxvt_term::process_escape_seq ()
2640{ 2670{
2641 unicode_t ch = cmd_getc (); 2671 unicode_t ch = cmd_getc ();
2642 2672
2643 if (priv_modes & PrivMode_vt52) 2673 if (priv_modes & PrivMode_vt52)
… …
2646 return; 2676 return;
2647 } 2677 }
2648 2678
2649 switch (ch) 2679 switch (ch)
2650 { 2680 {
2651 /* case 1: do_tek_mode (); break; */
2652 case '#': 2681 case '#':
2653 if (cmd_getc () == '8') 2682 if (cmd_getc () == '8')
2654 scr_E (); 2683 scr_E ();
2655 break; 2684 break;
2656 case '(': 2685 case '(':
… …
2679#if !ENABLE_MINIMAL 2708#if !ENABLE_MINIMAL
2680 case '9': 2709 case '9':
2681 scr_forwardindex (); 2710 scr_forwardindex ();
2682 break; 2711 break;
2683#endif 2712#endif
2713 // DECPAM/DECPNM
2684 case '=': 2714 case '=':
2715 priv_modes |= PrivMode_aplKP;
2716 break;
2685 case '>': 2717 case '>':
2686 set_privmode (PrivMode_aplKP, ch == '='); 2718 priv_modes &= ~PrivMode_aplKP;
2687 break; 2719 break;
2688 2720
2689 case C1_40: 2721 case C1_40:
2690 cmd_getc (); 2722 cmd_getc ();
2691 break; 2723 break;
… …
2695 2727
2696 /* 8.3.87: NEXT LINE */ 2728 /* 8.3.87: NEXT LINE */
2697 case C1_NEL: /* ESC E */ 2729 case C1_NEL: /* ESC E */
2698 { 2730 {
2699 wchar_t nlcr[] = { C0_LF, C0_CR }; 2731 wchar_t nlcr[] = { C0_LF, C0_CR };
2700 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2732 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2701 } 2733 }
2702 break; 2734 break;
2703 2735
2704 /* kidnapped escape sequence: Should be 8.3.48 */ 2736 /* kidnapped escape sequence: Should be 8.3.48 */
2705 case C1_ESA: /* ESC G */ 2737 case C1_ESA: /* ESC G */
2706 process_graphics (); 2738 // used by original rxvt for rob nations own graphics mode
2739 if (cmd_getc () == 'Q')
2740 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2707 break; 2741 break;
2708 2742
2709 /* 8.3.63: CHARACTER TABULATION SET */ 2743 /* 8.3.63: CHARACTER TABULATION SET */
2710 case C1_HTS: /* ESC H */ 2744 case C1_HTS: /* ESC H */
2711 scr_set_tab (1); 2745 scr_set_tab (1);
… …
2715 case C1_RI: /* ESC M */ 2749 case C1_RI: /* ESC M */
2716 scr_index (DN); 2750 scr_index (DN);
2717 break; 2751 break;
2718 2752
2719 /* 8.3.142: SINGLE-SHIFT TWO */ 2753 /* 8.3.142: SINGLE-SHIFT TWO */
2720 /*case C1_SS2: scr_single_shift (2); break; */ 2754 /* case C1_SS2: break; */
2721 2755
2722 /* 8.3.143: SINGLE-SHIFT THREE */ 2756 /* 8.3.143: SINGLE-SHIFT THREE */
2723 /*case C1_SS3: scr_single_shift (3); break; */ 2757 /* case C1_SS3: break; */
2724 2758
2725 /* 8.3.27: DEVICE CONTROL STRING */ 2759 /* 8.3.27: DEVICE CONTROL STRING */
2726 case C1_DCS: /* ESC P */ 2760 case C1_DCS: /* ESC P */
2727 process_dcs_seq (); 2761 process_dcs_seq ();
2728 break; 2762 break;
… …
2761 } 2795 }
2762} 2796}
2763/*}}} */ 2797/*}}} */
2764 2798
2765/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2799/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2766/* *INDENT-OFF* */
2767enum { 2800enum {
2768 CSI_ICH = 0x40, 2801 CSI_ICH = 0x40,
2769 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2802 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2770 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2803 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2771 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2804 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
2791 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2824 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2792 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2825 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2793 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2826 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2794 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2827 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2795 }; 2828 };
2796/* *INDENT-ON* */
2797 2829
2798void 2830void ecb_hot
2799rxvt_term::process_csi_seq () 2831rxvt_term::process_csi_seq ()
2800{ 2832{
2801 unicode_t ch, priv, i; 2833 unicode_t ch, priv, prev_ch, i;
2802 unsigned int nargs, p; 2834 unsigned int nargs, p;
2803 int n, ndef; 2835 int n, ndef;
2804 int arg[ESC_ARGS] = { }; 2836 int arg[ESC_ARGS] = { };
2805 2837
2806 nargs = 0; 2838 nargs = 0;
… …
2812 /* '<' '=' '>' '?' '!' */ 2844 /* '<' '=' '>' '?' '!' */
2813 priv = ch; 2845 priv = ch;
2814 ch = cmd_getc (); 2846 ch = cmd_getc ();
2815 } 2847 }
2816 2848
2849 prev_ch = 0;
2817 /* read any numerical arguments */ 2850 /* read any numerical arguments */
2818 for (n = -1; ch < CSI_ICH; ) 2851 for (n = -1; ch < CSI_ICH; )
2819 { 2852 {
2820 if (isdigit (ch)) 2853 if (isdigit (ch))
2821 { 2854 {
… …
2831 n = -1; 2864 n = -1;
2832 } 2865 }
2833 else if (IS_CONTROL (ch)) 2866 else if (IS_CONTROL (ch))
2834 process_nonprinting (ch); 2867 process_nonprinting (ch);
2835 2868
2869 prev_ch = ch;
2836 ch = cmd_getc (); 2870 ch = cmd_getc ();
2837 } 2871 }
2838 2872
2839 if (ch > CSI_7F) 2873 if (ch > CSI_7F)
2840 return; 2874 return;
… …
2881 scr_soft_reset (); 2915 scr_soft_reset ();
2882 2916
2883 static const int pm_h[] = { 7, 25 }; 2917 static const int pm_h[] = { 7, 25 };
2884 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 }; 2918 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2885 2919
2886 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h); 2920 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2887 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l); 2921 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2888 } 2922 }
2889 break; 2923 break;
2890 } 2924 }
2891 2925
2892 return; 2926 return;
… …
2910 } 2944 }
2911 break; 2945 break;
2912#endif 2946#endif
2913 2947
2914 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2948 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2915 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2949 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2916 arg[0] = -arg[0]; 2950 arg[0] = -arg[0];
2917 /* FALLTHROUGH */ 2951 /* FALLTHROUGH */
2918 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2952 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2919 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2953 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2920 scr_gotorc (arg[0], 0, RELATIVE); 2954 scr_gotorc (arg[0], 0, RELATIVE);
2921 break; 2955 break;
2922 2956
2923 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2957 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2924 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2958 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3074 scr_insert_mode (1); 3108 scr_insert_mode (1);
3075 else if (arg[0] == 20) 3109 else if (arg[0] == 20)
3076 priv_modes |= PrivMode_LFNL; 3110 priv_modes |= PrivMode_LFNL;
3077 break; 3111 break;
3078 3112
3113 case CSI_71: // DESCUSR: set cursor style
3114 if (prev_ch == ' ')
3115 set_cursor_style (arg[0]);
3116 break;
3117
3079 /* 3118 /*
3080 * PRIVATE USE beyond this point. All CSI_7? sequences here 3119 * PRIVATE USE beyond this point. All CSI_7? sequences here
3081 */ 3120 */
3082 case CSI_72: /* DECSTBM: set top and bottom margins */ 3121 case CSI_72: /* DECSTBM: set top and bottom margins */
3083 if (nargs == 1) 3122 if (nargs == 1)
… …
3111 } 3150 }
3112} 3151}
3113/*}}} */ 3152/*}}} */
3114 3153
3115#if !ENABLE_MINIMAL 3154#if !ENABLE_MINIMAL
3116/* ARGSUSED */
3117void 3155void
3118rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3156rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3119{ 3157{
3120 int x, y; 3158 int x, y;
3121 XWindowAttributes wattr; 3159 XWindowAttributes wattr;
… …
3130 { 3168 {
3131 /* 3169 /*
3132 * commands 3170 * commands
3133 */ 3171 */
3134 case 1: /* deiconify window */ 3172 case 1: /* deiconify window */
3135 XMapWindow (dpy, parent[0]); 3173 XMapWindow (dpy, parent);
3136 break; 3174 break;
3137 case 2: /* iconify window */ 3175 case 2: /* iconify window */
3138 XIconifyWindow (dpy, parent[0], display->screen); 3176 XIconifyWindow (dpy, parent, display->screen);
3139 break; 3177 break;
3140 case 3: /* set position (pixels) */ 3178 case 3: /* set position (pixels) */
3141 XMoveWindow (dpy, parent[0], args[1], args[2]); 3179 XMoveWindow (dpy, parent, args[1], args[2]);
3142 break; 3180 break;
3143 case 4: /* set size (pixels) */ 3181 case 4: /* set size (pixels) */
3144 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3182 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3145 break; 3183 break;
3146 case 5: /* raise window */ 3184 case 5: /* raise window */
3147 XRaiseWindow (dpy, parent[0]); 3185 XRaiseWindow (dpy, parent);
3148 break; 3186 break;
3149 case 6: /* lower window */ 3187 case 6: /* lower window */
3150 XLowerWindow (dpy, parent[0]); 3188 XLowerWindow (dpy, parent);
3151 break; 3189 break;
3152 case 7: /* refresh window */ 3190 case 7: /* refresh window */
3153 scr_touch (true); 3191 scr_touch (true);
3154 break; 3192 break;
3155 case 8: /* set size (chars) */ 3193 case 8: /* set size (chars) */
… …
3158 break; 3196 break;
3159 3197
3160 //case 9: NYI, TODO, restore maximized window or maximize window 3198 //case 9: NYI, TODO, restore maximized window or maximize window
3161 default: 3199 default:
3162 if (args[0] >= 24) /* set height (chars) */ 3200 if (args[0] >= 24) /* set height (chars) */
3163 set_widthheight ((unsigned int)width, 3201 set_widthheight ((unsigned int)vt_width,
3164 (unsigned int) (args[1] * fheight)); 3202 (unsigned int) (args[1] * fheight));
3165 break; 3203 break;
3166 3204
3167 /* 3205 /*
3168 * reports - some output format copied from XTerm 3206 * reports - some output format copied from XTerm
3169 */ 3207 */
3170 case 11: /* report window state */ 3208 case 11: /* report window state */
3171 XGetWindowAttributes (dpy, parent[0], &wattr); 3209 XGetWindowAttributes (dpy, parent, &wattr);
3172 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3210 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3173 break; 3211 break;
3174 case 13: /* report window position */ 3212 case 13: /* report window position */
3175 XGetWindowAttributes (dpy, parent[0], &wattr); 3213 XGetWindowAttributes (dpy, parent, &wattr);
3176 XTranslateCoordinates (dpy, parent[0], wattr.root, 3214 XTranslateCoordinates (dpy, parent, wattr.root,
3177 -wattr.border_width, -wattr.border_width, 3215 -wattr.border_width, -wattr.border_width,
3178 &x, &y, &wdummy); 3216 &x, &y, &wdummy);
3179 tt_printf ("\033[3;%d;%dt", x, y); 3217 tt_printf ("\033[3;%d;%dt", x, y);
3180 break; 3218 break;
3181 case 14: /* report window size (pixels) */ 3219 case 14: /* report window size (pixels) */
3182 XGetWindowAttributes (dpy, parent[0], &wattr); 3220 XGetWindowAttributes (dpy, parent, &wattr);
3183 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3221 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3184 break; 3222 break;
3185 case 18: /* report text area size (chars) */ 3223 case 18: /* report text area size (chars) */
3186 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3224 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3187 break; 3225 break;
… …
3189 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3227 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3190 break; 3228 break;
3191 case 20: /* report icon label */ 3229 case 20: /* report icon label */
3192 { 3230 {
3193 char *s; 3231 char *s;
3194 XGetIconName (dpy, parent[0], &s); 3232 XGetIconName (dpy, parent, &s);
3195 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3233 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3196 XFree (s); 3234 XFree (s);
3197 } 3235 }
3198 break; 3236 break;
3199 case 21: /* report window title */ 3237 case 21: /* report window title */
3200 { 3238 {
3201 char *s; 3239 char *s;
3202 XFetchName (dpy, parent[0], &s); 3240 XFetchName (dpy, parent, &s);
3203 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3241 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3204 XFree (s); 3242 XFree (s);
3205 } 3243 }
3206 break; 3244 break;
3207 } 3245 }
… …
3217rxvt_term::get_to_st (unicode_t &ends_how) 3255rxvt_term::get_to_st (unicode_t &ends_how)
3218{ 3256{
3219 unicode_t ch; 3257 unicode_t ch;
3220 bool seen_esc = false; 3258 bool seen_esc = false;
3221 unsigned int n = 0; 3259 unsigned int n = 0;
3222 wchar_t string[STRING_MAX]; 3260 wchar_t string[CBUFSIZ];
3223 3261
3224 while ((ch = cmd_getc ()) != NOCHAR) 3262 while ((ch = cmd_getc ()) != NOCHAR)
3225 { 3263 {
3226 if (seen_esc) 3264 if (seen_esc)
3227 { 3265 {
… …
3242 else if (ch < 0x20) 3280 else if (ch < 0x20)
3243 return NULL; /* other control character - exit */ 3281 return NULL; /* other control character - exit */
3244 3282
3245 seen_esc = false; 3283 seen_esc = false;
3246 3284
3247 if (n >= STRING_MAX - 1) 3285 if (n >= sizeof (string) - 1)
3248 // stop at some sane length 3286 // stop at some sane length
3249 return NULL; 3287 return NULL;
3250 3288
3251 string[n++] = ch; 3289 string[n++] = ch;
3252 } 3290 }
… …
3361 unsigned long bytes_after; 3399 unsigned long bytes_after;
3362 unsigned char *value = 0; 3400 unsigned char *value = 0;
3363 const char *str = ""; 3401 const char *str = "";
3364 3402
3365 if (prop 3403 if (prop
3366 && XGetWindowProperty (dpy, parent[0], 3404 && XGetWindowProperty (dpy, parent,
3367 prop, 0, 1<<16, 0, AnyPropertyType, 3405 prop, 0, 1<<16, 0, AnyPropertyType,
3368 &actual_type, &actual_format, 3406 &actual_type, &actual_format,
3369 &nitems, &bytes_after, &value) == Success 3407 &nitems, &bytes_after, &value) == Success
3370 && actual_type != None 3408 && actual_type != None
3371 && actual_format == 8) 3409 && actual_format == 8)
3372 str = (const char *)(value); 3410 str = (const char *)(value);
3373 3411
3374 tt_printf ("\033]%d;%s%c", op, str, resp); 3412 tt_printf ("\033]%d;%s%c", op, option (Opt_insecure) ? str : "", resp);
3375 3413
3376 XFree (value); 3414 XFree (value);
3377 } 3415 }
3378 else 3416 else
3379 { 3417 {
… …
3383 { 3421 {
3384 *eq = 0; 3422 *eq = 0;
3385 set_utf8_property (display->atom (str), eq + 1); 3423 set_utf8_property (display->atom (str), eq + 1);
3386 } 3424 }
3387 else 3425 else
3388 XDeleteProperty (dpy, parent[0], 3426 XDeleteProperty (dpy, parent,
3389 display->atom (str)); 3427 display->atom (str));
3390 } 3428 }
3391 break; 3429 break;
3392 3430
3393 case XTerm_Color: 3431 case XTerm_Color:
… …
3447 break; 3485 break;
3448#endif 3486#endif
3449 case URxvt_Color_border: 3487 case URxvt_Color_border:
3450 process_color_seq (op, Color_border, str, resp); 3488 process_color_seq (op, Color_border, str, resp);
3451 break; 3489 break;
3452#if ENABLE_TRANSPARENCY 3490
3491#if BG_IMAGE_FROM_ROOT
3453 case URxvt_Color_tint: 3492 case URxvt_Color_tint:
3454 process_color_seq (op, Color_tint, str, resp); 3493 process_color_seq (op, Color_tint, str, resp);
3455 { 3494 {
3456 bool changed = false; 3495 bool changed = false;
3457 3496
3458 if (ISSET_PIXCOLOR (Color_tint)) 3497 if (ISSET_PIXCOLOR (Color_tint))
3459 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3498 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3460 else
3461 changed = bgPixmap.unset_tint ();
3462 3499
3463 if (changed) 3500 if (changed)
3464 update_background (); 3501 update_background ();
3465 } 3502 }
3466 3503
… …
3470#if BG_IMAGE_FROM_FILE 3507#if BG_IMAGE_FROM_FILE
3471 case Rxvt_Pixmap: 3508 case Rxvt_Pixmap:
3472 if (!strcmp (str, "?")) 3509 if (!strcmp (str, "?"))
3473 { 3510 {
3474 char str[256]; 3511 char str[256];
3512 int h_scale = fimage.h_scale;
3513 int v_scale = fimage.v_scale;
3514 int h_align = fimage.h_align;
3515 int v_align = fimage.v_align;
3475 3516
3476 sprintf (str, "[%dx%d+%d+%d]", 3517 sprintf (str, "[%dx%d+%d+%d]",
3477 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3518 h_scale, v_scale,
3478 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3519 h_align, v_align);
3479 process_xterm_seq (XTerm_title, str, CHAR_ST); 3520 process_xterm_seq (XTerm_title, str, CHAR_ST);
3480 } 3521 }
3481 else 3522 else
3482 { 3523 {
3483 int changed = 0; 3524 bool changed = false;
3484 3525
3485 if (*str != ';') 3526 if (*str != ';')
3486 { 3527 {
3487 if (bgPixmap.set_file (str)) /* change pixmap */ 3528 try
3488 { 3529 {
3530 fimage.set_file_geometry (this, str);
3489 changed++; 3531 changed = true;
3490 str = strchr (str, ';');
3491 if (str == NULL)
3492 bgPixmap.set_defaultGeometry ();
3493 else 3532 }
3494 bgPixmap.set_geometry (str+1); 3533 catch (const class rxvt_failure_exception &e)
3534 {
3495 } 3535 }
3496 } 3536 }
3497 else 3537 else
3498 { 3538 {
3499 str++; 3539 str++;
3500 if (bgPixmap.set_geometry (str, true)) 3540 if (fimage.set_geometry (str, true))
3501 changed++; 3541 changed = true;
3502 } 3542 }
3503 3543
3504 if (changed) 3544 if (changed)
3505 { 3545 {
3506 if (bgPixmap.window_position_sensitive ()) 3546 if (bg_window_position_sensitive ())
3507 { 3547 {
3508 int x, y; 3548 int x, y;
3509 get_window_origin (x, y); 3549 get_window_origin (x, y);
3510 bgPixmap.set_position (x, y); 3550 parent_x = x;
3551 parent_y = y;
3511 } 3552 }
3512 update_background (); 3553 update_background ();
3513 } 3554 }
3514 } 3555 }
3515 break; 3556 break;
… …
3605 * 's' = save 3646 * 's' = save
3606 * 'r' = restore 3647 * 'r' = restore
3607 * 't' = toggle 3648 * 't' = toggle
3608 * so no need for fancy checking 3649 * so no need for fancy checking
3609 */ 3650 */
3610int 3651int ecb_cold
3611rxvt_term::privcases (int mode, unsigned long bit) 3652rxvt_term::privcases (int mode, unsigned long bit)
3612{ 3653{
3613 int state; 3654 int state;
3614 3655
3615 if (mode == 's') 3656 if (mode == 's')
3616 { 3657 {
3617 SavedModes |= (priv_modes & bit); 3658 if (priv_modes & bit)
3659 SavedModes |= bit;
3660 else
3661 SavedModes &= ~bit;
3618 return -1; 3662 return -1;
3619 } 3663 }
3620 else 3664 else
3621 { 3665 {
3622 if (mode == 'r') 3666 if (mode == 'r')
3623 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3667 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3624 else 3668 else
3625 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3669 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3626 3670
3627 set_privmode (bit, state); 3671 if (state)
3672 priv_modes |= bit;
3673 else
3674 priv_modes &= ~bit;
3628 } 3675 }
3629 3676
3630 return state; 3677 return state;
3631} 3678}
3632 3679
3633/* we're not using priv _yet_ */ 3680/* we're not using priv _yet_ */
3634void 3681void
3635rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3682rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3636{ 3683{
3637 unsigned int i, j; 3684 unsigned int i, j;
3638 int state; 3685 int state;
3639 3686
3640 static const struct 3687 static const struct
3641 { 3688 {
3642 const int argval; 3689 const int argval;
3643 const unsigned long bit; 3690 const unsigned long bit;
3644 } argtopriv[] = { 3691 } argtopriv[] = {
3645 { 1, PrivMode_aplCUR }, // DECCKM 3692 { 1, PrivMode_aplCUR }, // DECCKM
3646 { 2, PrivMode_vt52 }, 3693 { 2, PrivMode_vt52 }, // DECANM
3647 { 3, PrivMode_132 }, // DECCOLM 3694 { 3, PrivMode_132 }, // DECCOLM
3648 { 4, PrivMode_smoothScroll }, // DECSCLM 3695 { 4, PrivMode_smoothScroll }, // DECSCLM
3649 { 5, PrivMode_rVideo }, // DECSCNM 3696 { 5, PrivMode_rVideo }, // DECSCNM
3650 { 6, PrivMode_relOrigin }, // DECOM 3697 { 6, PrivMode_relOrigin }, // DECOM
3651 { 7, PrivMode_Autowrap }, // DECAWM 3698 { 7, PrivMode_Autowrap }, // DECAWM
3652 // 8, auto-repeat keys // DECARM 3699 // 8, auto-repeat keys // DECARM
3653 { 9, PrivMode_MouseX10 }, 3700 { 9, PrivMode_MouseX10 },
3654 // 18 end FF to printer after print screen 3701 // 18 end FF to printer after print screen
3655 // 19 Print screen prints full screen/scroll region 3702 // 19 Print screen prints full screen/scroll region
3656 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis 3703 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3657#ifdef scrollBar_esc 3704#ifdef scrollBar_esc
3658 { scrollBar_esc, PrivMode_scrollBar }, 3705 { scrollBar_esc, PrivMode_scrollBar },
3659#endif 3706#endif
3660 { 35, PrivMode_ShiftKeys }, // rxvt extension 3707 { 35, PrivMode_ShiftKeys }, // rxvt extension
3661 // 38, tektronix mode // DECTEK 3708 // 38, tektronix mode // DECTEK
3662 { 40, PrivMode_132OK }, 3709 { 40, PrivMode_132OK },
3663 // 41 xterm more fixes NYI 3710 // 41 xterm more fixes NYI
3664 // 45 margin bell NYI 3711 // 45 margin bell NYI
3665 // 46 start logging 3712 // 46 start logging
3666 { 47, PrivMode_Screen }, 3713 { 47, PrivMode_Screen },
3667 { 66, PrivMode_aplKP }, // DECPAM/DECPNM 3714 { 66, PrivMode_aplKP }, // DECNKM
3668#ifndef NO_BACKSPACE_KEY 3715#ifndef NO_BACKSPACE_KEY
3669 { 67, PrivMode_BackSpace }, // DECBKM 3716 { 67, PrivMode_BackSpace }, // DECBKM
3670#endif 3717#endif
3671 { 1000, PrivMode_MouseX11 }, 3718 { 1000, PrivMode_MouseX11 },
3672 { 1002, PrivMode_MouseBtnEvent }, 3719 { 1002, PrivMode_MouseBtnEvent },
… …
3701 for (i = 0; i < nargs; i++) 3748 for (i = 0; i < nargs; i++)
3702 { 3749 {
3703 state = -1; 3750 state = -1;
3704 3751
3705 /* basic handling */ 3752 /* basic handling */
3706 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3753 for (j = 0; j < ecb_array_length (argtopriv); j++)
3707 if (argtopriv[j].argval == arg[i]) 3754 if (argtopriv[j].argval == arg[i])
3708 { 3755 {
3709 state = privcases (mode, argtopriv[j].bit); 3756 state = privcases (mode, argtopriv[j].bit);
3710 break; 3757 break;
3711 } 3758 }
… …
3737 case 2: /* VT52 mode */ 3784 case 2: /* VT52 mode */
3738 /* oddball mode. should be set regardless of set/reset 3785 /* oddball mode. should be set regardless of set/reset
3739 * parameter. Return from VT52 mode with an ESC < from 3786 * parameter. Return from VT52 mode with an ESC < from
3740 * within VT52 mode 3787 * within VT52 mode
3741 */ 3788 */
3742 set_privmode (PrivMode_vt52, 1); 3789 priv_modes |= PrivMode_vt52;
3743 break; 3790 break;
3744 case 3: /* 80/132 */ 3791 case 3: /* 80/132 */
3745 if (priv_modes & PrivMode_132OK) 3792 if (priv_modes & PrivMode_132OK)
3746 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight); 3793 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3747 break; 3794 break;
… …
3762 if (state) /* orthogonal */ 3809 if (state) /* orthogonal */
3763 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3810 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3764 break; 3811 break;
3765#ifdef scrollBar_esc 3812#ifdef scrollBar_esc
3766 case scrollBar_esc: 3813 case scrollBar_esc:
3767 if (scrollBar.map (state)) 3814 scrollBar.map (state);
3768 {
3769 resize_all_windows (0, 0, 0); 3815 resize_all_windows (0, 0, 0);
3770 scr_touch (true); 3816 scr_touch (true);
3771 }
3772 break; 3817 break;
3773#endif 3818#endif
3774 case 25: /* visible/invisible cursor */ 3819 case 25: /* visible/invisible cursor */
3775 scr_cursor_visible (state); 3820 scr_cursor_visible (state);
3776 break; 3821 break;
… …
3831 } 3876 }
3832} 3877}
3833/*}}} */ 3878/*}}} */
3834 3879
3835/*{{{ process sgr sequences */ 3880/*{{{ process sgr sequences */
3836void 3881void ecb_hot
3837rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3882rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3838{ 3883{
3839 unsigned int i; 3884 unsigned int i;
3840 short rendset; 3885 short rendset;
3841 int rendstyle; 3886 int rendstyle;
… …
3982 break; 4027 break;
3983#endif 4028#endif
3984 } 4029 }
3985 } 4030 }
3986} 4031}
3987/*}}} */
3988 4032
3989/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3990void 4033void
3991rxvt_term::process_graphics () 4034rxvt_term::set_cursor_style (int style)
3992{ 4035{
3993 unicode_t ch, cmd = cmd_getc (); 4036 if (!IN_RANGE_INC (style, 0, 4))
3994
3995 if (cmd == 'Q')
3996 {
3997 /* query graphics */
3998 tt_printf ("\033G0\012"); /* no graphics */
3999 return; 4037 return;
4000 } 4038
4001 /* swallow other graphics sequences until terminating ':' */ 4039 set_option (Opt_cursorUnderline, style >= 3);
4002 do 4040
4003 ch = cmd_getc (); 4041#ifdef CURSOR_BLINK
4004 while (ch != ':'); 4042 set_option (Opt_cursorBlink, !style || (style & 1));
4043 cursor_blink_reset ();
4044#endif
4045
4046 want_refresh = 1;
4005} 4047}
4006/*}}} */ 4048/*}}} */
4007 4049
4008/* ------------------------------------------------------------------------- */ 4050/* ------------------------------------------------------------------------- */
4009 4051
… …
4040 4082
4041 if (v_buflen == 0) 4083 if (v_buflen == 0)
4042 { 4084 {
4043 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4085 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4044 4086
4087 max_it (written, 0);
4088
4045 if ((unsigned int)written == len) 4089 if (written == len)
4046 return; 4090 return;
4047 4091
4048 data += written; 4092 data += written;
4049 len -= written; 4093 len -= written;
4050 } 4094 }
4051 4095
4052 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4096 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
4053 4097
4054 memcpy (v_buffer + v_buflen, data, len); 4098 memcpy (v_buffer + v_buflen, data, len);
4055 v_buflen += len; 4099 v_buflen += len;
4056 4100
4057 pty_ev.set (ev::READ | ev::WRITE); 4101 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

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