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

Diff Legend

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