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.277 by root, Fri Jan 20 12:16:28 2006 UTC vs.
Revision 1.478 by root, Thu Feb 24 12:42:41 2011 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: command.C 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
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>
… …
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-2006 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2011 Marc Lehmann <schmorp@schmorp.de>
31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
31 * 32 *
32 * 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
33 * 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
34 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 36 * (at your option) any later version.
… …
49#include "rxvt.h" 50#include "rxvt.h"
50#include "rxvtperl.h" 51#include "rxvtperl.h"
51#include "version.h" 52#include "version.h"
52#include "command.h" 53#include "command.h"
53 54
54#if HAVE_SCHED_YIELD
55#undef HAVE_SCHED_YIELD // disabled for the time being
56//# include <sched.h>
57#endif
58
59#ifdef KEYSYM_RESOURCE 55#ifdef KEYSYM_RESOURCE
60# include "keyboard.h" 56# include "keyboard.h"
61#endif 57#endif
62 58
63#include <csignal> 59#include <csignal>
60
61#if LINUX_YIELD_HACK
62# include <ctime>
63#endif
64 64
65/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
66 66
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
68 68
… …
96 XK_Shift_L, 0x21e7, 96 XK_Shift_L, 0x21e7,
97 XK_Shift_R, 0x21e7, 97 XK_Shift_R, 0x21e7,
98 98
99 XK_Shift_Lock, 0x21eb, 99 XK_Shift_Lock, 0x21eb,
100 XK_ISO_Lock, 0x21eb, 100 XK_ISO_Lock, 0x21eb,
101 XK_ISO_Lock, 0x21eb,
102 XK_Caps_Lock, 0x21ec, 101 XK_Caps_Lock, 0x21ec,
103 XK_Num_Lock, 0x21ed, 102 XK_Num_Lock, 0x21ed,
104 XK_ISO_Level3_Shift, 0x21ee, 103 XK_ISO_Level3_Shift, 0x21ee,
105 XK_ISO_Level3_Lock, 0x21ef, 104 XK_ISO_Level3_Lock, 0x21ef,
106 XK_ISO_Group_Lock, 0x21f0, 105 XK_ISO_Group_Lock, 0x21f0,
… …
163 162
164void 163void
165rxvt_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)
166{ 165{
167 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
168 rxvt_font *f = (*fs)[fs->find_font (ch)];
169 wchar_t *chr, *alloc, ch2, *fname; 167 wchar_t *chr, *alloc, ch2, **fname;
170 int len; 168 int len;
171
172 fname = rxvt_utf8towcs (f->name);
173 169
174# if ENABLE_COMBINING 170# if ENABLE_COMBINING
175 if (IS_COMPOSE (ch)) 171 if (IS_COMPOSE (ch))
176 { 172 {
177 len = rxvt_composite.expand (ch, 0); 173 len = rxvt_composite.expand (ch, 0);
… …
198 r & RS_Blink ? " blink" : "", 194 r & RS_Blink ? " blink" : "",
199 r & RS_RVid ? " rvid" : "", 195 r & RS_RVid ? " rvid" : "",
200 r & RS_Uline ? " uline" : "", 196 r & RS_Uline ? " uline" : "",
201 r & RS_Careful ? " careful" : ""); 197 r & RS_Careful ? " careful" : "");
202 198
199 int width = 0;
200 fname = rxvt_temp_buf<wchar_t *> (len);
201 for (int i = 0; i < len; i++)
202 {
203 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])];
204 fname[i] = rxvt_utf8towcs (f->name);
203 int width = wcswidth (fname, wcslen (fname)); 205 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
206 }
204 207
205 max_it (width, 8+5); // for char + hey 208 max_it (width, 8+5); // for char + hex
206 max_it (width, strlen (attr)); 209 max_it (width, strlen (attr));
207 210
208 if (y >= 0) 211 if (y >= 0)
209 { 212 {
210 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 213 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
211 x = 0; 214 x = 0;
212 } 215 }
213 216
214 scr_overlay_new (x, y, width, len + 2); 217 scr_overlay_new (x, y, width, len * 2 + 1);
215 218
216 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 219 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
217 220
218 for (int y = 0; y < len; y++) 221 for (int y = 0; y < len; y++)
219 { 222 {
… …
222 ch = *chr++; 225 ch = *chr++;
223 226
224 sprintf (buf, "%8x", ch); 227 sprintf (buf, "%8x", ch);
225 scr_overlay_set (0, y, buf); 228 scr_overlay_set (0, y, buf);
226 scr_overlay_set (9, y, '='); 229 scr_overlay_set (9, y, '=');
227# if !UNICODE3 230# if !UNICODE_3
228 if (ch >= 0x10000) 231 if (ch >= 0x10000)
229 ch = 0xfffd; 232 ch = 0xfffd;
230# endif 233# endif
231 scr_overlay_set (11, y, ch, r); 234 scr_overlay_set (11, y, ch, r);
235
236 if (WCWIDTH (ch) >= 2)
232 scr_overlay_set (12, y, NOCHAR, r); 237 scr_overlay_set (12, y, NOCHAR, r);
233 } 238 }
234 239
240// {
241// char buf[4+4+3+1];
242// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
243// scr_overlay_set (0, 0, buf);
244// }
235 scr_overlay_set (0, len , attr); 245 scr_overlay_set (0, len , attr);
246 for (int i = 0; i < len; i++)
247 {
236 scr_overlay_set (0, len + 1, fname); 248 scr_overlay_set (0, len + 1 + i, fname[i]);
237
238 free (fname); 249 free (fname[i]);
250 }
239 251
240# if ENABLE_COMBINING 252# if ENABLE_COMBINING
241 if (alloc) 253 if (alloc)
242 delete [] alloc; 254 delete [] alloc;
243# endif 255# endif
… …
273 } 285 }
274 286
275 iso14755buf = 0; 287 iso14755buf = 0;
276} 288}
277 289
278int 290static int
279rxvt_term::hex_keyval (XKeyEvent &ev) 291hex_keyval (XKeyEvent &ev)
280{ 292{
281 // check wether this event corresponds to a hex digit 293 // check whether this event corresponds to a hex digit
282 // if the modifiers had not been pressed. 294 // if the modifiers had not been pressed.
283 for (int index = 0; index < 8; index++) 295 for (int index = 0; index < 8; index++)
284 { 296 {
285 KeySym k = XLookupKeysym (&ev, index); 297 KeySym k = XLookupKeysym (&ev, index);
286 298
… …
292 304
293 return -1; 305 return -1;
294} 306}
295#endif 307#endif
296 308
297/*{{{ Convert the keypress event into a string */ 309static inline KeySym
310translate_keypad (KeySym keysym, bool kp)
311{
312#ifdef XK_KP_Home
313 static const KeySym keypadtrans[] = {
314 XK_KP_7, // XK_KP_Home
315 XK_KP_4, // XK_KP_Left
316 XK_KP_8, // XK_KP_Up
317 XK_KP_6, // XK_KP_Right
318 XK_KP_2, // XK_KP_Down
319# ifndef UNSHIFTED_SCROLLKEYS
320 XK_KP_9, // XK_KP_Prior
321 XK_KP_3, // XK_KP_Next
322# else
323 XK_Prior,
324 XK_Next,
325# endif
326 XK_KP_1, // XK_KP_End
327 XK_KP_5, // XK_KP_Begin
328 };
329
330 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
331 {
332 unsigned int index = keysym - XK_KP_Home;
333 keysym = kp ? keypadtrans[index] : XK_Home + index;
334 }
335 else if (keysym == XK_KP_Insert)
336 keysym = kp ? XK_KP_0 : XK_Insert;
337# ifndef NO_DELETE_KEY
338 else if (keysym == XK_KP_Delete)
339 keysym = kp ? XK_KP_Decimal : XK_Delete;
340# endif
341#endif
342 return keysym;
343}
344
345static inline int
346map_function_key (KeySym keysym)
347{
348 int param = 0;
349
350 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
351 {
352 param = 11 + keysym - XK_F1;
353 if (keysym >= XK_F17)
354 param += 4;
355 else if (keysym >= XK_F15)
356 param += 3;
357 else if (keysym >= XK_F11)
358 param += 2;
359 else if (keysym >= XK_F6)
360 param += 1;
361 }
362 else
363 switch (keysym)
364 {
365 case XK_Find:
366 param = 1;
367 break;
368 case XK_Insert:
369 param = 2;
370 break;
371#ifdef DXK_Remove
372 case DXK_Remove:
373#endif
374 case XK_Execute:
375 param = 3;
376 break;
377 case XK_Select:
378 param = 4;
379 break;
380#ifndef UNSHIFTED_SCROLLKEYS
381 case XK_Prior:
382 param = 5;
383 break;
384 case XK_Next:
385 param = 6;
386 break;
387 case XK_Home:
388 param = 7;
389 break;
390 case XK_End:
391 param = 8;
392 break;
393#endif
394 case XK_Help:
395 param = 28;
396 break;
397 case XK_Menu:
398 param = 29;
399 break;
400 }
401 return param;
402}
403
298void 404void
299rxvt_term::lookup_key (XKeyEvent &ev) 405rxvt_term::key_press (XKeyEvent &ev)
300{ 406{
301 int ctrl, meta, shft, len; 407 int ctrl, meta, shft, len;
302 unsigned int newlen;
303 KeySym keysym; 408 KeySym keysym;
304#ifdef DEBUG_CMD
305 static int debug_key = 1; /* accessible by a debugger only */
306#endif
307 int valid_keysym; 409 int valid_keysym;
308 char kbuf[KBUFSZ]; 410 char kbuf[KBUFSZ];
411
412#if ISO_14755
413 if (iso14755buf & ISO_14755_52)
414 return;
415#endif
309 416
310 /* 417 /*
311 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 418 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
312 * escape sequence to toggle the Keypad. 419 * escape sequence to toggle the Keypad.
313 * 420 *
314 * Always permit `shift' to override the current setting 421 * Always permit `shift' to override the current setting
315 */ 422 */
316 shft = ev.state & ShiftMask; 423 shft = ev.state & ShiftMask;
317 ctrl = ev.state & ControlMask; 424 ctrl = ev.state & ControlMask;
318 meta = ev.state & ModMetaMask; 425 meta = ev.state & ModMetaMask;
319
320 if (numlock_state || (ev.state & ModNumLockMask))
321 {
322 numlock_state = (ev.state & ModNumLockMask);
323 PrivMode ((!numlock_state), PrivMode_aplKP);
324 }
325 426
326 kbuf[0] = 0; 427 kbuf[0] = 0;
327 428
328#ifdef USE_XIM 429#ifdef USE_XIM
329 if (Input_Context) 430 if (Input_Context)
… …
404#ifdef PAGING_CONTEXT_LINES 505#ifdef PAGING_CONTEXT_LINES
405 lnsppg = nrow - PAGING_CONTEXT_LINES; 506 lnsppg = nrow - PAGING_CONTEXT_LINES;
406#else 507#else
407 lnsppg = nrow * 4 / 5; 508 lnsppg = nrow * 4 / 5;
408#endif 509#endif
510 max_it (lnsppg, 1);
511
409 if (keysym == XK_Prior) 512 if (keysym == XK_Prior)
410 { 513 {
411 scr_page (UP, lnsppg); 514 scr_page (UP, lnsppg);
412 return; 515 return;
413 } 516 }
… …
478 } 581 }
479 } 582 }
480 583
481#if ENABLE_FRILLS || ISO_14755 584#if ENABLE_FRILLS || ISO_14755
482 // ISO 14755 support 585 // ISO 14755 support
483 if (shft && ctrl) 586 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
484 { 587 {
485 int hv; 588 int hv;
486 589
487 if (iso14755buf & ISO_14755_51 590 if (iso14755buf & ISO_14755_51
488 && (keysym == XK_space || keysym == XK_KP_Space 591 && (keysym == XK_space || keysym == XK_KP_Space
… …
490 { 593 {
491 commit_iso14755 (); 594 commit_iso14755 ();
492 iso14755buf = ISO_14755_51; 595 iso14755buf = ISO_14755_51;
493# if ISO_14755 596# if ISO_14755
494 iso14755_51 (0); 597 iso14755_51 (0);
598# endif
599 return;
600 }
601 else if (keysym == XK_BackSpace)
602 {
603 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
604# if ISO_14755
605 iso14755_51 (iso14755buf & ISO_14755_MASK);
495# endif 606# endif
496 return; 607 return;
497 } 608 }
498 else if ((hv = hex_keyval (ev)) >= 0) 609 else if ((hv = hex_keyval (ev)) >= 0)
499 { 610 {
… …
504# endif 615# endif
505 return; 616 return;
506 } 617 }
507 else 618 else
508 { 619 {
509# if ENABLE_OVERLAY 620# if ISO_14755
510 scr_overlay_off (); 621 scr_overlay_off ();
511# endif 622# endif
512 iso14755buf = 0; 623 iso14755buf = 0;
513 } 624 }
514 } 625 }
626 else if (option (Opt_iso14755) &&
515 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 627 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
516 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 628 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
517 if (!(iso14755buf & ISO_14755_STARTED)) 629 if (!(iso14755buf & ISO_14755_STARTED))
518 { 630 {
519 iso14755buf |= ISO_14755_STARTED; 631 iso14755buf |= ISO_14755_STARTED;
520# if ENABLE_OVERLAY 632# if ISO_14755
521 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 633 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
522 scr_overlay_set (0, 0, "ISO 14755 mode"); 634 scr_overlay_set (0, 0, "ISO 14755 mode");
523# endif 635# endif
524 } 636 }
525#endif 637#endif
526 638
527#ifdef PRINTPIPE 639#ifdef PRINTPIPE
528 if (keysym == XK_Print) 640 if (keysym == XK_Print)
529 { 641 {
530 scr_printscreen (ctrl | shft); 642 scr_printscreen (ctrl | shft);
531 return; 643 return;
532 } 644 }
533#endif 645#endif
534 646
535 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 647 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
536 { 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)
537 { 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
538 newlen = 1; 689 newlen = 0;
539 switch (keysym) 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:
540 { 773 {
541#ifndef NO_BACKSPACE_KEY 774 int param = map_function_key (keysym);
542 case XK_BackSpace: 775 if (param > 0)
543 if (priv_modes & PrivMode_HaveBackSpace) 776 sprintf (kbuf,"\033[%d~", param);
544 {
545 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
546 ^ !!ctrl) ? '\b' : '\177';
547 kbuf[1] = '\0';
548 }
549 else 777 else
550 strcpy (kbuf, key_backspace);
551 break;
552#endif
553#ifndef NO_DELETE_KEY
554# ifdef XK_KP_Prior
555 case XK_KP_Delete:
556 /* allow shift to override */
557 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
558 {
559 strcpy (kbuf, "\033On");
560 break;
561 }
562 /* FALLTHROUGH */
563# endif
564 case XK_Delete:
565 strcpy (kbuf, key_delete);
566 break;
567#endif
568 case XK_Tab:
569 if (shft)
570 strcpy (kbuf, "\033[Z");
571 else
572 {
573#ifdef CTRL_TAB_MAKES_META
574 if (ctrl)
575 meta = 1;
576#endif
577#ifdef MOD4_TAB_MAKES_META
578 if (ev.state & Mod4Mask)
579 meta = 1;
580#endif
581 newlen = 0;
582 }
583 break;
584
585#ifdef XK_KP_Left
586 case XK_KP_Up: /* \033Ox or standard */
587 case XK_KP_Down: /* \033Or or standard */
588 case XK_KP_Right: /* \033Ov or standard */
589 case XK_KP_Left: /* \033Ot or standard */
590 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
591 {
592 strcpy (kbuf, "\033OZ");
593 kbuf[2] = "txvr"[keysym - XK_KP_Left];
594 break;
595 }
596 else
597 /* translate to std. cursor key */
598 keysym = XK_Left + (keysym - XK_KP_Left);
599 /* FALLTHROUGH */
600#endif
601 case XK_Up: /* "\033[A" */
602 case XK_Down: /* "\033[B" */
603 case XK_Right: /* "\033[C" */
604 case XK_Left: /* "\033[D" */
605 strcpy (kbuf, "\033[Z");
606 kbuf[2] = "DACB"[keysym - XK_Left];
607 /* do Shift first */
608 if (shft)
609 kbuf[2] = "dacb"[keysym - XK_Left];
610 else if (ctrl)
611 {
612 kbuf[1] = 'O';
613 kbuf[2] = "dacb"[keysym - XK_Left];
614 }
615 else if (priv_modes & PrivMode_aplCUR)
616 kbuf[1] = 'O';
617 break;
618
619#ifndef UNSHIFTED_SCROLLKEYS
620# ifdef XK_KP_Prior
621 case XK_KP_Prior:
622 /* allow shift to override */
623 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
624 {
625 strcpy (kbuf, "\033Oy");
626 break;
627 }
628 /* FALLTHROUGH */
629# endif
630 case XK_Prior:
631 strcpy (kbuf, "\033[5~");
632 break;
633# ifdef XK_KP_Next
634 case XK_KP_Next:
635 /* allow shift to override */
636 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
637 {
638 strcpy (kbuf, "\033Os");
639 break;
640 }
641 /* FALLTHROUGH */
642# endif
643 case XK_Next:
644 strcpy (kbuf, "\033[6~");
645 break;
646#endif
647 case XK_KP_Enter:
648 /* allow shift to override */
649 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
650 {
651 strcpy (kbuf, "\033OM");
652 break;
653 }
654
655 /* FALLTHROUGH */
656
657 case XK_Return:
658 if (priv_modes & PrivMode_LFNL)
659 {
660 kbuf[0] = '\015';
661 kbuf[1] = '\012';
662 kbuf[2] = '\0';
663 }
664 else
665 {
666 kbuf[0] = '\015';
667 kbuf[1] = '\0';
668 }
669 break;
670
671#ifdef XK_KP_Begin
672 case XK_KP_Begin:
673 strcpy (kbuf, "\033Ou");
674 break;
675
676#endif
677 case XK_KP_F1: /* "\033OP" */
678 case XK_KP_F2: /* "\033OQ" */
679 case XK_KP_F3: /* "\033OR" */
680 case XK_KP_F4: /* "\033OS" */
681 strcpy (kbuf, "\033OP");
682 kbuf[2] += (keysym - XK_KP_F1);
683 break;
684
685 case XK_KP_Multiply: /* "\033Oj" : "*" */
686 case XK_KP_Add: /* "\033Ok" : "+" */
687 case XK_KP_Separator: /* "\033Ol" : "," */
688 case XK_KP_Subtract: /* "\033Om" : "-" */
689 case XK_KP_Decimal: /* "\033On" : "." */
690 case XK_KP_Divide: /* "\033Oo" : "/" */
691 case XK_KP_0: /* "\033Op" : "0" */
692 case XK_KP_1: /* "\033Oq" : "1" */
693 case XK_KP_2: /* "\033Or" : "2" */
694 case XK_KP_3: /* "\033Os" : "3" */
695 case XK_KP_4: /* "\033Ot" : "4" */
696 case XK_KP_5: /* "\033Ou" : "5" */
697 case XK_KP_6: /* "\033Ov" : "6" */
698 case XK_KP_7: /* "\033Ow" : "7" */
699 case XK_KP_8: /* "\033Ox" : "8" */
700 case XK_KP_9: /* "\033Oy" : "9" */
701 /* allow shift to override */
702 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
703 {
704 strcpy (kbuf, "\033Oj");
705 kbuf[2] += (keysym - XK_KP_Multiply);
706 }
707 else
708 {
709 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
710 kbuf[1] = '\0';
711 }
712 break;
713
714 case XK_Find:
715 strcpy (kbuf, "\033[1~");
716 break;
717
718#ifdef XK_KP_End
719 case XK_KP_Insert:
720 /* allow shift to override */
721 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
722 {
723 strcpy (kbuf, "\033Op");
724 break;
725 }
726 /* FALLTHROUGH */
727#endif
728 case XK_Insert:
729 strcpy (kbuf, "\033[2~");
730 break;
731#ifdef DXK_Remove /* support for DEC remove like key */
732 case DXK_Remove:
733 /* FALLTHROUGH */
734#endif
735 case XK_Execute:
736 strcpy (kbuf, "\033[3~");
737 break;
738 case XK_Select:
739 strcpy (kbuf, "\033[4~");
740 break;
741#ifdef XK_KP_End
742 case XK_KP_End:
743 /* allow shift to override */
744 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
745 {
746 strcpy (kbuf, "\033Oq");
747 break;
748 }
749 /* FALLTHROUGH */
750#endif
751 case XK_End:
752 strcpy (kbuf, KS_END);
753 break;
754#ifdef XK_KP_Home
755 case XK_KP_Home:
756 /* allow shift to override */
757 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
758 {
759 strcpy (kbuf, "\033Ow");
760 break;
761 }
762 /* FALLTHROUGH */
763#endif
764 case XK_Home:
765 strcpy (kbuf, KS_HOME);
766 break;
767
768#define FKEY(n, fkey) \
769 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
770
771 case XK_F1: /* "\033[11~" */
772 case XK_F2: /* "\033[12~" */
773 case XK_F3: /* "\033[13~" */
774 case XK_F4: /* "\033[14~" */
775 case XK_F5: /* "\033[15~" */
776 FKEY (11, XK_F1);
777 break;
778 case XK_F6: /* "\033[17~" */
779 case XK_F7: /* "\033[18~" */
780 case XK_F8: /* "\033[19~" */
781 case XK_F9: /* "\033[20~" */
782 case XK_F10: /* "\033[21~" */
783 FKEY (17, XK_F6);
784 break;
785 case XK_F11: /* "\033[23~" */
786 case XK_F12: /* "\033[24~" */
787 case XK_F13: /* "\033[25~" */
788 case XK_F14: /* "\033[26~" */
789 FKEY (23, XK_F11);
790 break;
791 case XK_F15: /* "\033[28~" */
792 case XK_F16: /* "\033[29~" */
793 FKEY (28, XK_F15);
794 break;
795 case XK_Help: /* "\033[28~" */
796 FKEY (28, XK_Help);
797 break;
798 case XK_Menu: /* "\033[29~" */
799 FKEY (29, XK_Menu);
800 break;
801 case XK_F17: /* "\033[31~" */
802 case XK_F18: /* "\033[32~" */
803 case XK_F19: /* "\033[33~" */
804 case XK_F20: /* "\033[34~" */
805 case XK_F21: /* "\033[35~" */
806 case XK_F22: /* "\033[36~" */
807 case XK_F23: /* "\033[37~" */
808 case XK_F24: /* "\033[38~" */
809 case XK_F25: /* "\033[39~" */
810 case XK_F26: /* "\033[40~" */
811 case XK_F27: /* "\033[41~" */
812 case XK_F28: /* "\033[42~" */
813 case XK_F29: /* "\033[43~" */
814 case XK_F30: /* "\033[44~" */
815 case XK_F31: /* "\033[45~" */
816 case XK_F32: /* "\033[46~" */
817 case XK_F33: /* "\033[47~" */
818 case XK_F34: /* "\033[48~" */
819 case XK_F35: /* "\033[49~" */
820 FKEY (31, XK_F17);
821 break;
822#undef FKEY
823 default:
824 newlen = 0; 778 newlen = 0;
825 break;
826 } 779 }
827 780 break;
828 if (newlen)
829 len = strlen (kbuf);
830 } 781 }
782
783 if (newlen)
784 len = strlen (kbuf);
831 785
832 /* 786 /*
833 * Pass meta for all function keys, if 'meta' option set 787 * Pass meta for all function keys, if 'meta' option set
834 */ 788 */
835#ifdef META8_OPTION 789#ifdef META8_OPTION
… …
870 return; 824 return;
871 825
872 if (len <= 0) 826 if (len <= 0)
873 return; /* not mapped */ 827 return; /* not mapped */
874 828
875 if (OPTION (Opt_scrollTtyKeypress)) 829 if (option (Opt_scrollTtyKeypress))
876 if (view_start) 830 if (view_start)
877 { 831 {
878 view_start = 0; 832 view_start = 0;
879 want_refresh = 1; 833 want_refresh = 1;
880 } 834 }
… …
902 { 856 {
903 const char ch = C0_ESC; 857 const char ch = C0_ESC;
904 tt_write (&ch, 1); 858 tt_write (&ch, 1);
905 } 859 }
906 860
907#if defined(DEBUG_CMD)
908 /* Display keyboard buffer contents */
909 unsigned char *p;
910 int i;
911
912 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
913 for (i = 0, p = kbuf; i < len; i++, p++)
914 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
915 fprintf (stderr, "'\n");
916#endif /* DEBUG_CMD */
917 tt_write (kbuf, (unsigned int)len); 861 tt_write (kbuf, (unsigned int)len);
918} 862}
919/*}}} */ 863
864void
865rxvt_term::key_release (XKeyEvent &ev)
866{
867#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
868 KeySym keysym;
869
870 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
871#endif
872
873#if ENABLE_FRILLS || ISO_14755
874 // ISO 14755 support
875 if (iso14755buf)
876 if (iso14755buf & ISO_14755_52)
877 {
878# if ISO_14755
879 scr_overlay_off ();
880# endif
881# if ISO_14755
882 // iso14755 part 5.2 handling: release time
883 // first: controls
884 if ((ev.state & ControlMask)
885 && ((keysym >= 0x40 && keysym <= 0x5f)
886 || (keysym >= 0x61 && keysym <= 0x7f)))
887 {
888 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
889 commit_iso14755 ();
890
891 return;
892 }
893
894 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
895 if (i[0] == keysym)
896 {
897 iso14755buf = ISO_14755_51 | i[1];
898 commit_iso14755 ();
899
900 return;
901 }
902
903 scr_bell ();
904# endif
905 iso14755buf = 0;
906
907 return;
908 }
909 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
910 {
911# if ISO_14755
912 scr_overlay_off ();
913# endif
914 if (iso14755buf & ISO_14755_51)
915 commit_iso14755 ();
916#if ISO_14755
917 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
918 {
919 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
920
921 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
922 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
923 }
924# endif
925 else
926 iso14755buf = 0;
927 }
928#endif
929
930 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
931 return;
932
933#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
934 if (!(ev.state & ControlMask))
935 slip_wheel_ev.stop ();
936 else if (keysym == XK_Control_L || keysym == XK_Control_R)
937 mouse_slip_wheel_speed = 0;
938#endif
939}
920 940
921#if defined (KEYSYM_RESOURCE) 941#if defined (KEYSYM_RESOURCE)
922unsigned int 942unsigned int
923rxvt_term::cmd_write (const char *str, unsigned int count) 943rxvt_term::cmd_write (const char *str, unsigned int count)
924{ 944{
… …
954void 974void
955rxvt_term::flush () 975rxvt_term::flush ()
956{ 976{
957 flush_ev.stop (); 977 flush_ev.stop ();
958 978
959#ifdef TRANSPARENT 979#ifdef HAVE_BG_PIXMAP
960 if (want_full_refresh) 980 if (bg_flags & BG_NEEDS_REFRESH)
961 { 981 {
962 want_full_refresh = 0; 982 bg_flags &= ~BG_NEEDS_REFRESH;
963 scr_clear ();
964 scr_touch (false); 983 scr_touch (false);
965 } 984 }
966#endif 985#endif
967 986
968 if (want_refresh) 987 if (want_refresh)
… …
1004 } 1023 }
1005 while (row < end_row); 1024 while (row < end_row);
1006 } 1025 }
1007 1026
1008 scr_refresh (); 1027 scr_refresh ();
1009 scrollbar_show (1); 1028 scrollBar.show (1);
1010#ifdef USE_XIM 1029#ifdef USE_XIM
1011 IMSendSpot (); 1030 IMSendSpot ();
1012#endif 1031#endif
1013 } 1032 }
1014 1033
1015 display->flush (); 1034 display->flush ();
1016} 1035}
1017 1036
1037/* checks whether a refresh is requested and starts the refresh timer */
1018void 1038void
1019rxvt_term::check_cb (check_watcher &w) 1039rxvt_term::refresh_check ()
1040{
1041 if (want_refresh && !flush_ev.is_active ())
1042 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1043
1044 display->flush ();
1045}
1046
1047void
1048rxvt_term::flush_cb (ev::timer &w, int revents)
1020{ 1049{
1021 make_current (); 1050 make_current ();
1022 1051
1023 display->flush ();
1024
1025 if (want_refresh && !flush_ev.active)
1026 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1027}
1028
1029void
1030rxvt_term::flush_cb (time_watcher &w)
1031{
1032 make_current ();
1033
1034 refresh_limit = 1;
1035 refresh_count = 0; 1052 refresh_count = 0;
1036 flush (); 1053 flush ();
1037} 1054}
1038 1055
1039#ifdef CURSOR_BLINK 1056#ifdef CURSOR_BLINK
1040void 1057void
1041rxvt_term::cursor_blink_cb (time_watcher &w) 1058rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1042{ 1059{
1043 hidden_cursor = !hidden_cursor; 1060 hidden_cursor = !hidden_cursor;
1044 want_refresh = 1; 1061 want_refresh = 1;
1045 1062 refresh_check ();
1046 w.start (w.at + CURSOR_BLINK_INTERVAL);
1047} 1063}
1048#endif 1064#endif
1049 1065
1050#ifdef TEXT_BLINK 1066#ifdef TEXT_BLINK
1051void 1067void
1052rxvt_term::text_blink_cb (time_watcher &w) 1068rxvt_term::text_blink_cb (ev::timer &w, int revents)
1053{ 1069{
1054 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1070 if (scr_refresh_rend (RS_Blink, RS_Blink))
1055 { 1071 {
1056 hidden_text = !hidden_text; 1072 hidden_text = !hidden_text;
1057 want_refresh = 1; 1073 want_refresh = 1;
1058 w.start (w.at + TEXT_BLINK_INTERVAL); 1074 refresh_check ();
1059 } 1075 }
1076 else
1077 w.stop ();
1060} 1078}
1061#endif 1079#endif
1062 1080
1063#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1081#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1064void 1082void
1065rxvt_term::cont_scroll_cb (time_watcher &w) 1083rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1066{ 1084{
1067 if ((scrollbar_isUp() || scrollbar_isDn()) && 1085 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1068 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1086 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1069 { 1087 {
1070 want_refresh = 1; 1088 want_refresh = 1;
1071 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1089 refresh_check ();
1072 } 1090 }
1091 else
1092 w.stop ();
1073} 1093}
1074#endif 1094#endif
1075 1095
1076#ifdef SELECTION_SCROLLING 1096#ifdef SELECTION_SCROLLING
1077void 1097void
1078rxvt_term::sel_scroll_cb (time_watcher &w) 1098rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1079{ 1099{
1080 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1100 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1081 { 1101 {
1082 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1102 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1083 want_refresh = 1; 1103 want_refresh = 1;
1084 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1104 refresh_check ();
1085 } 1105 }
1106 else
1107 w.stop ();
1086} 1108}
1087#endif 1109#endif
1088 1110
1089#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1111#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1090void 1112void
1091rxvt_term::slip_wheel_cb (time_watcher &w) 1113rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1092{ 1114{
1093 if (mouse_slip_wheel_speed == 0 1115 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1094 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1095 : scr_page (UP, mouse_slip_wheel_speed))
1096 { 1116 {
1097 if (view_start == top_row || view_start == 0)
1098 mouse_slip_wheel_speed = 0;
1099
1100 want_refresh = 1; 1117 want_refresh = 1;
1101 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1118 refresh_check ();
1119 }
1120
1121 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1102 } 1122 {
1123 mouse_slip_wheel_speed = 0;
1124 w.stop ();
1125 }
1103} 1126}
1104#endif 1127#endif
1105 1128
1106#if HAVE_SCHED_YIELD 1129#if LINUX_YIELD_HACK
1107static struct event_handler 1130static struct event_handler
1108{ 1131{
1109 check_watcher cw_yield; 1132 ev::prepare yield_ev;
1110 1133
1111 void yield (check_watcher &w) 1134 void yield_cb (ev::prepare &w, int revents)
1112 { 1135 {
1113 sched_yield (); 1136 // this should really be sched_yield(), but the linux guys thought
1137 // that giving a process calling sched_yield () less cpu time than
1138 // ones with high nice levels is a useful thing to do. It surely is is
1139 // allowed by the sus... as is returning ENOSYS.
1140 // since the linux guys additionally thought that breaking the only
1141 // known workaround against their unusable sched_yield hack is cool,
1142 // we just nanosleep a bit and hope for the best.
1143
1144 struct timespec ts = { 0, 1000 };
1145 nanosleep (&ts, 0);
1146
1114 w.stop (); 1147 w.stop ();
1115 } 1148 }
1116 1149
1117 event_handler () 1150 event_handler ()
1118 : cw_yield (this, &event_handler::yield) 1151 : yield_ev (this, &event_handler::yield_cb)
1119 { 1152 {
1120 } 1153 }
1121} event_handler; 1154} event_handler;
1122#endif 1155#endif
1123 1156
… …
1125rxvt_term::pty_fill () 1158rxvt_term::pty_fill ()
1126{ 1159{
1127 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1160 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1128 1161
1129 if (CBUFSIZ == n) 1162 if (CBUFSIZ == n)
1130 { 1163 n = 0; // normally this indicates a "too long" command sequence - just drop the data we have
1131 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1132 n = 0;
1133 }
1134 1164
1135 memmove (cmdbuf_base, cmdbuf_ptr, n); 1165 memmove (cmdbuf_base, cmdbuf_ptr, n);
1136 cmdbuf_ptr = cmdbuf_base; 1166 cmdbuf_ptr = cmdbuf_base;
1137 cmdbuf_endp = cmdbuf_ptr + n; 1167 cmdbuf_endp = cmdbuf_ptr + n;
1138 1168
… …
1143 cmdbuf_endp += r; 1173 cmdbuf_endp += r;
1144 return true; 1174 return true;
1145 } 1175 }
1146 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1176 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1147 { 1177 {
1148#if HAVE_SCHED_YIELD 1178#if LINUX_YIELD_HACK
1149 if (display->is_local) 1179 if (display->is_local)
1150 event_handler.cw_yield.start (); 1180 event_handler.yield_ev.start ();
1151#endif 1181#endif
1152 } 1182 }
1153 else 1183 else
1154 { 1184 {
1155 pty_ev.stop (); 1185 pty_ev.stop ();
1156 1186
1157 if (!OPTION (Opt_hold)) 1187 if (!option (Opt_hold))
1158 destroy (); 1188 destroy ();
1159 } 1189 }
1160 1190
1161 return false; 1191 return false;
1162} 1192}
1163 1193
1164void 1194void
1165rxvt_term::pty_cb (io_watcher &w, short revents) 1195rxvt_term::pty_cb (ev::io &w, int revents)
1166{ 1196{
1167 make_current (); 1197 make_current ();
1168 1198
1169 if (revents & EVENT_READ) 1199 if (revents & ev::READ)
1170 // loop, but don't allow a single term to monopolize us 1200 // loop, but don't allow a single term to monopolize us
1171 while (pty_fill ()) 1201 for (int i = CBUFCNT; i-- && pty_fill (); )
1172 if (cmd_parse ()) 1202 cmd_parse ();
1173 break;
1174 1203
1175 if (revents & EVENT_WRITE) 1204 if (revents & ev::WRITE)
1176 pty_write (); 1205 pty_write ();
1206
1207 refresh_check ();
1177} 1208}
1178 1209
1179void 1210void
1180rxvt_term::pointer_unblank () 1211rxvt_term::pointer_unblank ()
1181{ 1212{
1182 XDefineCursor (display->display, vt, TermWin_cursor); 1213 XDefineCursor (dpy, vt, TermWin_cursor);
1183 recolour_cursor (); 1214 recolour_cursor ();
1184 1215
1185#ifdef POINTER_BLANK 1216#ifdef POINTER_BLANK
1186 hidden_pointer = 0; 1217 hidden_pointer = 0;
1187 1218
1188 if (OPTION (Opt_pointerBlank)) 1219 if (option (Opt_pointerBlank))
1189 pointer_ev.start (NOW + pointerBlankDelay); 1220 pointer_ev.start (pointerBlankDelay);
1190#endif 1221#endif
1191} 1222}
1192 1223
1193#ifdef POINTER_BLANK 1224#ifdef POINTER_BLANK
1194void 1225void
1195rxvt_term::pointer_blank () 1226rxvt_term::pointer_blank ()
1196{ 1227{
1197 if (!OPTION (Opt_pointerBlank)) 1228 if (!option (Opt_pointerBlank))
1198 return; 1229 return;
1199 1230
1200 XDefineCursor (display->display, vt, display->blank_cursor); 1231 XDefineCursor (dpy, vt, display->blank_cursor);
1201 XFlush (display->display); 1232 XFlush (dpy);
1202 1233
1203 hidden_pointer = 1; 1234 hidden_pointer = 1;
1204} 1235}
1205 1236
1206void 1237void
1207rxvt_term::pointer_cb (time_watcher &w) 1238rxvt_term::pointer_cb (ev::timer &w, int revents)
1208{ 1239{
1209 make_current (); 1240 make_current ();
1210 1241
1211 pointer_blank (); 1242 pointer_blank ();
1212} 1243}
… …
1215void 1246void
1216rxvt_term::mouse_report (XButtonEvent &ev) 1247rxvt_term::mouse_report (XButtonEvent &ev)
1217{ 1248{
1218 int button_number, key_state = 0; 1249 int button_number, key_state = 0;
1219 int x, y; 1250 int x, y;
1251 int code = 32;
1220 1252
1221 x = ev.x; 1253 x = Pixel2Col (ev.x) + 1;
1222 y = ev.y; 1254 y = Pixel2Row (ev.y) + 1;
1223 pixel_position (&x, &y); 1255
1256 if (ev.type == MotionNotify)
1257 {
1258 if (x == mouse_row && y == mouse_col)
1259 return;
1260
1261 mouse_row = x;
1262 mouse_col = y;
1263 code += 32;
1264 }
1224 1265
1225 if (MEvent.button == AnyButton) 1266 if (MEvent.button == AnyButton)
1226 button_number = 3; 1267 button_number = 3;
1227 else 1268 else
1228 { 1269 {
1229 button_number = MEvent.button - Button1; 1270 button_number = MEvent.button - Button1;
1230 /* add 0x3D for wheel events, like xterm does */ 1271 /* add 0x3D for wheel events, like xterm does */
1231 if (button_number >= 3) 1272 if (button_number >= 3)
1232 button_number += (64 - 3); 1273 button_number += 64 - 3;
1233 } 1274 }
1234 1275
1235 if (priv_modes & PrivMode_MouseX10) 1276 if (priv_modes & PrivMode_MouseX10)
1236 { 1277 {
1237 /* 1278 /*
… …
1269 fputc ('A', stderr); 1310 fputc ('A', stderr);
1270 if (key_state & 32) 1311 if (key_state & 32)
1271 fputc ('2', stderr); 1312 fputc ('2', stderr);
1272 fprintf (stderr, "]: <%d>, %d/%d\n", 1313 fprintf (stderr, "]: <%d>, %d/%d\n",
1273 button_number, 1314 button_number,
1274 x + 1, 1315 x,
1275 y + 1); 1316 y);
1276#endif 1317#endif
1277 1318
1319#if ENABLE_FRILLS
1320 if (priv_modes & PrivMode_ExtMouseRight)
1321 tt_printf ("\033[%d;%d;%dM",
1322 code + button_number + key_state,
1323 x,
1324 y);
1325 else if (priv_modes & PrivMode_ExtModeMouse)
1326 tt_printf ("\033[M%c%lc%lc",
1327 code + button_number + key_state,
1328 wint_t (32 + x),
1329 wint_t (32 + y));
1330 else
1331#endif
1278 tt_printf ("\033[M%c%c%c", 1332 tt_printf ("\033[M%c%c%c",
1279 (32 + button_number + key_state), 1333 code + button_number + key_state,
1280 (32 + x + 1), 1334 32 + x,
1281 (32 + y + 1)); 1335 32 + y);
1282} 1336}
1283
1284#ifdef USING_W11LIB
1285void
1286rxvt_W11_process_x_event (XEvent *ev)
1287{
1288 rxvt_t *r = rxvt_get_r ();
1289
1290 x_cb (*ev);
1291}
1292#endif
1293 1337
1294/*{{{ process an X event */ 1338/*{{{ process an X event */
1295void 1339void
1296rxvt_term::x_cb (XEvent &ev) 1340rxvt_term::x_cb (XEvent &ev)
1297{ 1341{
1298 make_current (); 1342 make_current ();
1299 1343
1300 dDisp; 1344 dLocal (Display *, dpy);
1301 1345
1302 if (ev.xany.window == vt 1346 if (ev.xany.window == vt
1303 && SHOULD_INVOKE (HOOK_X_EVENT) 1347 && SHOULD_INVOKE (HOOK_X_EVENT)
1304 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1348 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1305 return; 1349 return;
… …
1310 unsigned int unused_mask; 1354 unsigned int unused_mask;
1311 1355
1312 switch (ev.type) 1356 switch (ev.type)
1313 { 1357 {
1314 case KeyPress: 1358 case KeyPress:
1315#if ISO_14755 1359 key_press (ev.xkey);
1316 if (!(iso14755buf & ISO_14755_52))
1317#endif
1318 lookup_key (ev.xkey);
1319
1320 break; 1360 break;
1321 1361
1322 case KeyRelease: 1362 case KeyRelease:
1323 { 1363 key_release (ev.xkey);
1324#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1325 KeySym keysym;
1326
1327 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1328#endif
1329
1330#if ENABLE_FRILLS || ISO_14755
1331 // ISO 14755 support
1332 if (iso14755buf)
1333 if (iso14755buf & ISO_14755_52)
1334 {
1335# if ENABLE_OVERLAY
1336 scr_overlay_off ();
1337# endif
1338# if ISO_14755
1339 // iso14755 part 5.2 handling: release time
1340 // first: controls
1341 if ((ev.xkey.state & ControlMask)
1342 && ((keysym >= 0x40 && keysym <= 0x5f)
1343 || (keysym >= 0x61 && keysym <= 0x7f)))
1344 {
1345 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1346 commit_iso14755 ();
1347 goto skip_switch;
1348 }
1349
1350 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1351 if (i[0] == keysym)
1352 {
1353 iso14755buf = ISO_14755_51 | i[1];
1354 commit_iso14755 ();
1355 goto skip_switch;
1356 }
1357
1358 scr_bell ();
1359# endif
1360 iso14755buf = 0;
1361 break;
1362 }
1363 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1364 {
1365# if ENABLE_OVERLAY
1366 scr_overlay_off ();
1367# endif
1368 if (iso14755buf & ISO_14755_51)
1369 commit_iso14755 ();
1370#if ISO_14755
1371 else if (iso14755buf & ISO_14755_STARTED)
1372 {
1373 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1374
1375 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1376 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1377 }
1378# endif
1379 else
1380 iso14755buf = 0;
1381 }
1382#endif
1383
1384 if (ev.xany.window == vt
1385 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1386 break;
1387
1388#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1389 if (!(ev.xkey.state & ControlMask))
1390 slip_wheel_ev.stop ();
1391 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1392 mouse_slip_wheel_speed = 0;
1393#endif
1394 break; 1364 break;
1395 }
1396 1365
1397 case ButtonPress: 1366 case ButtonPress:
1398 button_press (ev.xbutton); 1367 button_press (ev.xbutton);
1399 break; 1368 break;
1400 1369
… …
1415 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END))) 1384 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1416 destroy (); 1385 destroy ();
1417 } 1386 }
1418#if ENABLE_EWMH 1387#if ENABLE_EWMH
1419 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1388 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1420 XSendEvent (disp, ev.xclient.window = display->root, 1389 XSendEvent (dpy, ev.xclient.window = display->root,
1421 False, SubstructureRedirectMask | SubstructureNotifyMask, 1390 False, SubstructureRedirectMask | SubstructureNotifyMask,
1422 &ev); 1391 &ev);
1423#endif 1392#endif
1424 } 1393 }
1425 } 1394 }
… …
1431 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1400 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1432 focus_out (); 1401 focus_out ();
1433 } 1402 }
1434#endif 1403#endif
1435 } 1404 }
1436 break;
1437
1438 case MappingNotify:
1439 XRefreshKeyboardMapping (&ev.xmapping);
1440 break; 1405 break;
1441 1406
1442 /* 1407 /*
1443 * XXX: this is not the _current_ arrangement 1408 * XXX: this is not the _current_ arrangement
1444 * Here's my conclusion: 1409 * Here's my conclusion:
… …
1463 break; 1428 break;
1464 } 1429 }
1465 break; 1430 break;
1466 1431
1467 case FocusIn: 1432 case FocusIn:
1433 if (ev.xfocus.detail != NotifyInferior
1434 && ev.xfocus.detail != NotifyPointer
1435 && ev.xfocus.mode != NotifyGrab)
1468 focus_in (); 1436 focus_in ();
1469 break; 1437 break;
1470 1438
1471 case FocusOut: 1439 case FocusOut:
1440 if (ev.xfocus.detail != NotifyInferior
1441 && ev.xfocus.detail != NotifyPointer
1442 && ev.xfocus.mode != NotifyGrab)
1472 focus_out (); 1443 focus_out ();
1473 break; 1444 break;
1474 1445
1475 case ConfigureNotify: 1446 case ConfigureNotify:
1476 if (ev.xconfigure.window == parent[0]) 1447 if (ev.xconfigure.window == parent[0])
1477 { 1448 {
1478 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1449 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1479 ; 1450 ;
1451
1452#ifdef HAVE_BG_PIXMAP
1453 bool moved = false;
1454 if (bg_window_position_sensitive ())
1455 {
1456 int x, y;
1457 if (ev.xconfigure.send_event)
1458 {
1459 x = ev.xconfigure.x;
1460 y = ev.xconfigure.y;
1461 }
1462 else
1463 get_window_origin (x, y);
1464
1465 if (bg_set_position (x, y)
1466 || !(bg_flags & BG_IS_VALID))
1467 moved = true;
1468 }
1469#endif
1480 1470
1481 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1471 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1482 { 1472 {
1483 seen_resize = 1; 1473 seen_resize = 1;
1484 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1474 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1485 } 1475 }
1476 else
1477 {
1478#ifdef HAVE_BG_PIXMAP
1479 if (moved)
1480 {
1481 if (mapped)
1482 update_background ();
1483 else
1484 bg_invalidate ();
1485 }
1486#endif
1487 }
1486 1488
1487 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1489 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1488
1489#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1490 if (OPTION (Opt_transparent))
1491 check_our_parents ();
1492#endif
1493 } 1490 }
1494 break; 1491 break;
1495 1492
1496 case PropertyNotify: 1493 case PropertyNotify:
1497 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1494 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1498 && ev.xproperty.state == PropertyNewValue)
1499 selection_property (ev.xproperty.window, ev.xproperty.atom);
1500
1501 break; 1495 break;
1502 1496
1503 case SelectionClear: 1497 case SelectionClear:
1504 selection_clear (); 1498 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1505 break;
1506
1507 case SelectionNotify:
1508 if (selection_wait == Sel_normal)
1509 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1510 break; 1499 break;
1511 1500
1512 case SelectionRequest: 1501 case SelectionRequest:
1513 selection_send (ev.xselectionrequest); 1502 selection_send (ev.xselectionrequest);
1514 break; 1503 break;
1515 1504
1516 case MapNotify: 1505 case MapNotify:
1506#ifdef HAVE_BG_PIXMAP
1507 /* This is needed specifically to fix the case of no window manager or a
1508 * non-reparenting window manager. In those cases we never get first
1509 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1510 * care of multiplicity of ConfigureNotify events arriving while WM does
1511 * reparenting.
1512 * We should not render background immediately, as there could be several
1513 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1514 * by scheduling background redraw as soon as we can, but giving a short
1515 * bit of time for ConfigureNotifies to arrive.
1516 * We should render background PRIOR to drawing any text, but AFTER all
1517 * of ConfigureNotifys for the best results.
1518 */
1519 if (!(bg_flags & BG_IS_VALID))
1520 update_background_ev.start (0.025);
1521#endif
1517 mapped = 1; 1522 mapped = 1;
1518#ifdef TEXT_BLINK 1523#ifdef TEXT_BLINK
1519 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1524 text_blink_ev.start ();
1520#endif 1525#endif
1521 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1526 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1522 break; 1527 break;
1523 1528
1524 case UnmapNotify: 1529 case UnmapNotify:
… …
1526#ifdef TEXT_BLINK 1531#ifdef TEXT_BLINK
1527 text_blink_ev.stop (); 1532 text_blink_ev.stop ();
1528#endif 1533#endif
1529 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1534 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1530 break; 1535 break;
1531
1532#ifdef TRANSPARENT
1533 case ReparentNotify:
1534 rootwin_cb (ev);
1535 break;
1536#endif /* TRANSPARENT */
1537 1536
1538 case GraphicsExpose: 1537 case GraphicsExpose:
1539 case Expose: 1538 case Expose:
1540 if (ev.xany.window == vt) 1539 if (ev.xany.window == vt)
1541 { 1540 {
1542 do 1541 do
1542 {
1543 scr_expose (ev.xexpose.x, ev.xexpose.y, 1543 scr_expose (ev.xexpose.x, ev.xexpose.y,
1544 ev.xexpose.width, ev.xexpose.height, False); 1544 ev.xexpose.width, ev.xexpose.height, false);
1545 }
1545 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1546 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1546 1547
1547 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1548 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1548 1549
1549 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1550 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1551 {
1550 scr_expose (ev.xexpose.x, ev.xexpose.y, 1552 scr_expose (ev.xexpose.x, ev.xexpose.y,
1551 ev.xexpose.width, ev.xexpose.height, False); 1553 ev.xexpose.width, ev.xexpose.height, false);
1554 }
1552 1555
1553 want_refresh = 1; 1556 want_refresh = 1;
1554 } 1557 }
1555 else 1558 else
1556 { 1559 {
1557 XEvent unused_event; 1560 XEvent unused_event;
1558 1561
1559 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1562 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1560 ; 1563 ;
1561 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1564 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1562 ; 1565 ;
1563 1566
1564 if (isScrollbarWindow (ev.xany.window)) 1567 if (scrollBar.state && ev.xany.window == scrollBar.win)
1565 { 1568 {
1566 scrollBar.setIdle (); 1569 scrollBar.state = STATE_IDLE;
1567 scrollbar_show (0); 1570 scrollBar.show (0);
1568 } 1571 }
1569
1570#ifdef TRANSPARENT
1571 if (am_transparent && ev.xany.window == parent[0])
1572 XClearWindow (disp, ev.xany.window);
1573#endif
1574 } 1572 }
1575 break; 1573 break;
1576 1574
1577 case MotionNotify: 1575 case MotionNotify:
1578#ifdef POINTER_BLANK 1576#ifdef POINTER_BLANK
1579 if (hidden_pointer) 1577 if (hidden_pointer)
1580 pointer_unblank (); 1578 pointer_unblank ();
1581#endif 1579#endif
1580 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1581 || priv_modes & PrivMode_MouseAnyEvent)
1582 mouse_report (ev.xbutton);
1582 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1583 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1583 break; 1584 break;
1584 1585
1585 if (ev.xany.window == vt) 1586 if (ev.xany.window == vt)
1586 { 1587 {
1587 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1588 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1588 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1589 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1589 ; // nop 1590 ; // nop
1590 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1591 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1591 { 1592 {
1592 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1593 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1593 ; 1594 ;
1594 1595
1595 XQueryPointer (disp, vt, 1596 XQueryPointer (dpy, vt,
1596 &unused_root, &unused_child, 1597 &unused_root, &unused_child,
1597 &unused_root_x, &unused_root_y, 1598 &unused_root_x, &unused_root_y,
1598 &ev.xbutton.x, &ev.xbutton.y, 1599 &ev.xbutton.x, &ev.xbutton.y,
1599 &ev.xbutton.state); 1600 &ev.xbutton.state);
1600#ifdef MOUSE_THRESHOLD 1601#ifdef MOUSE_THRESHOLD
… …
1620 int dist; 1621 int dist;
1621 1622
1622 /* don't clobber the current delay if we are 1623 /* don't clobber the current delay if we are
1623 * already in the middle of scrolling. 1624 * already in the middle of scrolling.
1624 */ 1625 */
1625 if (!sel_scroll_ev.active) 1626 if (!sel_scroll_ev.is_active ())
1626 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1627 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1627 1628
1628 /* save the event params so we can highlight 1629 /* save the event params so we can highlight
1629 * the selection in the pending-scroll loop 1630 * the selection in the pending-scroll loop
1630 */ 1631 */
1631 selection_save_x = ev.xbutton.x; 1632 selection_save_x = ev.xbutton.x;
… …
1653 else 1654 else
1654 { 1655 {
1655 /* we are within the text window, so we 1656 /* we are within the text window, so we
1656 * shouldn't be scrolling 1657 * shouldn't be scrolling
1657 */ 1658 */
1658 if (sel_scroll_ev.active)
1659 sel_scroll_ev.stop(); 1659 sel_scroll_ev.stop();
1660 } 1660 }
1661#endif 1661#endif
1662#ifdef MOUSE_THRESHOLD 1662#ifdef MOUSE_THRESHOLD
1663 } 1663 }
1664#endif 1664#endif
1665 } 1665 }
1666 } 1666 }
1667 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1667 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1668 { 1668 {
1669 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1669 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1670 MotionNotify, &ev)) 1670 MotionNotify, &ev))
1671 ; 1671 ;
1672 1672
1673 XQueryPointer (disp, scrollBar.win, 1673 XQueryPointer (dpy, scrollBar.win,
1674 &unused_root, &unused_child, 1674 &unused_root, &unused_child,
1675 &unused_root_x, &unused_root_y, 1675 &unused_root_x, &unused_root_y,
1676 &ev.xbutton.x, &ev.xbutton.y, 1676 &ev.xbutton.x, &ev.xbutton.y,
1677 &unused_mask); 1677 &unused_mask);
1678 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1678 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1679 scrollbar_size ()); 1679 scrollBar.size ());
1680 want_refresh = 1; 1680 want_refresh = 1;
1681 refresh_limit = 0;
1682 scrollbar_show (1); 1681 scrollBar.show (1);
1683 } 1682 }
1684 break; 1683 break;
1685 } 1684 }
1686 1685
1687skip_switch: ;
1688
1689#if defined(CURSOR_BLINK) 1686#if defined(CURSOR_BLINK)
1690 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1687 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1691 { 1688 {
1692 if (hidden_cursor) 1689 if (hidden_cursor)
1693 { 1690 {
1694 hidden_cursor = 0; 1691 hidden_cursor = 0;
1695 want_refresh = 1; 1692 want_refresh = 1;
1696 } 1693 }
1697 1694
1698 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1695 cursor_blink_ev.again ();
1699 } 1696 }
1700#endif 1697#endif
1701 1698
1702#if defined(POINTER_BLANK) 1699#if defined(POINTER_BLANK)
1703 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1700 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1704 { 1701 {
1705 if (ev.type == MotionNotify 1702 if (ev.type == MotionNotify
1706 || ev.type == ButtonPress 1703 || ev.type == ButtonPress
1707 || ev.type == ButtonRelease) 1704 || ev.type == ButtonRelease)
1708 if (hidden_pointer) 1705 if (hidden_pointer)
… …
1710 1707
1711 if (ev.type == KeyPress && hidden_pointer == 0) 1708 if (ev.type == KeyPress && hidden_pointer == 0)
1712 pointer_blank (); 1709 pointer_blank ();
1713 } 1710 }
1714#endif 1711#endif
1712
1713 refresh_check ();
1715} 1714}
1715
1716#if ENABLE_FRILLS
1717void
1718rxvt_term::set_urgency (bool enable)
1719{
1720 if (enable == urgency_hint)
1721 return;
1722
1723 if (XWMHints *h = XGetWMHints (dpy, parent[0]))
1724 {
1725 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1726 XSetWMHints (dpy, parent[0], h);
1727 urgency_hint = enable;
1728 }
1729}
1730#endif
1716 1731
1717void 1732void
1718rxvt_term::focus_in () 1733rxvt_term::focus_in ()
1719{ 1734{
1720 if (!focus) 1735 if (!focus)
1721 { 1736 {
1722 focus = 1; 1737 focus = 1;
1723 want_refresh = 1; 1738 want_refresh = 1;
1724 1739
1725 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1726
1727#if USE_XIM 1740#if USE_XIM
1728 if (Input_Context != NULL) 1741 if (Input_Context != NULL)
1729 { 1742 {
1730 IMSetStatusPosition (); 1743 IMSetPosition ();
1731 XSetICFocus (Input_Context); 1744 XSetICFocus (Input_Context);
1732 } 1745 }
1733#endif 1746#endif
1734#if CURSOR_BLINK 1747#if CURSOR_BLINK
1735 if (OPTION (Opt_cursorBlink)) 1748 if (option (Opt_cursorBlink))
1736 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1749 cursor_blink_ev.again ();
1737#endif 1750#endif
1738#if OFF_FOCUS_FADING 1751#if OFF_FOCUS_FADING
1739 if (rs[Rs_fade]) 1752 if (rs[Rs_fade])
1740 { 1753 {
1741 pix_colors = pix_colors_focused; 1754 pix_colors = pix_colors_focused;
1742 scr_recolour (); 1755 scr_recolour ();
1743 } 1756 }
1744#endif 1757#endif
1758#if ENABLE_FRILLS
1759 if (option (Opt_urgentOnBell))
1760 set_urgency (0);
1761#endif
1762
1763 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1745 } 1764 }
1746} 1765}
1747 1766
1748void 1767void
1749rxvt_term::focus_out () 1768rxvt_term::focus_out ()
… …
1751 if (focus) 1770 if (focus)
1752 { 1771 {
1753 focus = 0; 1772 focus = 0;
1754 want_refresh = 1; 1773 want_refresh = 1;
1755 1774
1756 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1775#if ENABLE_FRILLS
1757 1776 if (option (Opt_urgentOnBell))
1777 set_urgency (0);
1778#endif
1758#if ENABLE_FRILLS || ISO_14755 1779#if ENABLE_FRILLS || ISO_14755
1759 if (iso14755buf) 1780 if (iso14755buf)
1760 { 1781 {
1761 iso14755buf = 0; 1782 iso14755buf = 0;
1762# if ENABLE_OVERLAY 1783# if ISO_14755
1763 scr_overlay_off (); 1784 scr_overlay_off ();
1764# endif 1785# endif
1765 } 1786 }
1766#endif 1787#endif
1767#if USE_XIM 1788#if USE_XIM
1768 if (Input_Context != NULL) 1789 if (Input_Context != NULL)
1769 XUnsetICFocus (Input_Context); 1790 XUnsetICFocus (Input_Context);
1770#endif 1791#endif
1771#if CURSOR_BLINK 1792#if CURSOR_BLINK
1772 if (OPTION (Opt_cursorBlink)) 1793 if (option (Opt_cursorBlink))
1773 cursor_blink_ev.stop (); 1794 cursor_blink_ev.stop ();
1795
1774 hidden_cursor = 0; 1796 hidden_cursor = 0;
1775#endif 1797#endif
1776#if OFF_FOCUS_FADING 1798#if OFF_FOCUS_FADING
1777 if (rs[Rs_fade]) 1799 if (rs[Rs_fade])
1778 { 1800 {
1779 pix_colors = pix_colors_unfocused; 1801 pix_colors = pix_colors_unfocused;
1780 scr_recolour (); 1802 scr_recolour ();
1781 } 1803 }
1782#endif 1804#endif
1805
1806 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1807 }
1808}
1809
1810void
1811rxvt_term::update_fade_color (unsigned int idx)
1812{
1813#if OFF_FOCUS_FADING
1814 if (rs[Rs_fade])
1783 } 1815 {
1816 rgba c;
1817 pix_colors [Color_fade].get (c);
1818 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1819 }
1820#endif
1784} 1821}
1785 1822
1786#if TRANSPARENT 1823#if ENABLE_TRANSPARENCY || ENABLE_PERL
1787void 1824void
1788rxvt_term::rootwin_cb (XEvent &ev) 1825rxvt_term::rootwin_cb (XEvent &ev)
1789{ 1826{
1790 make_current (); 1827 make_current ();
1791 1828
1829 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1830 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1831 return;
1832
1833# if ENABLE_TRANSPARENCY
1792 switch (ev.type) 1834 switch (ev.type)
1793 { 1835 {
1794 case PropertyNotify: 1836 case PropertyNotify:
1795 /* 1837 /*
1796 * if user used some Esetroot compatible prog to set the root bg, 1838 * if user used some Esetroot compatible prog to set the root bg,
1797 * use the property to determine the pixmap. We use it later on. 1839 * use the property to determine the pixmap. We use it later on.
1798 */ 1840 */
1799 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1841 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1800 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1842 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1801 return; 1843 {
1844 bg_set_root_pixmap ();
1845 update_background ();
1846 }
1802 1847
1803 /* FALLTHROUGH */
1804 case ReparentNotify:
1805 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1806 want_refresh = want_full_refresh = 1;
1807 break; 1848 break;
1808 } 1849 }
1850# endif
1851
1852 refresh_check ();
1809} 1853}
1810#endif 1854#endif
1811 1855
1812void 1856void
1813rxvt_term::button_press (XButtonEvent &ev) 1857rxvt_term::button_press (XButtonEvent &ev)
… …
1822 /* 1866 /*
1823 * VT window processing of button press 1867 * VT window processing of button press
1824 */ 1868 */
1825 if (ev.window == vt) 1869 if (ev.window == vt)
1826 { 1870 {
1871 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1872 return;
1873
1827#if ISO_14755 1874#if ISO_14755
1828 // 5.4 1875 // 5.4
1829 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1876 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1830 { 1877 {
1831 iso14755_54 (ev.x, ev.y); 1878 iso14755_54 (ev.x, ev.y);
… …
1841 /* save the xbutton state (for ButtonRelease) */ 1888 /* save the xbutton state (for ButtonRelease) */
1842 MEvent.state = ev.state; 1889 MEvent.state = ev.state;
1843#ifdef MOUSE_REPORT_DOUBLECLICK 1890#ifdef MOUSE_REPORT_DOUBLECLICK
1844 if (ev.button == MEvent.button && clickintime) 1891 if (ev.button == MEvent.button && clickintime)
1845 { 1892 {
1846 /* same button, within alloted time */ 1893 /* same button, within allowed time */
1847 MEvent.clicks++; 1894 MEvent.clicks++;
1848 1895
1849 if (MEvent.clicks > 1) 1896 if (MEvent.clicks > 1)
1850 { 1897 {
1851 /* only report double clicks */ 1898 /* only report double clicks */
… …
1865 mouse_report (ev); 1912 mouse_report (ev);
1866 } 1913 }
1867#else 1914#else
1868 MEvent.button = ev.button; 1915 MEvent.button = ev.button;
1869 mouse_report (ev); 1916 mouse_report (ev);
1870#endif /* MOUSE_REPORT_DOUBLECLICK */ 1917#endif /* MOUSE_REPORT_DOUBLECLICK */
1871 1918
1872 } 1919 }
1873 else 1920 else
1874 { 1921 {
1875 if (ev.button != MEvent.button) 1922 if (ev.button != MEvent.button)
1876 MEvent.clicks = 0; 1923 MEvent.clicks = 0;
1877 1924
1878 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1879 switch (ev.button) 1925 switch (ev.button)
1880 { 1926 {
1881 case Button1: 1927 case Button1:
1882 /* allow meta + click to select rectangular areas */ 1928 /* allow meta + click to select rectangular areas */
1883 /* should be done in screen.C */ 1929 /* should be done in screen.C */
1884#if ENABLE_FRILLS 1930#if ENABLE_FRILLS
1885 selection.rect = !!(ev.state & ModMetaMask); 1931 selection.rect = !!(ev.state & ModMetaMask);
1886#else 1932#else
1887 selection.rect = false; 1933 selection.rect = false;
1888#endif 1934#endif
1889 1935
1890 /* allow shift+left click to extend selection */ 1936 /* allow shift+left click to extend selection */
1891 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report)) 1937 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1892 { 1938 {
1893 if (MEvent.button == Button1 && clickintime) 1939 if (MEvent.button == Button1 && clickintime)
1894 selection_rotate (ev.x, ev.y); 1940 selection_rotate (ev.x, ev.y);
1895 else 1941 else
1896 selection_extend (ev.x, ev.y, 1); 1942 selection_extend (ev.x, ev.y, 1);
1897 } 1943 }
1898 else 1944 else
1899 { 1945 {
1900 if (MEvent.button == Button1 && clickintime) 1946 if (MEvent.button == Button1 && clickintime)
1901 MEvent.clicks++; 1947 MEvent.clicks++;
1902 else 1948 else
1903 MEvent.clicks = 1; 1949 MEvent.clicks = 1;
1904 1950
1905 selection_click (MEvent.clicks, ev.x, ev.y); 1951 selection_click (MEvent.clicks, ev.x, ev.y);
1906 } 1952 }
1907 1953
1908 MEvent.button = Button1; 1954 MEvent.button = Button1;
1909 break; 1955 break;
1910 1956
1911 case Button3: 1957 case Button3:
1912 if (MEvent.button == Button3 && clickintime) 1958 if (MEvent.button == Button3 && clickintime)
1913 selection_rotate (ev.x, ev.y); 1959 selection_rotate (ev.x, ev.y);
1914 else 1960 else
1915 selection_extend (ev.x, ev.y, 1); 1961 selection_extend (ev.x, ev.y, 1);
1916 1962
1917 MEvent.button = Button3; 1963 MEvent.button = Button3;
1918 break; 1964 break;
1919 } 1965 }
1920 } 1966 }
1921 1967
1922 MEvent.time = ev.time; 1968 MEvent.time = ev.time;
1923 return; 1969 return;
1924 } 1970 }
1925 1971
1926 /* 1972 /*
1927 * Scrollbar window processing of button press 1973 * Scrollbar window processing of button press
1928 */ 1974 */
1929 if (isScrollbarWindow (ev.window)) 1975 if (scrollBar.state && ev.window == scrollBar.win)
1930 { 1976 {
1931 scrollBar.setIdle (); 1977 page_dirn direction = NO_DIR;
1978
1979 if (scrollBar.upButton (ev.y))
1980 direction = UP; /* up */
1981 else if (scrollBar.dnButton (ev.y))
1982 direction = DN; /* down */
1983
1984 scrollBar.state = STATE_IDLE;
1932 /* 1985 /*
1933 * Rxvt-style scrollbar: 1986 * Rxvt-style scrollbar:
1934 * move up if mouse is above slider 1987 * move up if mouse is above slider
1935 * move dn if mouse is below slider 1988 * move dn if mouse is below slider
1936 * 1989 *
… …
1945 /* 1998 /*
1946 * Mouse report disabled scrollbar: 1999 * Mouse report disabled scrollbar:
1947 * arrow buttons - send up/down 2000 * arrow buttons - send up/down
1948 * click on scrollbar - send pageup/down 2001 * click on scrollbar - send pageup/down
1949 */ 2002 */
1950 if ((scrollBar.style == R_SB_NEXT 2003 if (direction == UP)
1951 && scrollbarnext_upButton (ev.y))
1952 || (scrollBar.style == R_SB_RXVT
1953 && scrollbarrxvt_upButton (ev.y)))
1954 tt_printf ("\033[A"); 2004 tt_printf ("\033[A");
1955 else if ((scrollBar.style == R_SB_NEXT 2005 else if (direction == DN)
1956 && scrollbarnext_dnButton (ev.y))
1957 || (scrollBar.style == R_SB_RXVT
1958 && scrollbarrxvt_dnButton (ev.y)))
1959 tt_printf ("\033[B"); 2006 tt_printf ("\033[B");
1960 else 2007 else
1961 switch (ev.button) 2008 switch (ev.button)
1962 { 2009 {
1963 case Button2: 2010 case Button2:
… …
1970 tt_printf ("\033[5~"); 2017 tt_printf ("\033[5~");
1971 break; 2018 break;
1972 } 2019 }
1973 } 2020 }
1974 else 2021 else
1975#endif /* NO_SCROLLBAR_REPORT */ 2022#endif /* NO_SCROLLBAR_REPORT */
1976
1977 {
1978 char upordown = 0;
1979
1980 if (scrollBar.style == R_SB_NEXT)
1981 { 2023 {
1982 if (scrollbarnext_upButton (ev.y)) 2024 if (direction != NO_DIR)
1983 upordown = -1; /* up */
1984 else if (scrollbarnext_dnButton (ev.y))
1985 upordown = 1; /* down */
1986 }
1987 else if (scrollBar.style == R_SB_RXVT)
1988 {
1989 if (scrollbarrxvt_upButton (ev.y))
1990 upordown = -1; /* up */
1991 else if (scrollbarrxvt_dnButton (ev.y))
1992 upordown = 1; /* down */
1993 }
1994 if (upordown)
1995 { 2025 {
1996#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2026#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2027 if (!cont_scroll_ev.is_active ())
1997 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2028 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1998#endif 2029#endif
1999 if (scr_page (upordown < 0 ? UP : DN, 1)) 2030 if (scr_page (direction, 1))
2000 { 2031 {
2001 if (upordown < 0) 2032 if (direction == UP)
2002 scrollBar.setUp (); 2033 scrollBar.state = STATE_UP;
2003 else 2034 else
2004 scrollBar.setDn (); 2035 scrollBar.state = STATE_DOWN;
2005 } 2036 }
2006 } 2037 }
2007 else 2038 else
2008 switch (ev.button) 2039 switch (ev.button)
2009 { 2040 {
2010 case Button2: 2041 case Button2:
2011 switch (scrollbar_align) 2042 switch (scrollBar.align)
2012 { 2043 {
2013 case R_SB_ALIGN_TOP: 2044 case R_SB_ALIGN_TOP:
2014 csrO = 0; 2045 csrO = 0;
2015 break; 2046 break;
2016 case R_SB_ALIGN_CENTRE: 2047 case R_SB_ALIGN_CENTRE:
… …
2022 } 2053 }
2023 2054
2024 if (scrollBar.style == R_SB_XTERM 2055 if (scrollBar.style == R_SB_XTERM
2025 || scrollbar_above_slider (ev.y) 2056 || scrollbar_above_slider (ev.y)
2026 || scrollbar_below_slider (ev.y)) 2057 || scrollbar_below_slider (ev.y))
2027 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2058 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2028 2059
2029 scrollBar.setMotion (); 2060 scrollBar.state = STATE_MOTION;
2030 break; 2061 break;
2031 2062
2032 case Button1: 2063 case Button1:
2033 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2064 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2034 csrO = ev.y - scrollBar.top; 2065 csrO = ev.y - scrollBar.top;
2035 /* FALLTHROUGH */ 2066 /* FALLTHROUGH */
2036 2067
2037 case Button3: 2068 case Button3:
2038 if (scrollBar.style != R_SB_XTERM) 2069 if (scrollBar.style != R_SB_XTERM)
… …
2048 scr_page (DN, nrow - 1); 2079 scr_page (DN, nrow - 1);
2049# else 2080# else
2050 scr_page (DN, nrow / 4); 2081 scr_page (DN, nrow / 4);
2051# endif 2082# endif
2052 else 2083 else
2053 scrollBar.setMotion (); 2084 scrollBar.state = STATE_MOTION;
2054 } 2085 }
2055 else 2086 else
2056 { 2087 {
2057 scr_page ((ev.button == Button1 ? DN : UP), 2088 scr_page ((ev.button == Button1 ? DN : UP),
2058 (nrow 2089 (nrow
2059 * scrollbar_position (ev.y) 2090 * scrollbar_position (ev.y)
2060 / scrollbar_size ())); 2091 / scrollBar.size ()));
2061 } 2092 }
2062 2093
2063 break; 2094 break;
2064 } 2095 }
2065 } 2096 }
… …
2075 2106
2076 csrO = 0; /* reset csr Offset */ 2107 csrO = 0; /* reset csr Offset */
2077 if (!bypass_keystate) 2108 if (!bypass_keystate)
2078 reportmode = !! (priv_modes & PrivMode_mouse_report); 2109 reportmode = !! (priv_modes & PrivMode_mouse_report);
2079 2110
2080 if (scrollbar_isUpDn ()) 2111 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2081 { 2112 {
2082 scrollBar.setIdle (); 2113 scrollBar.state = STATE_IDLE;
2083 scrollbar_show (0); 2114 scrollBar.show (0);
2084 } 2115 }
2085 2116
2086#ifdef SELECTION_SCROLLING 2117#ifdef SELECTION_SCROLLING
2087 if (sel_scroll_ev.active)
2088 sel_scroll_ev.stop(); 2118 sel_scroll_ev.stop();
2089#endif 2119#endif
2090 2120
2091 if (ev.window == vt) 2121 if (ev.window == vt)
2092 { 2122 {
2123 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2124 return;
2125
2093#if ISO_14755 2126#if ISO_14755
2094 // 5.4 2127 // 5.4
2095 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2128 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2096 return; 2129 return;
2097#endif 2130#endif
2131
2098 if (reportmode) 2132 if (reportmode)
2099 { 2133 {
2100 /* mouse report from vt window */ 2134 /* mouse report from vt window */
2101 /* don't report release of wheel "buttons" */ 2135 /* don't report release of wheel "buttons" */
2102 if (ev.button >= 4) 2136 if (ev.button >= 4)
… …
2113 mouse_report (ev); 2147 mouse_report (ev);
2114 } 2148 }
2115#else /* MOUSE_REPORT_DOUBLECLICK */ 2149#else /* MOUSE_REPORT_DOUBLECLICK */
2116 MEvent.button = AnyButton; 2150 MEvent.button = AnyButton;
2117 mouse_report (ev); 2151 mouse_report (ev);
2118#endif /* MOUSE_REPORT_DOUBLECLICK */ 2152#endif /* MOUSE_REPORT_DOUBLECLICK */
2119 return; 2153 return;
2120 } 2154 }
2121 2155
2122 /* 2156 /*
2123 * dumb hack to compensate for the failure of click-and-drag 2157 * dumb hack to compensate for the failure of click-and-drag
… …
2126 if (priv_modes & PrivMode_mouse_report 2160 if (priv_modes & PrivMode_mouse_report
2127 && bypass_keystate 2161 && bypass_keystate
2128 && ev.button == Button1 && MEvent.clicks <= 1) 2162 && ev.button == Button1 && MEvent.clicks <= 1)
2129 selection_extend (ev.x, ev.y, 0); 2163 selection_extend (ev.x, ev.y, 0);
2130 2164
2131 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2132 return;
2133
2134 switch (ev.button) 2165 switch (ev.button)
2135 { 2166 {
2136 case Button1: 2167 case Button1:
2137 case Button3: 2168 case Button3:
2138 selection_make (ev.time); 2169 selection_make (ev.time);
2139 break; 2170 break;
2140 2171
2141 case Button2: 2172 case Button2:
2142 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2173 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2143 selection_request (ev.time, ev.state & ShiftMask ? Sel_Clipboard : Sel_Primary); 2174 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2144 break; 2175 break;
2145 2176
2146#ifdef MOUSE_WHEEL 2177#ifdef MOUSE_WHEEL
2147 case Button4: 2178 case Button4:
2148 case Button5: 2179 case Button5:
… …
2152 2183
2153 v = ev.button == Button4 ? UP : DN; 2184 v = ev.button == Button4 ? UP : DN;
2154 2185
2155 if (ev.state & ShiftMask) 2186 if (ev.state & ShiftMask)
2156 i = 1; 2187 i = 1;
2157 else if (OPTION (Opt_mouseWheelScrollPage)) 2188 else if (option (Opt_mouseWheelScrollPage))
2158 i = nrow - 1; 2189 i = nrow - 1;
2159 else 2190 else
2160 i = 5; 2191 i = 5;
2161 2192
2162# ifdef MOUSE_SLIP_WHEELING 2193# ifdef MOUSE_SLIP_WHEELING
… …
2164 { 2195 {
2165 mouse_slip_wheel_speed += v ? -1 : 1; 2196 mouse_slip_wheel_speed += v ? -1 : 1;
2166 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2197 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2167 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2198 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2168 2199
2169 if (slip_wheel_ev.at < NOW) 2200 if (!slip_wheel_ev.is_active ())
2170 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2201 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2171
2172 slip_wheel_ev.start ();
2173 } 2202 }
2174 else 2203 else
2204# endif
2175 { 2205 {
2176# endif
2177 scr_page (v, i); 2206 scr_page (v, i);
2178 scrollbar_show (1); 2207 scrollBar.show (1);
2179# ifdef MOUSE_SLIP_WHEELING
2180 } 2208 }
2181# endif
2182 } 2209 }
2183 break; 2210 break;
2184#endif 2211#endif
2185 } 2212 }
2186 } 2213 }
2187} 2214}
2188 2215
2189#ifdef TRANSPARENT
2190#if TINTING
2191/* taken from aterm-0.4.2 */
2192
2193typedef uint32_t RUINT32T;
2194
2195void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2196{
2197 int sh_r, sh_g, sh_b;
2198 RUINT32T mask_r, mask_g, mask_b;
2199 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2200 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2201 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2202 int i;
2203
2204 Visual *visual = display->visual;
2205
2206 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2207
2208 /* for convenience */
2209 mask_r = visual->red_mask;
2210 mask_g = visual->green_mask;
2211 mask_b = visual->blue_mask;
2212
2213 /* boring lookup table pre-initialization */
2214 switch (srcImage->bits_per_pixel) {
2215 case 15:
2216 if ((mask_r != 0x7c00) ||
2217 (mask_g != 0x03e0) ||
2218 (mask_b != 0x001f))
2219 return;
2220 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2221 lookup_r = lookup;
2222 lookup_g = lookup+32;
2223 lookup_b = lookup+32+32;
2224 sh_r = 10;
2225 sh_g = 5;
2226 sh_b = 0;
2227 break;
2228 case 16:
2229 if ((mask_r != 0xf800) ||
2230 (mask_g != 0x07e0) ||
2231 (mask_b != 0x001f))
2232 return;
2233 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2234 lookup_r = lookup;
2235 lookup_g = lookup+32;
2236 lookup_b = lookup+32+64;
2237 sh_r = 11;
2238 sh_g = 5;
2239 sh_b = 0;
2240 break;
2241 case 24:
2242 if ((mask_r != 0xff0000) ||
2243 (mask_g != 0x00ff00) ||
2244 (mask_b != 0x0000ff))
2245 return;
2246 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2247 lookup_r = lookup;
2248 lookup_g = lookup+256;
2249 lookup_b = lookup+256+256;
2250 sh_r = 16;
2251 sh_g = 8;
2252 sh_b = 0;
2253 break;
2254 case 32:
2255 if ((mask_r != 0xff0000) ||
2256 (mask_g != 0x00ff00) ||
2257 (mask_b != 0x0000ff))
2258 return;
2259 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2260 lookup_r = lookup;
2261 lookup_g = lookup+256;
2262 lookup_b = lookup+256+256;
2263 sh_r = 16;
2264 sh_g = 8;
2265 sh_b = 0;
2266 break;
2267 default:
2268 return; /* we do not support this color depth */
2269 }
2270
2271 /* prepare limits for color transformation (each channel is handled separately) */
2272 if (shade < 0) {
2273 shade = -shade;
2274 if (shade < 0) shade = 0;
2275 if (shade > 100) shade = 100;
2276
2277 lower_lim_r = 65535-rm;
2278 lower_lim_g = 65535-gm;
2279 lower_lim_b = 65535-bm;
2280
2281 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2282 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2283 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2284
2285 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2286 } else {
2287 if (shade < 0) shade = 0;
2288 if (shade > 100) shade = 100;
2289
2290 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2291
2292 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2293 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2294 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2295 }
2296
2297 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2298 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2299 {
2300 unsigned int tmp;
2301
2302 tmp = lower_lim_r;
2303 lower_lim_r = lower_lim_b;
2304 lower_lim_b = tmp;
2305
2306 tmp = upper_lim_r;
2307 upper_lim_r = upper_lim_b;
2308 upper_lim_b = tmp;
2309 }
2310
2311 /* fill our lookup tables */
2312 for (i = 0; i <= mask_r>>sh_r; i++)
2313 {
2314 RUINT32T tmp;
2315 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2316 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2317 lookup_r[i] = (tmp/65535)<<sh_r;
2318 }
2319 for (i = 0; i <= mask_g>>sh_g; i++)
2320 {
2321 RUINT32T tmp;
2322 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2323 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2324 lookup_g[i] = (tmp/65535)<<sh_g;
2325 }
2326 for (i = 0; i <= mask_b>>sh_b; i++)
2327 {
2328 RUINT32T tmp;
2329 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2330 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2331 lookup_b[i] = (tmp/65535)<<sh_b;
2332 }
2333
2334 /* apply table to input image (replacing colors by newly calculated ones) */
2335 switch (srcImage->bits_per_pixel)
2336 {
2337 case 15:
2338 {
2339 unsigned short *p1, *pf, *p, *pl;
2340 p1 = (unsigned short *) srcImage->data;
2341 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2342 while (p1 < pf)
2343 {
2344 p = p1;
2345 pl = p1 + srcImage->width;
2346 for (; p < pl; p++)
2347 {
2348 *p = lookup_r[(*p & 0x7c00)>>10] |
2349 lookup_g[(*p & 0x03e0)>> 5] |
2350 lookup_b[(*p & 0x001f)];
2351 }
2352 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2353 }
2354 break;
2355 }
2356 case 16:
2357 {
2358 unsigned short *p1, *pf, *p, *pl;
2359 p1 = (unsigned short *) srcImage->data;
2360 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2361 while (p1 < pf)
2362 {
2363 p = p1;
2364 pl = p1 + srcImage->width;
2365 for (; p < pl; p++)
2366 {
2367 *p = lookup_r[(*p & 0xf800)>>11] |
2368 lookup_g[(*p & 0x07e0)>> 5] |
2369 lookup_b[(*p & 0x001f)];
2370 }
2371 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2372 }
2373 break;
2374 }
2375 case 24:
2376 {
2377 unsigned char *p1, *pf, *p, *pl;
2378 p1 = (unsigned char *) srcImage->data;
2379 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2380 while (p1 < pf)
2381 {
2382 p = p1;
2383 pl = p1 + srcImage->width * 3;
2384 for (; p < pl; p += 3)
2385 {
2386 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2387 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2388 p[2] = lookup_r[(p[2] & 0x0000ff)];
2389 }
2390 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2391 }
2392 break;
2393 }
2394 case 32:
2395 {
2396 RUINT32T *p1, *pf, *p, *pl;
2397 p1 = (RUINT32T *) srcImage->data;
2398 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2399
2400 while (p1 < pf)
2401 {
2402 p = p1;
2403 pl = p1 + srcImage->width;
2404 for (; p < pl; p++)
2405 {
2406 *p = lookup_r[(*p & 0xff0000)>>16] |
2407 lookup_g[(*p & 0x00ff00)>> 8] |
2408 lookup_b[(*p & 0x0000ff)] |
2409 (*p & ~0xffffff);
2410 }
2411 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2412 }
2413 break;
2414 }
2415 }
2416
2417 free (lookup);
2418}
2419#endif
2420
2421/*
2422 * Check our parents are still who we think they are.
2423 * Do transparency updates if required
2424 */
2425int
2426rxvt_term::check_our_parents ()
2427{
2428 int i, pchanged, aformat, have_pixmap, rootdepth;
2429 unsigned long nitems, bytes_after;
2430 Atom atype;
2431 unsigned char *prop = NULL;
2432 Window root, oldp, *list;
2433 Pixmap rootpixmap = None;
2434 XWindowAttributes wattr, wrootattr;
2435 dDisp;
2436
2437 pchanged = 0;
2438
2439 if (!OPTION (Opt_transparent))
2440 return pchanged; /* Don't try any more */
2441
2442 XGetWindowAttributes (disp, display->root, &wrootattr);
2443 rootdepth = wrootattr.depth;
2444
2445 XGetWindowAttributes (disp, parent[0], &wattr);
2446
2447 if (rootdepth != wattr.depth)
2448 {
2449 if (am_transparent)
2450 {
2451 pchanged = 1;
2452 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2453 am_transparent = am_pixmap_trans = 0;
2454 }
2455
2456 return pchanged; /* Don't try any more */
2457 }
2458
2459 /* Get all X ops out of the queue so that our information is up-to-date. */
2460 XSync (disp, False);
2461
2462 /*
2463 * Make the frame window set by the window manager have
2464 * the root background. Some window managers put multiple nested frame
2465 * windows for each client, so we have to take care about that.
2466 */
2467 i = (xa[XA_XROOTPMAP_ID]
2468 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2469 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2470 &nitems, &bytes_after, &prop) == Success);
2471
2472 if (!i || prop == NULL)
2473 i = (xa[XA_ESETROOT_PMAP_ID]
2474 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2475 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2476 &nitems, &bytes_after, &prop) == Success);
2477
2478 if (!i || prop == NULL
2479#if TINTING
2480 || !rs[Rs_color + Color_tint]
2481#endif
2482 )
2483 have_pixmap = 0;
2484 else
2485 {
2486 have_pixmap = 1;
2487 rootpixmap = *(Pixmap *)prop;
2488 XFree (prop);
2489 }
2490
2491 if (have_pixmap)
2492 {
2493 /*
2494 * Copy display->root pixmap transparency
2495 */
2496 int sx, sy, nx, ny;
2497 unsigned int nw, nh;
2498 Window cr;
2499 XImage *image;
2500 GC gc;
2501 XGCValues gcvalue;
2502
2503 XTranslateCoordinates (disp, parent[0], display->root,
2504 0, 0, &sx, &sy, &cr);
2505 nw = (unsigned int)szHint.width;
2506 nh = (unsigned int)szHint.height;
2507 nx = ny = 0;
2508
2509 if (sx < 0)
2510 {
2511 nw += sx;
2512 nx = -sx;
2513 sx = 0;
2514 }
2515
2516 if (sy < 0)
2517 {
2518 nh += sy;
2519 ny = -sy;
2520 sy = 0;
2521 }
2522
2523 min_it (nw, (unsigned int) (wrootattr.width - sx));
2524 min_it (nh, (unsigned int) (wrootattr.height - sy));
2525
2526 XSync (disp, False);
2527 allowedxerror = -1;
2528 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2529
2530 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2531 /* XXX: may need a delay here? */
2532 allowedxerror = 0;
2533
2534 if (image == NULL)
2535 {
2536 if (am_transparent && am_pixmap_trans)
2537 {
2538 pchanged = 1;
2539 if (pixmap != None)
2540 {
2541 XFreePixmap (disp, pixmap);
2542 pixmap = None;
2543 }
2544 }
2545
2546 am_pixmap_trans = 0;
2547 }
2548 else
2549 {
2550 if (pixmap != None)
2551 XFreePixmap (disp, pixmap);
2552
2553#if TINTING
2554 if (ISSET_PIXCOLOR (Color_tint))
2555 {
2556 unsigned short rm, gm, bm;
2557 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2558
2559 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2560
2561 ShadeXImage (display, image, shade, rm, gm, bm);
2562 }
2563#endif
2564
2565 pixmap = XCreatePixmap (disp, vt,
2566 szHint.width, szHint.height, image->depth);
2567 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2568 XPutImage (disp, pixmap, gc, image, 0, 0,
2569 nx, ny, image->width, image->height);
2570 XFreeGC (disp, gc);
2571 XDestroyImage (image);
2572 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2573 XClearWindow (disp, parent[0]);
2574
2575 if (!am_transparent || !am_pixmap_trans)
2576 pchanged = 1;
2577
2578 am_transparent = am_pixmap_trans = 1;
2579 }
2580 }
2581
2582 if (am_pixmap_trans)
2583 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2584 else
2585 {
2586 unsigned int n;
2587 /*
2588 * InheritPixmap transparency
2589 */
2590 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2591 {
2592 oldp = parent[i];
2593 XQueryTree (disp, parent[i - 1], &root,
2594 &parent[i], &list, &n);
2595 XFree (list);
2596
2597 if (parent[i] == display->root)
2598 {
2599 if (oldp != None)
2600 pchanged = 1;
2601
2602 break;
2603 }
2604
2605 if (oldp != parent[i])
2606 pchanged = 1;
2607 }
2608
2609 n = 0;
2610
2611 if (pchanged)
2612 {
2613 for (; n < (unsigned int)i; n++)
2614 {
2615 XGetWindowAttributes (disp, parent[n], &wattr);
2616 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2617 {
2618 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2619 break;
2620 }
2621 }
2622 }
2623
2624 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2625 {
2626 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2627 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2628 am_transparent = 0;
2629 /* XXX: also turn off Opt_transparent? */
2630 }
2631 else
2632 {
2633#if WAIT_FOR_WM
2634 /* wait (an arbitrary period) for the WM to do its thing
2635 * needed for fvwm2.2.2 (and before?) */
2636 sleep (1);
2637#endif
2638 for (n = 0; n < (unsigned int)i; n++)
2639 {
2640 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2641 XClearWindow (disp, parent[n]);
2642 }
2643
2644 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2645 am_transparent = 1;
2646 }
2647
2648 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2649 parent[i] = None;
2650 }
2651
2652 if (scrollBar.win)
2653 {
2654 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2655 scrollBar.setIdle ();
2656 scrollbar_show (0);
2657 }
2658
2659 if (am_transparent)
2660 {
2661 want_refresh = want_full_refresh = 1;
2662 if (am_pixmap_trans)
2663 flush ();
2664 }
2665
2666 return pchanged;
2667}
2668#endif
2669
2670/*}}} */ 2216/*}}} */
2671 2217
2672bool 2218void
2673rxvt_term::cmd_parse () 2219rxvt_term::cmd_parse ()
2674{ 2220{
2675 bool flag = false;
2676 wchar_t ch = NOCHAR; 2221 wchar_t ch = NOCHAR;
2677 char *seq_begin; // remember start of esc-sequence here 2222 char *seq_begin; // remember start of esc-sequence here
2678 2223
2679 for (;;) 2224 for (;;)
2680 { 2225 {
2681 if (ch == NOCHAR) 2226 if (expect_false (ch == NOCHAR))
2682 { 2227 {
2683 seq_begin = cmdbuf_ptr; 2228 seq_begin = cmdbuf_ptr;
2684 ch = next_char (); 2229 ch = next_char ();
2685 2230
2686 if (ch == NOCHAR) 2231 if (ch == NOCHAR)
2687 break; 2232 break;
2688 } 2233 }
2689 2234
2690 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2235 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2691 { 2236 {
2692 if (!seen_input) 2237 if (expect_false (!seen_input))
2693 { 2238 {
2694 seen_input = 1; 2239 seen_input = 1;
2695 // many badly-written programs (e.g. jed) contain a race condition: 2240 // many badly-written programs (e.g. jed) contain a race condition:
2696 // they first read the screensize and then install a SIGWINCH handler. 2241 // they first read the screensize and then install a SIGWINCH handler.
2697 // some window managers resize the window early, and these programs 2242 // some window managers resize the window early, and these programs
… …
2710 wchar_t *str = buf; 2255 wchar_t *str = buf;
2711 wchar_t *eol = str + min (ncol, UBUFSIZ); 2256 wchar_t *eol = str + min (ncol, UBUFSIZ);
2712 2257
2713 for (;;) 2258 for (;;)
2714 { 2259 {
2715 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2260 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2716 break; 2261 break;
2717 2262
2718 *str++ = ch; 2263 *str++ = ch;
2719 2264
2720 if (ch == C0_LF || str >= eol) 2265 if (expect_false (ch == C0_LF || str >= eol))
2721 { 2266 {
2722 if (ch == C0_LF) 2267 if (ch == C0_LF)
2723 nlines++; 2268 nlines++;
2724 2269
2725 refresh_count++; 2270 refresh_count++;
2726 2271
2727 if (!OPTION (Opt_jumpScroll) 2272 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2728 || (refresh_count >= refresh_limit * (nrow - 1)))
2729 { 2273 {
2730 refreshnow = true;
2731 refresh_count = 0; 2274 refresh_count = 0;
2275
2276 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2277 {
2278 refreshnow = true;
2732 ch = NOCHAR; 2279 ch = NOCHAR;
2733 break; 2280 break;
2281 }
2734 } 2282 }
2735 2283
2736 // scr_add_lines only works for nlines <= nrow - 1. 2284 // scr_add_lines only works for nlines <= nrow - 1.
2737 if (nlines >= nrow - 1) 2285 if (nlines >= nrow - 1)
2738 { 2286 {
… …
2766 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2314 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2767 scr_add_lines (buf, str - buf, nlines); 2315 scr_add_lines (buf, str - buf, nlines);
2768 2316
2769 /* 2317 /*
2770 * If there have been a lot of new lines, then update the screen 2318 * If there have been a lot of new lines, then update the screen
2771 * What the heck I'll cheat and only refresh less than every page-full. 2319 * What the heck we'll cheat and only refresh less than every page-full.
2772 * the number of pages between refreshes is refresh_limit, which 2320 * if skipScroll is enabled.
2773 * is incremented here because we must be doing flat-out scrolling.
2774 */ 2321 */
2775 if (refreshnow) 2322 if (refreshnow)
2776 { 2323 {
2777 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2778 refresh_limit++;
2779 else
2780 {
2781 flag = true;
2782 scr_refresh (); 2324 scr_refresh ();
2783 want_refresh = 1; 2325 want_refresh = 1;
2784 }
2785 } 2326 }
2786
2787 } 2327 }
2788 else 2328 else
2789 { 2329 {
2790 try 2330 try
2791 { 2331 {
… …
2799 } 2339 }
2800 2340
2801 ch = NOCHAR; 2341 ch = NOCHAR;
2802 } 2342 }
2803 } 2343 }
2804
2805 return flag;
2806} 2344}
2807 2345
2808// read the next character 2346// read the next character
2809wchar_t 2347wchar_t
2810rxvt_term::next_char () NOTHROW 2348rxvt_term::next_char () NOTHROW
2811{ 2349{
2812 while (cmdbuf_ptr < cmdbuf_endp) 2350 while (cmdbuf_ptr < cmdbuf_endp)
2813 { 2351 {
2814 // assume 7-bit to be ascii ALWAYS 2352 // assume 7-bit to be ascii ALWAYS
2815 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2353 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2816 return *cmdbuf_ptr++; 2354 return *cmdbuf_ptr++;
2817 2355
2818 wchar_t wc; 2356 wchar_t wc;
2819 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2357 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2820 2358
… …
2824 cmdbuf_ptr = cmdbuf_endp; 2362 cmdbuf_ptr = cmdbuf_endp;
2825 break; 2363 break;
2826 } 2364 }
2827 2365
2828 if (len == (size_t)-1) 2366 if (len == (size_t)-1)
2367 {
2368 mbstate.reset (); // reset now undefined conversion state
2829 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2369 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2370 }
2830 2371
2831 // assume wchar == unicode 2372 // assume wchar == unicode
2832 cmdbuf_ptr += len; 2373 cmdbuf_ptr += len;
2833 return wc & UNICODE_MASK; 2374 return wc & UNICODE_MASK;
2834 } 2375 }
… …
2878/*----------------------------------------------------------------------*/ 2419/*----------------------------------------------------------------------*/
2879#ifdef PRINTPIPE 2420#ifdef PRINTPIPE
2880FILE * 2421FILE *
2881rxvt_term::popen_printer () 2422rxvt_term::popen_printer ()
2882{ 2423{
2883 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2424 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2884 2425
2885 if (stream == NULL) 2426 if (stream == NULL)
2886 rxvt_warn ("can't open printer pipe, not printing.\n"); 2427 rxvt_warn ("can't open printer pipe, not printing.\n");
2887 2428
2888 return stream; 2429 return stream;
… …
2899 * simulate attached vt100 printer 2440 * simulate attached vt100 printer
2900 */ 2441 */
2901void 2442void
2902rxvt_term::process_print_pipe () 2443rxvt_term::process_print_pipe ()
2903{ 2444{
2904 int done; 2445 FILE *fd = popen_printer ();
2905 FILE *fd;
2906 2446
2907 if ((fd = popen_printer ()) == NULL) 2447 if (!fd)
2908 return; 2448 return;
2909 2449
2910 /* 2450 /*
2911 * Send all input to the printer until either ESC[4i or ESC[?4i 2451 * Send all input to the printer until either ESC[4i or ESC[?4i
2912 * is received. 2452 * is received.
2913 */ 2453 */
2914 for (done = 0; !done;) 2454 for (int done = 0; !done; )
2915 { 2455 {
2916 unsigned char buf[8]; 2456 unsigned char buf[8];
2917 unicode_t ch; 2457 unicode_t ch;
2918 unsigned int i, len; 2458 unsigned int i, len;
2919 2459
… …
2938 { 2478 {
2939 if ((buf[len++] = cmd_getc ()) == 'i') 2479 if ((buf[len++] = cmd_getc ()) == 'i')
2940 break; /* done = 1 */ 2480 break; /* done = 1 */
2941 } 2481 }
2942 } 2482 }
2943 2483
2944 for (i = 0; i < len; i++) 2484 for (i = 0; i < len; i++)
2945 if (putc (buf[i], fd) == EOF) 2485 if (putc (buf[i], fd) == EOF)
2946 { 2486 {
2947 done = 1; 2487 done = 1;
2948 break; 2488 break;
… …
2950 } 2490 }
2951 } 2491 }
2952 2492
2953 pclose_printer (fd); 2493 pclose_printer (fd);
2954} 2494}
2955#endif /* PRINTPIPE */ 2495#endif /* PRINTPIPE */
2956/*}}} */ 2496/*}}} */
2957 2497
2958/* *INDENT-OFF* */ 2498/* *INDENT-OFF* */
2959enum { 2499enum {
2960 C1_40 = 0x40, 2500 C1_40 = 0x40,
… …
3010 process_dcs_seq (); 2550 process_dcs_seq ();
3011 break; 2551 break;
3012 case 0x9b: /* CSI */ 2552 case 0x9b: /* CSI */
3013 process_csi_seq (); 2553 process_csi_seq ();
3014 break; 2554 break;
3015 case 0x9d: /* CSI */ 2555 case 0x9d: /* OSC */
3016 process_osc_seq (); 2556 process_osc_seq ();
3017 break; 2557 break;
3018#endif 2558#endif
3019 } 2559 }
3020} 2560}
… …
3064 break; 2604 break;
3065 case 'Z': /* identify the terminal type */ 2605 case 'Z': /* identify the terminal type */
3066 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2606 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
3067 break; 2607 break;
3068 case '<': /* turn off VT52 mode */ 2608 case '<': /* turn off VT52 mode */
3069 PrivMode (0, PrivMode_vt52); 2609 set_privmode (PrivMode_vt52, 0);
3070 break; 2610 break;
3071 case 'F': /* use special graphics character set */ 2611 case 'F': /* use special graphics character set */
3072 case 'G': /* use regular character set */ 2612 case 'G': /* use regular character set */
3073 /* unimplemented */ 2613 /* unimplemented */
3074 break; 2614 break;
… …
3110 scr_charset_set (2, (unsigned int)cmd_getc ()); 2650 scr_charset_set (2, (unsigned int)cmd_getc ());
3111 break; 2651 break;
3112 case '+': 2652 case '+':
3113 scr_charset_set (3, (unsigned int)cmd_getc ()); 2653 scr_charset_set (3, (unsigned int)cmd_getc ());
3114 break; 2654 break;
3115#if ENABLE_FRILLS 2655#if !ENABLE_MINIMAL
3116 case '6': 2656 case '6':
3117 scr_backindex (); 2657 scr_backindex ();
3118 break; 2658 break;
3119#endif 2659#endif
3120 case '7': 2660 case '7':
3121 scr_cursor (SAVE); 2661 scr_cursor (SAVE);
3122 break; 2662 break;
3123 case '8': 2663 case '8':
3124 scr_cursor (RESTORE); 2664 scr_cursor (RESTORE);
3125 break; 2665 break;
3126#if ENABLE_FRILLS 2666#if !ENABLE_MINIMAL
3127 case '9': 2667 case '9':
3128 scr_forwardindex (); 2668 scr_forwardindex ();
3129 break; 2669 break;
3130#endif 2670#endif
3131 case '=': 2671 case '=':
3132 case '>': 2672 case '>':
3133 PrivMode ((ch == '='), PrivMode_aplKP); 2673 set_privmode (PrivMode_aplKP, ch == '=');
3134 break; 2674 break;
3135 2675
3136 case C1_40: 2676 case C1_40:
3137 cmd_getc (); 2677 cmd_getc ();
3138 break; 2678 break;
… …
3142 2682
3143 /* 8.3.87: NEXT LINE */ 2683 /* 8.3.87: NEXT LINE */
3144 case C1_NEL: /* ESC E */ 2684 case C1_NEL: /* ESC E */
3145 { 2685 {
3146 wchar_t nlcr[] = { C0_LF, C0_CR }; 2686 wchar_t nlcr[] = { C0_LF, C0_CR };
3147 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2687 scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1);
3148 } 2688 }
3149 break; 2689 break;
3150 2690
3151 /* kidnapped escape sequence: Should be 8.3.48 */ 2691 /* kidnapped escape sequence: Should be 8.3.48 */
3152 case C1_ESA: /* ESC G */ 2692 case C1_ESA: /* ESC G */
… …
3177 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2717 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3178 case C1_SCI: /* ESC Z */ 2718 case C1_SCI: /* ESC Z */
3179 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2719 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3180 break; /* steal obsolete ESC [ c */ 2720 break; /* steal obsolete ESC [ c */
3181 2721
3182 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2722 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
3183 case C1_CSI: /* ESC [ */ 2723 case C1_CSI: /* ESC [ */
3184 process_csi_seq (); 2724 process_csi_seq ();
3185 break; 2725 break;
3186 2726
3187 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2727 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
3188 case C1_OSC: /* ESC ] */ 2728 case C1_OSC: /* ESC ] */
3189 process_osc_seq (); 2729 process_osc_seq ();
3190 break; 2730 break;
3191 2731
3192 /* 8.3.106: RESET TO INITIAL STATE */ 2732 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
3193 case 'c': 2733 case 'c':
3194 mbstate.reset (); 2734 mbstate.reset ();
3195 scr_poweron (); 2735 scr_poweron ();
3196 scrollbar_show (1); 2736 scrollBar.show (1);
3197 break; 2737 break;
3198 2738
3199 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2739 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
3200 case 'n': 2740 case 'n':
3201 scr_charset_choose (2); 2741 scr_charset_choose (2);
… …
3221 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2761 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
3222 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2762 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
3223 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2763 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
3224}; 2764};
3225 2765
3226#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2766#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
3227 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2767 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
3228 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2768 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
3229#define get_byte_array_bit(array, bit) \ 2769#define get_byte_array_bit(array, bit) \
3230 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2770 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
3231 2771
3232const unsigned char csi_defaults[] = 2772static const unsigned char csi_defaults[] =
3233 { 2773 {
3234 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2774 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
3235 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2775 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
3236 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2776 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
3237 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2777 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
… …
3246rxvt_term::process_csi_seq () 2786rxvt_term::process_csi_seq ()
3247{ 2787{
3248 unicode_t ch, priv, i; 2788 unicode_t ch, priv, i;
3249 unsigned int nargs, p; 2789 unsigned int nargs, p;
3250 int n, ndef; 2790 int n, ndef;
3251 int arg[ESC_ARGS]; 2791 int arg[ESC_ARGS] = { };
3252 2792
3253 for (nargs = ESC_ARGS; nargs > 0;) 2793 nargs = 0;
3254 arg[--nargs] = 0;
3255 2794
3256 priv = 0; 2795 priv = 0;
3257 ch = cmd_getc (); 2796 ch = cmd_getc ();
3258 if (ch >= '<' && ch <= '?') 2797 if ((ch >= '<' && ch <= '?') || ch == '!')
2798 {
3259 { /* '<' '=' '>' '?' */ 2799 /* '<' '=' '>' '?' '!' */
3260 priv = ch; 2800 priv = ch;
3261 ch = cmd_getc (); 2801 ch = cmd_getc ();
3262 } 2802 }
3263 2803
3264 /* read any numerical arguments */ 2804 /* read any numerical arguments */
… …
3293 ndef = get_byte_array_bit (csi_defaults, i); 2833 ndef = get_byte_array_bit (csi_defaults, i);
3294 for (p = 0; p < nargs; p++) 2834 for (p = 0; p < nargs; p++)
3295 if (arg[p] == -1) 2835 if (arg[p] == -1)
3296 arg[p] = ndef; 2836 arg[p] = ndef;
3297 2837
3298#ifdef DEBUG_CMD
3299 fprintf (stderr, "CSI ");
3300 for (p = 0; p < nargs; p++)
3301 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3302 fprintf (stderr, "%c\n", ch);
3303#endif
3304
3305 /* 2838 /*
3306 * private mode handling 2839 * private mode handling
3307 */ 2840 */
3308 if (priv) 2841 if (priv)
3309 { 2842 {
3310 switch (priv) 2843 switch (priv)
3311 { 2844 {
3312 case '>': 2845 case '>':
3313 if (ch == CSI_DA) /* secondary device attributes */ 2846 if (ch == CSI_DA) /* secondary device attributes */
3314 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 2847 {
2848 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2849 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2850 //
2851 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2852 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2853 // versions.
2854 //
2855 tt_printf ("\033[>%d;95;0c", 'U');
2856 }
3315 break; 2857 break;
2858
3316 case '?': 2859 case '?':
3317 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2860 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3318 process_terminal_mode (ch, priv, nargs, arg); 2861 process_terminal_mode (ch, priv, nargs, arg);
3319 break; 2862 break;
2863
2864 case '!':
2865 if (ch == CSI_70)
2866 {
2867 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2868 scr_soft_reset ();
2869
2870 static const int pm_h[] = { 7, 25 };
2871 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2872
2873 process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h);
2874 process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l);
3320 } 2875 }
2876 break;
2877 }
2878
3321 return; 2879 return;
3322 } 2880 }
3323 2881
3324 switch (ch) 2882 switch (ch)
3325 { 2883 {
… …
3445 break; 3003 break;
3446 case 6: /* CPR requested */ 3004 case 6: /* CPR requested */
3447 scr_report_position (); 3005 scr_report_position ();
3448 break; 3006 break;
3449 case 7: /* unofficial extension */ 3007 case 7: /* unofficial extension */
3450 if (OPTION (Opt_insecure)) 3008 if (option (Opt_insecure))
3451 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3009 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3452 break; 3010 break;
3453 case 8: /* unofficial extension */ 3011 case 8: /* unofficial extension */
3454 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3012 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3455 break; 3013 break;
… …
3522 break; 3080 break;
3523 case CSI_75: 3081 case CSI_75:
3524 scr_cursor (RESTORE); 3082 scr_cursor (RESTORE);
3525 break; 3083 break;
3526 3084
3527#if ENABLE_FRILLS 3085#if !ENABLE_MINIMAL
3528 case CSI_74: 3086 case CSI_74:
3529 process_window_ops (arg, nargs); 3087 process_window_ops (arg, nargs);
3530 break; 3088 break;
3531#endif 3089#endif
3532 3090
… …
3539 break; 3097 break;
3540 } 3098 }
3541} 3099}
3542/*}}} */ 3100/*}}} */
3543 3101
3544#if ENABLE_FRILLS 3102#if !ENABLE_MINIMAL
3545/* ARGSUSED */ 3103/* ARGSUSED */
3546void 3104void
3547rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3105rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3548{ 3106{
3549 int x, y; 3107 int x, y;
3550 XWindowAttributes wattr; 3108 XWindowAttributes wattr;
3551 Window wdummy; 3109 Window wdummy;
3552 dDisp; 3110
3111 dLocal (Display *, dpy);
3553 3112
3554 if (nargs == 0) 3113 if (nargs == 0)
3555 return; 3114 return;
3556 3115
3557 switch (args[0]) 3116 switch (args[0])
3558 { 3117 {
3559 /* 3118 /*
3560 * commands 3119 * commands
3561 */ 3120 */
3562 case 1: /* deiconify window */ 3121 case 1: /* deiconify window */
3563 XMapWindow (disp, parent[0]); 3122 XMapWindow (dpy, parent[0]);
3564 break; 3123 break;
3565 case 2: /* iconify window */ 3124 case 2: /* iconify window */
3566 XIconifyWindow (disp, parent[0], display->screen); 3125 XIconifyWindow (dpy, parent[0], display->screen);
3567 break; 3126 break;
3568 case 3: /* set position (pixels) */ 3127 case 3: /* set position (pixels) */
3569 XMoveWindow (disp, parent[0], args[1], args[2]); 3128 XMoveWindow (dpy, parent[0], args[1], args[2]);
3570 break; 3129 break;
3571 case 4: /* set size (pixels) */ 3130 case 4: /* set size (pixels) */
3572 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3131 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3573 break; 3132 break;
3574 case 5: /* raise window */ 3133 case 5: /* raise window */
3575 XRaiseWindow (disp, parent[0]); 3134 XRaiseWindow (dpy, parent[0]);
3576 break; 3135 break;
3577 case 6: /* lower window */ 3136 case 6: /* lower window */
3578 XLowerWindow (disp, parent[0]); 3137 XLowerWindow (dpy, parent[0]);
3579 break; 3138 break;
3580 case 7: /* refresh window */ 3139 case 7: /* refresh window */
3581 scr_touch (true); 3140 scr_touch (true);
3582 break; 3141 break;
3583 case 8: /* set size (chars) */ 3142 case 8: /* set size (chars) */
… …
3590 if (args[0] >= 24) /* set height (chars) */ 3149 if (args[0] >= 24) /* set height (chars) */
3591 set_widthheight ((unsigned int)width, 3150 set_widthheight ((unsigned int)width,
3592 (unsigned int) (args[1] * fheight)); 3151 (unsigned int) (args[1] * fheight));
3593 break; 3152 break;
3594 3153
3595
3596 /* 3154 /*
3597 * reports - some output format copied from XTerm 3155 * reports - some output format copied from XTerm
3598 */ 3156 */
3599 case 11: /* report window state */ 3157 case 11: /* report window state */
3600 XGetWindowAttributes (disp, parent[0], &wattr); 3158 XGetWindowAttributes (dpy, parent[0], &wattr);
3601 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3159 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3602 break; 3160 break;
3603 case 13: /* report window position */ 3161 case 13: /* report window position */
3604 XGetWindowAttributes (disp, parent[0], &wattr); 3162 XGetWindowAttributes (dpy, parent[0], &wattr);
3605 XTranslateCoordinates (disp, parent[0], wattr.root, 3163 XTranslateCoordinates (dpy, parent[0], wattr.root,
3606 -wattr.border_width, -wattr.border_width, 3164 -wattr.border_width, -wattr.border_width,
3607 &x, &y, &wdummy); 3165 &x, &y, &wdummy);
3608 tt_printf ("\033[3;%d;%dt", x, y); 3166 tt_printf ("\033[3;%d;%dt", x, y);
3609 break; 3167 break;
3610 case 14: /* report window size (pixels) */ 3168 case 14: /* report window size (pixels) */
3611 XGetWindowAttributes (disp, parent[0], &wattr); 3169 XGetWindowAttributes (dpy, parent[0], &wattr);
3612 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3170 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3613 break; 3171 break;
3614 case 18: /* report text area size (chars) */ 3172 case 18: /* report text area size (chars) */
3615 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3173 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3616 break; 3174 break;
… …
3618 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3176 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3619 break; 3177 break;
3620 case 20: /* report icon label */ 3178 case 20: /* report icon label */
3621 { 3179 {
3622 char *s; 3180 char *s;
3623 XGetIconName (disp, parent[0], &s); 3181 XGetIconName (dpy, parent[0], &s);
3624 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3182 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3625 XFree (s); 3183 XFree (s);
3626 } 3184 }
3627 break; 3185 break;
3628 case 21: /* report window title */ 3186 case 21: /* report window title */
3629 { 3187 {
3630 char *s; 3188 char *s;
3631 XFetchName (disp, parent[0], &s); 3189 XFetchName (dpy, parent[0], &s);
3632 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3190 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3633 XFree (s); 3191 XFree (s);
3634 } 3192 }
3635 break; 3193 break;
3636 } 3194 }
3637} 3195}
… …
3664 seen_esc = true; 3222 seen_esc = true;
3665 continue; 3223 continue;
3666 } 3224 }
3667 else if (ch == C0_BEL || ch == CHAR_ST) 3225 else if (ch == C0_BEL || ch == CHAR_ST)
3668 break; 3226 break;
3227 else if (ch == C0_SYN)
3228 ch = cmd_get8 ();
3669 else if (ch < 0x20) 3229 else if (ch < 0x20)
3670 return NULL; /* other control character - exit */ 3230 return NULL; /* other control character - exit */
3671 3231
3672 seen_esc = false; 3232 seen_esc = false;
3673 3233
3674 if (n >= STRING_MAX - 1) 3234 if (n >= STRING_MAX - 1)
3675 // stop at some sane length 3235 // stop at some sane length
3676 return NULL; 3236 return NULL;
3677 3237
3678 if (ch == C0_SYN)
3679 string[n++] = cmd_get8 ();
3680 else
3681 string[n++] = ch; 3238 string[n++] = ch;
3682 } 3239 }
3683 3240
3684 string[n++] = '\0'; 3241 string[n++] = '\0';
3685 3242
3686 ends_how = (ch == 0x5c ? C0_ESC : ch); 3243 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3693 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3250 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3694 */ 3251 */
3695void 3252void
3696rxvt_term::process_dcs_seq () 3253rxvt_term::process_dcs_seq ()
3697{ 3254{
3698 char *s;
3699 unicode_t eh;
3700
3701 /* 3255 /*
3702 * Not handled yet 3256 * Not handled yet
3703 */ 3257 */
3258
3259 unicode_t eh;
3704 s = get_to_st (eh); 3260 char *s = get_to_st (eh);
3705 if (s) 3261 if (s)
3706 free (s); 3262 free (s);
3707 3263
3708 return; 3264 return;
3709} 3265}
… …
3713 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3269 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3714 */ 3270 */
3715void 3271void
3716rxvt_term::process_osc_seq () 3272rxvt_term::process_osc_seq ()
3717{ 3273{
3718 unicode_t ch, eh;
3719 int arg; 3274 int arg;
3720 3275
3721 ch = cmd_getc (); 3276 unicode_t ch = cmd_getc ();
3722 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3277 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3723 arg = arg * 10 + (ch - '0'); 3278 arg = arg * 10 + (ch - '0');
3724 3279
3725 if (ch == ';') 3280 if (ch == ';')
3726 { 3281 {
3282 unicode_t eh;
3727 char *s = get_to_st (eh); 3283 char *s = get_to_st (eh);
3728 3284
3729 if (s) 3285 if (s)
3730 { 3286 {
3731 process_xterm_seq (arg, s, eh); 3287 process_xterm_seq (arg, s, eh);
… …
3737void 3293void
3738rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3294rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3739{ 3295{
3740 if (str[0] == '?' && !str[1]) 3296 if (str[0] == '?' && !str[1])
3741 { 3297 {
3742 unsigned short r, g, b; 3298 rgba c;
3743 pix_colors_focused[color].get (display, r, g, b); 3299 pix_colors_focused[color].get (c);
3300
3301#if XFT
3302 if (c.a != rgba::MAX_CC)
3303 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3304 else
3305#endif
3744 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3306 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3745 } 3307 }
3746 else 3308 else
3747 set_window_color (color, str); 3309 set_window_color (color, str);
3748} 3310}
3749 3311
3750/* 3312/*
3751 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3313 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3752 */ 3314 */
3753void 3315void
3754rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3316rxvt_term::process_xterm_seq (int op, char *str, char resp)
3755{ 3317{
3756 int color; 3318 int color;
3757 char *buf, *name; 3319 char *buf, *name;
3758 bool query = str[0] == '?' && !str[1]; 3320 bool query = str[0] == '?' && !str[1];
3759 int saveop = op; 3321 int saveop = op;
3760 dDisp; 3322
3323 dLocal (Display *, dpy);
3761 3324
3762 assert (str != NULL); 3325 assert (str != NULL);
3326
3327 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3328 return;
3329
3763 switch (op) 3330 switch (op)
3764 { 3331 {
3765 case XTerm_name: 3332 case XTerm_name:
3766 set_title (str); 3333 set_title (str);
3767 /* FALLTHROUGH */ 3334 /* FALLTHROUGH */
… …
3781 unsigned long bytes_after; 3348 unsigned long bytes_after;
3782 unsigned char *value = 0; 3349 unsigned char *value = 0;
3783 const char *str = ""; 3350 const char *str = "";
3784 3351
3785 if (prop 3352 if (prop
3786 && XGetWindowProperty (disp, parent[0], 3353 && XGetWindowProperty (dpy, parent[0],
3787 prop, 0, 1<<16, 0, AnyPropertyType, 3354 prop, 0, 1<<16, 0, AnyPropertyType,
3788 &actual_type, &actual_format, 3355 &actual_type, &actual_format,
3789 &nitems, &bytes_after, &value) == Success 3356 &nitems, &bytes_after, &value) == Success
3790 && actual_type != None 3357 && actual_type != None
3791 && actual_format == 8) 3358 && actual_format == 8)
3792 str = (const char *)(value); 3359 str = (const char *)(value);
3793 3360
3794 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3361 tt_printf ("\033]%d;%s%c", op, str, resp);
3795 3362
3796 XFree (value); 3363 XFree (value);
3797 } 3364 }
3798 else 3365 else
3799 { 3366 {
3800 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3367 char *eq = strchr (str, '=');
3801 3368
3802 if (eq) 3369 if (eq)
3803 { 3370 {
3804 *eq = 0; 3371 *eq = 0;
3805 set_utf8_property (display->atom (str), eq + 1); 3372 set_utf8_property (display->atom (str), eq + 1);
3806 } 3373 }
3807 else 3374 else
3808 XDeleteProperty (disp, parent[0], 3375 XDeleteProperty (dpy, parent[0],
3809 display->atom (str)); 3376 display->atom (str));
3810 } 3377 }
3811 break; 3378 break;
3812 3379
3813 case XTerm_Color: 3380 case XTerm_Color:
… …
3823 break; 3390 break;
3824 3391
3825 if ((buf = strchr (name, ';')) != NULL) 3392 if ((buf = strchr (name, ';')) != NULL)
3826 *buf++ = '\0'; 3393 *buf++ = '\0';
3827 3394
3828 if (name[0] == '?' && !name[1]) 3395 process_color_seq (op, color, name, resp);
3396 }
3397 break;
3398 case Rxvt_restoreFG:
3399 case XTerm_Color00:
3400 process_color_seq (op, Color_fg, str, resp);
3401 break;
3402 case Rxvt_restoreBG:
3403 case XTerm_Color01:
3404 process_color_seq (op, Color_bg, str, resp);
3405 break;
3406#ifndef NO_CURSORCOLOR
3407 case XTerm_Color_cursor:
3408 process_color_seq (op, Color_cursor, str, resp);
3409 break;
3410#endif
3411 case XTerm_Color_pointer_fg:
3412 process_color_seq (op, Color_pointer_fg, str, resp);
3413 break;
3414 case XTerm_Color_pointer_bg:
3415 process_color_seq (op, Color_pointer_bg, str, resp);
3416 break;
3417#ifdef OPTION_HC
3418 case XTerm_Color_HC:
3419 process_color_seq (op, Color_HC, str, resp);
3420 break;
3421 case XTerm_Color_HTC:
3422 process_color_seq (op, Color_HTC, str, resp);
3423 break;
3424#endif
3425#ifndef NO_BOLD_UNDERLINE_REVERSE
3426 case URxvt_Color_BD:
3427 process_color_seq (op, Color_BD, str, resp);
3428 break;
3429 case URxvt_Color_UL:
3430 process_color_seq (op, Color_UL, str, resp);
3431 break;
3432 case URxvt_Color_IT:
3433 process_color_seq (op, Color_IT, str, resp);
3434 break;
3435#endif
3436 case URxvt_Color_border:
3437 process_color_seq (op, Color_border, str, resp);
3438 break;
3439#if ENABLE_TRANSPARENCY
3440 case URxvt_Color_tint:
3441 process_color_seq (op, Color_tint, str, resp);
3442 {
3443 bool changed = false;
3444
3445 if (ISSET_PIXCOLOR (Color_tint))
3446 changed = bg_set_tint (pix_colors_focused [Color_tint]);
3447
3448 if (changed)
3449 update_background ();
3450 }
3451
3452 break;
3453#endif
3454
3455#if BG_IMAGE_FROM_FILE
3456 case Rxvt_Pixmap:
3457 if (!strcmp (str, "?"))
3458 {
3459 char str[256];
3460
3461 sprintf (str, "[%dx%d+%d+%d]",
3462 min (h_scale, 32767), min (v_scale, 32767),
3463 min (h_align, 32767), min (v_align, 32767));
3464 process_xterm_seq (XTerm_title, str, CHAR_ST);
3465 }
3466 else
3467 {
3468 int changed = 0;
3469
3470 if (*str != ';')
3829 { 3471 {
3830 unsigned short r, g, b; 3472 if (bg_set_file (str)) /* change pixmap */
3831 pix_colors_focused[color].get (display, r, g, b); 3473 {
3832 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3474 changed++;
3475 str = strchr (str, ';');
3476 if (str == NULL)
3477 bg_set_default_geometry ();
3478 else
3479 bg_set_geometry (str+1);
3480 }
3833 } 3481 }
3834 else 3482 else
3835 set_window_color (color, name); 3483 {
3484 str++;
3485 if (bg_set_geometry (str, true))
3486 changed++;
3487 }
3488
3489 if (changed)
3490 {
3491 if (bg_window_position_sensitive ())
3492 {
3493 int x, y;
3494 get_window_origin (x, y);
3495 bg_set_position (x, y);
3496 }
3497 update_background ();
3498 }
3836 } 3499 }
3837 break; 3500 break;
3838 case XTerm_Color00:
3839 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3840 break;
3841 case XTerm_Color01:
3842 process_color_seq (XTerm_Color01, Color_bg, str, resp);
3843 break;
3844#ifndef NO_CURSORCOLOR
3845 case XTerm_Color_cursor:
3846 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3847 break;
3848#endif 3501#endif
3849 case XTerm_Color_pointer_fg:
3850 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);
3851 break;
3852 case XTerm_Color_pointer_bg:
3853 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3854 break;
3855#ifndef NO_BOLD_UNDERLINE_REVERSE
3856 case XTerm_Color_RV:
3857 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3858 break;
3859 case Rxvt_Color_BD:
3860 case URxvt_Color_BD:
3861 process_color_seq (op, Color_BD, str, resp);
3862 break;
3863 case Rxvt_Color_UL:
3864 case URxvt_Color_UL:
3865 process_color_seq (op, Color_UL, str, resp);
3866 break;
3867 case URxvt_Color_IT:
3868 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3869 break;
3870#endif
3871#if TRANSPARENT && TINTING
3872 case URxvt_Color_tint:
3873 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3874 check_our_parents ();
3875 if (am_transparent)
3876 want_full_refresh = want_refresh = 1;
3877 break;
3878#endif
3879
3880 case Rxvt_Pixmap:
3881 {
3882 if (*str != ';')
3883 {
3884#if XPM_BACKGROUND
3885 scale_pixmap (""); /* reset to default scaling */
3886 set_bgPixmap (str); /* change pixmap */
3887 scr_touch (true);
3888#endif
3889 }
3890
3891 int changed = 0;
3892
3893 while ((str = strchr (str, ';')) != NULL)
3894 {
3895 str++;
3896#if XPM_BACKGROUND
3897 changed += scale_pixmap (str);
3898#endif
3899 }
3900
3901 if (changed)
3902 {
3903#ifdef XPM_BACKGROUND
3904 resize_pixmap ();
3905 scr_touch (true);
3906#endif
3907 }
3908 }
3909 break;
3910
3911 case Rxvt_restoreFG:
3912 set_window_color (Color_fg, str);
3913 break;
3914 case Rxvt_restoreBG:
3915 set_window_color (Color_bg, str);
3916 break;
3917 3502
3918 case XTerm_logfile: 3503 case XTerm_logfile:
3919 // TODO, when secure mode? 3504 // TODO, when secure mode?
3920 break; 3505 break;
3921 3506
… …
3939 case URxvt_italicFont: 3524 case URxvt_italicFont:
3940 case URxvt_boldItalicFont: 3525 case URxvt_boldItalicFont:
3941#endif 3526#endif
3942 if (query) 3527 if (query)
3943 tt_printf ("\33]%d;%-.250s%c", saveop, 3528 tt_printf ("\33]%d;%-.250s%c", saveop,
3944 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3529 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3945 ? fontset[op - URxvt_font]->fontdesc : "", 3530 ? fontset[op - URxvt_font]->fontdesc : "",
3946 resp); 3531 resp);
3947 else 3532 else
3948 { 3533 {
3949 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3534 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3952 allocated.push_back ((void *)res); 3537 allocated.push_back ((void *)res);
3953 set_fonts (); 3538 set_fonts ();
3954 } 3539 }
3955 break; 3540 break;
3956 3541
3957#if ENABLE_FRILLS 3542 case URxvt_version:
3543 if (query)
3544 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3545 op,
3546 rs[Rs_name], VERSION[0], VERSION[2],
3547 resp);
3548 break;
3549
3550#if !ENABLE_MINIMAL
3958 case URxvt_locale: 3551 case URxvt_locale:
3959 if (query) 3552 if (query)
3960 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3553 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3961 else 3554 else
3962 { 3555 {
3963 set_locale (str); 3556 set_locale (str);
3964 pty->set_utf8_mode (enc_utf8); 3557 pty->set_utf8_mode (enc_utf8);
3965 init_xlocale (); 3558 init_xlocale ();
… …
3980 break; 3573 break;
3981#endif 3574#endif
3982 3575
3983#if ENABLE_PERL 3576#if ENABLE_PERL
3984 case URxvt_perl: 3577 case URxvt_perl:
3985 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 3578 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3986 ; // no responses yet
3987 break; 3579 break;
3988#endif 3580#endif
3989 } 3581 }
3990} 3582}
3991/*----------------------------------------------------------------------*/ 3583/*----------------------------------------------------------------------*/
… …
4014 { 3606 {
4015 if (mode == 'r') 3607 if (mode == 'r')
4016 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3608 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
4017 else 3609 else
4018 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3610 state = (mode == 't') ? ! (priv_modes & bit) : mode;
4019 PrivMode (state, bit); 3611
3612 set_privmode (bit, state);
4020 } 3613 }
4021 3614
4022 return state; 3615 return state;
4023} 3616}
4024 3617
… …
4028{ 3621{
4029 unsigned int i, j; 3622 unsigned int i, j;
4030 int state; 3623 int state;
4031 3624
4032 static const struct 3625 static const struct
4033 { 3626 {
4034 const int argval; 3627 const int argval;
4035 const unsigned long bit; 3628 const unsigned long bit;
4036 }
4037
4038 argtopriv[] = { 3629 } argtopriv[] = {
4039 { 1, PrivMode_aplCUR }, 3630 { 1, PrivMode_aplCUR }, // DECCKM
4040 { 2, PrivMode_vt52 }, 3631 { 2, PrivMode_vt52 },
4041 { 3, PrivMode_132 }, 3632 { 3, PrivMode_132 }, // DECCOLM
4042 { 4, PrivMode_smoothScroll }, 3633 { 4, PrivMode_smoothScroll }, // DECSCLM
4043 { 5, PrivMode_rVideo }, 3634 { 5, PrivMode_rVideo }, // DECSCNM
4044 { 6, PrivMode_relOrigin }, 3635 { 6, PrivMode_relOrigin }, // DECOM
4045 { 7, PrivMode_Autowrap }, 3636 { 7, PrivMode_Autowrap }, // DECAWM
4046 // 8, bi-directional support mode 3637 // 8, auto-repeat keys // DECARM
4047 { 9, PrivMode_MouseX10 }, 3638 { 9, PrivMode_MouseX10 },
4048 // 18, 19 printing-related 3639 // 18 end FF to printer after print screen
3640 // 19 Print screen prints full screen/scroll region
4049 { 25, PrivMode_VisibleCursor }, 3641 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
4050#ifdef scrollBar_esc 3642#ifdef scrollBar_esc
4051 { scrollBar_esc, PrivMode_scrollBar }, 3643 { scrollBar_esc, PrivMode_scrollBar },
4052#endif 3644#endif
4053 { 35, PrivMode_ShiftKeys }, // rxvt extension 3645 { 35, PrivMode_ShiftKeys }, // rxvt extension
3646 // 38, tektronix mode // DECTEK
4054 { 40, PrivMode_132OK }, 3647 { 40, PrivMode_132OK },
4055 // 41 xterm more fixes NYI 3648 // 41 xterm more fixes NYI
4056 // 45 margin bell NYI 3649 // 45 margin bell NYI
4057 // 46 start logging 3650 // 46 start logging
4058 { 47, PrivMode_Screen }, 3651 { 47, PrivMode_Screen },
4059 { 66, PrivMode_aplKP }, 3652 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
4060#ifndef NO_BACKSPACE_KEY 3653#ifndef NO_BACKSPACE_KEY
4061 { 67, PrivMode_BackSpace }, 3654 { 67, PrivMode_BackSpace }, // DECBKM
4062#endif 3655#endif
4063 { 1000, PrivMode_MouseX11 }, 3656 { 1000, PrivMode_MouseX11 },
4064 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3657 { 1002, PrivMode_MouseBtnEvent },
4065 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3658 { 1003, PrivMode_MouseAnyEvent },
4066 // 1003 Use All Motion Mouse Tracking. NYI, TODO 3659#if ENABLE_FRILLS
3660 { 1005, PrivMode_ExtModeMouse },
3661#endif
4067 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3662 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4068 { 1011, PrivMode_Keypress }, // rxvt extension 3663 { 1011, PrivMode_Keypress }, // rxvt extension
3664#if ENABLE_FRILLS
3665 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3666#endif
4069 // 1035 enable modifiers for alt, numlock NYI 3667 // 1035 enable modifiers for alt, numlock NYI
4070 // 1036 send ESC for meta keys NYI 3668 // 1036 send ESC for meta keys NYI
4071 // 1037 send DEL for keypad delete NYI 3669 // 1037 send DEL for keypad delete NYI
4072 { 1047, PrivMode_Screen }, 3670 { 1047, PrivMode_Screen },
4073 // 1048 save and restore cursor 3671 // 1048 save and restore cursor, implemented in code
4074 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3672 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
4075 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3673 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3674 { 2004, PrivMode_BracketPaste },
4076 }; 3675 };
4077 3676
4078 if (nargs == 0) 3677 if (nargs == 0)
4079 return; 3678 return;
4080 3679
… …
4087 for (i = 0; i < nargs; i++) 3686 for (i = 0; i < nargs; i++)
4088 { 3687 {
4089 state = -1; 3688 state = -1;
4090 3689
4091 /* basic handling */ 3690 /* basic handling */
4092 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3691 for (j = 0; j < ARRAY_LENGTH(argtopriv); j++)
4093 if (argtopriv[j].argval == arg[i]) 3692 if (argtopriv[j].argval == arg[i])
4094 { 3693 {
4095 state = privcases (mode, argtopriv[j].bit); 3694 state = privcases (mode, argtopriv[j].bit);
4096 break; 3695 break;
4097 } 3696 }
… …
4105 3704
4106 scr_touch (true); 3705 scr_touch (true);
4107 break; 3706 break;
4108#endif 3707#endif
4109 case 1048: /* alternative cursor save */ 3708 case 1048: /* alternative cursor save */
4110 case 1049:
4111 if (OPTION (Opt_secondaryScreen)) 3709 if (option (Opt_secondaryScreen))
4112 if (mode == 0) 3710 if (mode == 0)
4113 scr_cursor (RESTORE); 3711 scr_cursor (RESTORE);
4114 else if (mode == 1) 3712 else if (mode == 1)
4115 scr_cursor (SAVE); 3713 scr_cursor (SAVE);
4116 break; 3714 break;
… …
4124 case 2: /* VT52 mode */ 3722 case 2: /* VT52 mode */
4125 /* oddball mode. should be set regardless of set/reset 3723 /* oddball mode. should be set regardless of set/reset
4126 * parameter. Return from VT52 mode with an ESC < from 3724 * parameter. Return from VT52 mode with an ESC < from
4127 * within VT52 mode 3725 * within VT52 mode
4128 */ 3726 */
4129 PrivMode (1, PrivMode_vt52); 3727 set_privmode (PrivMode_vt52, 1);
4130 break; 3728 break;
4131 case 3: /* 80/132 */ 3729 case 3: /* 80/132 */
4132 if (priv_modes & PrivMode_132OK) 3730 if (priv_modes & PrivMode_132OK)
4133 set_widthheight (((state ? 132 : 80) * fwidth), height); 3731 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
4134 break; 3732 break;
4135 case 4: /* smooth scrolling */ 3733 case 4: /* smooth scrolling */
4136 set_option (Opt_jumpScroll, !state); 3734 set_option (Opt_jumpScroll, !state);
4137 break; 3735 break;
4138 case 5: /* reverse video */ 3736 case 5: /* reverse video */
… …
4145 scr_autowrap (state); 3743 scr_autowrap (state);
4146 break; 3744 break;
4147 /* case 8: - auto repeat, can't do on a per window basis */ 3745 /* case 8: - auto repeat, can't do on a per window basis */
4148 case 9: /* X10 mouse reporting */ 3746 case 9: /* X10 mouse reporting */
4149 if (state) /* orthogonal */ 3747 if (state) /* orthogonal */
4150 priv_modes &= ~PrivMode_MouseX11; 3748 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4151 break; 3749 break;
4152#ifdef scrollBar_esc 3750#ifdef scrollBar_esc
4153 case scrollBar_esc: 3751 case scrollBar_esc:
4154 if (scrollbar_mapping (state)) 3752 if (scrollBar.map (state))
4155 { 3753 {
4156 resize_all_windows (0, 0, 0); 3754 resize_all_windows (0, 0, 0);
4157 scr_touch (true); 3755 scr_touch (true);
4158 } 3756 }
4159 break; 3757 break;
… …
4168 break; 3766 break;
4169 /* case 66: - application key pad */ 3767 /* case 66: - application key pad */
4170 /* case 67: - backspace key */ 3768 /* case 67: - backspace key */
4171 case 1000: /* X11 mouse reporting */ 3769 case 1000: /* X11 mouse reporting */
4172 if (state) /* orthogonal */ 3770 if (state) /* orthogonal */
4173 priv_modes &= ~PrivMode_MouseX10; 3771 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4174 break; 3772 break;
4175#if 0
4176 case 1001: 3773 case 1002:
4177 break; /* X11 mouse highlighting */ 3774 case 1003:
4178#endif 3775 if (state)
3776 {
3777 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3778 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3779 mouse_row = mouse_col = 0;
3780 vt_emask_mouse = PointerMotionMask;
3781 }
3782 else
3783 vt_emask_mouse = NoEventMask;
3784
3785 vt_select_input ();
3786 break;
4179 case 1010: /* scroll to bottom on TTY output inhibit */ 3787 case 1010: /* scroll to bottom on TTY output inhibit */
4180 set_option (Opt_scrollTtyOutput, !state); 3788 set_option (Opt_scrollTtyOutput, !state);
4181 break; 3789 break;
4182 case 1011: /* scroll to bottom on key press */ 3790 case 1011: /* scroll to bottom on key press */
4183 set_option (Opt_scrollTtyKeypress, state); 3791 set_option (Opt_scrollTtyKeypress, state);
4184 break; 3792 break;
4185 case 1047: /* secondary screen w/ clearing last */ 3793 case 1047: /* secondary screen w/ clearing last */
4186 if (OPTION (Opt_secondaryScreen)) 3794 if (option (Opt_secondaryScreen))
4187 if (current_screen != PRIMARY) 3795 if (!state)
4188 scr_erase_screen (2); 3796 scr_erase_screen (2);
3797
4189 scr_change_screen (state); 3798 scr_change_screen (state);
4190 break; 3799 break;
4191 case 1049: /* secondary screen w/ clearing first */ 3800 case 1049: /* secondary screen w/ clearing first */
3801 if (option (Opt_secondaryScreen))
3802 if (state)
3803 scr_cursor (SAVE);
3804
4192 scr_change_screen (state); 3805 scr_change_screen (state);
3806
4193 if (OPTION (Opt_secondaryScreen)) 3807 if (option (Opt_secondaryScreen))
4194 if (current_screen != PRIMARY) 3808 if (state)
4195 scr_erase_screen (2); 3809 scr_erase_screen (2);
3810 else
3811 scr_cursor (RESTORE);
4196 break; 3812 break;
4197 default: 3813 default:
4198 break; 3814 break;
4199 } 3815 }
4200 } 3816 }
… …
4326 scr_color (Color_bg, Color_bg); 3942 scr_color (Color_bg, Color_bg);
4327 break; 3943 break;
4328 3944
4329 //case 50: // not variable spacing 3945 //case 50: // not variable spacing
4330 3946
4331#if ENABLE_FRILLS 3947#if !ENABLE_MINIMAL
4332 case 90: 3948 case 90:
4333 case 91: /* set bright fg color */ 3949 case 91: /* set bright fg color */
4334 case 92: 3950 case 92:
4335 case 93: 3951 case 93:
4336 case 94: 3952 case 94:
… …
4360rxvt_term::process_graphics () 3976rxvt_term::process_graphics ()
4361{ 3977{
4362 unicode_t ch, cmd = cmd_getc (); 3978 unicode_t ch, cmd = cmd_getc ();
4363 3979
4364 if (cmd == 'Q') 3980 if (cmd == 'Q')
3981 {
4365 { /* query graphics */ 3982 /* query graphics */
4366 tt_printf ("\033G0\012"); /* no graphics */ 3983 tt_printf ("\033G0\012"); /* no graphics */
4367 return; 3984 return;
4368 } 3985 }
4369 /* swallow other graphics sequences until terminating ':' */ 3986 /* swallow other graphics sequences until terminating ':' */
4370 do 3987 do
… …
4393 4010
4394/* ---------------------------------------------------------------------- */ 4011/* ---------------------------------------------------------------------- */
4395/* Write data to the pty as typed by the user, pasted with the mouse, 4012/* Write data to the pty as typed by the user, pasted with the mouse,
4396 * or generated by us in response to a query ESC sequence. 4013 * or generated by us in response to a query ESC sequence.
4397 */ 4014 */
4398const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4015static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4399 4016
4400void 4017void
4401rxvt_term::tt_write (const char *data, unsigned int len) 4018rxvt_term::tt_write (const char *data, unsigned int len)
4402{ 4019{
4403 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4020 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
4415 4032
4416 data += written; 4033 data += written;
4417 len -= written; 4034 len -= written;
4418 } 4035 }
4419 4036
4420 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4037 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
4421 4038
4422 memcpy (v_buffer + v_buflen, data, len); 4039 memcpy (v_buffer + v_buflen, data, len);
4423 v_buflen += len; 4040 v_buflen += len;
4424 4041
4425 pty_ev.set (EVENT_READ | EVENT_WRITE); 4042 pty_ev.set (ev::READ | ev::WRITE);
4426} 4043}
4427 4044
4428void rxvt_term::pty_write () 4045void rxvt_term::pty_write ()
4429{ 4046{
4430 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4047 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4435 4052
4436 if (v_buflen == 0) 4053 if (v_buflen == 0)
4437 { 4054 {
4438 free (v_buffer); 4055 free (v_buffer);
4439 v_buffer = 0; 4056 v_buffer = 0;
4440 v_buflen = 0;
4441 4057
4442 pty_ev.set (EVENT_READ); 4058 pty_ev.set (ev::READ);
4443 return; 4059 return;
4444 } 4060 }
4445 4061
4446 memmove (v_buffer, v_buffer + written, v_buflen); 4062 memmove (v_buffer, v_buffer + written, v_buflen);
4447 } 4063 }
4448 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4064 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4449 pty_ev.set (EVENT_READ); 4065 pty_ev.set (ev::READ);
4450} 4066}
4451 4067
4452/*----------------------- end-of-file (C source) -----------------------*/ 4068/*----------------------- end-of-file (C source) -----------------------*/
4453 4069

Diff Legend

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