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.298 by root, Tue Jan 31 18:36:35 2006 UTC vs.
Revision 1.458 by sf-exg, Thu Nov 18 17:28:12 2010 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: command.C 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
31 * 32 *
32 * This program is free software; you can redistribute it and/or modify 33 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 34 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 36 * (at your option) any later version.
… …
49#include "rxvt.h" 50#include "rxvt.h"
50#include "rxvtperl.h" 51#include "rxvtperl.h"
51#include "version.h" 52#include "version.h"
52#include "command.h" 53#include "command.h"
53 54
54#if HAVE_SCHED_YIELD
55#undef HAVE_SCHED_YIELD // disabled for the time being
56//# include <sched.h>
57#endif
58
59#ifdef KEYSYM_RESOURCE 55#ifdef KEYSYM_RESOURCE
60# include "keyboard.h" 56# include "keyboard.h"
61#endif 57#endif
62 58
63#include <csignal> 59#include <csignal>
60
61#if LINUX_YIELD_HACK
62# include <ctime>
63#endif
64 64
65/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
66 66
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
68 68
… …
96 XK_Shift_L, 0x21e7, 96 XK_Shift_L, 0x21e7,
97 XK_Shift_R, 0x21e7, 97 XK_Shift_R, 0x21e7,
98 98
99 XK_Shift_Lock, 0x21eb, 99 XK_Shift_Lock, 0x21eb,
100 XK_ISO_Lock, 0x21eb, 100 XK_ISO_Lock, 0x21eb,
101 XK_ISO_Lock, 0x21eb,
102 XK_Caps_Lock, 0x21ec, 101 XK_Caps_Lock, 0x21ec,
103 XK_Num_Lock, 0x21ed, 102 XK_Num_Lock, 0x21ed,
104 XK_ISO_Level3_Shift, 0x21ee, 103 XK_ISO_Level3_Shift, 0x21ee,
105 XK_ISO_Level3_Lock, 0x21ef, 104 XK_ISO_Level3_Lock, 0x21ef,
106 XK_ISO_Group_Lock, 0x21f0, 105 XK_ISO_Group_Lock, 0x21f0,
… …
163 162
164void 163void
165rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y) 164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
166{ 165{
167 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
168 rxvt_font *f = (*fs)[fs->find_font (ch)];
169 wchar_t *chr, *alloc, ch2, *fname; 167 wchar_t *chr, *alloc, ch2, **fname;
170 int len; 168 int len;
171
172 fname = rxvt_utf8towcs (f->name);
173 169
174# if ENABLE_COMBINING 170# if ENABLE_COMBINING
175 if (IS_COMPOSE (ch)) 171 if (IS_COMPOSE (ch))
176 { 172 {
177 len = rxvt_composite.expand (ch, 0); 173 len = rxvt_composite.expand (ch, 0);
… …
198 r & RS_Blink ? " blink" : "", 194 r & RS_Blink ? " blink" : "",
199 r & RS_RVid ? " rvid" : "", 195 r & RS_RVid ? " rvid" : "",
200 r & RS_Uline ? " uline" : "", 196 r & RS_Uline ? " uline" : "",
201 r & RS_Careful ? " careful" : ""); 197 r & RS_Careful ? " careful" : "");
202 198
199 int width = 0;
200 fname = rxvt_temp_buf<wchar_t *> (len);
201 for (int i = 0; i < len; i++)
202 {
203 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])];
204 fname[i] = rxvt_utf8towcs (f->name);
203 int width = wcswidth (fname, wcslen (fname)); 205 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
206 }
204 207
205 max_it (width, 8+5); // for char + hey 208 max_it (width, 8+5); // for char + hex
206 max_it (width, strlen (attr)); 209 max_it (width, strlen (attr));
207 210
208 if (y >= 0) 211 if (y >= 0)
209 { 212 {
210 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 213 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
211 x = 0; 214 x = 0;
212 } 215 }
213 216
214 scr_overlay_new (x, y, width, len + 2); 217 scr_overlay_new (x, y, width, len * 2 + 1);
215 218
216 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 219 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
217 220
218 for (int y = 0; y < len; y++) 221 for (int y = 0; y < len; y++)
219 { 222 {
… …
222 ch = *chr++; 225 ch = *chr++;
223 226
224 sprintf (buf, "%8x", ch); 227 sprintf (buf, "%8x", ch);
225 scr_overlay_set (0, y, buf); 228 scr_overlay_set (0, y, buf);
226 scr_overlay_set (9, y, '='); 229 scr_overlay_set (9, y, '=');
227# if !UNICODE3 230# if !UNICODE_3
228 if (ch >= 0x10000) 231 if (ch >= 0x10000)
229 ch = 0xfffd; 232 ch = 0xfffd;
230# endif 233# endif
231 scr_overlay_set (11, y, ch, r); 234 scr_overlay_set (11, y, ch, r);
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 whether 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 {
292 KeySym k = XLookupKeysym (&ev, index); 297 KeySym k = XLookupKeysym (&ev, index);
293 298
… …
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 *
318 * Always permit `shift' to override the current setting 421 * Always permit `shift' to override the current setting
319 */ 422 */
320 shft = ev.state & ShiftMask; 423 shft = ev.state & ShiftMask;
321 ctrl = ev.state & ControlMask; 424 ctrl = ev.state & ControlMask;
322 meta = ev.state & ModMetaMask; 425 meta = ev.state & ModMetaMask;
323
324 if (numlock_state || (ev.state & ModNumLockMask))
325 {
326 numlock_state = (ev.state & ModNumLockMask);
327 PrivMode ((!numlock_state), PrivMode_aplKP);
328 }
329 426
330 kbuf[0] = 0; 427 kbuf[0] = 0;
331 428
332#ifdef USE_XIM 429#ifdef USE_XIM
333 if (Input_Context) 430 if (Input_Context)
… …
408#ifdef PAGING_CONTEXT_LINES 505#ifdef PAGING_CONTEXT_LINES
409 lnsppg = nrow - PAGING_CONTEXT_LINES; 506 lnsppg = nrow - PAGING_CONTEXT_LINES;
410#else 507#else
411 lnsppg = nrow * 4 / 5; 508 lnsppg = nrow * 4 / 5;
412#endif 509#endif
510 max_it (lnsppg, 1);
511
413 if (keysym == XK_Prior) 512 if (keysym == XK_Prior)
414 { 513 {
415 scr_page (UP, lnsppg); 514 scr_page (UP, lnsppg);
416 return; 515 return;
417 } 516 }
… …
482 } 581 }
483 } 582 }
484 583
485#if ENABLE_FRILLS || ISO_14755 584#if ENABLE_FRILLS || ISO_14755
486 // ISO 14755 support 585 // ISO 14755 support
487 if (shft && ctrl) 586 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
488 { 587 {
489 int hv; 588 int hv;
490 589
491 if (iso14755buf & ISO_14755_51 590 if (iso14755buf & ISO_14755_51
492 && (keysym == XK_space || keysym == XK_KP_Space 591 && (keysym == XK_space || keysym == XK_KP_Space
… …
494 { 593 {
495 commit_iso14755 (); 594 commit_iso14755 ();
496 iso14755buf = ISO_14755_51; 595 iso14755buf = ISO_14755_51;
497# if ISO_14755 596# if ISO_14755
498 iso14755_51 (0); 597 iso14755_51 (0);
598# endif
599 return;
600 }
601 else if (keysym == XK_BackSpace)
602 {
603 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
604# if ISO_14755
605 iso14755_51 (iso14755buf & ISO_14755_MASK);
499# endif 606# endif
500 return; 607 return;
501 } 608 }
502 else if ((hv = hex_keyval (ev)) >= 0) 609 else if ((hv = hex_keyval (ev)) >= 0)
503 { 610 {
… …
508# endif 615# endif
509 return; 616 return;
510 } 617 }
511 else 618 else
512 { 619 {
513# if ENABLE_OVERLAY 620# if ISO_14755
514 scr_overlay_off (); 621 scr_overlay_off ();
515# endif 622# endif
516 iso14755buf = 0; 623 iso14755buf = 0;
517 } 624 }
518 } 625 }
626 else if (option (Opt_iso14755) &&
519 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 627 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
520 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 628 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
521 if (!(iso14755buf & ISO_14755_STARTED)) 629 if (!(iso14755buf & ISO_14755_STARTED))
522 { 630 {
523 iso14755buf |= ISO_14755_STARTED; 631 iso14755buf |= ISO_14755_STARTED;
524# if ENABLE_OVERLAY 632# if ISO_14755
525 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 633 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
526 scr_overlay_set (0, 0, "ISO 14755 mode"); 634 scr_overlay_set (0, 0, "ISO 14755 mode");
527# endif 635# endif
528 } 636 }
529#endif 637#endif
530 638
531#ifdef PRINTPIPE 639#ifdef PRINTPIPE
532 if (keysym == XK_Print) 640 if (keysym == XK_Print)
533 { 641 {
534 scr_printscreen (ctrl | shft); 642 scr_printscreen (ctrl | shft);
535 return; 643 return;
536 } 644 }
537#endif 645#endif
538 646
539 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 647 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
540 { 648 {
649 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
650 unsigned int newlen = 1;
651
652 if (ev.state & ModNumLockMask)
653 kp = false;
654
655 keysym = translate_keypad (keysym, kp);
656
657 switch (keysym)
541 { 658 {
659#ifndef NO_BACKSPACE_KEY
660 case XK_BackSpace:
661 if (priv_modes & PrivMode_HaveBackSpace)
662 {
663 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
664 ^ !!ctrl) ? '\b' : '\177';
665 kbuf[1] = '\0';
666 }
667 else
668 strcpy (kbuf, rs[Rs_backspace_key]);
669 break;
670#endif
671#ifndef NO_DELETE_KEY
672 case XK_Delete:
673 strcpy (kbuf, rs[Rs_delete_key]);
674 break;
675#endif
676 case XK_Tab:
677 if (shft)
678 strcpy (kbuf, "\033[Z");
679 else
680 {
681#ifdef CTRL_TAB_MAKES_META
682 if (ctrl)
683 meta = 1;
684#endif
685#ifdef MOD4_TAB_MAKES_META
686 if (ev.state & Mod4Mask)
687 meta = 1;
688#endif
542 newlen = 1; 689 newlen = 0;
543 switch (keysym) 690 }
691 break;
692
693 case XK_Up: /* "\033[A" */
694 case XK_Down: /* "\033[B" */
695 case XK_Right: /* "\033[C" */
696 case XK_Left: /* "\033[D" */
697 strcpy (kbuf, "\033[Z");
698 kbuf[2] = "DACB"[keysym - XK_Left];
699 /* do Shift first */
700 if (shft)
701 kbuf[2] = "dacb"[keysym - XK_Left];
702 else if (ctrl)
703 {
704 kbuf[1] = 'O';
705 kbuf[2] = "dacb"[keysym - XK_Left];
706 }
707 else if (priv_modes & PrivMode_aplCUR)
708 kbuf[1] = 'O';
709 break;
710
711 case XK_KP_Enter:
712 /* allow shift to override */
713 if (kp)
714 {
715 strcpy (kbuf, "\033OM");
716 break;
717 }
718
719 /* FALLTHROUGH */
720
721 case XK_Return:
722 if (priv_modes & PrivMode_LFNL)
723 {
724 kbuf[0] = '\015';
725 kbuf[1] = '\012';
726 kbuf[2] = '\0';
727 }
728 else
729 {
730 kbuf[0] = '\015';
731 kbuf[1] = '\0';
732 }
733 break;
734
735 case XK_KP_F1: /* "\033OP" */
736 case XK_KP_F2: /* "\033OQ" */
737 case XK_KP_F3: /* "\033OR" */
738 case XK_KP_F4: /* "\033OS" */
739 strcpy (kbuf, "\033OP");
740 kbuf[2] += (keysym - XK_KP_F1);
741 break;
742
743 case XK_KP_Multiply: /* "\033Oj" : "*" */
744 case XK_KP_Add: /* "\033Ok" : "+" */
745 case XK_KP_Separator: /* "\033Ol" : "," */
746 case XK_KP_Subtract: /* "\033Om" : "-" */
747 case XK_KP_Decimal: /* "\033On" : "." */
748 case XK_KP_Divide: /* "\033Oo" : "/" */
749 case XK_KP_0: /* "\033Op" : "0" */
750 case XK_KP_1: /* "\033Oq" : "1" */
751 case XK_KP_2: /* "\033Or" : "2" */
752 case XK_KP_3: /* "\033Os" : "3" */
753 case XK_KP_4: /* "\033Ot" : "4" */
754 case XK_KP_5: /* "\033Ou" : "5" */
755 case XK_KP_6: /* "\033Ov" : "6" */
756 case XK_KP_7: /* "\033Ow" : "7" */
757 case XK_KP_8: /* "\033Ox" : "8" */
758 case XK_KP_9: /* "\033Oy" : "9" */
759 /* allow shift to override */
760 if (kp)
761 {
762 strcpy (kbuf, "\033Oj");
763 kbuf[2] += (keysym - XK_KP_Multiply);
764 }
765 else
766 {
767 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
768 kbuf[1] = '\0';
769 }
770 break;
771
772 default:
544 { 773 {
545#ifndef NO_BACKSPACE_KEY 774 int param = map_function_key (keysym);
546 case XK_BackSpace: 775 if (param > 0)
547 if (priv_modes & PrivMode_HaveBackSpace) 776 sprintf (kbuf,"\033[%d~", param);
548 {
549 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
550 ^ !!ctrl) ? '\b' : '\177';
551 kbuf[1] = '\0';
552 }
553 else 777 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; 778 newlen = 0;
829 break;
830 } 779 }
831 780 break;
832 if (newlen)
833 len = strlen (kbuf);
834 } 781 }
782
783 if (newlen)
784 len = strlen (kbuf);
835 785
836 /* 786 /*
837 * Pass meta for all function keys, if 'meta' option set 787 * Pass meta for all function keys, if 'meta' option set
838 */ 788 */
839#ifdef META8_OPTION 789#ifdef META8_OPTION
… …
874 return; 824 return;
875 825
876 if (len <= 0) 826 if (len <= 0)
877 return; /* not mapped */ 827 return; /* not mapped */
878 828
879 if (OPTION (Opt_scrollTtyKeypress)) 829 if (option (Opt_scrollTtyKeypress))
880 if (view_start) 830 if (view_start)
881 { 831 {
882 view_start = 0; 832 view_start = 0;
883 want_refresh = 1; 833 want_refresh = 1;
884 } 834 }
… …
908 tt_write (&ch, 1); 858 tt_write (&ch, 1);
909 } 859 }
910 860
911 tt_write (kbuf, (unsigned int)len); 861 tt_write (kbuf, (unsigned int)len);
912} 862}
913/*}}} */ 863
864void
865rxvt_term::key_release (XKeyEvent &ev)
866{
867#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
868 KeySym keysym;
869
870 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
871#endif
872
873#if ENABLE_FRILLS || ISO_14755
874 // ISO 14755 support
875 if (iso14755buf)
876 if (iso14755buf & ISO_14755_52)
877 {
878# if ISO_14755
879 scr_overlay_off ();
880# endif
881# if ISO_14755
882 // iso14755 part 5.2 handling: release time
883 // first: controls
884 if ((ev.state & ControlMask)
885 && ((keysym >= 0x40 && keysym <= 0x5f)
886 || (keysym >= 0x61 && keysym <= 0x7f)))
887 {
888 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
889 commit_iso14755 ();
890
891 return;
892 }
893
894 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
895 if (i[0] == keysym)
896 {
897 iso14755buf = ISO_14755_51 | i[1];
898 commit_iso14755 ();
899
900 return;
901 }
902
903 scr_bell ();
904# endif
905 iso14755buf = 0;
906
907 return;
908 }
909 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
910 {
911# if ISO_14755
912 scr_overlay_off ();
913# endif
914 if (iso14755buf & ISO_14755_51)
915 commit_iso14755 ();
916#if ISO_14755
917 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
918 {
919 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
920
921 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
922 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
923 }
924# endif
925 else
926 iso14755buf = 0;
927 }
928#endif
929
930 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
931 return;
932
933#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
934 if (!(ev.state & ControlMask))
935 slip_wheel_ev.stop ();
936 else if (keysym == XK_Control_L || keysym == XK_Control_R)
937 mouse_slip_wheel_speed = 0;
938#endif
939}
914 940
915#if defined (KEYSYM_RESOURCE) 941#if defined (KEYSYM_RESOURCE)
916unsigned int 942unsigned int
917rxvt_term::cmd_write (const char *str, unsigned int count) 943rxvt_term::cmd_write (const char *str, unsigned int count)
918{ 944{
… …
948void 974void
949rxvt_term::flush () 975rxvt_term::flush ()
950{ 976{
951 flush_ev.stop (); 977 flush_ev.stop ();
952 978
953#ifdef TRANSPARENT 979#ifdef HAVE_BG_PIXMAP
954 if (want_full_refresh) 980 if (bgPixmap.flags & bgPixmap_t::hasChanged)
955 { 981 {
956 want_full_refresh = 0; 982 bgPixmap.flags &= ~bgPixmap_t::hasChanged;
957 scr_clear (); 983// scr_clear (true); This needs to be researched further!
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 whether 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 workaround 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:
1460 if (ev.xconfigure.window == parent[0]) 1436 if (ev.xconfigure.window == parent[0])
1461 { 1437 {
1462 while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev)) 1438 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1463 ; 1439 ;
1464 1440
1465 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1441 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1466 { 1442 {
1467 seen_resize = 1; 1443 seen_resize = 1;
1468 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1444 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1469 } 1445 }
1446 else
1447 {
1448#ifdef HAVE_BG_PIXMAP
1449 if (bgPixmap.window_position_sensitive ())
1450 {
1451 if (mapped)
1452 update_background ();
1453 else
1454 bgPixmap.invalidate ();
1455 }
1456#endif
1457 }
1470 1458
1471 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1459 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 } 1460 }
1478 break; 1461 break;
1479 1462
1480 case PropertyNotify: 1463 case PropertyNotify:
1481 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1464 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
… …
1484 selection_property (ev.xproperty.window, ev.xproperty.atom); 1467 selection_property (ev.xproperty.window, ev.xproperty.atom);
1485 1468
1486 break; 1469 break;
1487 1470
1488 case SelectionClear: 1471 case SelectionClear:
1489 selection_clear (); 1472 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1490 break; 1473 break;
1491 1474
1492 case SelectionNotify: 1475 case SelectionNotify:
1493 if (selection_wait == Sel_normal) 1476 if (selection_wait == Sel_normal)
1494 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1477 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
… …
1497 case SelectionRequest: 1480 case SelectionRequest:
1498 selection_send (ev.xselectionrequest); 1481 selection_send (ev.xselectionrequest);
1499 break; 1482 break;
1500 1483
1501 case MapNotify: 1484 case MapNotify:
1485#ifdef HAVE_BG_PIXMAP
1486 /* This is needed specifically to fix the case of no window manager or a
1487 * non-reparenting window manager. In those cases we never get first
1488 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1489 * care of multiplicity of ConfigureNotify events arriving while WM does
1490 * reparenting.
1491 * We should not render background immediately, as there could be several
1492 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1493 * by scheduling background redraw as soon as we can, but giving a short
1494 * bit of time for ConfigureNotifies to arrive.
1495 * We should render background PRIOR to drawing any text, but AFTER all
1496 * of ConfigureNotifys for the best results.
1497 */
1498 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1499 update_background_ev.start (0.025);
1500#endif
1502 mapped = 1; 1501 mapped = 1;
1503#ifdef TEXT_BLINK 1502#ifdef TEXT_BLINK
1504 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1503 text_blink_ev.start ();
1505#endif 1504#endif
1506 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1505 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1507 break; 1506 break;
1508 1507
1509 case UnmapNotify: 1508 case UnmapNotify:
… …
1511#ifdef TEXT_BLINK 1510#ifdef TEXT_BLINK
1512 text_blink_ev.stop (); 1511 text_blink_ev.stop ();
1513#endif 1512#endif
1514 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1513 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1515 break; 1514 break;
1516
1517#ifdef TRANSPARENT
1518 case ReparentNotify:
1519 rootwin_cb (ev);
1520 break;
1521#endif /* TRANSPARENT */
1522 1515
1523 case GraphicsExpose: 1516 case GraphicsExpose:
1524 case Expose: 1517 case Expose:
1525 if (ev.xany.window == vt) 1518 if (ev.xany.window == vt)
1526 { 1519 {
1527 do 1520 do
1521 {
1528 scr_expose (ev.xexpose.x, ev.xexpose.y, 1522 scr_expose (ev.xexpose.x, ev.xexpose.y,
1529 ev.xexpose.width, ev.xexpose.height, False); 1523 ev.xexpose.width, ev.xexpose.height, False);
1524 }
1530 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev)); 1525 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1531 1526
1532 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1527 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1533 1528
1534 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev)) 1529 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1530 {
1535 scr_expose (ev.xexpose.x, ev.xexpose.y, 1531 scr_expose (ev.xexpose.x, ev.xexpose.y,
1536 ev.xexpose.width, ev.xexpose.height, False); 1532 ev.xexpose.width, ev.xexpose.height, False);
1533 }
1537 1534
1538 want_refresh = 1; 1535 want_refresh = 1;
1539 } 1536 }
1540 else 1537 else
1541 { 1538 {
1542 XEvent unused_event; 1539 XEvent unused_event;
1543 1540
1544 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event)) 1541 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1545 ; 1542 ;
1546 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event)) 1543 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1547 ; 1544 ;
1548 1545
1549 if (isScrollbarWindow (ev.xany.window)) 1546 if (scrollBar.state && ev.xany.window == scrollBar.win)
1550 { 1547 {
1551 scrollBar.setIdle (); 1548 scrollBar.state = STATE_IDLE;
1552 scrollbar_show (0); 1549 scrollBar.show (0);
1553 } 1550 }
1554
1555#ifdef TRANSPARENT
1556 if (am_transparent && ev.xany.window == parent[0])
1557 XClearWindow (xdisp, ev.xany.window);
1558#endif
1559 } 1551 }
1560 break; 1552 break;
1561 1553
1562 case MotionNotify: 1554 case MotionNotify:
1563#ifdef POINTER_BLANK 1555#ifdef POINTER_BLANK
1564 if (hidden_pointer) 1556 if (hidden_pointer)
1565 pointer_unblank (); 1557 pointer_unblank ();
1566#endif 1558#endif
1559 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1560 || priv_modes & PrivMode_MouseAnyEvent)
1561 mouse_report (ev.xbutton);
1567 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1562 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1568 break; 1563 break;
1569 1564
1570 if (ev.xany.window == vt) 1565 if (ev.xany.window == vt)
1571 { 1566 {
1572 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1567 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1573 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1568 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1574 ; // nop 1569 ; // nop
1575 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1570 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1576 { 1571 {
1577 while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev)) 1572 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1578 ; 1573 ;
1579 1574
1580 XQueryPointer (xdisp, vt, 1575 XQueryPointer (dpy, vt,
1581 &unused_root, &unused_child, 1576 &unused_root, &unused_child,
1582 &unused_root_x, &unused_root_y, 1577 &unused_root_x, &unused_root_y,
1583 &ev.xbutton.x, &ev.xbutton.y, 1578 &ev.xbutton.x, &ev.xbutton.y,
1584 &ev.xbutton.state); 1579 &ev.xbutton.state);
1585#ifdef MOUSE_THRESHOLD 1580#ifdef MOUSE_THRESHOLD
… …
1605 int dist; 1600 int dist;
1606 1601
1607 /* don't clobber the current delay if we are 1602 /* don't clobber the current delay if we are
1608 * already in the middle of scrolling. 1603 * already in the middle of scrolling.
1609 */ 1604 */
1610 if (!sel_scroll_ev.active) 1605 if (!sel_scroll_ev.is_active ())
1611 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1606 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1612 1607
1613 /* save the event params so we can highlight 1608 /* save the event params so we can highlight
1614 * the selection in the pending-scroll loop 1609 * the selection in the pending-scroll loop
1615 */ 1610 */
1616 selection_save_x = ev.xbutton.x; 1611 selection_save_x = ev.xbutton.x;
… …
1638 else 1633 else
1639 { 1634 {
1640 /* we are within the text window, so we 1635 /* we are within the text window, so we
1641 * shouldn't be scrolling 1636 * shouldn't be scrolling
1642 */ 1637 */
1643 if (sel_scroll_ev.active)
1644 sel_scroll_ev.stop(); 1638 sel_scroll_ev.stop();
1645 } 1639 }
1646#endif 1640#endif
1647#ifdef MOUSE_THRESHOLD 1641#ifdef MOUSE_THRESHOLD
1648 } 1642 }
1649#endif 1643#endif
1650 } 1644 }
1651 } 1645 }
1652 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1646 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1653 { 1647 {
1654 while (XCheckTypedWindowEvent (xdisp, scrollBar.win, 1648 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1655 MotionNotify, &ev)) 1649 MotionNotify, &ev))
1656 ; 1650 ;
1657 1651
1658 XQueryPointer (xdisp, scrollBar.win, 1652 XQueryPointer (dpy, scrollBar.win,
1659 &unused_root, &unused_child, 1653 &unused_root, &unused_child,
1660 &unused_root_x, &unused_root_y, 1654 &unused_root_x, &unused_root_y,
1661 &ev.xbutton.x, &ev.xbutton.y, 1655 &ev.xbutton.x, &ev.xbutton.y,
1662 &unused_mask); 1656 &unused_mask);
1663 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1657 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1664 scrollbar_size ()); 1658 scrollBar.size ());
1665 want_refresh = 1; 1659 want_refresh = 1;
1666 refresh_limit = 0;
1667 scrollbar_show (1); 1660 scrollBar.show (1);
1668 } 1661 }
1669 break; 1662 break;
1670 } 1663 }
1671 1664
1672skip_switch: ;
1673
1674#if defined(CURSOR_BLINK) 1665#if defined(CURSOR_BLINK)
1675 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1666 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1676 { 1667 {
1677 if (hidden_cursor) 1668 if (hidden_cursor)
1678 { 1669 {
1679 hidden_cursor = 0; 1670 hidden_cursor = 0;
1680 want_refresh = 1; 1671 want_refresh = 1;
1681 } 1672 }
1682 1673
1683 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1674 cursor_blink_ev.again ();
1684 } 1675 }
1685#endif 1676#endif
1686 1677
1687#if defined(POINTER_BLANK) 1678#if defined(POINTER_BLANK)
1688 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1679 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1689 { 1680 {
1690 if (ev.type == MotionNotify 1681 if (ev.type == MotionNotify
1691 || ev.type == ButtonPress 1682 || ev.type == ButtonPress
1692 || ev.type == ButtonRelease) 1683 || ev.type == ButtonRelease)
1693 if (hidden_pointer) 1684 if (hidden_pointer)
… …
1695 1686
1696 if (ev.type == KeyPress && hidden_pointer == 0) 1687 if (ev.type == KeyPress && hidden_pointer == 0)
1697 pointer_blank (); 1688 pointer_blank ();
1698 } 1689 }
1699#endif 1690#endif
1691
1692 refresh_check ();
1700} 1693}
1694
1695#if ENABLE_FRILLS
1696void
1697rxvt_term::set_urgency (bool enable)
1698{
1699 if (enable == urgency_hint)
1700 return;
1701
1702 if (XWMHints *h = XGetWMHints (dpy, parent[0]))
1703 {
1704 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1705 XSetWMHints (dpy, parent[0], h);
1706 urgency_hint = enable;
1707 }
1708}
1709#endif
1701 1710
1702void 1711void
1703rxvt_term::focus_in () 1712rxvt_term::focus_in ()
1704{ 1713{
1705 if (!focus) 1714 if (!focus)
1706 { 1715 {
1707 focus = 1; 1716 focus = 1;
1708 want_refresh = 1; 1717 want_refresh = 1;
1709 1718
1710 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1711
1712#if USE_XIM 1719#if USE_XIM
1713 if (Input_Context != NULL) 1720 if (Input_Context != NULL)
1714 { 1721 {
1715 IMSetStatusPosition (); 1722 IMSetPosition ();
1716 XSetICFocus (Input_Context); 1723 XSetICFocus (Input_Context);
1717 } 1724 }
1718#endif 1725#endif
1719#if CURSOR_BLINK 1726#if CURSOR_BLINK
1720 if (OPTION (Opt_cursorBlink)) 1727 if (option (Opt_cursorBlink))
1721 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1728 cursor_blink_ev.again ();
1722#endif 1729#endif
1723#if OFF_FOCUS_FADING 1730#if OFF_FOCUS_FADING
1724 if (rs[Rs_fade]) 1731 if (rs[Rs_fade])
1725 { 1732 {
1726 pix_colors = pix_colors_focused; 1733 pix_colors = pix_colors_focused;
1727 scr_recolour (); 1734 scr_recolour ();
1728 } 1735 }
1729#endif 1736#endif
1737#if ENABLE_FRILLS
1738 if (option (Opt_urgentOnBell))
1739 set_urgency (0);
1740#endif
1741
1742 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1730 } 1743 }
1731} 1744}
1732 1745
1733void 1746void
1734rxvt_term::focus_out () 1747rxvt_term::focus_out ()
… …
1736 if (focus) 1749 if (focus)
1737 { 1750 {
1738 focus = 0; 1751 focus = 0;
1739 want_refresh = 1; 1752 want_refresh = 1;
1740 1753
1741 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1754#if ENABLE_FRILLS
1742 1755 if (option (Opt_urgentOnBell))
1756 set_urgency (0);
1757#endif
1743#if ENABLE_FRILLS || ISO_14755 1758#if ENABLE_FRILLS || ISO_14755
1744 if (iso14755buf) 1759 if (iso14755buf)
1745 { 1760 {
1746 iso14755buf = 0; 1761 iso14755buf = 0;
1747# if ENABLE_OVERLAY 1762# if ISO_14755
1748 scr_overlay_off (); 1763 scr_overlay_off ();
1749# endif 1764# endif
1750 } 1765 }
1751#endif 1766#endif
1752#if USE_XIM 1767#if USE_XIM
1753 if (Input_Context != NULL) 1768 if (Input_Context != NULL)
1754 XUnsetICFocus (Input_Context); 1769 XUnsetICFocus (Input_Context);
1755#endif 1770#endif
1756#if CURSOR_BLINK 1771#if CURSOR_BLINK
1757 if (OPTION (Opt_cursorBlink)) 1772 if (option (Opt_cursorBlink))
1758 cursor_blink_ev.stop (); 1773 cursor_blink_ev.stop ();
1774
1759 hidden_cursor = 0; 1775 hidden_cursor = 0;
1760#endif 1776#endif
1761#if OFF_FOCUS_FADING 1777#if OFF_FOCUS_FADING
1762 if (rs[Rs_fade]) 1778 if (rs[Rs_fade])
1763 { 1779 {
1764 pix_colors = pix_colors_unfocused; 1780 pix_colors = pix_colors_unfocused;
1765 scr_recolour (); 1781 scr_recolour ();
1766 } 1782 }
1767#endif 1783#endif
1784
1785 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1786 }
1787}
1788
1789void
1790rxvt_term::update_fade_color (unsigned int idx)
1791{
1792#if OFF_FOCUS_FADING
1793 if (rs[Rs_fade])
1768 } 1794 {
1795 rgba c;
1796 pix_colors [Color_fade].get (c);
1797 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1798 }
1799#endif
1769} 1800}
1770 1801
1771#if TRANSPARENT 1802#if ENABLE_TRANSPARENCY || ENABLE_PERL
1772void 1803void
1773rxvt_term::rootwin_cb (XEvent &ev) 1804rxvt_term::rootwin_cb (XEvent &ev)
1774{ 1805{
1775 make_current (); 1806 make_current ();
1776 1807
1808 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1809 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1810 return;
1811
1812# if ENABLE_TRANSPARENCY
1777 switch (ev.type) 1813 switch (ev.type)
1778 { 1814 {
1779 case PropertyNotify: 1815 case PropertyNotify:
1780 /* 1816 /*
1781 * if user used some Esetroot compatible prog to set the root bg, 1817 * 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. 1818 * use the property to determine the pixmap. We use it later on.
1783 */ 1819 */
1784 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1820 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1785 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1821 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1786 return; 1822 {
1823 bgPixmap.set_root_pixmap ();
1824 update_background ();
1825 }
1787 1826
1788 /* FALLTHROUGH */
1789 case ReparentNotify:
1790 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1791 want_refresh = want_full_refresh = 1;
1792 break; 1827 break;
1793 } 1828 }
1829# endif
1830
1831 refresh_check ();
1794} 1832}
1795#endif 1833#endif
1796 1834
1797void 1835void
1798rxvt_term::button_press (XButtonEvent &ev) 1836rxvt_term::button_press (XButtonEvent &ev)
… …
1829 /* save the xbutton state (for ButtonRelease) */ 1867 /* save the xbutton state (for ButtonRelease) */
1830 MEvent.state = ev.state; 1868 MEvent.state = ev.state;
1831#ifdef MOUSE_REPORT_DOUBLECLICK 1869#ifdef MOUSE_REPORT_DOUBLECLICK
1832 if (ev.button == MEvent.button && clickintime) 1870 if (ev.button == MEvent.button && clickintime)
1833 { 1871 {
1834 /* same button, within alloted time */ 1872 /* same button, within allowed time */
1835 MEvent.clicks++; 1873 MEvent.clicks++;
1836 1874
1837 if (MEvent.clicks > 1) 1875 if (MEvent.clicks > 1)
1838 { 1876 {
1839 /* only report double clicks */ 1877 /* only report double clicks */
… …
1853 mouse_report (ev); 1891 mouse_report (ev);
1854 } 1892 }
1855#else 1893#else
1856 MEvent.button = ev.button; 1894 MEvent.button = ev.button;
1857 mouse_report (ev); 1895 mouse_report (ev);
1858#endif /* MOUSE_REPORT_DOUBLECLICK */ 1896#endif /* MOUSE_REPORT_DOUBLECLICK */
1859 1897
1860 } 1898 }
1861 else 1899 else
1862 { 1900 {
1863 if (ev.button != MEvent.button) 1901 if (ev.button != MEvent.button)
… …
1911 } 1949 }
1912 1950
1913 /* 1951 /*
1914 * Scrollbar window processing of button press 1952 * Scrollbar window processing of button press
1915 */ 1953 */
1916 if (isScrollbarWindow (ev.window)) 1954 if (scrollBar.state && ev.window == scrollBar.win)
1917 { 1955 {
1918 scrollBar.setIdle (); 1956 page_dirn direction = NO_DIR;
1957
1958 if (scrollBar.upButton (ev.y))
1959 direction = UP; /* up */
1960 else if (scrollBar.dnButton (ev.y))
1961 direction = DN; /* down */
1962
1963 scrollBar.state = STATE_IDLE;
1919 /* 1964 /*
1920 * Rxvt-style scrollbar: 1965 * Rxvt-style scrollbar:
1921 * move up if mouse is above slider 1966 * move up if mouse is above slider
1922 * move dn if mouse is below slider 1967 * move dn if mouse is below slider
1923 * 1968 *
… …
1932 /* 1977 /*
1933 * Mouse report disabled scrollbar: 1978 * Mouse report disabled scrollbar:
1934 * arrow buttons - send up/down 1979 * arrow buttons - send up/down
1935 * click on scrollbar - send pageup/down 1980 * click on scrollbar - send pageup/down
1936 */ 1981 */
1937 if ((scrollBar.style == R_SB_NEXT 1982 if (direction == UP)
1938 && scrollbarnext_upButton (ev.y))
1939 || (scrollBar.style == R_SB_RXVT
1940 && scrollbarrxvt_upButton (ev.y)))
1941 tt_printf ("\033[A"); 1983 tt_printf ("\033[A");
1942 else if ((scrollBar.style == R_SB_NEXT 1984 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"); 1985 tt_printf ("\033[B");
1947 else 1986 else
1948 switch (ev.button) 1987 switch (ev.button)
1949 { 1988 {
1950 case Button2: 1989 case Button2:
… …
1957 tt_printf ("\033[5~"); 1996 tt_printf ("\033[5~");
1958 break; 1997 break;
1959 } 1998 }
1960 } 1999 }
1961 else 2000 else
1962#endif /* NO_SCROLLBAR_REPORT */ 2001#endif /* NO_SCROLLBAR_REPORT */
1963
1964 {
1965 char upordown = 0;
1966
1967 if (scrollBar.style == R_SB_NEXT)
1968 { 2002 {
1969 if (scrollbarnext_upButton (ev.y)) 2003 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 { 2004 {
1983#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2005#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2006 if (!cont_scroll_ev.is_active ())
1984 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2007 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1985#endif 2008#endif
1986 if (scr_page (upordown < 0 ? UP : DN, 1)) 2009 if (scr_page (direction, 1))
1987 { 2010 {
1988 if (upordown < 0) 2011 if (direction == UP)
1989 scrollBar.setUp (); 2012 scrollBar.state = STATE_UP;
1990 else 2013 else
1991 scrollBar.setDn (); 2014 scrollBar.state = STATE_DOWN;
1992 } 2015 }
1993 } 2016 }
1994 else 2017 else
1995 switch (ev.button) 2018 switch (ev.button)
1996 { 2019 {
1997 case Button2: 2020 case Button2:
1998 switch (scrollbar_align) 2021 switch (scrollBar.align)
1999 { 2022 {
2000 case R_SB_ALIGN_TOP: 2023 case R_SB_ALIGN_TOP:
2001 csrO = 0; 2024 csrO = 0;
2002 break; 2025 break;
2003 case R_SB_ALIGN_CENTRE: 2026 case R_SB_ALIGN_CENTRE:
… …
2009 } 2032 }
2010 2033
2011 if (scrollBar.style == R_SB_XTERM 2034 if (scrollBar.style == R_SB_XTERM
2012 || scrollbar_above_slider (ev.y) 2035 || scrollbar_above_slider (ev.y)
2013 || scrollbar_below_slider (ev.y)) 2036 || scrollbar_below_slider (ev.y))
2014 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2037 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2015 2038
2016 scrollBar.setMotion (); 2039 scrollBar.state = STATE_MOTION;
2017 break; 2040 break;
2018 2041
2019 case Button1: 2042 case Button1:
2020 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2043 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2021 csrO = ev.y - scrollBar.top; 2044 csrO = ev.y - scrollBar.top;
2022 /* FALLTHROUGH */ 2045 /* FALLTHROUGH */
2023 2046
2024 case Button3: 2047 case Button3:
2025 if (scrollBar.style != R_SB_XTERM) 2048 if (scrollBar.style != R_SB_XTERM)
… …
2035 scr_page (DN, nrow - 1); 2058 scr_page (DN, nrow - 1);
2036# else 2059# else
2037 scr_page (DN, nrow / 4); 2060 scr_page (DN, nrow / 4);
2038# endif 2061# endif
2039 else 2062 else
2040 scrollBar.setMotion (); 2063 scrollBar.state = STATE_MOTION;
2041 } 2064 }
2042 else 2065 else
2043 { 2066 {
2044 scr_page ((ev.button == Button1 ? DN : UP), 2067 scr_page ((ev.button == Button1 ? DN : UP),
2045 (nrow 2068 (nrow
2046 * scrollbar_position (ev.y) 2069 * scrollbar_position (ev.y)
2047 / scrollbar_size ())); 2070 / scrollBar.size ()));
2048 } 2071 }
2049 2072
2050 break; 2073 break;
2051 } 2074 }
2052 } 2075 }
… …
2062 2085
2063 csrO = 0; /* reset csr Offset */ 2086 csrO = 0; /* reset csr Offset */
2064 if (!bypass_keystate) 2087 if (!bypass_keystate)
2065 reportmode = !! (priv_modes & PrivMode_mouse_report); 2088 reportmode = !! (priv_modes & PrivMode_mouse_report);
2066 2089
2067 if (scrollbar_isUpDn ()) 2090 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2068 { 2091 {
2069 scrollBar.setIdle (); 2092 scrollBar.state = STATE_IDLE;
2070 scrollbar_show (0); 2093 scrollBar.show (0);
2071 } 2094 }
2072 2095
2073#ifdef SELECTION_SCROLLING 2096#ifdef SELECTION_SCROLLING
2074 if (sel_scroll_ev.active)
2075 sel_scroll_ev.stop(); 2097 sel_scroll_ev.stop();
2076#endif 2098#endif
2077 2099
2078 if (ev.window == vt) 2100 if (ev.window == vt)
2079 { 2101 {
2080 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2102 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
… …
2104 mouse_report (ev); 2126 mouse_report (ev);
2105 } 2127 }
2106#else /* MOUSE_REPORT_DOUBLECLICK */ 2128#else /* MOUSE_REPORT_DOUBLECLICK */
2107 MEvent.button = AnyButton; 2129 MEvent.button = AnyButton;
2108 mouse_report (ev); 2130 mouse_report (ev);
2109#endif /* MOUSE_REPORT_DOUBLECLICK */ 2131#endif /* MOUSE_REPORT_DOUBLECLICK */
2110 return; 2132 return;
2111 } 2133 }
2112 2134
2113 /* 2135 /*
2114 * dumb hack to compensate for the failure of click-and-drag 2136 * dumb hack to compensate for the failure of click-and-drag
… …
2126 selection_make (ev.time); 2148 selection_make (ev.time);
2127 break; 2149 break;
2128 2150
2129 case Button2: 2151 case Button2:
2130 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2152 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); 2153 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2132 break; 2154 break;
2133 2155
2134#ifdef MOUSE_WHEEL 2156#ifdef MOUSE_WHEEL
2135 case Button4: 2157 case Button4:
2136 case Button5: 2158 case Button5:
… …
2140 2162
2141 v = ev.button == Button4 ? UP : DN; 2163 v = ev.button == Button4 ? UP : DN;
2142 2164
2143 if (ev.state & ShiftMask) 2165 if (ev.state & ShiftMask)
2144 i = 1; 2166 i = 1;
2145 else if (OPTION (Opt_mouseWheelScrollPage)) 2167 else if (option (Opt_mouseWheelScrollPage))
2146 i = nrow - 1; 2168 i = nrow - 1;
2147 else 2169 else
2148 i = 5; 2170 i = 5;
2149 2171
2150# ifdef MOUSE_SLIP_WHEELING 2172# ifdef MOUSE_SLIP_WHEELING
… …
2152 { 2174 {
2153 mouse_slip_wheel_speed += v ? -1 : 1; 2175 mouse_slip_wheel_speed += v ? -1 : 1;
2154 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2176 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2155 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2177 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2156 2178
2157 if (slip_wheel_ev.at < NOW) 2179 if (!slip_wheel_ev.is_active ())
2158 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2180 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2159
2160 slip_wheel_ev.start ();
2161 } 2181 }
2162 else 2182 else
2183# endif
2163 { 2184 {
2164# endif
2165 scr_page (v, i); 2185 scr_page (v, i);
2166 scrollbar_show (1); 2186 scrollBar.show (1);
2167# ifdef MOUSE_SLIP_WHEELING
2168 } 2187 }
2169# endif
2170 } 2188 }
2171 break; 2189 break;
2172#endif 2190#endif
2173 } 2191 }
2174 } 2192 }
2175} 2193}
2176 2194
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 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, &parent[i], &list, &n);
2580 XFree (list);
2581
2582 if (parent[i] == display->root)
2583 {
2584 if (oldp != None)
2585 pchanged = 1;
2586
2587 break;
2588 }
2589
2590 if (oldp != parent[i])
2591 pchanged = 1;
2592 }
2593
2594 n = 0;
2595
2596 if (pchanged)
2597 for (; n < (unsigned int)i; n++)
2598 {
2599 XGetWindowAttributes (xdisp, parent[n], &wattr);
2600
2601 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2602 {
2603 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2604 break;
2605 }
2606 }
2607
2608 if (n > (sizeof (parent) / sizeof (parent[0])))
2609 {
2610 XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2611 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2612 am_transparent = 0;
2613 /* XXX: also turn off Opt_transparent? */
2614 }
2615 else
2616 {
2617 for (n = 0; n < (unsigned int)i; n++)
2618 {
2619 XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2620 XClearWindow (xdisp, parent[n]);
2621 }
2622
2623 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2624 am_transparent = 1;
2625 }
2626
2627 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2628 parent[i] = None;
2629 }
2630
2631 if (scrollBar.win)
2632 {
2633 XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
2634 scrollBar.setIdle ();
2635 scrollbar_show (0);
2636 }
2637
2638 if (am_transparent)
2639 {
2640 want_refresh = want_full_refresh = 1;
2641 if (am_pixmap_trans)
2642 flush ();
2643 }
2644
2645 return pchanged;
2646}
2647#endif
2648
2649/*}}} */ 2195/*}}} */
2650 2196
2651bool 2197void
2652rxvt_term::cmd_parse () 2198rxvt_term::cmd_parse ()
2653{ 2199{
2654 bool flag = false;
2655 wchar_t ch = NOCHAR; 2200 wchar_t ch = NOCHAR;
2656 char *seq_begin; // remember start of esc-sequence here 2201 char *seq_begin; // remember start of esc-sequence here
2657 2202
2658 for (;;) 2203 for (;;)
2659 { 2204 {
2660 if (ch == NOCHAR) 2205 if (expect_false (ch == NOCHAR))
2661 { 2206 {
2662 seq_begin = cmdbuf_ptr; 2207 seq_begin = cmdbuf_ptr;
2663 ch = next_char (); 2208 ch = next_char ();
2664 2209
2665 if (ch == NOCHAR) 2210 if (ch == NOCHAR)
2666 break; 2211 break;
2667 } 2212 }
2668 2213
2669 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2214 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2670 { 2215 {
2671 if (!seen_input) 2216 if (expect_false (!seen_input))
2672 { 2217 {
2673 seen_input = 1; 2218 seen_input = 1;
2674 // many badly-written programs (e.g. jed) contain a race condition: 2219 // many badly-written programs (e.g. jed) contain a race condition:
2675 // they first read the screensize and then install a SIGWINCH handler. 2220 // they first read the screensize and then install a SIGWINCH handler.
2676 // some window managers resize the window early, and these programs 2221 // some window managers resize the window early, and these programs
… …
2689 wchar_t *str = buf; 2234 wchar_t *str = buf;
2690 wchar_t *eol = str + min (ncol, UBUFSIZ); 2235 wchar_t *eol = str + min (ncol, UBUFSIZ);
2691 2236
2692 for (;;) 2237 for (;;)
2693 { 2238 {
2694 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2239 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2695 break; 2240 break;
2696 2241
2697 *str++ = ch; 2242 *str++ = ch;
2698 2243
2699 if (ch == C0_LF || str >= eol) 2244 if (expect_false (ch == C0_LF || str >= eol))
2700 { 2245 {
2701 if (ch == C0_LF) 2246 if (ch == C0_LF)
2702 nlines++; 2247 nlines++;
2703 2248
2704 refresh_count++; 2249 refresh_count++;
2705 2250
2706 if (!OPTION (Opt_jumpScroll) 2251 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2707 || (refresh_count >= refresh_limit * (nrow - 1)))
2708 { 2252 {
2709 refreshnow = true;
2710 refresh_count = 0; 2253 refresh_count = 0;
2254
2255 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2256 {
2257 refreshnow = true;
2711 ch = NOCHAR; 2258 ch = NOCHAR;
2712 break; 2259 break;
2260 }
2713 } 2261 }
2714 2262
2715 // scr_add_lines only works for nlines <= nrow - 1. 2263 // scr_add_lines only works for nlines <= nrow - 1.
2716 if (nlines >= nrow - 1) 2264 if (nlines >= nrow - 1)
2717 { 2265 {
… …
2745 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2293 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2746 scr_add_lines (buf, str - buf, nlines); 2294 scr_add_lines (buf, str - buf, nlines);
2747 2295
2748 /* 2296 /*
2749 * If there have been a lot of new lines, then update the screen 2297 * If there have been a lot of new lines, then update the screen
2750 * What the heck I'll cheat and only refresh less than every page-full. 2298 * What the heck we'll cheat and only refresh less than every page-full.
2751 * the number of pages between refreshes is refresh_limit, which 2299 * if skipScroll is enabled.
2752 * is incremented here because we must be doing flat-out scrolling.
2753 */ 2300 */
2754 if (refreshnow) 2301 if (refreshnow)
2755 { 2302 {
2756 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2757 refresh_limit++;
2758 else
2759 {
2760 flag = true;
2761 scr_refresh (); 2303 scr_refresh ();
2762 want_refresh = 1; 2304 want_refresh = 1;
2763 }
2764 } 2305 }
2765
2766 } 2306 }
2767 else 2307 else
2768 { 2308 {
2769 try 2309 try
2770 { 2310 {
… …
2778 } 2318 }
2779 2319
2780 ch = NOCHAR; 2320 ch = NOCHAR;
2781 } 2321 }
2782 } 2322 }
2783
2784 return flag;
2785} 2323}
2786 2324
2787// read the next character 2325// read the next character
2788wchar_t 2326wchar_t
2789rxvt_term::next_char () NOTHROW 2327rxvt_term::next_char () NOTHROW
2790{ 2328{
2791 while (cmdbuf_ptr < cmdbuf_endp) 2329 while (cmdbuf_ptr < cmdbuf_endp)
2792 { 2330 {
2793 // assume 7-bit to be ascii ALWAYS 2331 // assume 7-bit to be ascii ALWAYS
2794 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2332 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2795 return *cmdbuf_ptr++; 2333 return *cmdbuf_ptr++;
2796 2334
2797 wchar_t wc; 2335 wchar_t wc;
2798 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2336 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2799 2337
… …
2803 cmdbuf_ptr = cmdbuf_endp; 2341 cmdbuf_ptr = cmdbuf_endp;
2804 break; 2342 break;
2805 } 2343 }
2806 2344
2807 if (len == (size_t)-1) 2345 if (len == (size_t)-1)
2346 {
2347 mbstate.reset (); // reset now undefined conversion state
2808 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2348 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2349 }
2809 2350
2810 // assume wchar == unicode 2351 // assume wchar == unicode
2811 cmdbuf_ptr += len; 2352 cmdbuf_ptr += len;
2812 return wc & UNICODE_MASK; 2353 return wc & UNICODE_MASK;
2813 } 2354 }
… …
2857/*----------------------------------------------------------------------*/ 2398/*----------------------------------------------------------------------*/
2858#ifdef PRINTPIPE 2399#ifdef PRINTPIPE
2859FILE * 2400FILE *
2860rxvt_term::popen_printer () 2401rxvt_term::popen_printer ()
2861{ 2402{
2862 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2403 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2863 2404
2864 if (stream == NULL) 2405 if (stream == NULL)
2865 rxvt_warn ("can't open printer pipe, not printing.\n"); 2406 rxvt_warn ("can't open printer pipe, not printing.\n");
2866 2407
2867 return stream; 2408 return stream;
… …
2878 * simulate attached vt100 printer 2419 * simulate attached vt100 printer
2879 */ 2420 */
2880void 2421void
2881rxvt_term::process_print_pipe () 2422rxvt_term::process_print_pipe ()
2882{ 2423{
2883 int done; 2424 FILE *fd = popen_printer ();
2884 FILE *fd;
2885 2425
2886 if ((fd = popen_printer ()) == NULL) 2426 if (!fd)
2887 return; 2427 return;
2888 2428
2889 /* 2429 /*
2890 * Send all input to the printer until either ESC[4i or ESC[?4i 2430 * Send all input to the printer until either ESC[4i or ESC[?4i
2891 * is received. 2431 * is received.
2892 */ 2432 */
2893 for (done = 0; !done;) 2433 for (int done = 0; !done; )
2894 { 2434 {
2895 unsigned char buf[8]; 2435 unsigned char buf[8];
2896 unicode_t ch; 2436 unicode_t ch;
2897 unsigned int i, len; 2437 unsigned int i, len;
2898 2438
… …
2917 { 2457 {
2918 if ((buf[len++] = cmd_getc ()) == 'i') 2458 if ((buf[len++] = cmd_getc ()) == 'i')
2919 break; /* done = 1 */ 2459 break; /* done = 1 */
2920 } 2460 }
2921 } 2461 }
2922 2462
2923 for (i = 0; i < len; i++) 2463 for (i = 0; i < len; i++)
2924 if (putc (buf[i], fd) == EOF) 2464 if (putc (buf[i], fd) == EOF)
2925 { 2465 {
2926 done = 1; 2466 done = 1;
2927 break; 2467 break;
… …
2929 } 2469 }
2930 } 2470 }
2931 2471
2932 pclose_printer (fd); 2472 pclose_printer (fd);
2933} 2473}
2934#endif /* PRINTPIPE */ 2474#endif /* PRINTPIPE */
2935/*}}} */ 2475/*}}} */
2936 2476
2937/* *INDENT-OFF* */ 2477/* *INDENT-OFF* */
2938enum { 2478enum {
2939 C1_40 = 0x40, 2479 C1_40 = 0x40,
… …
2989 process_dcs_seq (); 2529 process_dcs_seq ();
2990 break; 2530 break;
2991 case 0x9b: /* CSI */ 2531 case 0x9b: /* CSI */
2992 process_csi_seq (); 2532 process_csi_seq ();
2993 break; 2533 break;
2994 case 0x9d: /* CSI */ 2534 case 0x9d: /* OSC */
2995 process_osc_seq (); 2535 process_osc_seq ();
2996 break; 2536 break;
2997#endif 2537#endif
2998 } 2538 }
2999} 2539}
… …
3043 break; 2583 break;
3044 case 'Z': /* identify the terminal type */ 2584 case 'Z': /* identify the terminal type */
3045 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2585 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
3046 break; 2586 break;
3047 case '<': /* turn off VT52 mode */ 2587 case '<': /* turn off VT52 mode */
3048 PrivMode (0, PrivMode_vt52); 2588 set_privmode (PrivMode_vt52, 0);
3049 break; 2589 break;
3050 case 'F': /* use special graphics character set */ 2590 case 'F': /* use special graphics character set */
3051 case 'G': /* use regular character set */ 2591 case 'G': /* use regular character set */
3052 /* unimplemented */ 2592 /* unimplemented */
3053 break; 2593 break;
… …
3107 scr_forwardindex (); 2647 scr_forwardindex ();
3108 break; 2648 break;
3109#endif 2649#endif
3110 case '=': 2650 case '=':
3111 case '>': 2651 case '>':
3112 PrivMode ((ch == '='), PrivMode_aplKP); 2652 set_privmode (PrivMode_aplKP, ch == '=');
3113 break; 2653 break;
3114 2654
3115 case C1_40: 2655 case C1_40:
3116 cmd_getc (); 2656 cmd_getc ();
3117 break; 2657 break;
… …
3156 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2696 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3157 case C1_SCI: /* ESC Z */ 2697 case C1_SCI: /* ESC Z */
3158 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2698 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3159 break; /* steal obsolete ESC [ c */ 2699 break; /* steal obsolete ESC [ c */
3160 2700
3161 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2701 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
3162 case C1_CSI: /* ESC [ */ 2702 case C1_CSI: /* ESC [ */
3163 process_csi_seq (); 2703 process_csi_seq ();
3164 break; 2704 break;
3165 2705
3166 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2706 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
3167 case C1_OSC: /* ESC ] */ 2707 case C1_OSC: /* ESC ] */
3168 process_osc_seq (); 2708 process_osc_seq ();
3169 break; 2709 break;
3170 2710
3171 /* 8.3.106: RESET TO INITIAL STATE */ 2711 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
3172 case 'c': 2712 case 'c':
3173 mbstate.reset (); 2713 mbstate.reset ();
3174 scr_poweron (); 2714 scr_poweron ();
3175 scrollbar_show (1); 2715 scrollBar.show (1);
3176 break; 2716 break;
3177 2717
3178 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2718 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
3179 case 'n': 2719 case 'n':
3180 scr_charset_choose (2); 2720 scr_charset_choose (2);
… …
3225rxvt_term::process_csi_seq () 2765rxvt_term::process_csi_seq ()
3226{ 2766{
3227 unicode_t ch, priv, i; 2767 unicode_t ch, priv, i;
3228 unsigned int nargs, p; 2768 unsigned int nargs, p;
3229 int n, ndef; 2769 int n, ndef;
3230 int arg[ESC_ARGS]; 2770 int arg[ESC_ARGS] = { };
3231 2771
3232 for (nargs = ESC_ARGS; nargs > 0;) 2772 nargs = 0;
3233 arg[--nargs] = 0;
3234 2773
3235 priv = 0; 2774 priv = 0;
3236 ch = cmd_getc (); 2775 ch = cmd_getc ();
3237 if (ch >= '<' && ch <= '?') 2776 if ((ch >= '<' && ch <= '?') || ch == '!')
2777 {
3238 { /* '<' '=' '>' '?' */ 2778 /* '<' '=' '>' '?' '!' */
3239 priv = ch; 2779 priv = ch;
3240 ch = cmd_getc (); 2780 ch = cmd_getc ();
3241 } 2781 }
3242 2782
3243 /* read any numerical arguments */ 2783 /* read any numerical arguments */
… …
3282 switch (priv) 2822 switch (priv)
3283 { 2823 {
3284 case '>': 2824 case '>':
3285 if (ch == CSI_DA) /* secondary device attributes */ 2825 if (ch == CSI_DA) /* secondary device attributes */
3286 { 2826 {
3287 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, 2827 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
3288 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2828 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3289 // 2829 //
3290 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2830 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3291 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2831 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
3292 // that we do not support xterm mouse reporting (should be 95 when we do). 2832 // versions.
3293 // 2833 //
3294 tt_printf ("\033[>%d;94;0c", 'U'); 2834 tt_printf ("\033[>%d;95;0c", 'U');
3295 } 2835 }
3296 break; 2836 break;
2837
3297 case '?': 2838 case '?':
3298 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2839 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3299 process_terminal_mode (ch, priv, nargs, arg); 2840 process_terminal_mode (ch, priv, nargs, arg);
3300 break; 2841 break;
2842
2843 case '!':
2844 if (ch == CSI_70)
2845 {
2846 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2847 scr_soft_reset ();
2848
2849 static const int pm_h[] = { 7, 25 };
2850 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 };
2851
2852 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h);
2853 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l);
3301 } 2854 }
2855 break;
2856 }
2857
3302 return; 2858 return;
3303 } 2859 }
3304 2860
3305 switch (ch) 2861 switch (ch)
3306 { 2862 {
… …
3426 break; 2982 break;
3427 case 6: /* CPR requested */ 2983 case 6: /* CPR requested */
3428 scr_report_position (); 2984 scr_report_position ();
3429 break; 2985 break;
3430 case 7: /* unofficial extension */ 2986 case 7: /* unofficial extension */
3431 if (OPTION (Opt_insecure)) 2987 if (option (Opt_insecure))
3432 tt_printf ("%-.250s\012", rs[Rs_display_name]); 2988 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3433 break; 2989 break;
3434 case 8: /* unofficial extension */ 2990 case 8: /* unofficial extension */
3435 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2991 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3436 break; 2992 break;
… …
3529{ 3085{
3530 int x, y; 3086 int x, y;
3531 XWindowAttributes wattr; 3087 XWindowAttributes wattr;
3532 Window wdummy; 3088 Window wdummy;
3533 3089
3534 dLocal (Display *, xdisp); 3090 dLocal (Display *, dpy);
3535 3091
3536 if (nargs == 0) 3092 if (nargs == 0)
3537 return; 3093 return;
3538 3094
3539 switch (args[0]) 3095 switch (args[0])
3540 { 3096 {
3541 /* 3097 /*
3542 * commands 3098 * commands
3543 */ 3099 */
3544 case 1: /* deiconify window */ 3100 case 1: /* deiconify window */
3545 XMapWindow (xdisp, parent[0]); 3101 XMapWindow (dpy, parent[0]);
3546 break; 3102 break;
3547 case 2: /* iconify window */ 3103 case 2: /* iconify window */
3548 XIconifyWindow (xdisp, parent[0], display->screen); 3104 XIconifyWindow (dpy, parent[0], display->screen);
3549 break; 3105 break;
3550 case 3: /* set position (pixels) */ 3106 case 3: /* set position (pixels) */
3551 XMoveWindow (xdisp, parent[0], args[1], args[2]); 3107 XMoveWindow (dpy, parent[0], args[1], args[2]);
3552 break; 3108 break;
3553 case 4: /* set size (pixels) */ 3109 case 4: /* set size (pixels) */
3554 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3110 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3555 break; 3111 break;
3556 case 5: /* raise window */ 3112 case 5: /* raise window */
3557 XRaiseWindow (xdisp, parent[0]); 3113 XRaiseWindow (dpy, parent[0]);
3558 break; 3114 break;
3559 case 6: /* lower window */ 3115 case 6: /* lower window */
3560 XLowerWindow (xdisp, parent[0]); 3116 XLowerWindow (dpy, parent[0]);
3561 break; 3117 break;
3562 case 7: /* refresh window */ 3118 case 7: /* refresh window */
3563 scr_touch (true); 3119 scr_touch (true);
3564 break; 3120 break;
3565 case 8: /* set size (chars) */ 3121 case 8: /* set size (chars) */
… …
3572 if (args[0] >= 24) /* set height (chars) */ 3128 if (args[0] >= 24) /* set height (chars) */
3573 set_widthheight ((unsigned int)width, 3129 set_widthheight ((unsigned int)width,
3574 (unsigned int) (args[1] * fheight)); 3130 (unsigned int) (args[1] * fheight));
3575 break; 3131 break;
3576 3132
3577
3578 /* 3133 /*
3579 * reports - some output format copied from XTerm 3134 * reports - some output format copied from XTerm
3580 */ 3135 */
3581 case 11: /* report window state */ 3136 case 11: /* report window state */
3582 XGetWindowAttributes (xdisp, parent[0], &wattr); 3137 XGetWindowAttributes (dpy, parent[0], &wattr);
3583 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3138 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3584 break; 3139 break;
3585 case 13: /* report window position */ 3140 case 13: /* report window position */
3586 XGetWindowAttributes (xdisp, parent[0], &wattr); 3141 XGetWindowAttributes (dpy, parent[0], &wattr);
3587 XTranslateCoordinates (xdisp, parent[0], wattr.root, 3142 XTranslateCoordinates (dpy, parent[0], wattr.root,
3588 -wattr.border_width, -wattr.border_width, 3143 -wattr.border_width, -wattr.border_width,
3589 &x, &y, &wdummy); 3144 &x, &y, &wdummy);
3590 tt_printf ("\033[3;%d;%dt", x, y); 3145 tt_printf ("\033[3;%d;%dt", x, y);
3591 break; 3146 break;
3592 case 14: /* report window size (pixels) */ 3147 case 14: /* report window size (pixels) */
3593 XGetWindowAttributes (xdisp, parent[0], &wattr); 3148 XGetWindowAttributes (dpy, parent[0], &wattr);
3594 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3149 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3595 break; 3150 break;
3596 case 18: /* report text area size (chars) */ 3151 case 18: /* report text area size (chars) */
3597 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3152 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3598 break; 3153 break;
… …
3600 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3155 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3601 break; 3156 break;
3602 case 20: /* report icon label */ 3157 case 20: /* report icon label */
3603 { 3158 {
3604 char *s; 3159 char *s;
3605 XGetIconName (xdisp, parent[0], &s); 3160 XGetIconName (dpy, parent[0], &s);
3606 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3161 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3607 XFree (s); 3162 XFree (s);
3608 } 3163 }
3609 break; 3164 break;
3610 case 21: /* report window title */ 3165 case 21: /* report window title */
3611 { 3166 {
3612 char *s; 3167 char *s;
3613 XFetchName (xdisp, parent[0], &s); 3168 XFetchName (dpy, parent[0], &s);
3614 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3169 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3615 XFree (s); 3170 XFree (s);
3616 } 3171 }
3617 break; 3172 break;
3618 } 3173 }
3619} 3174}
… …
3646 seen_esc = true; 3201 seen_esc = true;
3647 continue; 3202 continue;
3648 } 3203 }
3649 else if (ch == C0_BEL || ch == CHAR_ST) 3204 else if (ch == C0_BEL || ch == CHAR_ST)
3650 break; 3205 break;
3206 else if (ch == C0_SYN)
3207 ch = cmd_get8 ();
3651 else if (ch < 0x20) 3208 else if (ch < 0x20)
3652 return NULL; /* other control character - exit */ 3209 return NULL; /* other control character - exit */
3653 3210
3654 seen_esc = false; 3211 seen_esc = false;
3655 3212
3656 if (n >= STRING_MAX - 1) 3213 if (n >= STRING_MAX - 1)
3657 // stop at some sane length 3214 // stop at some sane length
3658 return NULL; 3215 return NULL;
3659 3216
3660 if (ch == C0_SYN)
3661 string[n++] = cmd_get8 ();
3662 else
3663 string[n++] = ch; 3217 string[n++] = ch;
3664 } 3218 }
3665 3219
3666 string[n++] = '\0'; 3220 string[n++] = '\0';
3667 3221
3668 ends_how = (ch == 0x5c ? C0_ESC : ch); 3222 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3675 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3229 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3676 */ 3230 */
3677void 3231void
3678rxvt_term::process_dcs_seq () 3232rxvt_term::process_dcs_seq ()
3679{ 3233{
3680 char *s;
3681 unicode_t eh;
3682
3683 /* 3234 /*
3684 * Not handled yet 3235 * Not handled yet
3685 */ 3236 */
3237
3238 unicode_t eh;
3686 s = get_to_st (eh); 3239 char *s = get_to_st (eh);
3687 if (s) 3240 if (s)
3688 free (s); 3241 free (s);
3689 3242
3690 return; 3243 return;
3691} 3244}
… …
3695 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3248 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3696 */ 3249 */
3697void 3250void
3698rxvt_term::process_osc_seq () 3251rxvt_term::process_osc_seq ()
3699{ 3252{
3700 unicode_t ch, eh;
3701 int arg; 3253 int arg;
3702 3254
3703 ch = cmd_getc (); 3255 unicode_t ch = cmd_getc ();
3704 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3256 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3705 arg = arg * 10 + (ch - '0'); 3257 arg = arg * 10 + (ch - '0');
3706 3258
3707 if (ch == ';') 3259 if (ch == ';')
3708 { 3260 {
3261 unicode_t eh;
3709 char *s = get_to_st (eh); 3262 char *s = get_to_st (eh);
3710 3263
3711 if (s) 3264 if (s)
3712 { 3265 {
3713 process_xterm_seq (arg, s, eh); 3266 process_xterm_seq (arg, s, eh);
… …
3720rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3273rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3721{ 3274{
3722 if (str[0] == '?' && !str[1]) 3275 if (str[0] == '?' && !str[1])
3723 { 3276 {
3724 rgba c; 3277 rgba c;
3725 pix_colors_focused[color].get (this, c); 3278 pix_colors_focused[color].get (c);
3726 3279
3727#if XFT 3280#if XFT
3728 if (c.a != rgba::MAX_CC) 3281 if (c.a != rgba::MAX_CC)
3729 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp); 3282 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3730 else 3283 else
… …
3737 3290
3738/* 3291/*
3739 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3292 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3740 */ 3293 */
3741void 3294void
3742rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3295rxvt_term::process_xterm_seq (int op, char *str, char resp)
3743{ 3296{
3744 int color; 3297 int color;
3745 char *buf, *name; 3298 char *buf, *name;
3746 bool query = str[0] == '?' && !str[1]; 3299 bool query = str[0] == '?' && !str[1];
3747 int saveop = op; 3300 int saveop = op;
3748 3301
3749 dLocal (Display *, xdisp); 3302 dLocal (Display *, dpy);
3750 3303
3751 assert (str != NULL); 3304 assert (str != NULL);
3305
3306 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3307 return;
3308
3752 switch (op) 3309 switch (op)
3753 { 3310 {
3754 case XTerm_name: 3311 case XTerm_name:
3755 set_title (str); 3312 set_title (str);
3756 /* FALLTHROUGH */ 3313 /* FALLTHROUGH */
… …
3770 unsigned long bytes_after; 3327 unsigned long bytes_after;
3771 unsigned char *value = 0; 3328 unsigned char *value = 0;
3772 const char *str = ""; 3329 const char *str = "";
3773 3330
3774 if (prop 3331 if (prop
3775 && XGetWindowProperty (xdisp, parent[0], 3332 && XGetWindowProperty (dpy, parent[0],
3776 prop, 0, 1<<16, 0, AnyPropertyType, 3333 prop, 0, 1<<16, 0, AnyPropertyType,
3777 &actual_type, &actual_format, 3334 &actual_type, &actual_format,
3778 &nitems, &bytes_after, &value) == Success 3335 &nitems, &bytes_after, &value) == Success
3779 && actual_type != None 3336 && actual_type != None
3780 && actual_format == 8) 3337 && actual_format == 8)
… …
3784 3341
3785 XFree (value); 3342 XFree (value);
3786 } 3343 }
3787 else 3344 else
3788 { 3345 {
3789 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3346 char *eq = strchr (str, '=');
3790 3347
3791 if (eq) 3348 if (eq)
3792 { 3349 {
3793 *eq = 0; 3350 *eq = 0;
3794 set_utf8_property (display->atom (str), eq + 1); 3351 set_utf8_property (display->atom (str), eq + 1);
3795 } 3352 }
3796 else 3353 else
3797 XDeleteProperty (xdisp, parent[0], 3354 XDeleteProperty (dpy, parent[0],
3798 display->atom (str)); 3355 display->atom (str));
3799 } 3356 }
3800 break; 3357 break;
3801 3358
3802 case XTerm_Color: 3359 case XTerm_Color:
… …
3815 *buf++ = '\0'; 3372 *buf++ = '\0';
3816 3373
3817 process_color_seq (op, color, name, resp); 3374 process_color_seq (op, color, name, resp);
3818 } 3375 }
3819 break; 3376 break;
3377 case Rxvt_restoreFG:
3820 case XTerm_Color00: 3378 case XTerm_Color00:
3821 process_color_seq (op, Color_fg, str, resp); 3379 process_color_seq (op, Color_fg, str, resp);
3822 break; 3380 break;
3381 case Rxvt_restoreBG:
3823 case XTerm_Color01: 3382 case XTerm_Color01:
3824 process_color_seq (op, Color_bg, str, resp); 3383 process_color_seq (op, Color_bg, str, resp);
3825 break; 3384 break;
3826#ifndef NO_CURSORCOLOR 3385#ifndef NO_CURSORCOLOR
3827 case XTerm_Color_cursor: 3386 case XTerm_Color_cursor:
… …
3832 process_color_seq (op, Color_pointer_fg, str, resp); 3391 process_color_seq (op, Color_pointer_fg, str, resp);
3833 break; 3392 break;
3834 case XTerm_Color_pointer_bg: 3393 case XTerm_Color_pointer_bg:
3835 process_color_seq (op, Color_pointer_bg, str, resp); 3394 process_color_seq (op, Color_pointer_bg, str, resp);
3836 break; 3395 break;
3396#ifdef OPTION_HC
3397 case XTerm_Color_HC:
3398 process_color_seq (op, Color_HC, str, resp);
3399 break;
3400 case XTerm_Color_HTC:
3401 process_color_seq (op, Color_HTC, str, resp);
3402 break;
3403#endif
3837#ifndef NO_BOLD_UNDERLINE_REVERSE 3404#ifndef NO_BOLD_UNDERLINE_REVERSE
3838 case XTerm_Color_RV:
3839 process_color_seq (op, Color_RV, str, resp);
3840 break;
3841 case Rxvt_Color_BD:
3842 case URxvt_Color_BD: 3405 case URxvt_Color_BD:
3843 process_color_seq (op, Color_BD, str, resp); 3406 process_color_seq (op, Color_BD, str, resp);
3844 break; 3407 break;
3845 case Rxvt_Color_UL:
3846 case URxvt_Color_UL: 3408 case URxvt_Color_UL:
3847 process_color_seq (op, Color_UL, str, resp); 3409 process_color_seq (op, Color_UL, str, resp);
3848 break; 3410 break;
3849 case URxvt_Color_IT: 3411 case URxvt_Color_IT:
3850 process_color_seq (op, Color_IT, str, resp); 3412 process_color_seq (op, Color_IT, str, resp);
3851 break; 3413 break;
3852#endif 3414#endif
3853#if TRANSPARENT && TINTING 3415 case URxvt_Color_border:
3416 process_color_seq (op, Color_border, str, resp);
3417 break;
3418#if ENABLE_TRANSPARENCY
3854 case URxvt_Color_tint: 3419 case URxvt_Color_tint:
3855 process_color_seq (op, Color_tint, str, resp); 3420 process_color_seq (op, Color_tint, str, resp);
3421 {
3422 bool changed = false;
3856 3423
3857 check_our_parents (); 3424 if (ISSET_PIXCOLOR (Color_tint))
3425 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3426 else
3427 changed = bgPixmap.unset_tint ();
3858 3428
3859 if (am_transparent) 3429 if (changed)
3860 want_full_refresh = want_refresh = 1; 3430 update_background ();
3431 }
3861 3432
3862 break; 3433 break;
3863#endif 3434#endif
3864 3435
3436#if BG_IMAGE_FROM_FILE
3865 case Rxvt_Pixmap: 3437 case Rxvt_Pixmap:
3866 { 3438 if (!strcmp (str, "?"))
3867 if (*str != ';')
3868 { 3439 {
3869#if XPM_BACKGROUND 3440 char str[256];
3870 scale_pixmap (""); /* reset to default scaling */ 3441
3871 set_bgPixmap (str); /* change pixmap */ 3442 sprintf (str, "[%dx%d+%d+%d]",
3872 scr_touch (true); 3443 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3873#endif 3444 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3445 process_xterm_seq (XTerm_title, str, CHAR_ST);
3874 } 3446 }
3875 3447 else
3448 {
3876 int changed = 0; 3449 int changed = 0;
3877 3450
3878 while ((str = strchr (str, ';')) != NULL) 3451 if (*str != ';')
3879 { 3452 {
3453 if (bgPixmap.set_file (str)) /* change pixmap */
3454 changed++;
3455 str = strchr (str, ';');
3456 if (str == NULL)
3457 bgPixmap.set_defaultGeometry ();
3458 else
3459 bgPixmap.set_geometry (str+1);
3460 }
3461 else
3462 {
3880 str++; 3463 str++;
3881#if XPM_BACKGROUND 3464 if (bgPixmap.set_geometry (str, true))
3882 changed += scale_pixmap (str); 3465 changed++;
3883#endif
3884 } 3466 }
3885 3467
3886 if (changed) 3468 if (changed)
3887 { 3469 update_background ();
3888#ifdef XPM_BACKGROUND
3889 resize_pixmap ();
3890 scr_touch (true);
3891#endif
3892 } 3470 }
3893 }
3894 break; 3471 break;
3895 3472#endif
3896 case Rxvt_restoreFG:
3897 set_window_color (Color_fg, str);
3898 break;
3899 case Rxvt_restoreBG:
3900 set_window_color (Color_bg, str);
3901 break;
3902 3473
3903 case XTerm_logfile: 3474 case XTerm_logfile:
3904 // TODO, when secure mode? 3475 // TODO, when secure mode?
3905 break; 3476 break;
3906 3477
… …
3924 case URxvt_italicFont: 3495 case URxvt_italicFont:
3925 case URxvt_boldItalicFont: 3496 case URxvt_boldItalicFont:
3926#endif 3497#endif
3927 if (query) 3498 if (query)
3928 tt_printf ("\33]%d;%-.250s%c", saveop, 3499 tt_printf ("\33]%d;%-.250s%c", saveop,
3929 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3500 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3930 ? fontset[op - URxvt_font]->fontdesc : "", 3501 ? fontset[op - URxvt_font]->fontdesc : "",
3931 resp); 3502 resp);
3932 else 3503 else
3933 { 3504 {
3934 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3505 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3948 break; 3519 break;
3949 3520
3950#if !ENABLE_MINIMAL 3521#if !ENABLE_MINIMAL
3951 case URxvt_locale: 3522 case URxvt_locale:
3952 if (query) 3523 if (query)
3953 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp); 3524 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3954 else 3525 else
3955 { 3526 {
3956 set_locale (str); 3527 set_locale (str);
3957 pty->set_utf8_mode (enc_utf8); 3528 pty->set_utf8_mode (enc_utf8);
3958 init_xlocale (); 3529 init_xlocale ();
… …
3973 break; 3544 break;
3974#endif 3545#endif
3975 3546
3976#if ENABLE_PERL 3547#if ENABLE_PERL
3977 case URxvt_perl: 3548 case URxvt_perl:
3978 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 3549 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3979 ; // no responses yet
3980 break; 3550 break;
3981#endif 3551#endif
3982 } 3552 }
3983} 3553}
3984/*----------------------------------------------------------------------*/ 3554/*----------------------------------------------------------------------*/
… …
4007 { 3577 {
4008 if (mode == 'r') 3578 if (mode == 'r')
4009 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3579 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
4010 else 3580 else
4011 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3581 state = (mode == 't') ? ! (priv_modes & bit) : mode;
4012 PrivMode (state, bit); 3582
3583 set_privmode (bit, state);
4013 } 3584 }
4014 3585
4015 return state; 3586 return state;
4016} 3587}
4017 3588
… …
4021{ 3592{
4022 unsigned int i, j; 3593 unsigned int i, j;
4023 int state; 3594 int state;
4024 3595
4025 static const struct 3596 static const struct
4026 { 3597 {
4027 const int argval; 3598 const int argval;
4028 const unsigned long bit; 3599 const unsigned long bit;
4029 }
4030
4031 argtopriv[] = { 3600 } argtopriv[] = {
4032 { 1, PrivMode_aplCUR }, 3601 { 1, PrivMode_aplCUR }, // DECCKM
4033 { 2, PrivMode_vt52 }, 3602 { 2, PrivMode_vt52 },
4034 { 3, PrivMode_132 }, 3603 { 3, PrivMode_132 }, // DECCOLM
4035 { 4, PrivMode_smoothScroll }, 3604 { 4, PrivMode_smoothScroll }, // DECSCLM
4036 { 5, PrivMode_rVideo }, 3605 { 5, PrivMode_rVideo }, // DECSCNM
4037 { 6, PrivMode_relOrigin }, 3606 { 6, PrivMode_relOrigin }, // DECOM
4038 { 7, PrivMode_Autowrap }, 3607 { 7, PrivMode_Autowrap }, // DECAWM
4039 // 8, bi-directional support mode 3608 // 8, auto-repeat keys // DECARM
4040 { 9, PrivMode_MouseX10 }, 3609 { 9, PrivMode_MouseX10 },
4041 // 18, 19 printing-related 3610 // 18 end FF to printer after print screen
3611 // 19 Print screen prints full screen/scroll region
4042 { 25, PrivMode_VisibleCursor }, 3612 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
4043#ifdef scrollBar_esc 3613#ifdef scrollBar_esc
4044 { scrollBar_esc, PrivMode_scrollBar }, 3614 { scrollBar_esc, PrivMode_scrollBar },
4045#endif 3615#endif
4046 { 35, PrivMode_ShiftKeys }, // rxvt extension 3616 { 35, PrivMode_ShiftKeys }, // rxvt extension
3617 // 38, tektronix mode // DECTEK
4047 { 40, PrivMode_132OK }, 3618 { 40, PrivMode_132OK },
4048 // 41 xterm more fixes NYI 3619 // 41 xterm more fixes NYI
4049 // 45 margin bell NYI 3620 // 45 margin bell NYI
4050 // 46 start logging 3621 // 46 start logging
4051 { 47, PrivMode_Screen }, 3622 { 47, PrivMode_Screen },
4052 { 66, PrivMode_aplKP }, 3623 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
4053#ifndef NO_BACKSPACE_KEY 3624#ifndef NO_BACKSPACE_KEY
4054 { 67, PrivMode_BackSpace }, 3625 { 67, PrivMode_BackSpace }, // DECBKM
4055#endif 3626#endif
4056 { 1000, PrivMode_MouseX11 }, 3627 { 1000, PrivMode_MouseX11 },
4057 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3628 { 1002, PrivMode_MouseBtnEvent },
4058 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3629 { 1003, PrivMode_MouseAnyEvent },
4059 // 1003 Use All Motion Mouse Tracking. NYI, TODO
4060 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3630 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4061 { 1011, PrivMode_Keypress }, // rxvt extension 3631 { 1011, PrivMode_Keypress }, // rxvt extension
4062 // 1035 enable modifiers for alt, numlock NYI 3632 // 1035 enable modifiers for alt, numlock NYI
4063 // 1036 send ESC for meta keys NYI 3633 // 1036 send ESC for meta keys NYI
4064 // 1037 send DEL for keypad delete NYI 3634 // 1037 send DEL for keypad delete NYI
4065 { 1047, PrivMode_Screen }, 3635 { 1047, PrivMode_Screen },
4066 // 1048 save and restore cursor 3636 // 1048 save and restore cursor
4067 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3637 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
4068 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3638 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3639 { 2004, PrivMode_BracketPaste },
4069 }; 3640 };
4070 3641
4071 if (nargs == 0) 3642 if (nargs == 0)
4072 return; 3643 return;
4073 3644
… …
4098 3669
4099 scr_touch (true); 3670 scr_touch (true);
4100 break; 3671 break;
4101#endif 3672#endif
4102 case 1048: /* alternative cursor save */ 3673 case 1048: /* alternative cursor save */
4103 case 1049:
4104 if (OPTION (Opt_secondaryScreen)) 3674 if (option (Opt_secondaryScreen))
4105 if (mode == 0) 3675 if (mode == 0)
4106 scr_cursor (RESTORE); 3676 scr_cursor (RESTORE);
4107 else if (mode == 1) 3677 else if (mode == 1)
4108 scr_cursor (SAVE); 3678 scr_cursor (SAVE);
4109 break; 3679 break;
… …
4117 case 2: /* VT52 mode */ 3687 case 2: /* VT52 mode */
4118 /* oddball mode. should be set regardless of set/reset 3688 /* oddball mode. should be set regardless of set/reset
4119 * parameter. Return from VT52 mode with an ESC < from 3689 * parameter. Return from VT52 mode with an ESC < from
4120 * within VT52 mode 3690 * within VT52 mode
4121 */ 3691 */
4122 PrivMode (1, PrivMode_vt52); 3692 set_privmode (PrivMode_vt52, 1);
4123 break; 3693 break;
4124 case 3: /* 80/132 */ 3694 case 3: /* 80/132 */
4125 if (priv_modes & PrivMode_132OK) 3695 if (priv_modes & PrivMode_132OK)
4126 set_widthheight (((state ? 132 : 80) * fwidth), height); 3696 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
4127 break; 3697 break;
4128 case 4: /* smooth scrolling */ 3698 case 4: /* smooth scrolling */
4129 set_option (Opt_jumpScroll, !state); 3699 set_option (Opt_jumpScroll, !state);
4130 break; 3700 break;
4131 case 5: /* reverse video */ 3701 case 5: /* reverse video */
… …
4138 scr_autowrap (state); 3708 scr_autowrap (state);
4139 break; 3709 break;
4140 /* case 8: - auto repeat, can't do on a per window basis */ 3710 /* case 8: - auto repeat, can't do on a per window basis */
4141 case 9: /* X10 mouse reporting */ 3711 case 9: /* X10 mouse reporting */
4142 if (state) /* orthogonal */ 3712 if (state) /* orthogonal */
4143 priv_modes &= ~PrivMode_MouseX11; 3713 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4144 break; 3714 break;
4145#ifdef scrollBar_esc 3715#ifdef scrollBar_esc
4146 case scrollBar_esc: 3716 case scrollBar_esc:
4147 if (scrollbar_mapping (state)) 3717 if (scrollBar.map (state))
4148 { 3718 {
4149 resize_all_windows (0, 0, 0); 3719 resize_all_windows (0, 0, 0);
4150 scr_touch (true); 3720 scr_touch (true);
4151 } 3721 }
4152 break; 3722 break;
… …
4161 break; 3731 break;
4162 /* case 66: - application key pad */ 3732 /* case 66: - application key pad */
4163 /* case 67: - backspace key */ 3733 /* case 67: - backspace key */
4164 case 1000: /* X11 mouse reporting */ 3734 case 1000: /* X11 mouse reporting */
4165 if (state) /* orthogonal */ 3735 if (state) /* orthogonal */
4166 priv_modes &= ~PrivMode_MouseX10; 3736 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4167 break; 3737 break;
4168#if 0
4169 case 1001: 3738 case 1002:
4170 break; /* X11 mouse highlighting */ 3739 case 1003:
4171#endif 3740 if (state)
3741 {
3742 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3743 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3744 vt_emask_mouse = PointerMotionMask;
3745 }
3746 else
3747 vt_emask_mouse = NoEventMask;
3748
3749 vt_select_input ();
3750 break;
4172 case 1010: /* scroll to bottom on TTY output inhibit */ 3751 case 1010: /* scroll to bottom on TTY output inhibit */
4173 set_option (Opt_scrollTtyOutput, !state); 3752 set_option (Opt_scrollTtyOutput, !state);
4174 break; 3753 break;
4175 case 1011: /* scroll to bottom on key press */ 3754 case 1011: /* scroll to bottom on key press */
4176 set_option (Opt_scrollTtyKeypress, state); 3755 set_option (Opt_scrollTtyKeypress, state);
4177 break; 3756 break;
4178 case 1047: /* secondary screen w/ clearing last */ 3757 case 1047: /* secondary screen w/ clearing last */
4179 if (OPTION (Opt_secondaryScreen)) 3758 if (option (Opt_secondaryScreen))
4180 if (current_screen != PRIMARY) 3759 if (!state)
4181 scr_erase_screen (2); 3760 scr_erase_screen (2);
3761
4182 scr_change_screen (state); 3762 scr_change_screen (state);
4183 break; 3763 break;
4184 case 1049: /* secondary screen w/ clearing first */ 3764 case 1049: /* secondary screen w/ clearing first */
3765 if (option (Opt_secondaryScreen))
3766 if (state)
3767 scr_cursor (SAVE);
3768
4185 scr_change_screen (state); 3769 scr_change_screen (state);
3770
4186 if (OPTION (Opt_secondaryScreen)) 3771 if (option (Opt_secondaryScreen))
4187 if (current_screen != PRIMARY) 3772 if (state)
4188 scr_erase_screen (2); 3773 scr_erase_screen (2);
3774 else
3775 scr_cursor (RESTORE);
4189 break; 3776 break;
4190 default: 3777 default:
4191 break; 3778 break;
4192 } 3779 }
4193 } 3780 }
… …
4353rxvt_term::process_graphics () 3940rxvt_term::process_graphics ()
4354{ 3941{
4355 unicode_t ch, cmd = cmd_getc (); 3942 unicode_t ch, cmd = cmd_getc ();
4356 3943
4357 if (cmd == 'Q') 3944 if (cmd == 'Q')
3945 {
4358 { /* query graphics */ 3946 /* query graphics */
4359 tt_printf ("\033G0\012"); /* no graphics */ 3947 tt_printf ("\033G0\012"); /* no graphics */
4360 return; 3948 return;
4361 } 3949 }
4362 /* swallow other graphics sequences until terminating ':' */ 3950 /* swallow other graphics sequences until terminating ':' */
4363 do 3951 do
… …
4413 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4001 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4414 4002
4415 memcpy (v_buffer + v_buflen, data, len); 4003 memcpy (v_buffer + v_buflen, data, len);
4416 v_buflen += len; 4004 v_buflen += len;
4417 4005
4418 pty_ev.set (EVENT_READ | EVENT_WRITE); 4006 pty_ev.set (ev::READ | ev::WRITE);
4419} 4007}
4420 4008
4421void rxvt_term::pty_write () 4009void rxvt_term::pty_write ()
4422{ 4010{
4423 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4011 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4428 4016
4429 if (v_buflen == 0) 4017 if (v_buflen == 0)
4430 { 4018 {
4431 free (v_buffer); 4019 free (v_buffer);
4432 v_buffer = 0; 4020 v_buffer = 0;
4433 v_buflen = 0;
4434 4021
4435 pty_ev.set (EVENT_READ); 4022 pty_ev.set (ev::READ);
4436 return; 4023 return;
4437 } 4024 }
4438 4025
4439 memmove (v_buffer, v_buffer + written, v_buflen); 4026 memmove (v_buffer, v_buffer + written, v_buflen);
4440 } 4027 }
4441 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4028 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4442 pty_ev.set (EVENT_READ); 4029 pty_ev.set (ev::READ);
4443} 4030}
4444 4031
4445/*----------------------- end-of-file (C source) -----------------------*/ 4032/*----------------------- end-of-file (C source) -----------------------*/
4446 4033

Diff Legend

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