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.303 by root, Tue Jan 31 21:47:56 2006 UTC vs.
Revision 1.438 by root, Thu Feb 4 21:55:12 2010 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-2007 Marc Lehmann <pcg@goof.com>
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.
… …
95 XK_Shift_L, 0x21e7, 96 XK_Shift_L, 0x21e7,
96 XK_Shift_R, 0x21e7, 97 XK_Shift_R, 0x21e7,
97 98
98 XK_Shift_Lock, 0x21eb, 99 XK_Shift_Lock, 0x21eb,
99 XK_ISO_Lock, 0x21eb, 100 XK_ISO_Lock, 0x21eb,
100 XK_ISO_Lock, 0x21eb,
101 XK_Caps_Lock, 0x21ec, 101 XK_Caps_Lock, 0x21ec,
102 XK_Num_Lock, 0x21ed, 102 XK_Num_Lock, 0x21ed,
103 XK_ISO_Level3_Shift, 0x21ee, 103 XK_ISO_Level3_Shift, 0x21ee,
104 XK_ISO_Level3_Lock, 0x21ef, 104 XK_ISO_Level3_Lock, 0x21ef,
105 XK_ISO_Group_Lock, 0x21f0, 105 XK_ISO_Group_Lock, 0x21f0,
… …
199 r & RS_Uline ? " uline" : "", 199 r & RS_Uline ? " uline" : "",
200 r & RS_Careful ? " careful" : ""); 200 r & RS_Careful ? " careful" : "");
201 201
202 int width = wcswidth (fname, wcslen (fname)); 202 int width = wcswidth (fname, wcslen (fname));
203 203
204 max_it (width, 8+5); // for char + hey 204 max_it (width, 8+5); // for char + hex
205 max_it (width, strlen (attr)); 205 max_it (width, strlen (attr));
206 206
207 if (y >= 0) 207 if (y >= 0)
208 { 208 {
209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
… …
221 ch = *chr++; 221 ch = *chr++;
222 222
223 sprintf (buf, "%8x", ch); 223 sprintf (buf, "%8x", ch);
224 scr_overlay_set (0, y, buf); 224 scr_overlay_set (0, y, buf);
225 scr_overlay_set (9, y, '='); 225 scr_overlay_set (9, y, '=');
226# if !UNICODE3 226# if !UNICODE_3
227 if (ch >= 0x10000) 227 if (ch >= 0x10000)
228 ch = 0xfffd; 228 ch = 0xfffd;
229# endif 229# endif
230 scr_overlay_set (11, y, ch, r); 230 scr_overlay_set (11, y, ch, r);
231 231
… …
279 } 279 }
280 280
281 iso14755buf = 0; 281 iso14755buf = 0;
282} 282}
283 283
284int 284static int
285rxvt_term::hex_keyval (XKeyEvent &ev) 285hex_keyval (XKeyEvent &ev)
286{ 286{
287 // check wether this event corresponds to a hex digit 287 // check wether this event corresponds to a hex digit
288 // if the modifiers had not been pressed. 288 // if the modifiers had not been pressed.
289 for (int index = 0; index < 8; index++) 289 for (int index = 0; index < 8; index++)
290 { 290 {
… …
298 298
299 return -1; 299 return -1;
300} 300}
301#endif 301#endif
302 302
303/*{{{ Convert the keypress event into a string */ 303static inline KeySym
304translate_keypad (KeySym keysym, bool kp)
305{
306#ifdef XK_KP_Home
307 static const KeySym keypadtrans[] = {
308 XK_KP_7, // XK_KP_Home
309 XK_KP_4, // XK_KP_Left
310 XK_KP_8, // XK_KP_Up
311 XK_KP_6, // XK_KP_Right
312 XK_KP_2, // XK_KP_Down
313# ifndef UNSHIFTED_SCROLLKEYS
314 XK_KP_9, // XK_KP_Prior
315 XK_KP_3, // XK_KP_Next
316# else
317 XK_Prior,
318 XK_Next,
319# endif
320 XK_KP_1, // XK_KP_End
321 XK_KP_5, // XK_KP_Begin
322 };
323
324 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
325 {
326 unsigned int index = keysym - XK_KP_Home;
327 keysym = kp ? keypadtrans[index] : XK_Home + index;
328 }
329 else if (keysym == XK_KP_Insert)
330 keysym = kp ? XK_KP_0 : XK_Insert;
331# ifndef NO_DELETE_KEY
332 else if (keysym == XK_KP_Delete)
333 keysym = kp ? XK_KP_Decimal : XK_Delete;
334# endif
335#endif
336 return keysym;
337}
338
339static inline int
340map_function_key (KeySym keysym)
341{
342 int param = 0;
343
344 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
345 {
346 param = 11 + keysym - XK_F1;
347 if (keysym >= XK_F17)
348 param += 4;
349 else if (keysym >= XK_F15)
350 param += 3;
351 else if (keysym >= XK_F11)
352 param += 2;
353 else if (keysym >= XK_F6)
354 param += 1;
355 }
356 else
357 switch (keysym)
358 {
359 case XK_Find:
360 param = 1;
361 break;
362 case XK_Insert:
363 param = 2;
364 break;
365#ifdef DXK_Remove
366 case DXK_Remove:
367#endif
368 case XK_Execute:
369 param = 3;
370 break;
371 case XK_Select:
372 param = 4;
373 break;
374#ifndef UNSHIFTED_SCROLLKEYS
375 case XK_Prior:
376 param = 5;
377 break;
378 case XK_Next:
379 param = 6;
380 break;
381 case XK_Home:
382 param = 7;
383 break;
384 case XK_End:
385 param = 8;
386 break;
387#endif
388 case XK_Help:
389 param = 28;
390 break;
391 case XK_Menu:
392 param = 29;
393 break;
394 }
395 return param;
396}
397
304void 398void
305rxvt_term::lookup_key (XKeyEvent &ev) 399rxvt_term::key_press (XKeyEvent &ev)
306{ 400{
307 int ctrl, meta, shft, len; 401 int ctrl, meta, shft, len;
308 unsigned int newlen;
309 KeySym keysym; 402 KeySym keysym;
310 int valid_keysym; 403 int valid_keysym;
311 char kbuf[KBUFSZ]; 404 char kbuf[KBUFSZ];
405
406#if ISO_14755
407 if (iso14755buf & ISO_14755_52)
408 return;
409#endif
312 410
313 /* 411 /*
314 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 412 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
315 * escape sequence to toggle the Keypad. 413 * escape sequence to toggle the Keypad.
316 * 414 *
… …
321 meta = ev.state & ModMetaMask; 419 meta = ev.state & ModMetaMask;
322 420
323 if (numlock_state || (ev.state & ModNumLockMask)) 421 if (numlock_state || (ev.state & ModNumLockMask))
324 { 422 {
325 numlock_state = (ev.state & ModNumLockMask); 423 numlock_state = (ev.state & ModNumLockMask);
326 PrivMode ((!numlock_state), PrivMode_aplKP); 424 set_privmode (PrivMode_aplKP, !numlock_state);
327 } 425 }
328 426
329 kbuf[0] = 0; 427 kbuf[0] = 0;
330 428
331#ifdef USE_XIM 429#ifdef USE_XIM
… …
407#ifdef PAGING_CONTEXT_LINES 505#ifdef PAGING_CONTEXT_LINES
408 lnsppg = nrow - PAGING_CONTEXT_LINES; 506 lnsppg = nrow - PAGING_CONTEXT_LINES;
409#else 507#else
410 lnsppg = nrow * 4 / 5; 508 lnsppg = nrow * 4 / 5;
411#endif 509#endif
510 max_it (lnsppg, 1);
511
412 if (keysym == XK_Prior) 512 if (keysym == XK_Prior)
413 { 513 {
414 scr_page (UP, lnsppg); 514 scr_page (UP, lnsppg);
415 return; 515 return;
416 } 516 }
… …
481 } 581 }
482 } 582 }
483 583
484#if ENABLE_FRILLS || ISO_14755 584#if ENABLE_FRILLS || ISO_14755
485 // ISO 14755 support 585 // ISO 14755 support
486 if (shft && ctrl) 586 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
487 { 587 {
488 int hv; 588 int hv;
489 589
490 if (iso14755buf & ISO_14755_51 590 if (iso14755buf & ISO_14755_51
491 && (keysym == XK_space || keysym == XK_KP_Space 591 && (keysym == XK_space || keysym == XK_KP_Space
… …
493 { 593 {
494 commit_iso14755 (); 594 commit_iso14755 ();
495 iso14755buf = ISO_14755_51; 595 iso14755buf = ISO_14755_51;
496# if ISO_14755 596# if ISO_14755
497 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);
498# endif 606# endif
499 return; 607 return;
500 } 608 }
501 else if ((hv = hex_keyval (ev)) >= 0) 609 else if ((hv = hex_keyval (ev)) >= 0)
502 { 610 {
… …
507# endif 615# endif
508 return; 616 return;
509 } 617 }
510 else 618 else
511 { 619 {
512# if ENABLE_OVERLAY 620# if ISO_14755
513 scr_overlay_off (); 621 scr_overlay_off ();
514# endif 622# endif
515 iso14755buf = 0; 623 iso14755buf = 0;
516 } 624 }
517 } 625 }
626 else if (option (Opt_iso14755) &&
518 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 627 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
519 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 628 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
520 if (!(iso14755buf & ISO_14755_STARTED)) 629 if (!(iso14755buf & ISO_14755_STARTED))
521 { 630 {
522 iso14755buf |= ISO_14755_STARTED; 631 iso14755buf |= ISO_14755_STARTED;
523# if ENABLE_OVERLAY 632# if ISO_14755
524 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 633 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
525 scr_overlay_set (0, 0, "ISO 14755 mode"); 634 scr_overlay_set (0, 0, "ISO 14755 mode");
526# endif 635# endif
527 } 636 }
528#endif 637#endif
529 638
530#ifdef PRINTPIPE 639#ifdef PRINTPIPE
531 if (keysym == XK_Print) 640 if (keysym == XK_Print)
532 { 641 {
533 scr_printscreen (ctrl | shft); 642 scr_printscreen (ctrl | shft);
534 return; 643 return;
535 } 644 }
536#endif 645#endif
537 646
538 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 647 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
539 { 648 {
649 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
650 unsigned int newlen = 1;
651
652 switch (translate_keypad (keysym, kp))
540 { 653 {
654#ifndef NO_BACKSPACE_KEY
655 case XK_BackSpace:
656 if (priv_modes & PrivMode_HaveBackSpace)
657 {
658 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
659 ^ !!ctrl) ? '\b' : '\177';
660 kbuf[1] = '\0';
661 }
662 else
663 strcpy (kbuf, rs[Rs_backspace_key]);
664 break;
665#endif
666#ifndef NO_DELETE_KEY
667 case XK_Delete:
668 strcpy (kbuf, rs[Rs_delete_key]);
669 break;
670#endif
671 case XK_Tab:
672 if (shft)
673 strcpy (kbuf, "\033[Z");
674 else
675 {
676#ifdef CTRL_TAB_MAKES_META
677 if (ctrl)
678 meta = 1;
679#endif
680#ifdef MOD4_TAB_MAKES_META
681 if (ev.state & Mod4Mask)
682 meta = 1;
683#endif
541 newlen = 1; 684 newlen = 0;
542 switch (keysym) 685 }
686 break;
687
688 case XK_Up: /* "\033[A" */
689 case XK_Down: /* "\033[B" */
690 case XK_Right: /* "\033[C" */
691 case XK_Left: /* "\033[D" */
692 strcpy (kbuf, "\033[Z");
693 kbuf[2] = "DACB"[keysym - XK_Left];
694 /* do Shift first */
695 if (shft)
696 kbuf[2] = "dacb"[keysym - XK_Left];
697 else if (ctrl)
698 {
699 kbuf[1] = 'O';
700 kbuf[2] = "dacb"[keysym - XK_Left];
701 }
702 else if (priv_modes & PrivMode_aplCUR)
703 kbuf[1] = 'O';
704 break;
705
706 case XK_KP_Enter:
707 /* allow shift to override */
708 if (kp)
709 {
710 strcpy (kbuf, "\033OM");
711 break;
712 }
713
714 /* FALLTHROUGH */
715
716 case XK_Return:
717 if (priv_modes & PrivMode_LFNL)
718 {
719 kbuf[0] = '\015';
720 kbuf[1] = '\012';
721 kbuf[2] = '\0';
722 }
723 else
724 {
725 kbuf[0] = '\015';
726 kbuf[1] = '\0';
727 }
728 break;
729
730 case XK_KP_F1: /* "\033OP" */
731 case XK_KP_F2: /* "\033OQ" */
732 case XK_KP_F3: /* "\033OR" */
733 case XK_KP_F4: /* "\033OS" */
734 strcpy (kbuf, "\033OP");
735 kbuf[2] += (keysym - XK_KP_F1);
736 break;
737
738 case XK_KP_Multiply: /* "\033Oj" : "*" */
739 case XK_KP_Add: /* "\033Ok" : "+" */
740 case XK_KP_Separator: /* "\033Ol" : "," */
741 case XK_KP_Subtract: /* "\033Om" : "-" */
742 case XK_KP_Decimal: /* "\033On" : "." */
743 case XK_KP_Divide: /* "\033Oo" : "/" */
744 case XK_KP_0: /* "\033Op" : "0" */
745 case XK_KP_1: /* "\033Oq" : "1" */
746 case XK_KP_2: /* "\033Or" : "2" */
747 case XK_KP_3: /* "\033Os" : "3" */
748 case XK_KP_4: /* "\033Ot" : "4" */
749 case XK_KP_5: /* "\033Ou" : "5" */
750 case XK_KP_6: /* "\033Ov" : "6" */
751 case XK_KP_7: /* "\033Ow" : "7" */
752 case XK_KP_8: /* "\033Ox" : "8" */
753 case XK_KP_9: /* "\033Oy" : "9" */
754 /* allow shift to override */
755 if (kp)
756 {
757 strcpy (kbuf, "\033Oj");
758 kbuf[2] += (keysym - XK_KP_Multiply);
759 }
760 else
761 {
762 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
763 kbuf[1] = '\0';
764 }
765 break;
766
767 default:
543 { 768 {
544#ifndef NO_BACKSPACE_KEY 769 int param = map_function_key (keysym);
545 case XK_BackSpace: 770 if (param > 0)
546 if (priv_modes & PrivMode_HaveBackSpace) 771 sprintf (kbuf,"\033[%d~", param);
547 {
548 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
549 ^ !!ctrl) ? '\b' : '\177';
550 kbuf[1] = '\0';
551 }
552 else 772 else
553 strcpy (kbuf, key_backspace);
554 break;
555#endif
556#ifndef NO_DELETE_KEY
557# ifdef XK_KP_Prior
558 case XK_KP_Delete:
559 /* allow shift to override */
560 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
561 {
562 strcpy (kbuf, "\033On");
563 break;
564 }
565 /* FALLTHROUGH */
566# endif
567 case XK_Delete:
568 strcpy (kbuf, key_delete);
569 break;
570#endif
571 case XK_Tab:
572 if (shft)
573 strcpy (kbuf, "\033[Z");
574 else
575 {
576#ifdef CTRL_TAB_MAKES_META
577 if (ctrl)
578 meta = 1;
579#endif
580#ifdef MOD4_TAB_MAKES_META
581 if (ev.state & Mod4Mask)
582 meta = 1;
583#endif
584 newlen = 0;
585 }
586 break;
587
588#ifdef XK_KP_Left
589 case XK_KP_Up: /* \033Ox or standard */
590 case XK_KP_Down: /* \033Or or standard */
591 case XK_KP_Right: /* \033Ov or standard */
592 case XK_KP_Left: /* \033Ot or standard */
593 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
594 {
595 strcpy (kbuf, "\033OZ");
596 kbuf[2] = "txvr"[keysym - XK_KP_Left];
597 break;
598 }
599 else
600 /* translate to std. cursor key */
601 keysym = XK_Left + (keysym - XK_KP_Left);
602 /* FALLTHROUGH */
603#endif
604 case XK_Up: /* "\033[A" */
605 case XK_Down: /* "\033[B" */
606 case XK_Right: /* "\033[C" */
607 case XK_Left: /* "\033[D" */
608 strcpy (kbuf, "\033[Z");
609 kbuf[2] = "DACB"[keysym - XK_Left];
610 /* do Shift first */
611 if (shft)
612 kbuf[2] = "dacb"[keysym - XK_Left];
613 else if (ctrl)
614 {
615 kbuf[1] = 'O';
616 kbuf[2] = "dacb"[keysym - XK_Left];
617 }
618 else if (priv_modes & PrivMode_aplCUR)
619 kbuf[1] = 'O';
620 break;
621
622#ifndef UNSHIFTED_SCROLLKEYS
623# ifdef XK_KP_Prior
624 case XK_KP_Prior:
625 /* allow shift to override */
626 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
627 {
628 strcpy (kbuf, "\033Oy");
629 break;
630 }
631 /* FALLTHROUGH */
632# endif
633 case XK_Prior:
634 strcpy (kbuf, "\033[5~");
635 break;
636# ifdef XK_KP_Next
637 case XK_KP_Next:
638 /* allow shift to override */
639 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
640 {
641 strcpy (kbuf, "\033Os");
642 break;
643 }
644 /* FALLTHROUGH */
645# endif
646 case XK_Next:
647 strcpy (kbuf, "\033[6~");
648 break;
649#endif
650 case XK_KP_Enter:
651 /* allow shift to override */
652 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
653 {
654 strcpy (kbuf, "\033OM");
655 break;
656 }
657
658 /* FALLTHROUGH */
659
660 case XK_Return:
661 if (priv_modes & PrivMode_LFNL)
662 {
663 kbuf[0] = '\015';
664 kbuf[1] = '\012';
665 kbuf[2] = '\0';
666 }
667 else
668 {
669 kbuf[0] = '\015';
670 kbuf[1] = '\0';
671 }
672 break;
673
674#ifdef XK_KP_Begin
675 case XK_KP_Begin:
676 strcpy (kbuf, "\033Ou");
677 break;
678
679#endif
680 case XK_KP_F1: /* "\033OP" */
681 case XK_KP_F2: /* "\033OQ" */
682 case XK_KP_F3: /* "\033OR" */
683 case XK_KP_F4: /* "\033OS" */
684 strcpy (kbuf, "\033OP");
685 kbuf[2] += (keysym - XK_KP_F1);
686 break;
687
688 case XK_KP_Multiply: /* "\033Oj" : "*" */
689 case XK_KP_Add: /* "\033Ok" : "+" */
690 case XK_KP_Separator: /* "\033Ol" : "," */
691 case XK_KP_Subtract: /* "\033Om" : "-" */
692 case XK_KP_Decimal: /* "\033On" : "." */
693 case XK_KP_Divide: /* "\033Oo" : "/" */
694 case XK_KP_0: /* "\033Op" : "0" */
695 case XK_KP_1: /* "\033Oq" : "1" */
696 case XK_KP_2: /* "\033Or" : "2" */
697 case XK_KP_3: /* "\033Os" : "3" */
698 case XK_KP_4: /* "\033Ot" : "4" */
699 case XK_KP_5: /* "\033Ou" : "5" */
700 case XK_KP_6: /* "\033Ov" : "6" */
701 case XK_KP_7: /* "\033Ow" : "7" */
702 case XK_KP_8: /* "\033Ox" : "8" */
703 case XK_KP_9: /* "\033Oy" : "9" */
704 /* allow shift to override */
705 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
706 {
707 strcpy (kbuf, "\033Oj");
708 kbuf[2] += (keysym - XK_KP_Multiply);
709 }
710 else
711 {
712 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
713 kbuf[1] = '\0';
714 }
715 break;
716
717 case XK_Find:
718 strcpy (kbuf, "\033[1~");
719 break;
720
721#ifdef XK_KP_End
722 case XK_KP_Insert:
723 /* allow shift to override */
724 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
725 {
726 strcpy (kbuf, "\033Op");
727 break;
728 }
729 /* FALLTHROUGH */
730#endif
731 case XK_Insert:
732 strcpy (kbuf, "\033[2~");
733 break;
734#ifdef DXK_Remove /* support for DEC remove like key */
735 case DXK_Remove:
736 /* FALLTHROUGH */
737#endif
738 case XK_Execute:
739 strcpy (kbuf, "\033[3~");
740 break;
741 case XK_Select:
742 strcpy (kbuf, "\033[4~");
743 break;
744#ifdef XK_KP_End
745 case XK_KP_End:
746 /* allow shift to override */
747 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
748 {
749 strcpy (kbuf, "\033Oq");
750 break;
751 }
752 /* FALLTHROUGH */
753#endif
754 case XK_End:
755 strcpy (kbuf, KS_END);
756 break;
757#ifdef XK_KP_Home
758 case XK_KP_Home:
759 /* allow shift to override */
760 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
761 {
762 strcpy (kbuf, "\033Ow");
763 break;
764 }
765 /* FALLTHROUGH */
766#endif
767 case XK_Home:
768 strcpy (kbuf, KS_HOME);
769 break;
770
771#define FKEY(n, fkey) \
772 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
773
774 case XK_F1: /* "\033[11~" */
775 case XK_F2: /* "\033[12~" */
776 case XK_F3: /* "\033[13~" */
777 case XK_F4: /* "\033[14~" */
778 case XK_F5: /* "\033[15~" */
779 FKEY (11, XK_F1);
780 break;
781 case XK_F6: /* "\033[17~" */
782 case XK_F7: /* "\033[18~" */
783 case XK_F8: /* "\033[19~" */
784 case XK_F9: /* "\033[20~" */
785 case XK_F10: /* "\033[21~" */
786 FKEY (17, XK_F6);
787 break;
788 case XK_F11: /* "\033[23~" */
789 case XK_F12: /* "\033[24~" */
790 case XK_F13: /* "\033[25~" */
791 case XK_F14: /* "\033[26~" */
792 FKEY (23, XK_F11);
793 break;
794 case XK_F15: /* "\033[28~" */
795 case XK_F16: /* "\033[29~" */
796 FKEY (28, XK_F15);
797 break;
798 case XK_Help: /* "\033[28~" */
799 FKEY (28, XK_Help);
800 break;
801 case XK_Menu: /* "\033[29~" */
802 FKEY (29, XK_Menu);
803 break;
804 case XK_F17: /* "\033[31~" */
805 case XK_F18: /* "\033[32~" */
806 case XK_F19: /* "\033[33~" */
807 case XK_F20: /* "\033[34~" */
808 case XK_F21: /* "\033[35~" */
809 case XK_F22: /* "\033[36~" */
810 case XK_F23: /* "\033[37~" */
811 case XK_F24: /* "\033[38~" */
812 case XK_F25: /* "\033[39~" */
813 case XK_F26: /* "\033[40~" */
814 case XK_F27: /* "\033[41~" */
815 case XK_F28: /* "\033[42~" */
816 case XK_F29: /* "\033[43~" */
817 case XK_F30: /* "\033[44~" */
818 case XK_F31: /* "\033[45~" */
819 case XK_F32: /* "\033[46~" */
820 case XK_F33: /* "\033[47~" */
821 case XK_F34: /* "\033[48~" */
822 case XK_F35: /* "\033[49~" */
823 FKEY (31, XK_F17);
824 break;
825#undef FKEY
826 default:
827 newlen = 0; 773 newlen = 0;
828 break;
829 } 774 }
830 775 break;
831 if (newlen)
832 len = strlen (kbuf);
833 } 776 }
777
778 if (newlen)
779 len = strlen (kbuf);
834 780
835 /* 781 /*
836 * Pass meta for all function keys, if 'meta' option set 782 * Pass meta for all function keys, if 'meta' option set
837 */ 783 */
838#ifdef META8_OPTION 784#ifdef META8_OPTION
… …
873 return; 819 return;
874 820
875 if (len <= 0) 821 if (len <= 0)
876 return; /* not mapped */ 822 return; /* not mapped */
877 823
878 if (OPTION (Opt_scrollTtyKeypress)) 824 if (option (Opt_scrollTtyKeypress))
879 if (view_start) 825 if (view_start)
880 { 826 {
881 view_start = 0; 827 view_start = 0;
882 want_refresh = 1; 828 want_refresh = 1;
883 } 829 }
… …
907 tt_write (&ch, 1); 853 tt_write (&ch, 1);
908 } 854 }
909 855
910 tt_write (kbuf, (unsigned int)len); 856 tt_write (kbuf, (unsigned int)len);
911} 857}
912/*}}} */ 858
859void
860rxvt_term::key_release (XKeyEvent &ev)
861{
862#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
863 KeySym keysym;
864
865 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
866#endif
867
868#if ENABLE_FRILLS || ISO_14755
869 // ISO 14755 support
870 if (iso14755buf)
871 if (iso14755buf & ISO_14755_52)
872 {
873# if ISO_14755
874 scr_overlay_off ();
875# endif
876# if ISO_14755
877 // iso14755 part 5.2 handling: release time
878 // first: controls
879 if ((ev.state & ControlMask)
880 && ((keysym >= 0x40 && keysym <= 0x5f)
881 || (keysym >= 0x61 && keysym <= 0x7f)))
882 {
883 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
884 commit_iso14755 ();
885
886 return;
887 }
888
889 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
890 if (i[0] == keysym)
891 {
892 iso14755buf = ISO_14755_51 | i[1];
893 commit_iso14755 ();
894
895 return;
896 }
897
898 scr_bell ();
899# endif
900 iso14755buf = 0;
901
902 return;
903 }
904 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
905 {
906# if ISO_14755
907 scr_overlay_off ();
908# endif
909 if (iso14755buf & ISO_14755_51)
910 commit_iso14755 ();
911#if ISO_14755
912 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
913 {
914 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
915
916 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
917 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
918 }
919# endif
920 else
921 iso14755buf = 0;
922 }
923#endif
924
925 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
926 return;
927
928#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
929 if (!(ev.state & ControlMask))
930 slip_wheel_ev.stop ();
931 else if (keysym == XK_Control_L || keysym == XK_Control_R)
932 mouse_slip_wheel_speed = 0;
933#endif
934}
913 935
914#if defined (KEYSYM_RESOURCE) 936#if defined (KEYSYM_RESOURCE)
915unsigned int 937unsigned int
916rxvt_term::cmd_write (const char *str, unsigned int count) 938rxvt_term::cmd_write (const char *str, unsigned int count)
917{ 939{
… …
947void 969void
948rxvt_term::flush () 970rxvt_term::flush ()
949{ 971{
950 flush_ev.stop (); 972 flush_ev.stop ();
951 973
952#ifdef TRANSPARENT 974#ifdef HAVE_BG_PIXMAP
953 if (want_full_refresh) 975 if (bgPixmap.check_clearChanged ())
954 { 976 {
955 want_full_refresh = 0; 977// scr_clear (true); This needs to be researched further!
956 scr_clear ();
957 scr_touch (false); 978 scr_touch (false);
958 } 979 }
959#endif 980#endif
960 981
961 if (want_refresh) 982 if (want_refresh)
… …
997 } 1018 }
998 while (row < end_row); 1019 while (row < end_row);
999 } 1020 }
1000 1021
1001 scr_refresh (); 1022 scr_refresh ();
1002 scrollbar_show (1); 1023 scrollBar.show (1);
1003#ifdef USE_XIM 1024#ifdef USE_XIM
1004 IMSendSpot (); 1025 IMSendSpot ();
1005#endif 1026#endif
1006 } 1027 }
1007 1028
1008 display->flush (); 1029 display->flush ();
1009} 1030}
1010 1031
1032/* checks wether a refresh is requested and starts the refresh timer */
1011void 1033void
1012rxvt_term::check_cb (check_watcher &w) 1034rxvt_term::refresh_check ()
1035{
1036 if (want_refresh && !flush_ev.is_active ())
1037 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1038
1039 display->flush ();
1040}
1041
1042void
1043rxvt_term::flush_cb (ev::timer &w, int revents)
1013{ 1044{
1014 make_current (); 1045 make_current ();
1015 1046
1016 display->flush ();
1017
1018 if (want_refresh && !flush_ev.active)
1019 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1020}
1021
1022void
1023rxvt_term::flush_cb (time_watcher &w)
1024{
1025 make_current ();
1026
1027 refresh_limit = 1;
1028 refresh_count = 0; 1047 refresh_count = 0;
1029 flush (); 1048 flush ();
1030} 1049}
1031 1050
1032#ifdef CURSOR_BLINK 1051#ifdef CURSOR_BLINK
1033void 1052void
1034rxvt_term::cursor_blink_cb (time_watcher &w) 1053rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1035{ 1054{
1036 hidden_cursor = !hidden_cursor; 1055 hidden_cursor = !hidden_cursor;
1037 want_refresh = 1; 1056 want_refresh = 1;
1038 1057 refresh_check ();
1039 w.start (w.at + CURSOR_BLINK_INTERVAL);
1040} 1058}
1041#endif 1059#endif
1042 1060
1043#ifdef TEXT_BLINK 1061#ifdef TEXT_BLINK
1044void 1062void
1045rxvt_term::text_blink_cb (time_watcher &w) 1063rxvt_term::text_blink_cb (ev::timer &w, int revents)
1046{ 1064{
1047 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1065 if (scr_refresh_rend (RS_Blink, RS_Blink))
1048 { 1066 {
1049 hidden_text = !hidden_text; 1067 hidden_text = !hidden_text;
1050 want_refresh = 1; 1068 want_refresh = 1;
1051 w.start (w.at + TEXT_BLINK_INTERVAL); 1069 refresh_check ();
1052 } 1070 }
1071 else
1072 w.stop ();
1053} 1073}
1054#endif 1074#endif
1055 1075
1056#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1076#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1057void 1077void
1058rxvt_term::cont_scroll_cb (time_watcher &w) 1078rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1059{ 1079{
1060 if ((scrollbar_isUp() || scrollbar_isDn()) && 1080 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1061 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1081 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1062 { 1082 {
1063 want_refresh = 1; 1083 want_refresh = 1;
1064 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1084 refresh_check ();
1065 } 1085 }
1086 else
1087 w.stop ();
1066} 1088}
1067#endif 1089#endif
1068 1090
1069#ifdef SELECTION_SCROLLING 1091#ifdef SELECTION_SCROLLING
1070void 1092void
1071rxvt_term::sel_scroll_cb (time_watcher &w) 1093rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1072{ 1094{
1073 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1095 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1074 { 1096 {
1075 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1097 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1076 want_refresh = 1; 1098 want_refresh = 1;
1077 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1099 refresh_check ();
1078 } 1100 }
1101 else
1102 w.stop ();
1079} 1103}
1080#endif 1104#endif
1081 1105
1082#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1106#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1083void 1107void
1084rxvt_term::slip_wheel_cb (time_watcher &w) 1108rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1085{ 1109{
1086 if (mouse_slip_wheel_speed == 0 1110 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1087 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1088 : scr_page (UP, mouse_slip_wheel_speed))
1089 { 1111 {
1090 if (view_start == top_row || view_start == 0)
1091 mouse_slip_wheel_speed = 0;
1092
1093 want_refresh = 1; 1112 want_refresh = 1;
1094 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1113 refresh_check ();
1114 }
1115
1116 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1117 {
1118 mouse_slip_wheel_speed = 0;
1119 w.stop ();
1095 } 1120 }
1096} 1121}
1097#endif 1122#endif
1098 1123
1099#if LINUX_YIELD_HACK 1124#if LINUX_YIELD_HACK
1100static struct event_handler 1125static struct event_handler
1101{ 1126{
1102 check_watcher yield_ev; 1127 ev::prepare yield_ev;
1103 1128
1104 void yield_cb (check_watcher &w) 1129 void yield_cb (ev::prepare &w, int revents)
1105 { 1130 {
1106 // this should really be sched_yield(), but the linux guys thought 1131 // this should really be sched_yield(), but the linux guys thought
1107 // that giving a process calling sched_yield () less cpu time than 1132 // that giving a process calling sched_yield () less cpu time than
1108 // ones with high nice levels. 1133 // ones with high nice levels is a useful thing to do. It surely is is
1134 // allowed by the sus... as is returning ENOSYS.
1135 // since the linux guys additionally thought that breaking the only
1136 // known workaroudn against their unusable sched_yield hack is cool,
1137 // we just nanosleep a bit and hope for the best.
1109 1138
1110 struct timespec ts = { 0, 0 }; 1139 struct timespec ts = { 0, 1000 };
1111 nanosleep (&ts, 0); 1140 nanosleep (&ts, 0);
1112 1141
1113 w.stop (); 1142 w.stop ();
1114 } 1143 }
1115 1144
… …
1151 } 1180 }
1152 else 1181 else
1153 { 1182 {
1154 pty_ev.stop (); 1183 pty_ev.stop ();
1155 1184
1156 if (!OPTION (Opt_hold)) 1185 if (!option (Opt_hold))
1157 destroy (); 1186 destroy ();
1158 } 1187 }
1159 1188
1160 return false; 1189 return false;
1161} 1190}
1162 1191
1163void 1192void
1164rxvt_term::pty_cb (io_watcher &w, short revents) 1193rxvt_term::pty_cb (ev::io &w, int revents)
1165{ 1194{
1166 make_current (); 1195 make_current ();
1167 1196
1168 if (revents & EVENT_READ) 1197 if (revents & ev::READ)
1169 // loop, but don't allow a single term to monopolize us 1198 // loop, but don't allow a single term to monopolize us
1170 while (pty_fill ()) 1199 for (int i = CBUFCNT; i-- && pty_fill (); )
1171 if (cmd_parse ()) 1200 cmd_parse ();
1172 break;
1173 1201
1174 if (revents & EVENT_WRITE) 1202 if (revents & ev::WRITE)
1175 pty_write (); 1203 pty_write ();
1204
1205 refresh_check ();
1176} 1206}
1177 1207
1178void 1208void
1179rxvt_term::pointer_unblank () 1209rxvt_term::pointer_unblank ()
1180{ 1210{
1181 XDefineCursor (xdisp, vt, TermWin_cursor); 1211 XDefineCursor (dpy, vt, TermWin_cursor);
1182 recolour_cursor (); 1212 recolour_cursor ();
1183 1213
1184#ifdef POINTER_BLANK 1214#ifdef POINTER_BLANK
1185 hidden_pointer = 0; 1215 hidden_pointer = 0;
1186 1216
1187 if (OPTION (Opt_pointerBlank)) 1217 if (option (Opt_pointerBlank))
1188 pointer_ev.start (NOW + pointerBlankDelay); 1218 pointer_ev.start (pointerBlankDelay);
1189#endif 1219#endif
1190} 1220}
1191 1221
1192#ifdef POINTER_BLANK 1222#ifdef POINTER_BLANK
1193void 1223void
1194rxvt_term::pointer_blank () 1224rxvt_term::pointer_blank ()
1195{ 1225{
1196 if (!OPTION (Opt_pointerBlank)) 1226 if (!option (Opt_pointerBlank))
1197 return; 1227 return;
1198 1228
1199 XDefineCursor (xdisp, vt, display->blank_cursor); 1229 XDefineCursor (dpy, vt, display->blank_cursor);
1200 XFlush (xdisp); 1230 XFlush (dpy);
1201 1231
1202 hidden_pointer = 1; 1232 hidden_pointer = 1;
1203} 1233}
1204 1234
1205void 1235void
1206rxvt_term::pointer_cb (time_watcher &w) 1236rxvt_term::pointer_cb (ev::timer &w, int revents)
1207{ 1237{
1208 make_current (); 1238 make_current ();
1209 1239
1210 pointer_blank (); 1240 pointer_blank ();
1211} 1241}
… …
1214void 1244void
1215rxvt_term::mouse_report (XButtonEvent &ev) 1245rxvt_term::mouse_report (XButtonEvent &ev)
1216{ 1246{
1217 int button_number, key_state = 0; 1247 int button_number, key_state = 0;
1218 int x, y; 1248 int x, y;
1249 int code = 32;
1219 1250
1220 x = ev.x; 1251 x = Pixel2Col (ev.x);
1221 y = ev.y; 1252 y = Pixel2Row (ev.y);
1222 pixel_position (&x, &y); 1253 if (ev.type == MotionNotify)
1254 {
1255 if (x == mouse_row && y == mouse_col)
1256 return;
1257 mouse_row = x;
1258 mouse_col = y;
1259 code += 32;
1260 }
1223 1261
1224 if (MEvent.button == AnyButton) 1262 if (MEvent.button == AnyButton)
1225 button_number = 3; 1263 button_number = 3;
1226 else 1264 else
1227 { 1265 {
… …
1273 x + 1, 1311 x + 1,
1274 y + 1); 1312 y + 1);
1275#endif 1313#endif
1276 1314
1277 tt_printf ("\033[M%c%c%c", 1315 tt_printf ("\033[M%c%c%c",
1278 (32 + button_number + key_state), 1316 (code + button_number + key_state),
1279 (32 + x + 1), 1317 (32 + x + 1),
1280 (32 + y + 1)); 1318 (32 + y + 1));
1281} 1319}
1282 1320
1283/*{{{ process an X event */ 1321/*{{{ process an X event */
1284void 1322void
1285rxvt_term::x_cb (XEvent &ev) 1323rxvt_term::x_cb (XEvent &ev)
1286{ 1324{
1287 make_current (); 1325 make_current ();
1288 1326
1289 dLocal (Display *, xdisp); 1327 dLocal (Display *, dpy);
1290 1328
1291 if (ev.xany.window == vt 1329 if (ev.xany.window == vt
1292 && SHOULD_INVOKE (HOOK_X_EVENT) 1330 && SHOULD_INVOKE (HOOK_X_EVENT)
1293 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1331 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1294 return; 1332 return;
… …
1299 unsigned int unused_mask; 1337 unsigned int unused_mask;
1300 1338
1301 switch (ev.type) 1339 switch (ev.type)
1302 { 1340 {
1303 case KeyPress: 1341 case KeyPress:
1304#if ISO_14755 1342 key_press (ev.xkey);
1305 if (!(iso14755buf & ISO_14755_52))
1306#endif
1307 lookup_key (ev.xkey);
1308
1309 break; 1343 break;
1310 1344
1311 case KeyRelease: 1345 case KeyRelease:
1312 { 1346 key_release (ev.xkey);
1313#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1314 KeySym keysym;
1315
1316 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1317#endif
1318
1319#if ENABLE_FRILLS || ISO_14755
1320 // ISO 14755 support
1321 if (iso14755buf)
1322 if (iso14755buf & ISO_14755_52)
1323 {
1324# if ENABLE_OVERLAY
1325 scr_overlay_off ();
1326# endif
1327# if ISO_14755
1328 // iso14755 part 5.2 handling: release time
1329 // first: controls
1330 if ((ev.xkey.state & ControlMask)
1331 && ((keysym >= 0x40 && keysym <= 0x5f)
1332 || (keysym >= 0x61 && keysym <= 0x7f)))
1333 {
1334 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1335 commit_iso14755 ();
1336 goto skip_switch;
1337 }
1338
1339 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1340 if (i[0] == keysym)
1341 {
1342 iso14755buf = ISO_14755_51 | i[1];
1343 commit_iso14755 ();
1344 goto skip_switch;
1345 }
1346
1347 scr_bell ();
1348# endif
1349 iso14755buf = 0;
1350 break;
1351 }
1352 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1353 {
1354# if ENABLE_OVERLAY
1355 scr_overlay_off ();
1356# endif
1357 if (iso14755buf & ISO_14755_51)
1358 commit_iso14755 ();
1359#if ISO_14755
1360 else if (iso14755buf & ISO_14755_STARTED)
1361 {
1362 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1363
1364 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1365 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1366 }
1367# endif
1368 else
1369 iso14755buf = 0;
1370 }
1371#endif
1372
1373 if (ev.xany.window == vt
1374 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1375 break;
1376
1377#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1378 if (!(ev.xkey.state & ControlMask))
1379 slip_wheel_ev.stop ();
1380 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1381 mouse_slip_wheel_speed = 0;
1382#endif
1383 break; 1347 break;
1384 }
1385 1348
1386 case ButtonPress: 1349 case ButtonPress:
1387 button_press (ev.xbutton); 1350 button_press (ev.xbutton);
1388 break; 1351 break;
1389 1352
… …
1404 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END))) 1367 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1405 destroy (); 1368 destroy ();
1406 } 1369 }
1407#if ENABLE_EWMH 1370#if ENABLE_EWMH
1408 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1371 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1409 XSendEvent (xdisp, ev.xclient.window = display->root, 1372 XSendEvent (dpy, ev.xclient.window = display->root,
1410 False, SubstructureRedirectMask | SubstructureNotifyMask, 1373 False, SubstructureRedirectMask | SubstructureNotifyMask,
1411 &ev); 1374 &ev);
1412#endif 1375#endif
1413 } 1376 }
1414 } 1377 }
… …
1420 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1383 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1421 focus_out (); 1384 focus_out ();
1422 } 1385 }
1423#endif 1386#endif
1424 } 1387 }
1425 break;
1426
1427 case MappingNotify:
1428 XRefreshKeyboardMapping (&ev.xmapping);
1429 break; 1388 break;
1430 1389
1431 /* 1390 /*
1432 * XXX: this is not the _current_ arrangement 1391 * XXX: this is not the _current_ arrangement
1433 * Here's my conclusion: 1392 * Here's my conclusion:
… …
1452 break; 1411 break;
1453 } 1412 }
1454 break; 1413 break;
1455 1414
1456 case FocusIn: 1415 case FocusIn:
1416 if (ev.xfocus.detail != NotifyInferior
1417 && ev.xfocus.detail != NotifyPointer
1418 && ev.xfocus.mode != NotifyGrab)
1457 focus_in (); 1419 focus_in ();
1458 break; 1420 break;
1459 1421
1460 case FocusOut: 1422 case FocusOut:
1423 if (ev.xfocus.detail != NotifyInferior
1424 && ev.xfocus.detail != NotifyPointer
1425 && ev.xfocus.mode != NotifyGrab)
1461 focus_out (); 1426 focus_out ();
1462 break; 1427 break;
1463 1428
1464 case ConfigureNotify: 1429 case ConfigureNotify:
1430 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1431 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1432 szHint.width, szHint.height);*/
1465 if (ev.xconfigure.window == parent[0]) 1433 if (ev.xconfigure.window == parent[0])
1466 { 1434 {
1467 while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev)) 1435 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1468 ; 1436 ;
1469 1437
1470 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1438 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1471 { 1439 {
1472 seen_resize = 1; 1440 seen_resize = 1;
1473 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1441 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1474 } 1442 }
1443 else
1444 {
1445#ifdef HAVE_BG_PIXMAP
1446 if (bgPixmap.window_position_sensitive ())
1447 {
1448 if (mapped)
1449 update_background ();
1450 else
1451 bgPixmap.invalidate ();
1452 }
1453#endif
1454 }
1475 1455
1476 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1456 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1477
1478#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1479 if (OPTION (Opt_transparent))
1480 check_our_parents ();
1481#endif
1482 } 1457 }
1483 break; 1458 break;
1484 1459
1485 case PropertyNotify: 1460 case PropertyNotify:
1486 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1461 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
… …
1489 selection_property (ev.xproperty.window, ev.xproperty.atom); 1464 selection_property (ev.xproperty.window, ev.xproperty.atom);
1490 1465
1491 break; 1466 break;
1492 1467
1493 case SelectionClear: 1468 case SelectionClear:
1494 selection_clear (); 1469 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1495 break; 1470 break;
1496 1471
1497 case SelectionNotify: 1472 case SelectionNotify:
1498 if (selection_wait == Sel_normal) 1473 if (selection_wait == Sel_normal)
1499 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1474 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
… …
1502 case SelectionRequest: 1477 case SelectionRequest:
1503 selection_send (ev.xselectionrequest); 1478 selection_send (ev.xselectionrequest);
1504 break; 1479 break;
1505 1480
1506 case MapNotify: 1481 case MapNotify:
1482#ifdef HAVE_BG_PIXMAP
1483 /* This is needed spcifically to fix the case of no window manager or a
1484 * non-reparenting window manager. In those cases we never get first
1485 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1486 * care of multiplicity of ConfigureNotify events arriwing while WM does
1487 * reparenting.
1488 * We should not render background immidiately, as there could be several
1489 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1490 * by scheduling background redraw as soon as we can, but giving a short
1491 * bit of time for ConfigureNotifies to arrive.
1492 * We should render background PRIOR to drawing any text, but AFTER all
1493 * of ConfigureNotifys for the best results.
1494 */
1495 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1496 update_background_ev.start (0.025);
1497#endif
1507 mapped = 1; 1498 mapped = 1;
1508#ifdef TEXT_BLINK 1499#ifdef TEXT_BLINK
1509 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1500 text_blink_ev.start ();
1510#endif 1501#endif
1511 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1502 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1512 break; 1503 break;
1513 1504
1514 case UnmapNotify: 1505 case UnmapNotify:
… …
1516#ifdef TEXT_BLINK 1507#ifdef TEXT_BLINK
1517 text_blink_ev.stop (); 1508 text_blink_ev.stop ();
1518#endif 1509#endif
1519 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1510 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1520 break; 1511 break;
1521
1522#ifdef TRANSPARENT
1523 case ReparentNotify:
1524 rootwin_cb (ev);
1525 break;
1526#endif /* TRANSPARENT */
1527 1512
1528 case GraphicsExpose: 1513 case GraphicsExpose:
1529 case Expose: 1514 case Expose:
1530 if (ev.xany.window == vt) 1515 if (ev.xany.window == vt)
1531 { 1516 {
1532 do 1517 do
1518 {
1533 scr_expose (ev.xexpose.x, ev.xexpose.y, 1519 scr_expose (ev.xexpose.x, ev.xexpose.y,
1534 ev.xexpose.width, ev.xexpose.height, False); 1520 ev.xexpose.width, ev.xexpose.height, False);
1521 }
1535 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev)); 1522 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1536 1523
1537 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1524 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1538 1525
1539 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev)) 1526 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1527 {
1540 scr_expose (ev.xexpose.x, ev.xexpose.y, 1528 scr_expose (ev.xexpose.x, ev.xexpose.y,
1541 ev.xexpose.width, ev.xexpose.height, False); 1529 ev.xexpose.width, ev.xexpose.height, False);
1530 }
1542 1531
1543 want_refresh = 1; 1532 want_refresh = 1;
1544 } 1533 }
1545 else 1534 else
1546 { 1535 {
1547 XEvent unused_event; 1536 XEvent unused_event;
1548 1537
1549 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event)) 1538 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1550 ; 1539 ;
1551 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event)) 1540 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1552 ; 1541 ;
1553 1542
1554 if (isScrollbarWindow (ev.xany.window)) 1543 if (scrollBar.state && ev.xany.window == scrollBar.win)
1555 { 1544 {
1556 scrollBar.setIdle (); 1545 scrollBar.state = STATE_IDLE;
1557 scrollbar_show (0); 1546 scrollBar.show (0);
1558 } 1547 }
1559
1560#ifdef TRANSPARENT
1561 if (am_transparent && ev.xany.window == parent[0])
1562 XClearWindow (xdisp, ev.xany.window);
1563#endif
1564 } 1548 }
1565 break; 1549 break;
1566 1550
1567 case MotionNotify: 1551 case MotionNotify:
1568#ifdef POINTER_BLANK 1552#ifdef POINTER_BLANK
1569 if (hidden_pointer) 1553 if (hidden_pointer)
1570 pointer_unblank (); 1554 pointer_unblank ();
1571#endif 1555#endif
1556 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1557 || priv_modes & PrivMode_MouseAnyEvent)
1558 mouse_report (ev.xbutton);
1572 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1559 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1573 break; 1560 break;
1574 1561
1575 if (ev.xany.window == vt) 1562 if (ev.xany.window == vt)
1576 { 1563 {
1577 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1564 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1578 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1565 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1579 ; // nop 1566 ; // nop
1580 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1567 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1581 { 1568 {
1582 while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev)) 1569 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1583 ; 1570 ;
1584 1571
1585 XQueryPointer (xdisp, vt, 1572 XQueryPointer (dpy, vt,
1586 &unused_root, &unused_child, 1573 &unused_root, &unused_child,
1587 &unused_root_x, &unused_root_y, 1574 &unused_root_x, &unused_root_y,
1588 &ev.xbutton.x, &ev.xbutton.y, 1575 &ev.xbutton.x, &ev.xbutton.y,
1589 &ev.xbutton.state); 1576 &ev.xbutton.state);
1590#ifdef MOUSE_THRESHOLD 1577#ifdef MOUSE_THRESHOLD
… …
1610 int dist; 1597 int dist;
1611 1598
1612 /* don't clobber the current delay if we are 1599 /* don't clobber the current delay if we are
1613 * already in the middle of scrolling. 1600 * already in the middle of scrolling.
1614 */ 1601 */
1615 if (!sel_scroll_ev.active) 1602 if (!sel_scroll_ev.is_active ())
1616 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1603 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1617 1604
1618 /* save the event params so we can highlight 1605 /* save the event params so we can highlight
1619 * the selection in the pending-scroll loop 1606 * the selection in the pending-scroll loop
1620 */ 1607 */
1621 selection_save_x = ev.xbutton.x; 1608 selection_save_x = ev.xbutton.x;
… …
1643 else 1630 else
1644 { 1631 {
1645 /* we are within the text window, so we 1632 /* we are within the text window, so we
1646 * shouldn't be scrolling 1633 * shouldn't be scrolling
1647 */ 1634 */
1648 if (sel_scroll_ev.active)
1649 sel_scroll_ev.stop(); 1635 sel_scroll_ev.stop();
1650 } 1636 }
1651#endif 1637#endif
1652#ifdef MOUSE_THRESHOLD 1638#ifdef MOUSE_THRESHOLD
1653 } 1639 }
1654#endif 1640#endif
1655 } 1641 }
1656 } 1642 }
1657 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1643 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1658 { 1644 {
1659 while (XCheckTypedWindowEvent (xdisp, scrollBar.win, 1645 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1660 MotionNotify, &ev)) 1646 MotionNotify, &ev))
1661 ; 1647 ;
1662 1648
1663 XQueryPointer (xdisp, scrollBar.win, 1649 XQueryPointer (dpy, scrollBar.win,
1664 &unused_root, &unused_child, 1650 &unused_root, &unused_child,
1665 &unused_root_x, &unused_root_y, 1651 &unused_root_x, &unused_root_y,
1666 &ev.xbutton.x, &ev.xbutton.y, 1652 &ev.xbutton.x, &ev.xbutton.y,
1667 &unused_mask); 1653 &unused_mask);
1668 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1654 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1669 scrollbar_size ()); 1655 scrollBar.size ());
1670 want_refresh = 1; 1656 want_refresh = 1;
1671 refresh_limit = 0;
1672 scrollbar_show (1); 1657 scrollBar.show (1);
1673 } 1658 }
1674 break; 1659 break;
1675 } 1660 }
1676 1661
1677skip_switch: ;
1678
1679#if defined(CURSOR_BLINK) 1662#if defined(CURSOR_BLINK)
1680 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1663 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1681 { 1664 {
1682 if (hidden_cursor) 1665 if (hidden_cursor)
1683 { 1666 {
1684 hidden_cursor = 0; 1667 hidden_cursor = 0;
1685 want_refresh = 1; 1668 want_refresh = 1;
1686 } 1669 }
1687 1670
1688 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1671 cursor_blink_ev.again ();
1689 } 1672 }
1690#endif 1673#endif
1691 1674
1692#if defined(POINTER_BLANK) 1675#if defined(POINTER_BLANK)
1693 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1676 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1694 { 1677 {
1695 if (ev.type == MotionNotify 1678 if (ev.type == MotionNotify
1696 || ev.type == ButtonPress 1679 || ev.type == ButtonPress
1697 || ev.type == ButtonRelease) 1680 || ev.type == ButtonRelease)
1698 if (hidden_pointer) 1681 if (hidden_pointer)
… …
1700 1683
1701 if (ev.type == KeyPress && hidden_pointer == 0) 1684 if (ev.type == KeyPress && hidden_pointer == 0)
1702 pointer_blank (); 1685 pointer_blank ();
1703 } 1686 }
1704#endif 1687#endif
1688
1689 refresh_check ();
1705} 1690}
1691
1692#if ENABLE_FRILLS
1693void
1694rxvt_term::set_urgency (bool enable)
1695{
1696 if (enable == urgency_hint)
1697 return;
1698
1699 if (XWMHints *h = XGetWMHints (dpy, parent[0]))
1700 {
1701 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1702 XSetWMHints (dpy, parent[0], h);
1703 urgency_hint = enable;
1704 }
1705}
1706#endif
1706 1707
1707void 1708void
1708rxvt_term::focus_in () 1709rxvt_term::focus_in ()
1709{ 1710{
1710 if (!focus) 1711 if (!focus)
1711 { 1712 {
1712 focus = 1; 1713 focus = 1;
1713 want_refresh = 1; 1714 want_refresh = 1;
1714 1715
1715 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1716
1717#if USE_XIM 1716#if USE_XIM
1718 if (Input_Context != NULL) 1717 if (Input_Context != NULL)
1719 { 1718 {
1720 IMSetStatusPosition (); 1719 IMSetPosition ();
1721 XSetICFocus (Input_Context); 1720 XSetICFocus (Input_Context);
1722 } 1721 }
1723#endif 1722#endif
1724#if CURSOR_BLINK 1723#if CURSOR_BLINK
1725 if (OPTION (Opt_cursorBlink)) 1724 if (option (Opt_cursorBlink))
1726 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1725 cursor_blink_ev.again ();
1727#endif 1726#endif
1728#if OFF_FOCUS_FADING 1727#if OFF_FOCUS_FADING
1729 if (rs[Rs_fade]) 1728 if (rs[Rs_fade])
1730 { 1729 {
1731 pix_colors = pix_colors_focused; 1730 pix_colors = pix_colors_focused;
1732 scr_recolour (); 1731 scr_recolour ();
1733 } 1732 }
1734#endif 1733#endif
1734#if ENABLE_FRILLS
1735 if (option (Opt_urgentOnBell))
1736 set_urgency (0);
1737#endif
1738
1739 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1735 } 1740 }
1736} 1741}
1737 1742
1738void 1743void
1739rxvt_term::focus_out () 1744rxvt_term::focus_out ()
… …
1741 if (focus) 1746 if (focus)
1742 { 1747 {
1743 focus = 0; 1748 focus = 0;
1744 want_refresh = 1; 1749 want_refresh = 1;
1745 1750
1746 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1751#if ENABLE_FRILLS
1747 1752 if (option (Opt_urgentOnBell))
1753 set_urgency (0);
1754#endif
1748#if ENABLE_FRILLS || ISO_14755 1755#if ENABLE_FRILLS || ISO_14755
1749 if (iso14755buf) 1756 if (iso14755buf)
1750 { 1757 {
1751 iso14755buf = 0; 1758 iso14755buf = 0;
1752# if ENABLE_OVERLAY 1759# if ISO_14755
1753 scr_overlay_off (); 1760 scr_overlay_off ();
1754# endif 1761# endif
1755 } 1762 }
1756#endif 1763#endif
1757#if USE_XIM 1764#if USE_XIM
1758 if (Input_Context != NULL) 1765 if (Input_Context != NULL)
1759 XUnsetICFocus (Input_Context); 1766 XUnsetICFocus (Input_Context);
1760#endif 1767#endif
1761#if CURSOR_BLINK 1768#if CURSOR_BLINK
1762 if (OPTION (Opt_cursorBlink)) 1769 if (option (Opt_cursorBlink))
1763 cursor_blink_ev.stop (); 1770 cursor_blink_ev.stop ();
1771
1764 hidden_cursor = 0; 1772 hidden_cursor = 0;
1765#endif 1773#endif
1766#if OFF_FOCUS_FADING 1774#if OFF_FOCUS_FADING
1767 if (rs[Rs_fade]) 1775 if (rs[Rs_fade])
1768 { 1776 {
1769 pix_colors = pix_colors_unfocused; 1777 pix_colors = pix_colors_unfocused;
1770 scr_recolour (); 1778 scr_recolour ();
1771 } 1779 }
1772#endif 1780#endif
1781
1782 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1783 }
1784}
1785
1786void
1787rxvt_term::update_fade_color (unsigned int idx)
1788{
1789#if OFF_FOCUS_FADING
1790 if (rs[Rs_fade])
1773 } 1791 {
1792 rgba c;
1793 pix_colors [Color_fade].get (c);
1794 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1795 }
1796#endif
1774} 1797}
1775 1798
1776#if TRANSPARENT 1799#if ENABLE_TRANSPARENCY || ENABLE_PERL
1777void 1800void
1778rxvt_term::rootwin_cb (XEvent &ev) 1801rxvt_term::rootwin_cb (XEvent &ev)
1779{ 1802{
1780 make_current (); 1803 make_current ();
1781 1804
1805 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1806 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1807 return;
1808
1809# if ENABLE_TRANSPARENCY
1782 switch (ev.type) 1810 switch (ev.type)
1783 { 1811 {
1784 case PropertyNotify: 1812 case PropertyNotify:
1785 /* 1813 /*
1786 * if user used some Esetroot compatible prog to set the root bg, 1814 * if user used some Esetroot compatible prog to set the root bg,
1787 * use the property to determine the pixmap. We use it later on. 1815 * use the property to determine the pixmap. We use it later on.
1788 */ 1816 */
1789 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1817 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1790 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1818 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1791 return; 1819 {
1820 bgPixmap.set_root_pixmap ();
1821 update_background ();
1822 }
1792 1823
1793 /* FALLTHROUGH */
1794 case ReparentNotify:
1795 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1796 want_refresh = want_full_refresh = 1;
1797 break; 1824 break;
1798 } 1825 }
1826# endif
1827
1828 refresh_check ();
1799} 1829}
1800#endif 1830#endif
1801 1831
1802void 1832void
1803rxvt_term::button_press (XButtonEvent &ev) 1833rxvt_term::button_press (XButtonEvent &ev)
… …
1858 mouse_report (ev); 1888 mouse_report (ev);
1859 } 1889 }
1860#else 1890#else
1861 MEvent.button = ev.button; 1891 MEvent.button = ev.button;
1862 mouse_report (ev); 1892 mouse_report (ev);
1863#endif /* MOUSE_REPORT_DOUBLECLICK */ 1893#endif /* MOUSE_REPORT_DOUBLECLICK */
1864 1894
1865 } 1895 }
1866 else 1896 else
1867 { 1897 {
1868 if (ev.button != MEvent.button) 1898 if (ev.button != MEvent.button)
… …
1916 } 1946 }
1917 1947
1918 /* 1948 /*
1919 * Scrollbar window processing of button press 1949 * Scrollbar window processing of button press
1920 */ 1950 */
1921 if (isScrollbarWindow (ev.window)) 1951 if (scrollBar.state && ev.window == scrollBar.win)
1922 { 1952 {
1923 scrollBar.setIdle (); 1953 page_dirn direction = NO_DIR;
1954
1955 if (scrollBar.upButton (ev.y))
1956 direction = UP; /* up */
1957 else if (scrollBar.dnButton (ev.y))
1958 direction = DN; /* down */
1959
1960 scrollBar.state = STATE_IDLE;
1924 /* 1961 /*
1925 * Rxvt-style scrollbar: 1962 * Rxvt-style scrollbar:
1926 * move up if mouse is above slider 1963 * move up if mouse is above slider
1927 * move dn if mouse is below slider 1964 * move dn if mouse is below slider
1928 * 1965 *
… …
1937 /* 1974 /*
1938 * Mouse report disabled scrollbar: 1975 * Mouse report disabled scrollbar:
1939 * arrow buttons - send up/down 1976 * arrow buttons - send up/down
1940 * click on scrollbar - send pageup/down 1977 * click on scrollbar - send pageup/down
1941 */ 1978 */
1942 if ((scrollBar.style == R_SB_NEXT 1979 if (direction == UP)
1943 && scrollbarnext_upButton (ev.y))
1944 || (scrollBar.style == R_SB_RXVT
1945 && scrollbarrxvt_upButton (ev.y)))
1946 tt_printf ("\033[A"); 1980 tt_printf ("\033[A");
1947 else if ((scrollBar.style == R_SB_NEXT 1981 else if (direction == DN)
1948 && scrollbarnext_dnButton (ev.y))
1949 || (scrollBar.style == R_SB_RXVT
1950 && scrollbarrxvt_dnButton (ev.y)))
1951 tt_printf ("\033[B"); 1982 tt_printf ("\033[B");
1952 else 1983 else
1953 switch (ev.button) 1984 switch (ev.button)
1954 { 1985 {
1955 case Button2: 1986 case Button2:
… …
1962 tt_printf ("\033[5~"); 1993 tt_printf ("\033[5~");
1963 break; 1994 break;
1964 } 1995 }
1965 } 1996 }
1966 else 1997 else
1967#endif /* NO_SCROLLBAR_REPORT */ 1998#endif /* NO_SCROLLBAR_REPORT */
1968
1969 {
1970 char upordown = 0;
1971
1972 if (scrollBar.style == R_SB_NEXT)
1973 { 1999 {
1974 if (scrollbarnext_upButton (ev.y)) 2000 if (direction != NO_DIR)
1975 upordown = -1; /* up */
1976 else if (scrollbarnext_dnButton (ev.y))
1977 upordown = 1; /* down */
1978 }
1979 else if (scrollBar.style == R_SB_RXVT)
1980 {
1981 if (scrollbarrxvt_upButton (ev.y))
1982 upordown = -1; /* up */
1983 else if (scrollbarrxvt_dnButton (ev.y))
1984 upordown = 1; /* down */
1985 }
1986 if (upordown)
1987 { 2001 {
1988#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2002#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2003 if (!cont_scroll_ev.is_active ())
1989 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2004 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1990#endif 2005#endif
1991 if (scr_page (upordown < 0 ? UP : DN, 1)) 2006 if (scr_page (direction, 1))
1992 { 2007 {
1993 if (upordown < 0) 2008 if (direction == UP)
1994 scrollBar.setUp (); 2009 scrollBar.state = STATE_UP;
1995 else 2010 else
1996 scrollBar.setDn (); 2011 scrollBar.state = STATE_DOWN;
1997 } 2012 }
1998 } 2013 }
1999 else 2014 else
2000 switch (ev.button) 2015 switch (ev.button)
2001 { 2016 {
2002 case Button2: 2017 case Button2:
2003 switch (scrollbar_align) 2018 switch (scrollBar.align)
2004 { 2019 {
2005 case R_SB_ALIGN_TOP: 2020 case R_SB_ALIGN_TOP:
2006 csrO = 0; 2021 csrO = 0;
2007 break; 2022 break;
2008 case R_SB_ALIGN_CENTRE: 2023 case R_SB_ALIGN_CENTRE:
… …
2014 } 2029 }
2015 2030
2016 if (scrollBar.style == R_SB_XTERM 2031 if (scrollBar.style == R_SB_XTERM
2017 || scrollbar_above_slider (ev.y) 2032 || scrollbar_above_slider (ev.y)
2018 || scrollbar_below_slider (ev.y)) 2033 || scrollbar_below_slider (ev.y))
2019 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2034 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2020 2035
2021 scrollBar.setMotion (); 2036 scrollBar.state = STATE_MOTION;
2022 break; 2037 break;
2023 2038
2024 case Button1: 2039 case Button1:
2025 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2040 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2026 csrO = ev.y - scrollBar.top; 2041 csrO = ev.y - scrollBar.top;
2027 /* FALLTHROUGH */ 2042 /* FALLTHROUGH */
2028 2043
2029 case Button3: 2044 case Button3:
2030 if (scrollBar.style != R_SB_XTERM) 2045 if (scrollBar.style != R_SB_XTERM)
… …
2040 scr_page (DN, nrow - 1); 2055 scr_page (DN, nrow - 1);
2041# else 2056# else
2042 scr_page (DN, nrow / 4); 2057 scr_page (DN, nrow / 4);
2043# endif 2058# endif
2044 else 2059 else
2045 scrollBar.setMotion (); 2060 scrollBar.state = STATE_MOTION;
2046 } 2061 }
2047 else 2062 else
2048 { 2063 {
2049 scr_page ((ev.button == Button1 ? DN : UP), 2064 scr_page ((ev.button == Button1 ? DN : UP),
2050 (nrow 2065 (nrow
2051 * scrollbar_position (ev.y) 2066 * scrollbar_position (ev.y)
2052 / scrollbar_size ())); 2067 / scrollBar.size ()));
2053 } 2068 }
2054 2069
2055 break; 2070 break;
2056 } 2071 }
2057 } 2072 }
… …
2067 2082
2068 csrO = 0; /* reset csr Offset */ 2083 csrO = 0; /* reset csr Offset */
2069 if (!bypass_keystate) 2084 if (!bypass_keystate)
2070 reportmode = !! (priv_modes & PrivMode_mouse_report); 2085 reportmode = !! (priv_modes & PrivMode_mouse_report);
2071 2086
2072 if (scrollbar_isUpDn ()) 2087 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2073 { 2088 {
2074 scrollBar.setIdle (); 2089 scrollBar.state = STATE_IDLE;
2075 scrollbar_show (0); 2090 scrollBar.show (0);
2076 } 2091 }
2077 2092
2078#ifdef SELECTION_SCROLLING 2093#ifdef SELECTION_SCROLLING
2079 if (sel_scroll_ev.active)
2080 sel_scroll_ev.stop(); 2094 sel_scroll_ev.stop();
2081#endif 2095#endif
2082 2096
2083 if (ev.window == vt) 2097 if (ev.window == vt)
2084 { 2098 {
2085 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2099 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
… …
2109 mouse_report (ev); 2123 mouse_report (ev);
2110 } 2124 }
2111#else /* MOUSE_REPORT_DOUBLECLICK */ 2125#else /* MOUSE_REPORT_DOUBLECLICK */
2112 MEvent.button = AnyButton; 2126 MEvent.button = AnyButton;
2113 mouse_report (ev); 2127 mouse_report (ev);
2114#endif /* MOUSE_REPORT_DOUBLECLICK */ 2128#endif /* MOUSE_REPORT_DOUBLECLICK */
2115 return; 2129 return;
2116 } 2130 }
2117 2131
2118 /* 2132 /*
2119 * dumb hack to compensate for the failure of click-and-drag 2133 * dumb hack to compensate for the failure of click-and-drag
… …
2131 selection_make (ev.time); 2145 selection_make (ev.time);
2132 break; 2146 break;
2133 2147
2134 case Button2: 2148 case Button2:
2135 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2149 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2136 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary); 2150 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2137 break; 2151 break;
2138 2152
2139#ifdef MOUSE_WHEEL 2153#ifdef MOUSE_WHEEL
2140 case Button4: 2154 case Button4:
2141 case Button5: 2155 case Button5:
… …
2145 2159
2146 v = ev.button == Button4 ? UP : DN; 2160 v = ev.button == Button4 ? UP : DN;
2147 2161
2148 if (ev.state & ShiftMask) 2162 if (ev.state & ShiftMask)
2149 i = 1; 2163 i = 1;
2150 else if (OPTION (Opt_mouseWheelScrollPage)) 2164 else if (option (Opt_mouseWheelScrollPage))
2151 i = nrow - 1; 2165 i = nrow - 1;
2152 else 2166 else
2153 i = 5; 2167 i = 5;
2154 2168
2155# ifdef MOUSE_SLIP_WHEELING 2169# ifdef MOUSE_SLIP_WHEELING
… …
2157 { 2171 {
2158 mouse_slip_wheel_speed += v ? -1 : 1; 2172 mouse_slip_wheel_speed += v ? -1 : 1;
2159 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2173 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2160 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2174 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2161 2175
2162 if (slip_wheel_ev.at < NOW) 2176 if (!slip_wheel_ev.is_active ())
2163 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2177 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2164
2165 slip_wheel_ev.start ();
2166 } 2178 }
2167 else 2179 else
2180# endif
2168 { 2181 {
2169# endif
2170 scr_page (v, i); 2182 scr_page (v, i);
2171 scrollbar_show (1); 2183 scrollBar.show (1);
2172# ifdef MOUSE_SLIP_WHEELING
2173 } 2184 }
2174# endif
2175 } 2185 }
2176 break; 2186 break;
2177#endif 2187#endif
2178 } 2188 }
2179 } 2189 }
2180} 2190}
2181 2191
2182#ifdef TRANSPARENT
2183#if TINTING
2184/* taken from aterm-0.4.2 */
2185
2186typedef uint32_t RUINT32T;
2187
2188void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2189{
2190 int sh_r, sh_g, sh_b;
2191 RUINT32T mask_r, mask_g, mask_b;
2192 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2193 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2194 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2195 int i;
2196
2197 Visual *visual = term->visual;
2198
2199 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2200
2201 /* for convenience */
2202 mask_r = visual->red_mask;
2203 mask_g = visual->green_mask;
2204 mask_b = visual->blue_mask;
2205
2206 /* boring lookup table pre-initialization */
2207 switch (srcImage->bits_per_pixel) {
2208 case 15:
2209 if ((mask_r != 0x7c00) ||
2210 (mask_g != 0x03e0) ||
2211 (mask_b != 0x001f))
2212 return;
2213 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2214 lookup_r = lookup;
2215 lookup_g = lookup+32;
2216 lookup_b = lookup+32+32;
2217 sh_r = 10;
2218 sh_g = 5;
2219 sh_b = 0;
2220 break;
2221 case 16:
2222 if ((mask_r != 0xf800) ||
2223 (mask_g != 0x07e0) ||
2224 (mask_b != 0x001f))
2225 return;
2226 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2227 lookup_r = lookup;
2228 lookup_g = lookup+32;
2229 lookup_b = lookup+32+64;
2230 sh_r = 11;
2231 sh_g = 5;
2232 sh_b = 0;
2233 break;
2234 case 24:
2235 if ((mask_r != 0xff0000) ||
2236 (mask_g != 0x00ff00) ||
2237 (mask_b != 0x0000ff))
2238 return;
2239 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2240 lookup_r = lookup;
2241 lookup_g = lookup+256;
2242 lookup_b = lookup+256+256;
2243 sh_r = 16;
2244 sh_g = 8;
2245 sh_b = 0;
2246 break;
2247 case 32:
2248 if ((mask_r != 0xff0000) ||
2249 (mask_g != 0x00ff00) ||
2250 (mask_b != 0x0000ff))
2251 return;
2252 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2253 lookup_r = lookup;
2254 lookup_g = lookup+256;
2255 lookup_b = lookup+256+256;
2256 sh_r = 16;
2257 sh_g = 8;
2258 sh_b = 0;
2259 break;
2260 default:
2261 return; /* we do not support this color depth */
2262 }
2263
2264 /* prepare limits for color transformation (each channel is handled separately) */
2265 if (shade < 0) {
2266 shade = -shade;
2267 if (shade < 0) shade = 0;
2268 if (shade > 100) shade = 100;
2269
2270 lower_lim_r = 65535-rm;
2271 lower_lim_g = 65535-gm;
2272 lower_lim_b = 65535-bm;
2273
2274 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2275 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2276 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2277
2278 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2279 } else {
2280 if (shade < 0) shade = 0;
2281 if (shade > 100) shade = 100;
2282
2283 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2284
2285 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2286 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2287 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2288 }
2289
2290 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2291 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2292 {
2293 unsigned int tmp;
2294
2295 tmp = lower_lim_r;
2296 lower_lim_r = lower_lim_b;
2297 lower_lim_b = tmp;
2298
2299 tmp = upper_lim_r;
2300 upper_lim_r = upper_lim_b;
2301 upper_lim_b = tmp;
2302 }
2303
2304 /* fill our lookup tables */
2305 for (i = 0; i <= mask_r>>sh_r; i++)
2306 {
2307 RUINT32T tmp;
2308 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2309 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2310 lookup_r[i] = (tmp/65535)<<sh_r;
2311 }
2312 for (i = 0; i <= mask_g>>sh_g; i++)
2313 {
2314 RUINT32T tmp;
2315 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2316 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2317 lookup_g[i] = (tmp/65535)<<sh_g;
2318 }
2319 for (i = 0; i <= mask_b>>sh_b; i++)
2320 {
2321 RUINT32T tmp;
2322 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2323 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2324 lookup_b[i] = (tmp/65535)<<sh_b;
2325 }
2326
2327 /* apply table to input image (replacing colors by newly calculated ones) */
2328 switch (srcImage->bits_per_pixel)
2329 {
2330 case 15:
2331 {
2332 unsigned short *p1, *pf, *p, *pl;
2333 p1 = (unsigned short *) srcImage->data;
2334 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2335 while (p1 < pf)
2336 {
2337 p = p1;
2338 pl = p1 + srcImage->width;
2339 for (; p < pl; p++)
2340 {
2341 *p = lookup_r[(*p & 0x7c00)>>10] |
2342 lookup_g[(*p & 0x03e0)>> 5] |
2343 lookup_b[(*p & 0x001f)];
2344 }
2345 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2346 }
2347 break;
2348 }
2349 case 16:
2350 {
2351 unsigned short *p1, *pf, *p, *pl;
2352 p1 = (unsigned short *) srcImage->data;
2353 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2354 while (p1 < pf)
2355 {
2356 p = p1;
2357 pl = p1 + srcImage->width;
2358 for (; p < pl; p++)
2359 {
2360 *p = lookup_r[(*p & 0xf800)>>11] |
2361 lookup_g[(*p & 0x07e0)>> 5] |
2362 lookup_b[(*p & 0x001f)];
2363 }
2364 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2365 }
2366 break;
2367 }
2368 case 24:
2369 {
2370 unsigned char *p1, *pf, *p, *pl;
2371 p1 = (unsigned char *) srcImage->data;
2372 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2373 while (p1 < pf)
2374 {
2375 p = p1;
2376 pl = p1 + srcImage->width * 3;
2377 for (; p < pl; p += 3)
2378 {
2379 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2380 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2381 p[2] = lookup_r[(p[2] & 0x0000ff)];
2382 }
2383 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2384 }
2385 break;
2386 }
2387 case 32:
2388 {
2389 RUINT32T *p1, *pf, *p, *pl;
2390 p1 = (RUINT32T *) srcImage->data;
2391 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2392
2393 while (p1 < pf)
2394 {
2395 p = p1;
2396 pl = p1 + srcImage->width;
2397 for (; p < pl; p++)
2398 {
2399 *p = lookup_r[(*p & 0xff0000)>>16] |
2400 lookup_g[(*p & 0x00ff00)>> 8] |
2401 lookup_b[(*p & 0x0000ff)] |
2402 (*p & ~0xffffff);
2403 }
2404 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2405 }
2406 break;
2407 }
2408 }
2409
2410 free (lookup);
2411}
2412#endif
2413
2414/*
2415 * Check our parents are still who we think they are.
2416 * Do transparency updates if required
2417 */
2418int
2419rxvt_term::check_our_parents ()
2420{
2421 int i, pchanged, aformat, have_pixmap, rootdepth;
2422 unsigned long nitems, bytes_after;
2423 Atom atype;
2424 unsigned char *prop = NULL;
2425 Window root, oldp, *list;
2426 Pixmap rootpixmap = None;
2427 XWindowAttributes wattr, wrootattr;
2428
2429 pchanged = 0;
2430
2431 if (!OPTION (Opt_transparent))
2432 return pchanged; /* Don't try any more */
2433
2434 XGetWindowAttributes (xdisp, display->root, &wrootattr);
2435 rootdepth = wrootattr.depth;
2436
2437 XGetWindowAttributes (xdisp, parent[0], &wattr);
2438
2439 if (rootdepth != wattr.depth)
2440 {
2441 if (am_transparent)
2442 {
2443 pchanged = 1;
2444 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2445 am_transparent = am_pixmap_trans = 0;
2446 }
2447
2448 return pchanged; /* Don't try any more */
2449 }
2450
2451 /* Get all X ops out of the queue so that our information is up-to-date. */
2452 XSync (xdisp, False);
2453
2454 /*
2455 * Make the frame window set by the window manager have
2456 * the root background. Some window managers put multiple nested frame
2457 * windows for each client, so we have to take care about that.
2458 */
2459 i = (xa[XA_XROOTPMAP_ID]
2460 && XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
2461 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2462 &nitems, &bytes_after, &prop) == Success);
2463
2464 if (!i || prop == NULL)
2465 i = (xa[XA_ESETROOT_PMAP_ID]
2466 && XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2467 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2468 &nitems, &bytes_after, &prop) == Success);
2469
2470 if (!i || prop == NULL
2471#if TINTING
2472 || !ISSET_PIXCOLOR (Color_tint)
2473#endif
2474 )
2475 have_pixmap = 0;
2476 else
2477 {
2478 have_pixmap = 1;
2479 rootpixmap = *(Pixmap *)prop;
2480 XFree (prop);
2481 }
2482
2483 if (have_pixmap)
2484 {
2485 /*
2486 * Copy display->root pixmap transparency
2487 */
2488 int sx, sy, nx, ny;
2489 unsigned int nw, nh;
2490 Window cr;
2491 XImage *image;
2492 GC gc;
2493 XGCValues gcvalue;
2494
2495 XTranslateCoordinates (xdisp, parent[0], display->root,
2496 0, 0, &sx, &sy, &cr);
2497 nw = (unsigned int)szHint.width;
2498 nh = (unsigned int)szHint.height;
2499 nx = ny = 0;
2500
2501 if (sx < 0)
2502 {
2503 nw += sx;
2504 nx = -sx;
2505 sx = 0;
2506 }
2507
2508 if (sy < 0)
2509 {
2510 nh += sy;
2511 ny = -sy;
2512 sy = 0;
2513 }
2514
2515 min_it (nw, (unsigned int) (wrootattr.width - sx));
2516 min_it (nh, (unsigned int) (wrootattr.height - sy));
2517
2518 XSync (xdisp, False);
2519 allowedxerror = -1;
2520 image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2521
2522 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2523 /* XXX: may need a delay here? */
2524 allowedxerror = 0;
2525
2526 if (image == NULL)
2527 {
2528 if (am_transparent && am_pixmap_trans)
2529 {
2530 pchanged = 1;
2531 if (pixmap != None)
2532 {
2533 XFreePixmap (xdisp, pixmap);
2534 pixmap = None;
2535 }
2536 }
2537
2538 am_pixmap_trans = 0;
2539 }
2540 else
2541 {
2542 if (pixmap != None)
2543 XFreePixmap (xdisp, pixmap);
2544
2545#if TINTING
2546 if (ISSET_PIXCOLOR (Color_tint))
2547 {
2548 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2549
2550 rgba c;
2551 pix_colors_focused [Color_tint].get (c);
2552
2553 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2554 }
2555#endif
2556
2557 pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2558 gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2559 XPutImage (xdisp, pixmap, gc, image, 0, 0,
2560 nx, ny, image->width, image->height);
2561 XFreeGC (xdisp, gc);
2562 XDestroyImage (image);
2563 XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2564 XClearWindow (xdisp, parent[0]);
2565
2566 if (!am_transparent || !am_pixmap_trans)
2567 pchanged = 1;
2568
2569 am_transparent = am_pixmap_trans = 1;
2570 }
2571 }
2572
2573 if (am_pixmap_trans)
2574 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2575 else
2576 {
2577 unsigned int n;
2578 /*
2579 * InheritPixmap transparency
2580 */
2581 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2582 {
2583 oldp = parent[i];
2584 XQueryTree (xdisp, parent[i - 1], &root, &parent[i], &list, &n);
2585 XFree (list);
2586
2587 if (parent[i] == display->root)
2588 {
2589 if (oldp != None)
2590 pchanged = 1;
2591
2592 break;
2593 }
2594
2595 if (oldp != parent[i])
2596 pchanged = 1;
2597 }
2598
2599 n = 0;
2600
2601 if (pchanged)
2602 for (; n < (unsigned int)i; n++)
2603 {
2604 XGetWindowAttributes (xdisp, parent[n], &wattr);
2605
2606 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2607 {
2608 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2609 break;
2610 }
2611 }
2612
2613 if (n > (sizeof (parent) / sizeof (parent[0])))
2614 {
2615 XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2616 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2617 am_transparent = 0;
2618 /* XXX: also turn off Opt_transparent? */
2619 }
2620 else
2621 {
2622 for (n = 0; n < (unsigned int)i; n++)
2623 {
2624 XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2625 XClearWindow (xdisp, parent[n]);
2626 }
2627
2628 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2629 am_transparent = 1;
2630 }
2631
2632 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2633 parent[i] = None;
2634 }
2635
2636 if (scrollBar.win)
2637 {
2638 XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
2639 scrollBar.setIdle ();
2640 scrollbar_show (0);
2641 }
2642
2643 if (am_transparent)
2644 {
2645 want_refresh = want_full_refresh = 1;
2646 if (am_pixmap_trans)
2647 flush ();
2648 }
2649
2650 return pchanged;
2651}
2652#endif
2653
2654/*}}} */ 2192/*}}} */
2655 2193
2656bool 2194void
2657rxvt_term::cmd_parse () 2195rxvt_term::cmd_parse ()
2658{ 2196{
2659 bool flag = false;
2660 wchar_t ch = NOCHAR; 2197 wchar_t ch = NOCHAR;
2661 char *seq_begin; // remember start of esc-sequence here 2198 char *seq_begin; // remember start of esc-sequence here
2662 2199
2663 for (;;) 2200 for (;;)
2664 { 2201 {
2665 if (ch == NOCHAR) 2202 if (expect_false (ch == NOCHAR))
2666 { 2203 {
2667 seq_begin = cmdbuf_ptr; 2204 seq_begin = cmdbuf_ptr;
2668 ch = next_char (); 2205 ch = next_char ();
2669 2206
2670 if (ch == NOCHAR) 2207 if (ch == NOCHAR)
2671 break; 2208 break;
2672 } 2209 }
2673 2210
2674 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2211 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2675 { 2212 {
2676 if (!seen_input) 2213 if (expect_false (!seen_input))
2677 { 2214 {
2678 seen_input = 1; 2215 seen_input = 1;
2679 // many badly-written programs (e.g. jed) contain a race condition: 2216 // many badly-written programs (e.g. jed) contain a race condition:
2680 // they first read the screensize and then install a SIGWINCH handler. 2217 // they first read the screensize and then install a SIGWINCH handler.
2681 // some window managers resize the window early, and these programs 2218 // some window managers resize the window early, and these programs
… …
2694 wchar_t *str = buf; 2231 wchar_t *str = buf;
2695 wchar_t *eol = str + min (ncol, UBUFSIZ); 2232 wchar_t *eol = str + min (ncol, UBUFSIZ);
2696 2233
2697 for (;;) 2234 for (;;)
2698 { 2235 {
2699 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2236 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2700 break; 2237 break;
2701 2238
2702 *str++ = ch; 2239 *str++ = ch;
2703 2240
2704 if (ch == C0_LF || str >= eol) 2241 if (expect_false (ch == C0_LF || str >= eol))
2705 { 2242 {
2706 if (ch == C0_LF) 2243 if (ch == C0_LF)
2707 nlines++; 2244 nlines++;
2708 2245
2709 refresh_count++; 2246 refresh_count++;
2710 2247
2711 if (!OPTION (Opt_jumpScroll) 2248 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2712 || (refresh_count >= refresh_limit * (nrow - 1)))
2713 { 2249 {
2714 refreshnow = true;
2715 refresh_count = 0; 2250 refresh_count = 0;
2251
2252 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2253 {
2254 refreshnow = true;
2716 ch = NOCHAR; 2255 ch = NOCHAR;
2717 break; 2256 break;
2257 }
2718 } 2258 }
2719 2259
2720 // scr_add_lines only works for nlines <= nrow - 1. 2260 // scr_add_lines only works for nlines <= nrow - 1.
2721 if (nlines >= nrow - 1) 2261 if (nlines >= nrow - 1)
2722 { 2262 {
… …
2750 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2290 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2751 scr_add_lines (buf, str - buf, nlines); 2291 scr_add_lines (buf, str - buf, nlines);
2752 2292
2753 /* 2293 /*
2754 * If there have been a lot of new lines, then update the screen 2294 * If there have been a lot of new lines, then update the screen
2755 * What the heck I'll cheat and only refresh less than every page-full. 2295 * What the heck we'll cheat and only refresh less than every page-full.
2756 * the number of pages between refreshes is refresh_limit, which 2296 * if skipScroll is enabled.
2757 * is incremented here because we must be doing flat-out scrolling.
2758 */ 2297 */
2759 if (refreshnow) 2298 if (refreshnow)
2760 { 2299 {
2761 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2762 refresh_limit++;
2763 else
2764 {
2765 flag = true;
2766 scr_refresh (); 2300 scr_refresh ();
2767 want_refresh = 1; 2301 want_refresh = 1;
2768 }
2769 } 2302 }
2770
2771 } 2303 }
2772 else 2304 else
2773 { 2305 {
2774 try 2306 try
2775 { 2307 {
… …
2783 } 2315 }
2784 2316
2785 ch = NOCHAR; 2317 ch = NOCHAR;
2786 } 2318 }
2787 } 2319 }
2788
2789 return flag;
2790} 2320}
2791 2321
2792// read the next character 2322// read the next character
2793wchar_t 2323wchar_t
2794rxvt_term::next_char () NOTHROW 2324rxvt_term::next_char () NOTHROW
2795{ 2325{
2796 while (cmdbuf_ptr < cmdbuf_endp) 2326 while (cmdbuf_ptr < cmdbuf_endp)
2797 { 2327 {
2798 // assume 7-bit to be ascii ALWAYS 2328 // assume 7-bit to be ascii ALWAYS
2799 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2329 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2800 return *cmdbuf_ptr++; 2330 return *cmdbuf_ptr++;
2801 2331
2802 wchar_t wc; 2332 wchar_t wc;
2803 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2333 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2804 2334
… …
2808 cmdbuf_ptr = cmdbuf_endp; 2338 cmdbuf_ptr = cmdbuf_endp;
2809 break; 2339 break;
2810 } 2340 }
2811 2341
2812 if (len == (size_t)-1) 2342 if (len == (size_t)-1)
2343 {
2344 mbstate.reset (); // reset now undefined conversion state
2813 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2345 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2346 }
2814 2347
2815 // assume wchar == unicode 2348 // assume wchar == unicode
2816 cmdbuf_ptr += len; 2349 cmdbuf_ptr += len;
2817 return wc & UNICODE_MASK; 2350 return wc & UNICODE_MASK;
2818 } 2351 }
… …
2862/*----------------------------------------------------------------------*/ 2395/*----------------------------------------------------------------------*/
2863#ifdef PRINTPIPE 2396#ifdef PRINTPIPE
2864FILE * 2397FILE *
2865rxvt_term::popen_printer () 2398rxvt_term::popen_printer ()
2866{ 2399{
2867 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2400 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2868 2401
2869 if (stream == NULL) 2402 if (stream == NULL)
2870 rxvt_warn ("can't open printer pipe, not printing.\n"); 2403 rxvt_warn ("can't open printer pipe, not printing.\n");
2871 2404
2872 return stream; 2405 return stream;
… …
2883 * simulate attached vt100 printer 2416 * simulate attached vt100 printer
2884 */ 2417 */
2885void 2418void
2886rxvt_term::process_print_pipe () 2419rxvt_term::process_print_pipe ()
2887{ 2420{
2888 int done; 2421 FILE *fd = popen_printer ();
2889 FILE *fd;
2890 2422
2891 if ((fd = popen_printer ()) == NULL) 2423 if (!fd)
2892 return; 2424 return;
2893 2425
2894 /* 2426 /*
2895 * Send all input to the printer until either ESC[4i or ESC[?4i 2427 * Send all input to the printer until either ESC[4i or ESC[?4i
2896 * is received. 2428 * is received.
2897 */ 2429 */
2898 for (done = 0; !done;) 2430 for (int done = 0; !done; )
2899 { 2431 {
2900 unsigned char buf[8]; 2432 unsigned char buf[8];
2901 unicode_t ch; 2433 unicode_t ch;
2902 unsigned int i, len; 2434 unsigned int i, len;
2903 2435
… …
2922 { 2454 {
2923 if ((buf[len++] = cmd_getc ()) == 'i') 2455 if ((buf[len++] = cmd_getc ()) == 'i')
2924 break; /* done = 1 */ 2456 break; /* done = 1 */
2925 } 2457 }
2926 } 2458 }
2927 2459
2928 for (i = 0; i < len; i++) 2460 for (i = 0; i < len; i++)
2929 if (putc (buf[i], fd) == EOF) 2461 if (putc (buf[i], fd) == EOF)
2930 { 2462 {
2931 done = 1; 2463 done = 1;
2932 break; 2464 break;
… …
2934 } 2466 }
2935 } 2467 }
2936 2468
2937 pclose_printer (fd); 2469 pclose_printer (fd);
2938} 2470}
2939#endif /* PRINTPIPE */ 2471#endif /* PRINTPIPE */
2940/*}}} */ 2472/*}}} */
2941 2473
2942/* *INDENT-OFF* */ 2474/* *INDENT-OFF* */
2943enum { 2475enum {
2944 C1_40 = 0x40, 2476 C1_40 = 0x40,
… …
2994 process_dcs_seq (); 2526 process_dcs_seq ();
2995 break; 2527 break;
2996 case 0x9b: /* CSI */ 2528 case 0x9b: /* CSI */
2997 process_csi_seq (); 2529 process_csi_seq ();
2998 break; 2530 break;
2999 case 0x9d: /* CSI */ 2531 case 0x9d: /* OSC */
3000 process_osc_seq (); 2532 process_osc_seq ();
3001 break; 2533 break;
3002#endif 2534#endif
3003 } 2535 }
3004} 2536}
… …
3048 break; 2580 break;
3049 case 'Z': /* identify the terminal type */ 2581 case 'Z': /* identify the terminal type */
3050 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2582 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
3051 break; 2583 break;
3052 case '<': /* turn off VT52 mode */ 2584 case '<': /* turn off VT52 mode */
3053 PrivMode (0, PrivMode_vt52); 2585 set_privmode (PrivMode_vt52, 0);
3054 break; 2586 break;
3055 case 'F': /* use special graphics character set */ 2587 case 'F': /* use special graphics character set */
3056 case 'G': /* use regular character set */ 2588 case 'G': /* use regular character set */
3057 /* unimplemented */ 2589 /* unimplemented */
3058 break; 2590 break;
… …
3112 scr_forwardindex (); 2644 scr_forwardindex ();
3113 break; 2645 break;
3114#endif 2646#endif
3115 case '=': 2647 case '=':
3116 case '>': 2648 case '>':
3117 PrivMode ((ch == '='), PrivMode_aplKP); 2649 set_privmode (PrivMode_aplKP, ch == '=');
3118 break; 2650 break;
3119 2651
3120 case C1_40: 2652 case C1_40:
3121 cmd_getc (); 2653 cmd_getc ();
3122 break; 2654 break;
… …
3161 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2693 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3162 case C1_SCI: /* ESC Z */ 2694 case C1_SCI: /* ESC Z */
3163 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2695 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3164 break; /* steal obsolete ESC [ c */ 2696 break; /* steal obsolete ESC [ c */
3165 2697
3166 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2698 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
3167 case C1_CSI: /* ESC [ */ 2699 case C1_CSI: /* ESC [ */
3168 process_csi_seq (); 2700 process_csi_seq ();
3169 break; 2701 break;
3170 2702
3171 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2703 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
3172 case C1_OSC: /* ESC ] */ 2704 case C1_OSC: /* ESC ] */
3173 process_osc_seq (); 2705 process_osc_seq ();
3174 break; 2706 break;
3175 2707
3176 /* 8.3.106: RESET TO INITIAL STATE */ 2708 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
3177 case 'c': 2709 case 'c':
3178 mbstate.reset (); 2710 mbstate.reset ();
3179 scr_poweron (); 2711 scr_poweron ();
3180 scrollbar_show (1); 2712 scrollBar.show (1);
3181 break; 2713 break;
3182 2714
3183 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2715 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
3184 case 'n': 2716 case 'n':
3185 scr_charset_choose (2); 2717 scr_charset_choose (2);
… …
3230rxvt_term::process_csi_seq () 2762rxvt_term::process_csi_seq ()
3231{ 2763{
3232 unicode_t ch, priv, i; 2764 unicode_t ch, priv, i;
3233 unsigned int nargs, p; 2765 unsigned int nargs, p;
3234 int n, ndef; 2766 int n, ndef;
3235 int arg[ESC_ARGS]; 2767 int arg[ESC_ARGS] = { };
3236 2768
3237 for (nargs = ESC_ARGS; nargs > 0;) 2769 nargs = 0;
3238 arg[--nargs] = 0;
3239 2770
3240 priv = 0; 2771 priv = 0;
3241 ch = cmd_getc (); 2772 ch = cmd_getc ();
3242 if (ch >= '<' && ch <= '?') 2773 if ((ch >= '<' && ch <= '?') || ch == '!')
2774 {
3243 { /* '<' '=' '>' '?' */ 2775 /* '<' '=' '>' '?' '!' */
3244 priv = ch; 2776 priv = ch;
3245 ch = cmd_getc (); 2777 ch = cmd_getc ();
3246 } 2778 }
3247 2779
3248 /* read any numerical arguments */ 2780 /* read any numerical arguments */
… …
3287 switch (priv) 2819 switch (priv)
3288 { 2820 {
3289 case '>': 2821 case '>':
3290 if (ch == CSI_DA) /* secondary device attributes */ 2822 if (ch == CSI_DA) /* secondary device attributes */
3291 { 2823 {
3292 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, 2824 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
3293 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2825 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3294 // 2826 //
3295 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2827 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3296 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2828 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
3297 // that we do not support xterm mouse reporting (should be 95 when we do). 2829 // versions.
3298 // 2830 //
3299 tt_printf ("\033[>%d;94;0c", 'U'); 2831 tt_printf ("\033[>%d;95;0c", 'U');
3300 } 2832 }
3301 break; 2833 break;
2834
3302 case '?': 2835 case '?':
3303 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2836 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3304 process_terminal_mode (ch, priv, nargs, arg); 2837 process_terminal_mode (ch, priv, nargs, arg);
3305 break; 2838 break;
2839
2840 case '!':
2841 if (ch == CSI_70)
2842 {
2843 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2844 scr_soft_reset ();
2845
2846 static const int pm_h[] = { 7, 25 };
2847 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 };
2848
2849 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h);
2850 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l);
3306 } 2851 }
2852 break;
2853 }
2854
3307 return; 2855 return;
3308 } 2856 }
3309 2857
3310 switch (ch) 2858 switch (ch)
3311 { 2859 {
… …
3431 break; 2979 break;
3432 case 6: /* CPR requested */ 2980 case 6: /* CPR requested */
3433 scr_report_position (); 2981 scr_report_position ();
3434 break; 2982 break;
3435 case 7: /* unofficial extension */ 2983 case 7: /* unofficial extension */
3436 if (OPTION (Opt_insecure)) 2984 if (option (Opt_insecure))
3437 tt_printf ("%-.250s\012", rs[Rs_display_name]); 2985 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3438 break; 2986 break;
3439 case 8: /* unofficial extension */ 2987 case 8: /* unofficial extension */
3440 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2988 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3441 break; 2989 break;
… …
3534{ 3082{
3535 int x, y; 3083 int x, y;
3536 XWindowAttributes wattr; 3084 XWindowAttributes wattr;
3537 Window wdummy; 3085 Window wdummy;
3538 3086
3539 dLocal (Display *, xdisp); 3087 dLocal (Display *, dpy);
3540 3088
3541 if (nargs == 0) 3089 if (nargs == 0)
3542 return; 3090 return;
3543 3091
3544 switch (args[0]) 3092 switch (args[0])
3545 { 3093 {
3546 /* 3094 /*
3547 * commands 3095 * commands
3548 */ 3096 */
3549 case 1: /* deiconify window */ 3097 case 1: /* deiconify window */
3550 XMapWindow (xdisp, parent[0]); 3098 XMapWindow (dpy, parent[0]);
3551 break; 3099 break;
3552 case 2: /* iconify window */ 3100 case 2: /* iconify window */
3553 XIconifyWindow (xdisp, parent[0], display->screen); 3101 XIconifyWindow (dpy, parent[0], display->screen);
3554 break; 3102 break;
3555 case 3: /* set position (pixels) */ 3103 case 3: /* set position (pixels) */
3556 XMoveWindow (xdisp, parent[0], args[1], args[2]); 3104 XMoveWindow (dpy, parent[0], args[1], args[2]);
3557 break; 3105 break;
3558 case 4: /* set size (pixels) */ 3106 case 4: /* set size (pixels) */
3559 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3107 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3560 break; 3108 break;
3561 case 5: /* raise window */ 3109 case 5: /* raise window */
3562 XRaiseWindow (xdisp, parent[0]); 3110 XRaiseWindow (dpy, parent[0]);
3563 break; 3111 break;
3564 case 6: /* lower window */ 3112 case 6: /* lower window */
3565 XLowerWindow (xdisp, parent[0]); 3113 XLowerWindow (dpy, parent[0]);
3566 break; 3114 break;
3567 case 7: /* refresh window */ 3115 case 7: /* refresh window */
3568 scr_touch (true); 3116 scr_touch (true);
3569 break; 3117 break;
3570 case 8: /* set size (chars) */ 3118 case 8: /* set size (chars) */
… …
3581 3129
3582 /* 3130 /*
3583 * reports - some output format copied from XTerm 3131 * reports - some output format copied from XTerm
3584 */ 3132 */
3585 case 11: /* report window state */ 3133 case 11: /* report window state */
3586 XGetWindowAttributes (xdisp, parent[0], &wattr); 3134 XGetWindowAttributes (dpy, parent[0], &wattr);
3587 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3135 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3588 break; 3136 break;
3589 case 13: /* report window position */ 3137 case 13: /* report window position */
3590 XGetWindowAttributes (xdisp, parent[0], &wattr); 3138 XGetWindowAttributes (dpy, parent[0], &wattr);
3591 XTranslateCoordinates (xdisp, parent[0], wattr.root, 3139 XTranslateCoordinates (dpy, parent[0], wattr.root,
3592 -wattr.border_width, -wattr.border_width, 3140 -wattr.border_width, -wattr.border_width,
3593 &x, &y, &wdummy); 3141 &x, &y, &wdummy);
3594 tt_printf ("\033[3;%d;%dt", x, y); 3142 tt_printf ("\033[3;%d;%dt", x, y);
3595 break; 3143 break;
3596 case 14: /* report window size (pixels) */ 3144 case 14: /* report window size (pixels) */
3597 XGetWindowAttributes (xdisp, parent[0], &wattr); 3145 XGetWindowAttributes (dpy, parent[0], &wattr);
3598 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3146 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3599 break; 3147 break;
3600 case 18: /* report text area size (chars) */ 3148 case 18: /* report text area size (chars) */
3601 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3149 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3602 break; 3150 break;
… …
3604 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3152 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3605 break; 3153 break;
3606 case 20: /* report icon label */ 3154 case 20: /* report icon label */
3607 { 3155 {
3608 char *s; 3156 char *s;
3609 XGetIconName (xdisp, parent[0], &s); 3157 XGetIconName (dpy, parent[0], &s);
3610 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3158 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3611 XFree (s); 3159 XFree (s);
3612 } 3160 }
3613 break; 3161 break;
3614 case 21: /* report window title */ 3162 case 21: /* report window title */
3615 { 3163 {
3616 char *s; 3164 char *s;
3617 XFetchName (xdisp, parent[0], &s); 3165 XFetchName (dpy, parent[0], &s);
3618 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3166 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3619 XFree (s); 3167 XFree (s);
3620 } 3168 }
3621 break; 3169 break;
3622 } 3170 }
3623} 3171}
… …
3650 seen_esc = true; 3198 seen_esc = true;
3651 continue; 3199 continue;
3652 } 3200 }
3653 else if (ch == C0_BEL || ch == CHAR_ST) 3201 else if (ch == C0_BEL || ch == CHAR_ST)
3654 break; 3202 break;
3203 else if (ch == C0_SYN)
3204 ch = cmd_get8 ();
3655 else if (ch < 0x20) 3205 else if (ch < 0x20)
3656 return NULL; /* other control character - exit */ 3206 return NULL; /* other control character - exit */
3657 3207
3658 seen_esc = false; 3208 seen_esc = false;
3659 3209
3660 if (n >= STRING_MAX - 1) 3210 if (n >= STRING_MAX - 1)
3661 // stop at some sane length 3211 // stop at some sane length
3662 return NULL; 3212 return NULL;
3663 3213
3664 if (ch == C0_SYN)
3665 string[n++] = cmd_get8 ();
3666 else
3667 string[n++] = ch; 3214 string[n++] = ch;
3668 } 3215 }
3669 3216
3670 string[n++] = '\0'; 3217 string[n++] = '\0';
3671 3218
3672 ends_how = (ch == 0x5c ? C0_ESC : ch); 3219 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3741 3288
3742/* 3289/*
3743 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3290 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3744 */ 3291 */
3745void 3292void
3746rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3293rxvt_term::process_xterm_seq (int op, char *str, char resp)
3747{ 3294{
3748 int color; 3295 int color;
3749 char *buf, *name; 3296 char *buf, *name;
3750 bool query = str[0] == '?' && !str[1]; 3297 bool query = str[0] == '?' && !str[1];
3751 int saveop = op; 3298 int saveop = op;
3752 3299
3753 dLocal (Display *, xdisp); 3300 dLocal (Display *, dpy);
3754 3301
3755 assert (str != NULL); 3302 assert (str != NULL);
3303
3304 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3305 return;
3306
3756 switch (op) 3307 switch (op)
3757 { 3308 {
3758 case XTerm_name: 3309 case XTerm_name:
3759 set_title (str); 3310 set_title (str);
3760 /* FALLTHROUGH */ 3311 /* FALLTHROUGH */
… …
3774 unsigned long bytes_after; 3325 unsigned long bytes_after;
3775 unsigned char *value = 0; 3326 unsigned char *value = 0;
3776 const char *str = ""; 3327 const char *str = "";
3777 3328
3778 if (prop 3329 if (prop
3779 && XGetWindowProperty (xdisp, parent[0], 3330 && XGetWindowProperty (dpy, parent[0],
3780 prop, 0, 1<<16, 0, AnyPropertyType, 3331 prop, 0, 1<<16, 0, AnyPropertyType,
3781 &actual_type, &actual_format, 3332 &actual_type, &actual_format,
3782 &nitems, &bytes_after, &value) == Success 3333 &nitems, &bytes_after, &value) == Success
3783 && actual_type != None 3334 && actual_type != None
3784 && actual_format == 8) 3335 && actual_format == 8)
… …
3788 3339
3789 XFree (value); 3340 XFree (value);
3790 } 3341 }
3791 else 3342 else
3792 { 3343 {
3793 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3344 char *eq = strchr (str, '=');
3794 3345
3795 if (eq) 3346 if (eq)
3796 { 3347 {
3797 *eq = 0; 3348 *eq = 0;
3798 set_utf8_property (display->atom (str), eq + 1); 3349 set_utf8_property (display->atom (str), eq + 1);
3799 } 3350 }
3800 else 3351 else
3801 XDeleteProperty (xdisp, parent[0], 3352 XDeleteProperty (dpy, parent[0],
3802 display->atom (str)); 3353 display->atom (str));
3803 } 3354 }
3804 break; 3355 break;
3805 3356
3806 case XTerm_Color: 3357 case XTerm_Color:
… …
3819 *buf++ = '\0'; 3370 *buf++ = '\0';
3820 3371
3821 process_color_seq (op, color, name, resp); 3372 process_color_seq (op, color, name, resp);
3822 } 3373 }
3823 break; 3374 break;
3375 case Rxvt_restoreFG:
3824 case XTerm_Color00: 3376 case XTerm_Color00:
3825 process_color_seq (op, Color_fg, str, resp); 3377 process_color_seq (op, Color_fg, str, resp);
3826 break; 3378 break;
3379 case Rxvt_restoreBG:
3827 case XTerm_Color01: 3380 case XTerm_Color01:
3828 process_color_seq (op, Color_bg, str, resp); 3381 process_color_seq (op, Color_bg, str, resp);
3829 break; 3382 break;
3830#ifndef NO_CURSORCOLOR 3383#ifndef NO_CURSORCOLOR
3831 case XTerm_Color_cursor: 3384 case XTerm_Color_cursor:
… …
3852 break; 3405 break;
3853 case URxvt_Color_IT: 3406 case URxvt_Color_IT:
3854 process_color_seq (op, Color_IT, str, resp); 3407 process_color_seq (op, Color_IT, str, resp);
3855 break; 3408 break;
3856#endif 3409#endif
3857#if TRANSPARENT && TINTING 3410 case URxvt_Color_border:
3411 process_color_seq (op, Color_border, str, resp);
3412 break;
3413#if ENABLE_TRANSPARENCY
3858 case URxvt_Color_tint: 3414 case URxvt_Color_tint:
3859 process_color_seq (op, Color_tint, str, resp); 3415 process_color_seq (op, Color_tint, str, resp);
3416 {
3417 bool changed = false;
3860 3418
3861 check_our_parents (); 3419 if (ISSET_PIXCOLOR (Color_tint))
3420 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3421 else
3422 changed = bgPixmap.unset_tint ();
3862 3423
3863 if (am_transparent) 3424 if (changed)
3864 want_full_refresh = want_refresh = 1; 3425 update_background ();
3426 }
3865 3427
3866 break; 3428 break;
3867#endif 3429#endif
3868 3430
3431#if BG_IMAGE_FROM_FILE
3869 case Rxvt_Pixmap: 3432 case Rxvt_Pixmap:
3870 { 3433 if (!strcmp (str, "?"))
3871 if (*str != ';')
3872 { 3434 {
3873#if XPM_BACKGROUND 3435 char str[256];
3874 scale_pixmap (""); /* reset to default scaling */ 3436
3875 set_bgPixmap (str); /* change pixmap */ 3437 sprintf (str, "[%dx%d+%d+%d]",
3876 scr_touch (true); 3438 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3877#endif 3439 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3440 process_xterm_seq (XTerm_title, str, CHAR_ST);
3878 } 3441 }
3879 3442 else
3443 {
3880 int changed = 0; 3444 int changed = 0;
3881 3445
3882 while ((str = strchr (str, ';')) != NULL) 3446 if (*str != ';')
3883 { 3447 {
3448 /* reset to default scaling :*/
3449 bgPixmap.unset_geometry ();
3450 if (bgPixmap.set_file (str)) /* change pixmap */
3451 changed++;
3452 str = strchr (str, ';');
3453 if (str == NULL)
3454 bgPixmap.set_defaultGeometry ();
3455 }
3456
3457 while (str)
3458 {
3884 str++; 3459 str++;
3885#if XPM_BACKGROUND 3460 if (bgPixmap.set_geometry (str))
3886 changed += scale_pixmap (str); 3461 changed++;
3887#endif 3462 str = strchr (str, ';');
3888 } 3463 }
3889 3464
3890 if (changed) 3465 if (changed)
3891 { 3466 update_background ();
3892#ifdef XPM_BACKGROUND
3893 resize_pixmap ();
3894 scr_touch (true);
3895#endif
3896 } 3467 }
3897 }
3898 break; 3468 break;
3899 3469#endif
3900 case Rxvt_restoreFG:
3901 set_window_color (Color_fg, str);
3902 break;
3903 case Rxvt_restoreBG:
3904 set_window_color (Color_bg, str);
3905 break;
3906 3470
3907 case XTerm_logfile: 3471 case XTerm_logfile:
3908 // TODO, when secure mode? 3472 // TODO, when secure mode?
3909 break; 3473 break;
3910 3474
… …
3928 case URxvt_italicFont: 3492 case URxvt_italicFont:
3929 case URxvt_boldItalicFont: 3493 case URxvt_boldItalicFont:
3930#endif 3494#endif
3931 if (query) 3495 if (query)
3932 tt_printf ("\33]%d;%-.250s%c", saveop, 3496 tt_printf ("\33]%d;%-.250s%c", saveop,
3933 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3497 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3934 ? fontset[op - URxvt_font]->fontdesc : "", 3498 ? fontset[op - URxvt_font]->fontdesc : "",
3935 resp); 3499 resp);
3936 else 3500 else
3937 { 3501 {
3938 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3502 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3952 break; 3516 break;
3953 3517
3954#if !ENABLE_MINIMAL 3518#if !ENABLE_MINIMAL
3955 case URxvt_locale: 3519 case URxvt_locale:
3956 if (query) 3520 if (query)
3957 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp); 3521 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3958 else 3522 else
3959 { 3523 {
3960 set_locale (str); 3524 set_locale (str);
3961 pty->set_utf8_mode (enc_utf8); 3525 pty->set_utf8_mode (enc_utf8);
3962 init_xlocale (); 3526 init_xlocale ();
… …
3977 break; 3541 break;
3978#endif 3542#endif
3979 3543
3980#if ENABLE_PERL 3544#if ENABLE_PERL
3981 case URxvt_perl: 3545 case URxvt_perl:
3982 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 3546 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3983 ; // no responses yet
3984 break; 3547 break;
3985#endif 3548#endif
3986 } 3549 }
3987} 3550}
3988/*----------------------------------------------------------------------*/ 3551/*----------------------------------------------------------------------*/
… …
4011 { 3574 {
4012 if (mode == 'r') 3575 if (mode == 'r')
4013 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3576 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
4014 else 3577 else
4015 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3578 state = (mode == 't') ? ! (priv_modes & bit) : mode;
4016 PrivMode (state, bit); 3579 set_privmode (bit, state);
4017 } 3580 }
4018 3581
4019 return state; 3582 return state;
4020} 3583}
4021 3584
… …
4025{ 3588{
4026 unsigned int i, j; 3589 unsigned int i, j;
4027 int state; 3590 int state;
4028 3591
4029 static const struct 3592 static const struct
4030 { 3593 {
4031 const int argval; 3594 const int argval;
4032 const unsigned long bit; 3595 const unsigned long bit;
4033 }
4034
4035 argtopriv[] = { 3596 } argtopriv[] = {
4036 { 1, PrivMode_aplCUR }, 3597 { 1, PrivMode_aplCUR }, // DECCKM
4037 { 2, PrivMode_vt52 }, 3598 { 2, PrivMode_vt52 },
4038 { 3, PrivMode_132 }, 3599 { 3, PrivMode_132 }, // DECCOLM
4039 { 4, PrivMode_smoothScroll }, 3600 { 4, PrivMode_smoothScroll }, // DECSCLM
4040 { 5, PrivMode_rVideo }, 3601 { 5, PrivMode_rVideo }, // DECSCNM
4041 { 6, PrivMode_relOrigin }, 3602 { 6, PrivMode_relOrigin }, // DECOM
4042 { 7, PrivMode_Autowrap }, 3603 { 7, PrivMode_Autowrap }, // DECAWM
4043 // 8, bi-directional support mode 3604 // 8, auto-repeat keys // DECARM
4044 { 9, PrivMode_MouseX10 }, 3605 { 9, PrivMode_MouseX10 },
4045 // 18, 19 printing-related 3606 // 18 end FF to printer after print screen
3607 // 19 Print screen prints full screen/scorll region
4046 { 25, PrivMode_VisibleCursor }, 3608 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
4047#ifdef scrollBar_esc 3609#ifdef scrollBar_esc
4048 { scrollBar_esc, PrivMode_scrollBar }, 3610 { scrollBar_esc, PrivMode_scrollBar },
4049#endif 3611#endif
4050 { 35, PrivMode_ShiftKeys }, // rxvt extension 3612 { 35, PrivMode_ShiftKeys }, // rxvt extension
3613 // 38, tektronix mode // DECTEK
4051 { 40, PrivMode_132OK }, 3614 { 40, PrivMode_132OK },
4052 // 41 xterm more fixes NYI 3615 // 41 xterm more fixes NYI
4053 // 45 margin bell NYI 3616 // 45 margin bell NYI
4054 // 46 start logging 3617 // 46 start logging
4055 { 47, PrivMode_Screen }, 3618 { 47, PrivMode_Screen },
4056 { 66, PrivMode_aplKP }, 3619 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
4057#ifndef NO_BACKSPACE_KEY 3620#ifndef NO_BACKSPACE_KEY
4058 { 67, PrivMode_BackSpace }, 3621 { 67, PrivMode_BackSpace }, // DECBKM
4059#endif 3622#endif
4060 { 1000, PrivMode_MouseX11 }, 3623 { 1000, PrivMode_MouseX11 },
4061 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3624 { 1002, PrivMode_MouseBtnEvent },
4062 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3625 { 1003, PrivMode_MouseAnyEvent },
4063 // 1003 Use All Motion Mouse Tracking. NYI, TODO
4064 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3626 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4065 { 1011, PrivMode_Keypress }, // rxvt extension 3627 { 1011, PrivMode_Keypress }, // rxvt extension
4066 // 1035 enable modifiers for alt, numlock NYI 3628 // 1035 enable modifiers for alt, numlock NYI
4067 // 1036 send ESC for meta keys NYI 3629 // 1036 send ESC for meta keys NYI
4068 // 1037 send DEL for keypad delete NYI 3630 // 1037 send DEL for keypad delete NYI
4069 { 1047, PrivMode_Screen }, 3631 { 1047, PrivMode_Screen },
4070 // 1048 save and restore cursor 3632 // 1048 save and restore cursor
4071 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3633 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
4072 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3634 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3635 { 2004, PrivMode_BracketPaste },
4073 }; 3636 };
4074 3637
4075 if (nargs == 0) 3638 if (nargs == 0)
4076 return; 3639 return;
4077 3640
… …
4102 3665
4103 scr_touch (true); 3666 scr_touch (true);
4104 break; 3667 break;
4105#endif 3668#endif
4106 case 1048: /* alternative cursor save */ 3669 case 1048: /* alternative cursor save */
4107 case 1049:
4108 if (OPTION (Opt_secondaryScreen)) 3670 if (option (Opt_secondaryScreen))
4109 if (mode == 0) 3671 if (mode == 0)
4110 scr_cursor (RESTORE); 3672 scr_cursor (RESTORE);
4111 else if (mode == 1) 3673 else if (mode == 1)
4112 scr_cursor (SAVE); 3674 scr_cursor (SAVE);
4113 break; 3675 break;
… …
4121 case 2: /* VT52 mode */ 3683 case 2: /* VT52 mode */
4122 /* oddball mode. should be set regardless of set/reset 3684 /* oddball mode. should be set regardless of set/reset
4123 * parameter. Return from VT52 mode with an ESC < from 3685 * parameter. Return from VT52 mode with an ESC < from
4124 * within VT52 mode 3686 * within VT52 mode
4125 */ 3687 */
4126 PrivMode (1, PrivMode_vt52); 3688 set_privmode (PrivMode_vt52, 1);
4127 break; 3689 break;
4128 case 3: /* 80/132 */ 3690 case 3: /* 80/132 */
4129 if (priv_modes & PrivMode_132OK) 3691 if (priv_modes & PrivMode_132OK)
4130 set_widthheight (((state ? 132 : 80) * fwidth), height); 3692 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
4131 break; 3693 break;
4132 case 4: /* smooth scrolling */ 3694 case 4: /* smooth scrolling */
4133 set_option (Opt_jumpScroll, !state); 3695 set_option (Opt_jumpScroll, !state);
4134 break; 3696 break;
4135 case 5: /* reverse video */ 3697 case 5: /* reverse video */
… …
4142 scr_autowrap (state); 3704 scr_autowrap (state);
4143 break; 3705 break;
4144 /* case 8: - auto repeat, can't do on a per window basis */ 3706 /* case 8: - auto repeat, can't do on a per window basis */
4145 case 9: /* X10 mouse reporting */ 3707 case 9: /* X10 mouse reporting */
4146 if (state) /* orthogonal */ 3708 if (state) /* orthogonal */
4147 priv_modes &= ~PrivMode_MouseX11; 3709 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4148 break; 3710 break;
4149#ifdef scrollBar_esc 3711#ifdef scrollBar_esc
4150 case scrollBar_esc: 3712 case scrollBar_esc:
4151 if (scrollbar_mapping (state)) 3713 if (scrollBar.map (state))
4152 { 3714 {
4153 resize_all_windows (0, 0, 0); 3715 resize_all_windows (0, 0, 0);
4154 scr_touch (true); 3716 scr_touch (true);
4155 } 3717 }
4156 break; 3718 break;
… …
4165 break; 3727 break;
4166 /* case 66: - application key pad */ 3728 /* case 66: - application key pad */
4167 /* case 67: - backspace key */ 3729 /* case 67: - backspace key */
4168 case 1000: /* X11 mouse reporting */ 3730 case 1000: /* X11 mouse reporting */
4169 if (state) /* orthogonal */ 3731 if (state) /* orthogonal */
4170 priv_modes &= ~PrivMode_MouseX10; 3732 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4171 break; 3733 break;
4172#if 0
4173 case 1001: 3734 case 1002:
4174 break; /* X11 mouse highlighting */ 3735 case 1003:
4175#endif 3736 if (state)
3737 {
3738 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3739 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3740 vt_emask_mouse = PointerMotionMask;
3741 }
3742 else
3743 vt_emask_mouse = NoEventMask;
3744
3745 vt_select_input ();
3746 break;
4176 case 1010: /* scroll to bottom on TTY output inhibit */ 3747 case 1010: /* scroll to bottom on TTY output inhibit */
4177 set_option (Opt_scrollTtyOutput, !state); 3748 set_option (Opt_scrollTtyOutput, !state);
4178 break; 3749 break;
4179 case 1011: /* scroll to bottom on key press */ 3750 case 1011: /* scroll to bottom on key press */
4180 set_option (Opt_scrollTtyKeypress, state); 3751 set_option (Opt_scrollTtyKeypress, state);
4181 break; 3752 break;
4182 case 1047: /* secondary screen w/ clearing last */ 3753 case 1047: /* secondary screen w/ clearing last */
4183 if (OPTION (Opt_secondaryScreen)) 3754 if (option (Opt_secondaryScreen))
4184 if (current_screen != PRIMARY) 3755 if (!state)
4185 scr_erase_screen (2); 3756 scr_erase_screen (2);
3757
4186 scr_change_screen (state); 3758 scr_change_screen (state);
4187 break; 3759 break;
4188 case 1049: /* secondary screen w/ clearing first */ 3760 case 1049: /* secondary screen w/ clearing first */
3761 if (option (Opt_secondaryScreen))
3762 if (state)
3763 scr_cursor (SAVE);
3764
4189 scr_change_screen (state); 3765 scr_change_screen (state);
3766
4190 if (OPTION (Opt_secondaryScreen)) 3767 if (option (Opt_secondaryScreen))
4191 if (current_screen != PRIMARY) 3768 if (state)
4192 scr_erase_screen (2); 3769 scr_erase_screen (2);
3770 else
3771 scr_cursor (RESTORE);
4193 break; 3772 break;
4194 default: 3773 default:
4195 break; 3774 break;
4196 } 3775 }
4197 } 3776 }
… …
4357rxvt_term::process_graphics () 3936rxvt_term::process_graphics ()
4358{ 3937{
4359 unicode_t ch, cmd = cmd_getc (); 3938 unicode_t ch, cmd = cmd_getc ();
4360 3939
4361 if (cmd == 'Q') 3940 if (cmd == 'Q')
3941 {
4362 { /* query graphics */ 3942 /* query graphics */
4363 tt_printf ("\033G0\012"); /* no graphics */ 3943 tt_printf ("\033G0\012"); /* no graphics */
4364 return; 3944 return;
4365 } 3945 }
4366 /* swallow other graphics sequences until terminating ':' */ 3946 /* swallow other graphics sequences until terminating ':' */
4367 do 3947 do
… …
4417 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 3997 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4418 3998
4419 memcpy (v_buffer + v_buflen, data, len); 3999 memcpy (v_buffer + v_buflen, data, len);
4420 v_buflen += len; 4000 v_buflen += len;
4421 4001
4422 pty_ev.set (EVENT_READ | EVENT_WRITE); 4002 pty_ev.set (ev::READ | ev::WRITE);
4423} 4003}
4424 4004
4425void rxvt_term::pty_write () 4005void rxvt_term::pty_write ()
4426{ 4006{
4427 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4007 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4432 4012
4433 if (v_buflen == 0) 4013 if (v_buflen == 0)
4434 { 4014 {
4435 free (v_buffer); 4015 free (v_buffer);
4436 v_buffer = 0; 4016 v_buffer = 0;
4437 v_buflen = 0;
4438 4017
4439 pty_ev.set (EVENT_READ); 4018 pty_ev.set (ev::READ);
4440 return; 4019 return;
4441 } 4020 }
4442 4021
4443 memmove (v_buffer, v_buffer + written, v_buflen); 4022 memmove (v_buffer, v_buffer + written, v_buflen);
4444 } 4023 }
4445 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4024 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4446 pty_ev.set (EVENT_READ); 4025 pty_ev.set (ev::READ);
4447} 4026}
4448 4027
4449/*----------------------- end-of-file (C source) -----------------------*/ 4028/*----------------------- end-of-file (C source) -----------------------*/
4450 4029

Diff Legend

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