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.299 by root, Tue Jan 31 19:11:43 2006 UTC vs.
Revision 1.451 by root, Sun May 23 00:37:19 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.check_clearChanged ())
955 { 981 {
956 want_full_refresh = 0; 982// scr_clear (true); This needs to be researched further!
957 scr_clear ();
958 scr_touch (false); 983 scr_touch (false);
959 } 984 }
960#endif 985#endif
961 986
962 if (want_refresh) 987 if (want_refresh)
… …
998 } 1023 }
999 while (row < end_row); 1024 while (row < end_row);
1000 } 1025 }
1001 1026
1002 scr_refresh (); 1027 scr_refresh ();
1003 scrollbar_show (1); 1028 scrollBar.show (1);
1004#ifdef USE_XIM 1029#ifdef USE_XIM
1005 IMSendSpot (); 1030 IMSendSpot ();
1006#endif 1031#endif
1007 } 1032 }
1008 1033
1009 display->flush (); 1034 display->flush ();
1010} 1035}
1011 1036
1037/* checks whether a refresh is requested and starts the refresh timer */
1012void 1038void
1013rxvt_term::check_cb (check_watcher &w) 1039rxvt_term::refresh_check ()
1040{
1041 if (want_refresh && !flush_ev.is_active ())
1042 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1043
1044 display->flush ();
1045}
1046
1047void
1048rxvt_term::flush_cb (ev::timer &w, int revents)
1014{ 1049{
1015 make_current (); 1050 make_current ();
1016 1051
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; 1052 refresh_count = 0;
1030 flush (); 1053 flush ();
1031} 1054}
1032 1055
1033#ifdef CURSOR_BLINK 1056#ifdef CURSOR_BLINK
1034void 1057void
1035rxvt_term::cursor_blink_cb (time_watcher &w) 1058rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1036{ 1059{
1037 hidden_cursor = !hidden_cursor; 1060 hidden_cursor = !hidden_cursor;
1038 want_refresh = 1; 1061 want_refresh = 1;
1039 1062 refresh_check ();
1040 w.start (w.at + CURSOR_BLINK_INTERVAL);
1041} 1063}
1042#endif 1064#endif
1043 1065
1044#ifdef TEXT_BLINK 1066#ifdef TEXT_BLINK
1045void 1067void
1046rxvt_term::text_blink_cb (time_watcher &w) 1068rxvt_term::text_blink_cb (ev::timer &w, int revents)
1047{ 1069{
1048 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1070 if (scr_refresh_rend (RS_Blink, RS_Blink))
1049 { 1071 {
1050 hidden_text = !hidden_text; 1072 hidden_text = !hidden_text;
1051 want_refresh = 1; 1073 want_refresh = 1;
1052 w.start (w.at + TEXT_BLINK_INTERVAL); 1074 refresh_check ();
1053 } 1075 }
1076 else
1077 w.stop ();
1054} 1078}
1055#endif 1079#endif
1056 1080
1057#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1081#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1058void 1082void
1059rxvt_term::cont_scroll_cb (time_watcher &w) 1083rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1060{ 1084{
1061 if ((scrollbar_isUp() || scrollbar_isDn()) && 1085 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1062 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1086 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1063 { 1087 {
1064 want_refresh = 1; 1088 want_refresh = 1;
1065 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1089 refresh_check ();
1066 } 1090 }
1091 else
1092 w.stop ();
1067} 1093}
1068#endif 1094#endif
1069 1095
1070#ifdef SELECTION_SCROLLING 1096#ifdef SELECTION_SCROLLING
1071void 1097void
1072rxvt_term::sel_scroll_cb (time_watcher &w) 1098rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1073{ 1099{
1074 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1100 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1075 { 1101 {
1076 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1102 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1077 want_refresh = 1; 1103 want_refresh = 1;
1078 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1104 refresh_check ();
1079 } 1105 }
1106 else
1107 w.stop ();
1080} 1108}
1081#endif 1109#endif
1082 1110
1083#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1111#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1084void 1112void
1085rxvt_term::slip_wheel_cb (time_watcher &w) 1113rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1086{ 1114{
1087 if (mouse_slip_wheel_speed == 0 1115 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 { 1116 {
1091 if (view_start == top_row || view_start == 0)
1092 mouse_slip_wheel_speed = 0;
1093
1094 want_refresh = 1; 1117 want_refresh = 1;
1095 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1118 refresh_check ();
1119 }
1120
1121 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1096 } 1122 {
1123 mouse_slip_wheel_speed = 0;
1124 w.stop ();
1125 }
1097} 1126}
1098#endif 1127#endif
1099 1128
1100#if HAVE_SCHED_YIELD 1129#if LINUX_YIELD_HACK
1101static struct event_handler 1130static struct event_handler
1102{ 1131{
1103 check_watcher cw_yield; 1132 ev::prepare yield_ev;
1104 1133
1105 void yield (check_watcher &w) 1134 void yield_cb (ev::prepare &w, int revents)
1106 { 1135 {
1107 sched_yield (); 1136 // this should really be sched_yield(), but the linux guys thought
1137 // that giving a process calling sched_yield () less cpu time than
1138 // ones with high nice levels is a useful thing to do. It surely is is
1139 // allowed by the sus... as is returning ENOSYS.
1140 // since the linux guys additionally thought that breaking the only
1141 // known workaround against their unusable sched_yield hack is cool,
1142 // we just nanosleep a bit and hope for the best.
1143
1144 struct timespec ts = { 0, 1000 };
1145 nanosleep (&ts, 0);
1146
1108 w.stop (); 1147 w.stop ();
1109 } 1148 }
1110 1149
1111 event_handler () 1150 event_handler ()
1112 : cw_yield (this, &event_handler::yield) 1151 : yield_ev (this, &event_handler::yield_cb)
1113 { 1152 {
1114 } 1153 }
1115} event_handler; 1154} event_handler;
1116#endif 1155#endif
1117 1156
… …
1137 cmdbuf_endp += r; 1176 cmdbuf_endp += r;
1138 return true; 1177 return true;
1139 } 1178 }
1140 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1179 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1141 { 1180 {
1142#if HAVE_SCHED_YIELD 1181#if LINUX_YIELD_HACK
1143 if (display->is_local) 1182 if (display->is_local)
1144 event_handler.cw_yield.start (); 1183 event_handler.yield_ev.start ();
1145#endif 1184#endif
1146 } 1185 }
1147 else 1186 else
1148 { 1187 {
1149 pty_ev.stop (); 1188 pty_ev.stop ();
1150 1189
1151 if (!OPTION (Opt_hold)) 1190 if (!option (Opt_hold))
1152 destroy (); 1191 destroy ();
1153 } 1192 }
1154 1193
1155 return false; 1194 return false;
1156} 1195}
1157 1196
1158void 1197void
1159rxvt_term::pty_cb (io_watcher &w, short revents) 1198rxvt_term::pty_cb (ev::io &w, int revents)
1160{ 1199{
1161 make_current (); 1200 make_current ();
1162 1201
1163 if (revents & EVENT_READ) 1202 if (revents & ev::READ)
1164 // loop, but don't allow a single term to monopolize us 1203 // loop, but don't allow a single term to monopolize us
1165 while (pty_fill ()) 1204 for (int i = CBUFCNT; i-- && pty_fill (); )
1166 if (cmd_parse ()) 1205 cmd_parse ();
1167 break;
1168 1206
1169 if (revents & EVENT_WRITE) 1207 if (revents & ev::WRITE)
1170 pty_write (); 1208 pty_write ();
1209
1210 refresh_check ();
1171} 1211}
1172 1212
1173void 1213void
1174rxvt_term::pointer_unblank () 1214rxvt_term::pointer_unblank ()
1175{ 1215{
1176 XDefineCursor (xdisp, vt, TermWin_cursor); 1216 XDefineCursor (dpy, vt, TermWin_cursor);
1177 recolour_cursor (); 1217 recolour_cursor ();
1178 1218
1179#ifdef POINTER_BLANK 1219#ifdef POINTER_BLANK
1180 hidden_pointer = 0; 1220 hidden_pointer = 0;
1181 1221
1182 if (OPTION (Opt_pointerBlank)) 1222 if (option (Opt_pointerBlank))
1183 pointer_ev.start (NOW + pointerBlankDelay); 1223 pointer_ev.start (pointerBlankDelay);
1184#endif 1224#endif
1185} 1225}
1186 1226
1187#ifdef POINTER_BLANK 1227#ifdef POINTER_BLANK
1188void 1228void
1189rxvt_term::pointer_blank () 1229rxvt_term::pointer_blank ()
1190{ 1230{
1191 if (!OPTION (Opt_pointerBlank)) 1231 if (!option (Opt_pointerBlank))
1192 return; 1232 return;
1193 1233
1194 XDefineCursor (xdisp, vt, display->blank_cursor); 1234 XDefineCursor (dpy, vt, display->blank_cursor);
1195 XFlush (xdisp); 1235 XFlush (dpy);
1196 1236
1197 hidden_pointer = 1; 1237 hidden_pointer = 1;
1198} 1238}
1199 1239
1200void 1240void
1201rxvt_term::pointer_cb (time_watcher &w) 1241rxvt_term::pointer_cb (ev::timer &w, int revents)
1202{ 1242{
1203 make_current (); 1243 make_current ();
1204 1244
1205 pointer_blank (); 1245 pointer_blank ();
1206} 1246}
… …
1209void 1249void
1210rxvt_term::mouse_report (XButtonEvent &ev) 1250rxvt_term::mouse_report (XButtonEvent &ev)
1211{ 1251{
1212 int button_number, key_state = 0; 1252 int button_number, key_state = 0;
1213 int x, y; 1253 int x, y;
1254 int code = 32;
1214 1255
1215 x = ev.x; 1256 x = Pixel2Col (ev.x);
1216 y = ev.y; 1257 y = Pixel2Row (ev.y);
1217 pixel_position (&x, &y); 1258 if (ev.type == MotionNotify)
1259 {
1260 if (x == mouse_row && y == mouse_col)
1261 return;
1262 mouse_row = x;
1263 mouse_col = y;
1264 code += 32;
1265 }
1218 1266
1219 if (MEvent.button == AnyButton) 1267 if (MEvent.button == AnyButton)
1220 button_number = 3; 1268 button_number = 3;
1221 else 1269 else
1222 { 1270 {
… …
1268 x + 1, 1316 x + 1,
1269 y + 1); 1317 y + 1);
1270#endif 1318#endif
1271 1319
1272 tt_printf ("\033[M%c%c%c", 1320 tt_printf ("\033[M%c%c%c",
1273 (32 + button_number + key_state), 1321 (code + button_number + key_state),
1274 (32 + x + 1), 1322 (32 + x + 1),
1275 (32 + y + 1)); 1323 (32 + y + 1));
1276} 1324}
1277 1325
1278/*{{{ process an X event */ 1326/*{{{ process an X event */
1279void 1327void
1280rxvt_term::x_cb (XEvent &ev) 1328rxvt_term::x_cb (XEvent &ev)
1281{ 1329{
1282 make_current (); 1330 make_current ();
1283 1331
1284 dLocal (Display *, xdisp); 1332 dLocal (Display *, dpy);
1285 1333
1286 if (ev.xany.window == vt 1334 if (ev.xany.window == vt
1287 && SHOULD_INVOKE (HOOK_X_EVENT) 1335 && SHOULD_INVOKE (HOOK_X_EVENT)
1288 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1336 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1289 return; 1337 return;
… …
1294 unsigned int unused_mask; 1342 unsigned int unused_mask;
1295 1343
1296 switch (ev.type) 1344 switch (ev.type)
1297 { 1345 {
1298 case KeyPress: 1346 case KeyPress:
1299#if ISO_14755 1347 key_press (ev.xkey);
1300 if (!(iso14755buf & ISO_14755_52))
1301#endif
1302 lookup_key (ev.xkey);
1303
1304 break; 1348 break;
1305 1349
1306 case KeyRelease: 1350 case KeyRelease:
1307 { 1351 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; 1352 break;
1379 }
1380 1353
1381 case ButtonPress: 1354 case ButtonPress:
1382 button_press (ev.xbutton); 1355 button_press (ev.xbutton);
1383 break; 1356 break;
1384 1357
… …
1399 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END))) 1372 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1400 destroy (); 1373 destroy ();
1401 } 1374 }
1402#if ENABLE_EWMH 1375#if ENABLE_EWMH
1403 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1376 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1404 XSendEvent (xdisp, ev.xclient.window = display->root, 1377 XSendEvent (dpy, ev.xclient.window = display->root,
1405 False, SubstructureRedirectMask | SubstructureNotifyMask, 1378 False, SubstructureRedirectMask | SubstructureNotifyMask,
1406 &ev); 1379 &ev);
1407#endif 1380#endif
1408 } 1381 }
1409 } 1382 }
… …
1415 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1388 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1416 focus_out (); 1389 focus_out ();
1417 } 1390 }
1418#endif 1391#endif
1419 } 1392 }
1420 break;
1421
1422 case MappingNotify:
1423 XRefreshKeyboardMapping (&ev.xmapping);
1424 break; 1393 break;
1425 1394
1426 /* 1395 /*
1427 * XXX: this is not the _current_ arrangement 1396 * XXX: this is not the _current_ arrangement
1428 * Here's my conclusion: 1397 * Here's my conclusion:
… …
1447 break; 1416 break;
1448 } 1417 }
1449 break; 1418 break;
1450 1419
1451 case FocusIn: 1420 case FocusIn:
1421 if (ev.xfocus.detail != NotifyInferior
1422 && ev.xfocus.detail != NotifyPointer
1423 && ev.xfocus.mode != NotifyGrab)
1452 focus_in (); 1424 focus_in ();
1453 break; 1425 break;
1454 1426
1455 case FocusOut: 1427 case FocusOut:
1428 if (ev.xfocus.detail != NotifyInferior
1429 && ev.xfocus.detail != NotifyPointer
1430 && ev.xfocus.mode != NotifyGrab)
1456 focus_out (); 1431 focus_out ();
1457 break; 1432 break;
1458 1433
1459 case ConfigureNotify: 1434 case ConfigureNotify:
1435 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1436 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1437 szHint.width, szHint.height);*/
1460 if (ev.xconfigure.window == parent[0]) 1438 if (ev.xconfigure.window == parent[0])
1461 { 1439 {
1462 while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev)) 1440 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1463 ; 1441 ;
1464 1442
1465 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1443 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1466 { 1444 {
1467 seen_resize = 1; 1445 seen_resize = 1;
1468 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1446 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1469 } 1447 }
1448 else
1449 {
1450#ifdef HAVE_BG_PIXMAP
1451 if (bgPixmap.window_position_sensitive ())
1452 {
1453 if (mapped)
1454 update_background ();
1455 else
1456 bgPixmap.invalidate ();
1457 }
1458#endif
1459 }
1470 1460
1471 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1461 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 } 1462 }
1478 break; 1463 break;
1479 1464
1480 case PropertyNotify: 1465 case PropertyNotify:
1481 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1466 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
… …
1484 selection_property (ev.xproperty.window, ev.xproperty.atom); 1469 selection_property (ev.xproperty.window, ev.xproperty.atom);
1485 1470
1486 break; 1471 break;
1487 1472
1488 case SelectionClear: 1473 case SelectionClear:
1489 selection_clear (); 1474 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1490 break; 1475 break;
1491 1476
1492 case SelectionNotify: 1477 case SelectionNotify:
1493 if (selection_wait == Sel_normal) 1478 if (selection_wait == Sel_normal)
1494 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1479 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
… …
1497 case SelectionRequest: 1482 case SelectionRequest:
1498 selection_send (ev.xselectionrequest); 1483 selection_send (ev.xselectionrequest);
1499 break; 1484 break;
1500 1485
1501 case MapNotify: 1486 case MapNotify:
1487#ifdef HAVE_BG_PIXMAP
1488 /* This is needed spcifically to fix the case of no window manager or a
1489 * non-reparenting window manager. In those cases we never get first
1490 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1491 * care of multiplicity of ConfigureNotify events arriwing while WM does
1492 * reparenting.
1493 * We should not render background immidiately, as there could be several
1494 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1495 * by scheduling background redraw as soon as we can, but giving a short
1496 * bit of time for ConfigureNotifies to arrive.
1497 * We should render background PRIOR to drawing any text, but AFTER all
1498 * of ConfigureNotifys for the best results.
1499 */
1500 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1501 update_background_ev.start (0.025);
1502#endif
1502 mapped = 1; 1503 mapped = 1;
1503#ifdef TEXT_BLINK 1504#ifdef TEXT_BLINK
1504 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1505 text_blink_ev.start ();
1505#endif 1506#endif
1506 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1507 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1507 break; 1508 break;
1508 1509
1509 case UnmapNotify: 1510 case UnmapNotify:
… …
1511#ifdef TEXT_BLINK 1512#ifdef TEXT_BLINK
1512 text_blink_ev.stop (); 1513 text_blink_ev.stop ();
1513#endif 1514#endif
1514 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1515 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1515 break; 1516 break;
1516
1517#ifdef TRANSPARENT
1518 case ReparentNotify:
1519 rootwin_cb (ev);
1520 break;
1521#endif /* TRANSPARENT */
1522 1517
1523 case GraphicsExpose: 1518 case GraphicsExpose:
1524 case Expose: 1519 case Expose:
1525 if (ev.xany.window == vt) 1520 if (ev.xany.window == vt)
1526 { 1521 {
1527 do 1522 do
1523 {
1528 scr_expose (ev.xexpose.x, ev.xexpose.y, 1524 scr_expose (ev.xexpose.x, ev.xexpose.y,
1529 ev.xexpose.width, ev.xexpose.height, False); 1525 ev.xexpose.width, ev.xexpose.height, False);
1526 }
1530 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev)); 1527 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1531 1528
1532 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1529 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1533 1530
1534 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev)) 1531 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1532 {
1535 scr_expose (ev.xexpose.x, ev.xexpose.y, 1533 scr_expose (ev.xexpose.x, ev.xexpose.y,
1536 ev.xexpose.width, ev.xexpose.height, False); 1534 ev.xexpose.width, ev.xexpose.height, False);
1535 }
1537 1536
1538 want_refresh = 1; 1537 want_refresh = 1;
1539 } 1538 }
1540 else 1539 else
1541 { 1540 {
1542 XEvent unused_event; 1541 XEvent unused_event;
1543 1542
1544 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event)) 1543 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1545 ; 1544 ;
1546 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event)) 1545 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1547 ; 1546 ;
1548 1547
1549 if (isScrollbarWindow (ev.xany.window)) 1548 if (scrollBar.state && ev.xany.window == scrollBar.win)
1550 { 1549 {
1551 scrollBar.setIdle (); 1550 scrollBar.state = STATE_IDLE;
1552 scrollbar_show (0); 1551 scrollBar.show (0);
1553 } 1552 }
1554
1555#ifdef TRANSPARENT
1556 if (am_transparent && ev.xany.window == parent[0])
1557 XClearWindow (xdisp, ev.xany.window);
1558#endif
1559 } 1553 }
1560 break; 1554 break;
1561 1555
1562 case MotionNotify: 1556 case MotionNotify:
1563#ifdef POINTER_BLANK 1557#ifdef POINTER_BLANK
1564 if (hidden_pointer) 1558 if (hidden_pointer)
1565 pointer_unblank (); 1559 pointer_unblank ();
1566#endif 1560#endif
1561 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1562 || priv_modes & PrivMode_MouseAnyEvent)
1563 mouse_report (ev.xbutton);
1567 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1564 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1568 break; 1565 break;
1569 1566
1570 if (ev.xany.window == vt) 1567 if (ev.xany.window == vt)
1571 { 1568 {
1572 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1569 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1573 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1570 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1574 ; // nop 1571 ; // nop
1575 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1572 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1576 { 1573 {
1577 while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev)) 1574 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1578 ; 1575 ;
1579 1576
1580 XQueryPointer (xdisp, vt, 1577 XQueryPointer (dpy, vt,
1581 &unused_root, &unused_child, 1578 &unused_root, &unused_child,
1582 &unused_root_x, &unused_root_y, 1579 &unused_root_x, &unused_root_y,
1583 &ev.xbutton.x, &ev.xbutton.y, 1580 &ev.xbutton.x, &ev.xbutton.y,
1584 &ev.xbutton.state); 1581 &ev.xbutton.state);
1585#ifdef MOUSE_THRESHOLD 1582#ifdef MOUSE_THRESHOLD
… …
1605 int dist; 1602 int dist;
1606 1603
1607 /* don't clobber the current delay if we are 1604 /* don't clobber the current delay if we are
1608 * already in the middle of scrolling. 1605 * already in the middle of scrolling.
1609 */ 1606 */
1610 if (!sel_scroll_ev.active) 1607 if (!sel_scroll_ev.is_active ())
1611 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1608 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1612 1609
1613 /* save the event params so we can highlight 1610 /* save the event params so we can highlight
1614 * the selection in the pending-scroll loop 1611 * the selection in the pending-scroll loop
1615 */ 1612 */
1616 selection_save_x = ev.xbutton.x; 1613 selection_save_x = ev.xbutton.x;
… …
1638 else 1635 else
1639 { 1636 {
1640 /* we are within the text window, so we 1637 /* we are within the text window, so we
1641 * shouldn't be scrolling 1638 * shouldn't be scrolling
1642 */ 1639 */
1643 if (sel_scroll_ev.active)
1644 sel_scroll_ev.stop(); 1640 sel_scroll_ev.stop();
1645 } 1641 }
1646#endif 1642#endif
1647#ifdef MOUSE_THRESHOLD 1643#ifdef MOUSE_THRESHOLD
1648 } 1644 }
1649#endif 1645#endif
1650 } 1646 }
1651 } 1647 }
1652 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1648 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1653 { 1649 {
1654 while (XCheckTypedWindowEvent (xdisp, scrollBar.win, 1650 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1655 MotionNotify, &ev)) 1651 MotionNotify, &ev))
1656 ; 1652 ;
1657 1653
1658 XQueryPointer (xdisp, scrollBar.win, 1654 XQueryPointer (dpy, scrollBar.win,
1659 &unused_root, &unused_child, 1655 &unused_root, &unused_child,
1660 &unused_root_x, &unused_root_y, 1656 &unused_root_x, &unused_root_y,
1661 &ev.xbutton.x, &ev.xbutton.y, 1657 &ev.xbutton.x, &ev.xbutton.y,
1662 &unused_mask); 1658 &unused_mask);
1663 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1659 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1664 scrollbar_size ()); 1660 scrollBar.size ());
1665 want_refresh = 1; 1661 want_refresh = 1;
1666 refresh_limit = 0;
1667 scrollbar_show (1); 1662 scrollBar.show (1);
1668 } 1663 }
1669 break; 1664 break;
1670 } 1665 }
1671 1666
1672skip_switch: ;
1673
1674#if defined(CURSOR_BLINK) 1667#if defined(CURSOR_BLINK)
1675 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1668 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1676 { 1669 {
1677 if (hidden_cursor) 1670 if (hidden_cursor)
1678 { 1671 {
1679 hidden_cursor = 0; 1672 hidden_cursor = 0;
1680 want_refresh = 1; 1673 want_refresh = 1;
1681 } 1674 }
1682 1675
1683 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1676 cursor_blink_ev.again ();
1684 } 1677 }
1685#endif 1678#endif
1686 1679
1687#if defined(POINTER_BLANK) 1680#if defined(POINTER_BLANK)
1688 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1681 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1689 { 1682 {
1690 if (ev.type == MotionNotify 1683 if (ev.type == MotionNotify
1691 || ev.type == ButtonPress 1684 || ev.type == ButtonPress
1692 || ev.type == ButtonRelease) 1685 || ev.type == ButtonRelease)
1693 if (hidden_pointer) 1686 if (hidden_pointer)
… …
1695 1688
1696 if (ev.type == KeyPress && hidden_pointer == 0) 1689 if (ev.type == KeyPress && hidden_pointer == 0)
1697 pointer_blank (); 1690 pointer_blank ();
1698 } 1691 }
1699#endif 1692#endif
1693
1694 refresh_check ();
1700} 1695}
1696
1697#if ENABLE_FRILLS
1698void
1699rxvt_term::set_urgency (bool enable)
1700{
1701 if (enable == urgency_hint)
1702 return;
1703
1704 if (XWMHints *h = XGetWMHints (dpy, parent[0]))
1705 {
1706 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1707 XSetWMHints (dpy, parent[0], h);
1708 urgency_hint = enable;
1709 }
1710}
1711#endif
1701 1712
1702void 1713void
1703rxvt_term::focus_in () 1714rxvt_term::focus_in ()
1704{ 1715{
1705 if (!focus) 1716 if (!focus)
1706 { 1717 {
1707 focus = 1; 1718 focus = 1;
1708 want_refresh = 1; 1719 want_refresh = 1;
1709 1720
1710 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1711
1712#if USE_XIM 1721#if USE_XIM
1713 if (Input_Context != NULL) 1722 if (Input_Context != NULL)
1714 { 1723 {
1715 IMSetStatusPosition (); 1724 IMSetPosition ();
1716 XSetICFocus (Input_Context); 1725 XSetICFocus (Input_Context);
1717 } 1726 }
1718#endif 1727#endif
1719#if CURSOR_BLINK 1728#if CURSOR_BLINK
1720 if (OPTION (Opt_cursorBlink)) 1729 if (option (Opt_cursorBlink))
1721 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1730 cursor_blink_ev.again ();
1722#endif 1731#endif
1723#if OFF_FOCUS_FADING 1732#if OFF_FOCUS_FADING
1724 if (rs[Rs_fade]) 1733 if (rs[Rs_fade])
1725 { 1734 {
1726 pix_colors = pix_colors_focused; 1735 pix_colors = pix_colors_focused;
1727 scr_recolour (); 1736 scr_recolour ();
1728 } 1737 }
1729#endif 1738#endif
1739#if ENABLE_FRILLS
1740 if (option (Opt_urgentOnBell))
1741 set_urgency (0);
1742#endif
1743
1744 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1730 } 1745 }
1731} 1746}
1732 1747
1733void 1748void
1734rxvt_term::focus_out () 1749rxvt_term::focus_out ()
… …
1736 if (focus) 1751 if (focus)
1737 { 1752 {
1738 focus = 0; 1753 focus = 0;
1739 want_refresh = 1; 1754 want_refresh = 1;
1740 1755
1741 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1756#if ENABLE_FRILLS
1742 1757 if (option (Opt_urgentOnBell))
1758 set_urgency (0);
1759#endif
1743#if ENABLE_FRILLS || ISO_14755 1760#if ENABLE_FRILLS || ISO_14755
1744 if (iso14755buf) 1761 if (iso14755buf)
1745 { 1762 {
1746 iso14755buf = 0; 1763 iso14755buf = 0;
1747# if ENABLE_OVERLAY 1764# if ISO_14755
1748 scr_overlay_off (); 1765 scr_overlay_off ();
1749# endif 1766# endif
1750 } 1767 }
1751#endif 1768#endif
1752#if USE_XIM 1769#if USE_XIM
1753 if (Input_Context != NULL) 1770 if (Input_Context != NULL)
1754 XUnsetICFocus (Input_Context); 1771 XUnsetICFocus (Input_Context);
1755#endif 1772#endif
1756#if CURSOR_BLINK 1773#if CURSOR_BLINK
1757 if (OPTION (Opt_cursorBlink)) 1774 if (option (Opt_cursorBlink))
1758 cursor_blink_ev.stop (); 1775 cursor_blink_ev.stop ();
1776
1759 hidden_cursor = 0; 1777 hidden_cursor = 0;
1760#endif 1778#endif
1761#if OFF_FOCUS_FADING 1779#if OFF_FOCUS_FADING
1762 if (rs[Rs_fade]) 1780 if (rs[Rs_fade])
1763 { 1781 {
1764 pix_colors = pix_colors_unfocused; 1782 pix_colors = pix_colors_unfocused;
1765 scr_recolour (); 1783 scr_recolour ();
1766 } 1784 }
1767#endif 1785#endif
1786
1787 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1788 }
1789}
1790
1791void
1792rxvt_term::update_fade_color (unsigned int idx)
1793{
1794#if OFF_FOCUS_FADING
1795 if (rs[Rs_fade])
1768 } 1796 {
1797 rgba c;
1798 pix_colors [Color_fade].get (c);
1799 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1800 }
1801#endif
1769} 1802}
1770 1803
1771#if TRANSPARENT 1804#if ENABLE_TRANSPARENCY || ENABLE_PERL
1772void 1805void
1773rxvt_term::rootwin_cb (XEvent &ev) 1806rxvt_term::rootwin_cb (XEvent &ev)
1774{ 1807{
1775 make_current (); 1808 make_current ();
1776 1809
1810 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1811 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1812 return;
1813
1814# if ENABLE_TRANSPARENCY
1777 switch (ev.type) 1815 switch (ev.type)
1778 { 1816 {
1779 case PropertyNotify: 1817 case PropertyNotify:
1780 /* 1818 /*
1781 * if user used some Esetroot compatible prog to set the root bg, 1819 * 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. 1820 * use the property to determine the pixmap. We use it later on.
1783 */ 1821 */
1784 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1822 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1785 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1823 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1786 return; 1824 {
1825 bgPixmap.set_root_pixmap ();
1826 update_background ();
1827 }
1787 1828
1788 /* FALLTHROUGH */
1789 case ReparentNotify:
1790 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1791 want_refresh = want_full_refresh = 1;
1792 break; 1829 break;
1793 } 1830 }
1831# endif
1832
1833 refresh_check ();
1794} 1834}
1795#endif 1835#endif
1796 1836
1797void 1837void
1798rxvt_term::button_press (XButtonEvent &ev) 1838rxvt_term::button_press (XButtonEvent &ev)
… …
1853 mouse_report (ev); 1893 mouse_report (ev);
1854 } 1894 }
1855#else 1895#else
1856 MEvent.button = ev.button; 1896 MEvent.button = ev.button;
1857 mouse_report (ev); 1897 mouse_report (ev);
1858#endif /* MOUSE_REPORT_DOUBLECLICK */ 1898#endif /* MOUSE_REPORT_DOUBLECLICK */
1859 1899
1860 } 1900 }
1861 else 1901 else
1862 { 1902 {
1863 if (ev.button != MEvent.button) 1903 if (ev.button != MEvent.button)
… …
1911 } 1951 }
1912 1952
1913 /* 1953 /*
1914 * Scrollbar window processing of button press 1954 * Scrollbar window processing of button press
1915 */ 1955 */
1916 if (isScrollbarWindow (ev.window)) 1956 if (scrollBar.state && ev.window == scrollBar.win)
1917 { 1957 {
1918 scrollBar.setIdle (); 1958 page_dirn direction = NO_DIR;
1959
1960 if (scrollBar.upButton (ev.y))
1961 direction = UP; /* up */
1962 else if (scrollBar.dnButton (ev.y))
1963 direction = DN; /* down */
1964
1965 scrollBar.state = STATE_IDLE;
1919 /* 1966 /*
1920 * Rxvt-style scrollbar: 1967 * Rxvt-style scrollbar:
1921 * move up if mouse is above slider 1968 * move up if mouse is above slider
1922 * move dn if mouse is below slider 1969 * move dn if mouse is below slider
1923 * 1970 *
… …
1932 /* 1979 /*
1933 * Mouse report disabled scrollbar: 1980 * Mouse report disabled scrollbar:
1934 * arrow buttons - send up/down 1981 * arrow buttons - send up/down
1935 * click on scrollbar - send pageup/down 1982 * click on scrollbar - send pageup/down
1936 */ 1983 */
1937 if ((scrollBar.style == R_SB_NEXT 1984 if (direction == UP)
1938 && scrollbarnext_upButton (ev.y))
1939 || (scrollBar.style == R_SB_RXVT
1940 && scrollbarrxvt_upButton (ev.y)))
1941 tt_printf ("\033[A"); 1985 tt_printf ("\033[A");
1942 else if ((scrollBar.style == R_SB_NEXT 1986 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"); 1987 tt_printf ("\033[B");
1947 else 1988 else
1948 switch (ev.button) 1989 switch (ev.button)
1949 { 1990 {
1950 case Button2: 1991 case Button2:
… …
1957 tt_printf ("\033[5~"); 1998 tt_printf ("\033[5~");
1958 break; 1999 break;
1959 } 2000 }
1960 } 2001 }
1961 else 2002 else
1962#endif /* NO_SCROLLBAR_REPORT */ 2003#endif /* NO_SCROLLBAR_REPORT */
1963
1964 {
1965 char upordown = 0;
1966
1967 if (scrollBar.style == R_SB_NEXT)
1968 { 2004 {
1969 if (scrollbarnext_upButton (ev.y)) 2005 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 { 2006 {
1983#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2007#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2008 if (!cont_scroll_ev.is_active ())
1984 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2009 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1985#endif 2010#endif
1986 if (scr_page (upordown < 0 ? UP : DN, 1)) 2011 if (scr_page (direction, 1))
1987 { 2012 {
1988 if (upordown < 0) 2013 if (direction == UP)
1989 scrollBar.setUp (); 2014 scrollBar.state = STATE_UP;
1990 else 2015 else
1991 scrollBar.setDn (); 2016 scrollBar.state = STATE_DOWN;
1992 } 2017 }
1993 } 2018 }
1994 else 2019 else
1995 switch (ev.button) 2020 switch (ev.button)
1996 { 2021 {
1997 case Button2: 2022 case Button2:
1998 switch (scrollbar_align) 2023 switch (scrollBar.align)
1999 { 2024 {
2000 case R_SB_ALIGN_TOP: 2025 case R_SB_ALIGN_TOP:
2001 csrO = 0; 2026 csrO = 0;
2002 break; 2027 break;
2003 case R_SB_ALIGN_CENTRE: 2028 case R_SB_ALIGN_CENTRE:
… …
2009 } 2034 }
2010 2035
2011 if (scrollBar.style == R_SB_XTERM 2036 if (scrollBar.style == R_SB_XTERM
2012 || scrollbar_above_slider (ev.y) 2037 || scrollbar_above_slider (ev.y)
2013 || scrollbar_below_slider (ev.y)) 2038 || scrollbar_below_slider (ev.y))
2014 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2039 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2015 2040
2016 scrollBar.setMotion (); 2041 scrollBar.state = STATE_MOTION;
2017 break; 2042 break;
2018 2043
2019 case Button1: 2044 case Button1:
2020 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2045 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2021 csrO = ev.y - scrollBar.top; 2046 csrO = ev.y - scrollBar.top;
2022 /* FALLTHROUGH */ 2047 /* FALLTHROUGH */
2023 2048
2024 case Button3: 2049 case Button3:
2025 if (scrollBar.style != R_SB_XTERM) 2050 if (scrollBar.style != R_SB_XTERM)
… …
2035 scr_page (DN, nrow - 1); 2060 scr_page (DN, nrow - 1);
2036# else 2061# else
2037 scr_page (DN, nrow / 4); 2062 scr_page (DN, nrow / 4);
2038# endif 2063# endif
2039 else 2064 else
2040 scrollBar.setMotion (); 2065 scrollBar.state = STATE_MOTION;
2041 } 2066 }
2042 else 2067 else
2043 { 2068 {
2044 scr_page ((ev.button == Button1 ? DN : UP), 2069 scr_page ((ev.button == Button1 ? DN : UP),
2045 (nrow 2070 (nrow
2046 * scrollbar_position (ev.y) 2071 * scrollbar_position (ev.y)
2047 / scrollbar_size ())); 2072 / scrollBar.size ()));
2048 } 2073 }
2049 2074
2050 break; 2075 break;
2051 } 2076 }
2052 } 2077 }
… …
2062 2087
2063 csrO = 0; /* reset csr Offset */ 2088 csrO = 0; /* reset csr Offset */
2064 if (!bypass_keystate) 2089 if (!bypass_keystate)
2065 reportmode = !! (priv_modes & PrivMode_mouse_report); 2090 reportmode = !! (priv_modes & PrivMode_mouse_report);
2066 2091
2067 if (scrollbar_isUpDn ()) 2092 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2068 { 2093 {
2069 scrollBar.setIdle (); 2094 scrollBar.state = STATE_IDLE;
2070 scrollbar_show (0); 2095 scrollBar.show (0);
2071 } 2096 }
2072 2097
2073#ifdef SELECTION_SCROLLING 2098#ifdef SELECTION_SCROLLING
2074 if (sel_scroll_ev.active)
2075 sel_scroll_ev.stop(); 2099 sel_scroll_ev.stop();
2076#endif 2100#endif
2077 2101
2078 if (ev.window == vt) 2102 if (ev.window == vt)
2079 { 2103 {
2080 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2104 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
… …
2104 mouse_report (ev); 2128 mouse_report (ev);
2105 } 2129 }
2106#else /* MOUSE_REPORT_DOUBLECLICK */ 2130#else /* MOUSE_REPORT_DOUBLECLICK */
2107 MEvent.button = AnyButton; 2131 MEvent.button = AnyButton;
2108 mouse_report (ev); 2132 mouse_report (ev);
2109#endif /* MOUSE_REPORT_DOUBLECLICK */ 2133#endif /* MOUSE_REPORT_DOUBLECLICK */
2110 return; 2134 return;
2111 } 2135 }
2112 2136
2113 /* 2137 /*
2114 * dumb hack to compensate for the failure of click-and-drag 2138 * dumb hack to compensate for the failure of click-and-drag
… …
2126 selection_make (ev.time); 2150 selection_make (ev.time);
2127 break; 2151 break;
2128 2152
2129 case Button2: 2153 case Button2:
2130 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2154 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); 2155 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2132 break; 2156 break;
2133 2157
2134#ifdef MOUSE_WHEEL 2158#ifdef MOUSE_WHEEL
2135 case Button4: 2159 case Button4:
2136 case Button5: 2160 case Button5:
… …
2140 2164
2141 v = ev.button == Button4 ? UP : DN; 2165 v = ev.button == Button4 ? UP : DN;
2142 2166
2143 if (ev.state & ShiftMask) 2167 if (ev.state & ShiftMask)
2144 i = 1; 2168 i = 1;
2145 else if (OPTION (Opt_mouseWheelScrollPage)) 2169 else if (option (Opt_mouseWheelScrollPage))
2146 i = nrow - 1; 2170 i = nrow - 1;
2147 else 2171 else
2148 i = 5; 2172 i = 5;
2149 2173
2150# ifdef MOUSE_SLIP_WHEELING 2174# ifdef MOUSE_SLIP_WHEELING
… …
2152 { 2176 {
2153 mouse_slip_wheel_speed += v ? -1 : 1; 2177 mouse_slip_wheel_speed += v ? -1 : 1;
2154 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2178 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2155 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2179 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2156 2180
2157 if (slip_wheel_ev.at < NOW) 2181 if (!slip_wheel_ev.is_active ())
2158 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2182 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2159
2160 slip_wheel_ev.start ();
2161 } 2183 }
2162 else 2184 else
2185# endif
2163 { 2186 {
2164# endif
2165 scr_page (v, i); 2187 scr_page (v, i);
2166 scrollbar_show (1); 2188 scrollBar.show (1);
2167# ifdef MOUSE_SLIP_WHEELING
2168 } 2189 }
2169# endif
2170 } 2190 }
2171 break; 2191 break;
2172#endif 2192#endif
2173 } 2193 }
2174 } 2194 }
2175} 2195}
2176 2196
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/*}}} */ 2197/*}}} */
2650 2198
2651bool 2199void
2652rxvt_term::cmd_parse () 2200rxvt_term::cmd_parse ()
2653{ 2201{
2654 bool flag = false;
2655 wchar_t ch = NOCHAR; 2202 wchar_t ch = NOCHAR;
2656 char *seq_begin; // remember start of esc-sequence here 2203 char *seq_begin; // remember start of esc-sequence here
2657 2204
2658 for (;;) 2205 for (;;)
2659 { 2206 {
2660 if (ch == NOCHAR) 2207 if (expect_false (ch == NOCHAR))
2661 { 2208 {
2662 seq_begin = cmdbuf_ptr; 2209 seq_begin = cmdbuf_ptr;
2663 ch = next_char (); 2210 ch = next_char ();
2664 2211
2665 if (ch == NOCHAR) 2212 if (ch == NOCHAR)
2666 break; 2213 break;
2667 } 2214 }
2668 2215
2669 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2216 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2670 { 2217 {
2671 if (!seen_input) 2218 if (expect_false (!seen_input))
2672 { 2219 {
2673 seen_input = 1; 2220 seen_input = 1;
2674 // many badly-written programs (e.g. jed) contain a race condition: 2221 // many badly-written programs (e.g. jed) contain a race condition:
2675 // they first read the screensize and then install a SIGWINCH handler. 2222 // they first read the screensize and then install a SIGWINCH handler.
2676 // some window managers resize the window early, and these programs 2223 // some window managers resize the window early, and these programs
… …
2689 wchar_t *str = buf; 2236 wchar_t *str = buf;
2690 wchar_t *eol = str + min (ncol, UBUFSIZ); 2237 wchar_t *eol = str + min (ncol, UBUFSIZ);
2691 2238
2692 for (;;) 2239 for (;;)
2693 { 2240 {
2694 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2241 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2695 break; 2242 break;
2696 2243
2697 *str++ = ch; 2244 *str++ = ch;
2698 2245
2699 if (ch == C0_LF || str >= eol) 2246 if (expect_false (ch == C0_LF || str >= eol))
2700 { 2247 {
2701 if (ch == C0_LF) 2248 if (ch == C0_LF)
2702 nlines++; 2249 nlines++;
2703 2250
2704 refresh_count++; 2251 refresh_count++;
2705 2252
2706 if (!OPTION (Opt_jumpScroll) 2253 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2707 || (refresh_count >= refresh_limit * (nrow - 1)))
2708 { 2254 {
2709 refreshnow = true;
2710 refresh_count = 0; 2255 refresh_count = 0;
2256
2257 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2258 {
2259 refreshnow = true;
2711 ch = NOCHAR; 2260 ch = NOCHAR;
2712 break; 2261 break;
2262 }
2713 } 2263 }
2714 2264
2715 // scr_add_lines only works for nlines <= nrow - 1. 2265 // scr_add_lines only works for nlines <= nrow - 1.
2716 if (nlines >= nrow - 1) 2266 if (nlines >= nrow - 1)
2717 { 2267 {
… …
2745 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2295 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2746 scr_add_lines (buf, str - buf, nlines); 2296 scr_add_lines (buf, str - buf, nlines);
2747 2297
2748 /* 2298 /*
2749 * If there have been a lot of new lines, then update the screen 2299 * 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. 2300 * 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 2301 * if skipScroll is enabled.
2752 * is incremented here because we must be doing flat-out scrolling.
2753 */ 2302 */
2754 if (refreshnow) 2303 if (refreshnow)
2755 { 2304 {
2756 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2757 refresh_limit++;
2758 else
2759 {
2760 flag = true;
2761 scr_refresh (); 2305 scr_refresh ();
2762 want_refresh = 1; 2306 want_refresh = 1;
2763 }
2764 } 2307 }
2765
2766 } 2308 }
2767 else 2309 else
2768 { 2310 {
2769 try 2311 try
2770 { 2312 {
… …
2778 } 2320 }
2779 2321
2780 ch = NOCHAR; 2322 ch = NOCHAR;
2781 } 2323 }
2782 } 2324 }
2783
2784 return flag;
2785} 2325}
2786 2326
2787// read the next character 2327// read the next character
2788wchar_t 2328wchar_t
2789rxvt_term::next_char () NOTHROW 2329rxvt_term::next_char () NOTHROW
2790{ 2330{
2791 while (cmdbuf_ptr < cmdbuf_endp) 2331 while (cmdbuf_ptr < cmdbuf_endp)
2792 { 2332 {
2793 // assume 7-bit to be ascii ALWAYS 2333 // assume 7-bit to be ascii ALWAYS
2794 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2334 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2795 return *cmdbuf_ptr++; 2335 return *cmdbuf_ptr++;
2796 2336
2797 wchar_t wc; 2337 wchar_t wc;
2798 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2338 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2799 2339
… …
2803 cmdbuf_ptr = cmdbuf_endp; 2343 cmdbuf_ptr = cmdbuf_endp;
2804 break; 2344 break;
2805 } 2345 }
2806 2346
2807 if (len == (size_t)-1) 2347 if (len == (size_t)-1)
2348 {
2349 mbstate.reset (); // reset now undefined conversion state
2808 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2350 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2351 }
2809 2352
2810 // assume wchar == unicode 2353 // assume wchar == unicode
2811 cmdbuf_ptr += len; 2354 cmdbuf_ptr += len;
2812 return wc & UNICODE_MASK; 2355 return wc & UNICODE_MASK;
2813 } 2356 }
… …
2857/*----------------------------------------------------------------------*/ 2400/*----------------------------------------------------------------------*/
2858#ifdef PRINTPIPE 2401#ifdef PRINTPIPE
2859FILE * 2402FILE *
2860rxvt_term::popen_printer () 2403rxvt_term::popen_printer ()
2861{ 2404{
2862 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2405 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2863 2406
2864 if (stream == NULL) 2407 if (stream == NULL)
2865 rxvt_warn ("can't open printer pipe, not printing.\n"); 2408 rxvt_warn ("can't open printer pipe, not printing.\n");
2866 2409
2867 return stream; 2410 return stream;
… …
2878 * simulate attached vt100 printer 2421 * simulate attached vt100 printer
2879 */ 2422 */
2880void 2423void
2881rxvt_term::process_print_pipe () 2424rxvt_term::process_print_pipe ()
2882{ 2425{
2883 int done; 2426 FILE *fd = popen_printer ();
2884 FILE *fd;
2885 2427
2886 if ((fd = popen_printer ()) == NULL) 2428 if (!fd)
2887 return; 2429 return;
2888 2430
2889 /* 2431 /*
2890 * Send all input to the printer until either ESC[4i or ESC[?4i 2432 * Send all input to the printer until either ESC[4i or ESC[?4i
2891 * is received. 2433 * is received.
2892 */ 2434 */
2893 for (done = 0; !done;) 2435 for (int done = 0; !done; )
2894 { 2436 {
2895 unsigned char buf[8]; 2437 unsigned char buf[8];
2896 unicode_t ch; 2438 unicode_t ch;
2897 unsigned int i, len; 2439 unsigned int i, len;
2898 2440
… …
2917 { 2459 {
2918 if ((buf[len++] = cmd_getc ()) == 'i') 2460 if ((buf[len++] = cmd_getc ()) == 'i')
2919 break; /* done = 1 */ 2461 break; /* done = 1 */
2920 } 2462 }
2921 } 2463 }
2922 2464
2923 for (i = 0; i < len; i++) 2465 for (i = 0; i < len; i++)
2924 if (putc (buf[i], fd) == EOF) 2466 if (putc (buf[i], fd) == EOF)
2925 { 2467 {
2926 done = 1; 2468 done = 1;
2927 break; 2469 break;
… …
2929 } 2471 }
2930 } 2472 }
2931 2473
2932 pclose_printer (fd); 2474 pclose_printer (fd);
2933} 2475}
2934#endif /* PRINTPIPE */ 2476#endif /* PRINTPIPE */
2935/*}}} */ 2477/*}}} */
2936 2478
2937/* *INDENT-OFF* */ 2479/* *INDENT-OFF* */
2938enum { 2480enum {
2939 C1_40 = 0x40, 2481 C1_40 = 0x40,
… …
2989 process_dcs_seq (); 2531 process_dcs_seq ();
2990 break; 2532 break;
2991 case 0x9b: /* CSI */ 2533 case 0x9b: /* CSI */
2992 process_csi_seq (); 2534 process_csi_seq ();
2993 break; 2535 break;
2994 case 0x9d: /* CSI */ 2536 case 0x9d: /* OSC */
2995 process_osc_seq (); 2537 process_osc_seq ();
2996 break; 2538 break;
2997#endif 2539#endif
2998 } 2540 }
2999} 2541}
… …
3043 break; 2585 break;
3044 case 'Z': /* identify the terminal type */ 2586 case 'Z': /* identify the terminal type */
3045 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2587 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
3046 break; 2588 break;
3047 case '<': /* turn off VT52 mode */ 2589 case '<': /* turn off VT52 mode */
3048 PrivMode (0, PrivMode_vt52); 2590 set_privmode (PrivMode_vt52, 0);
3049 break; 2591 break;
3050 case 'F': /* use special graphics character set */ 2592 case 'F': /* use special graphics character set */
3051 case 'G': /* use regular character set */ 2593 case 'G': /* use regular character set */
3052 /* unimplemented */ 2594 /* unimplemented */
3053 break; 2595 break;
… …
3107 scr_forwardindex (); 2649 scr_forwardindex ();
3108 break; 2650 break;
3109#endif 2651#endif
3110 case '=': 2652 case '=':
3111 case '>': 2653 case '>':
3112 PrivMode ((ch == '='), PrivMode_aplKP); 2654 set_privmode (PrivMode_aplKP, ch == '=');
3113 break; 2655 break;
3114 2656
3115 case C1_40: 2657 case C1_40:
3116 cmd_getc (); 2658 cmd_getc ();
3117 break; 2659 break;
… …
3156 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2698 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3157 case C1_SCI: /* ESC Z */ 2699 case C1_SCI: /* ESC Z */
3158 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2700 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3159 break; /* steal obsolete ESC [ c */ 2701 break; /* steal obsolete ESC [ c */
3160 2702
3161 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2703 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
3162 case C1_CSI: /* ESC [ */ 2704 case C1_CSI: /* ESC [ */
3163 process_csi_seq (); 2705 process_csi_seq ();
3164 break; 2706 break;
3165 2707
3166 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2708 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
3167 case C1_OSC: /* ESC ] */ 2709 case C1_OSC: /* ESC ] */
3168 process_osc_seq (); 2710 process_osc_seq ();
3169 break; 2711 break;
3170 2712
3171 /* 8.3.106: RESET TO INITIAL STATE */ 2713 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
3172 case 'c': 2714 case 'c':
3173 mbstate.reset (); 2715 mbstate.reset ();
3174 scr_poweron (); 2716 scr_poweron ();
3175 scrollbar_show (1); 2717 scrollBar.show (1);
3176 break; 2718 break;
3177 2719
3178 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2720 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
3179 case 'n': 2721 case 'n':
3180 scr_charset_choose (2); 2722 scr_charset_choose (2);
… …
3225rxvt_term::process_csi_seq () 2767rxvt_term::process_csi_seq ()
3226{ 2768{
3227 unicode_t ch, priv, i; 2769 unicode_t ch, priv, i;
3228 unsigned int nargs, p; 2770 unsigned int nargs, p;
3229 int n, ndef; 2771 int n, ndef;
3230 int arg[ESC_ARGS]; 2772 int arg[ESC_ARGS] = { };
3231 2773
3232 for (nargs = ESC_ARGS; nargs > 0;) 2774 nargs = 0;
3233 arg[--nargs] = 0;
3234 2775
3235 priv = 0; 2776 priv = 0;
3236 ch = cmd_getc (); 2777 ch = cmd_getc ();
3237 if (ch >= '<' && ch <= '?') 2778 if ((ch >= '<' && ch <= '?') || ch == '!')
2779 {
3238 { /* '<' '=' '>' '?' */ 2780 /* '<' '=' '>' '?' '!' */
3239 priv = ch; 2781 priv = ch;
3240 ch = cmd_getc (); 2782 ch = cmd_getc ();
3241 } 2783 }
3242 2784
3243 /* read any numerical arguments */ 2785 /* read any numerical arguments */
… …
3282 switch (priv) 2824 switch (priv)
3283 { 2825 {
3284 case '>': 2826 case '>':
3285 if (ch == CSI_DA) /* secondary device attributes */ 2827 if (ch == CSI_DA) /* secondary device attributes */
3286 { 2828 {
3287 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, 2829 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
3288 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2830 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3289 // 2831 //
3290 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2832 // 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 2833 // 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). 2834 // versions.
3293 // 2835 //
3294 tt_printf ("\033[>%d;94;0c", 'U'); 2836 tt_printf ("\033[>%d;95;0c", 'U');
3295 } 2837 }
3296 break; 2838 break;
2839
3297 case '?': 2840 case '?':
3298 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2841 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3299 process_terminal_mode (ch, priv, nargs, arg); 2842 process_terminal_mode (ch, priv, nargs, arg);
3300 break; 2843 break;
2844
2845 case '!':
2846 if (ch == CSI_70)
2847 {
2848 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2849 scr_soft_reset ();
2850
2851 static const int pm_h[] = { 7, 25 };
2852 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 };
2853
2854 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h);
2855 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l);
3301 } 2856 }
2857 break;
2858 }
2859
3302 return; 2860 return;
3303 } 2861 }
3304 2862
3305 switch (ch) 2863 switch (ch)
3306 { 2864 {
… …
3426 break; 2984 break;
3427 case 6: /* CPR requested */ 2985 case 6: /* CPR requested */
3428 scr_report_position (); 2986 scr_report_position ();
3429 break; 2987 break;
3430 case 7: /* unofficial extension */ 2988 case 7: /* unofficial extension */
3431 if (OPTION (Opt_insecure)) 2989 if (option (Opt_insecure))
3432 tt_printf ("%-.250s\012", rs[Rs_display_name]); 2990 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3433 break; 2991 break;
3434 case 8: /* unofficial extension */ 2992 case 8: /* unofficial extension */
3435 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2993 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3436 break; 2994 break;
… …
3529{ 3087{
3530 int x, y; 3088 int x, y;
3531 XWindowAttributes wattr; 3089 XWindowAttributes wattr;
3532 Window wdummy; 3090 Window wdummy;
3533 3091
3534 dLocal (Display *, xdisp); 3092 dLocal (Display *, dpy);
3535 3093
3536 if (nargs == 0) 3094 if (nargs == 0)
3537 return; 3095 return;
3538 3096
3539 switch (args[0]) 3097 switch (args[0])
3540 { 3098 {
3541 /* 3099 /*
3542 * commands 3100 * commands
3543 */ 3101 */
3544 case 1: /* deiconify window */ 3102 case 1: /* deiconify window */
3545 XMapWindow (xdisp, parent[0]); 3103 XMapWindow (dpy, parent[0]);
3546 break; 3104 break;
3547 case 2: /* iconify window */ 3105 case 2: /* iconify window */
3548 XIconifyWindow (xdisp, parent[0], display->screen); 3106 XIconifyWindow (dpy, parent[0], display->screen);
3549 break; 3107 break;
3550 case 3: /* set position (pixels) */ 3108 case 3: /* set position (pixels) */
3551 XMoveWindow (xdisp, parent[0], args[1], args[2]); 3109 XMoveWindow (dpy, parent[0], args[1], args[2]);
3552 break; 3110 break;
3553 case 4: /* set size (pixels) */ 3111 case 4: /* set size (pixels) */
3554 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3112 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3555 break; 3113 break;
3556 case 5: /* raise window */ 3114 case 5: /* raise window */
3557 XRaiseWindow (xdisp, parent[0]); 3115 XRaiseWindow (dpy, parent[0]);
3558 break; 3116 break;
3559 case 6: /* lower window */ 3117 case 6: /* lower window */
3560 XLowerWindow (xdisp, parent[0]); 3118 XLowerWindow (dpy, parent[0]);
3561 break; 3119 break;
3562 case 7: /* refresh window */ 3120 case 7: /* refresh window */
3563 scr_touch (true); 3121 scr_touch (true);
3564 break; 3122 break;
3565 case 8: /* set size (chars) */ 3123 case 8: /* set size (chars) */
… …
3576 3134
3577 /* 3135 /*
3578 * reports - some output format copied from XTerm 3136 * reports - some output format copied from XTerm
3579 */ 3137 */
3580 case 11: /* report window state */ 3138 case 11: /* report window state */
3581 XGetWindowAttributes (xdisp, parent[0], &wattr); 3139 XGetWindowAttributes (dpy, parent[0], &wattr);
3582 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3140 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3583 break; 3141 break;
3584 case 13: /* report window position */ 3142 case 13: /* report window position */
3585 XGetWindowAttributes (xdisp, parent[0], &wattr); 3143 XGetWindowAttributes (dpy, parent[0], &wattr);
3586 XTranslateCoordinates (xdisp, parent[0], wattr.root, 3144 XTranslateCoordinates (dpy, parent[0], wattr.root,
3587 -wattr.border_width, -wattr.border_width, 3145 -wattr.border_width, -wattr.border_width,
3588 &x, &y, &wdummy); 3146 &x, &y, &wdummy);
3589 tt_printf ("\033[3;%d;%dt", x, y); 3147 tt_printf ("\033[3;%d;%dt", x, y);
3590 break; 3148 break;
3591 case 14: /* report window size (pixels) */ 3149 case 14: /* report window size (pixels) */
3592 XGetWindowAttributes (xdisp, parent[0], &wattr); 3150 XGetWindowAttributes (dpy, parent[0], &wattr);
3593 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3151 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3594 break; 3152 break;
3595 case 18: /* report text area size (chars) */ 3153 case 18: /* report text area size (chars) */
3596 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3154 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3597 break; 3155 break;
… …
3599 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3157 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3600 break; 3158 break;
3601 case 20: /* report icon label */ 3159 case 20: /* report icon label */
3602 { 3160 {
3603 char *s; 3161 char *s;
3604 XGetIconName (xdisp, parent[0], &s); 3162 XGetIconName (dpy, parent[0], &s);
3605 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3163 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3606 XFree (s); 3164 XFree (s);
3607 } 3165 }
3608 break; 3166 break;
3609 case 21: /* report window title */ 3167 case 21: /* report window title */
3610 { 3168 {
3611 char *s; 3169 char *s;
3612 XFetchName (xdisp, parent[0], &s); 3170 XFetchName (dpy, parent[0], &s);
3613 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3171 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3614 XFree (s); 3172 XFree (s);
3615 } 3173 }
3616 break; 3174 break;
3617 } 3175 }
3618} 3176}
… …
3645 seen_esc = true; 3203 seen_esc = true;
3646 continue; 3204 continue;
3647 } 3205 }
3648 else if (ch == C0_BEL || ch == CHAR_ST) 3206 else if (ch == C0_BEL || ch == CHAR_ST)
3649 break; 3207 break;
3208 else if (ch == C0_SYN)
3209 ch = cmd_get8 ();
3650 else if (ch < 0x20) 3210 else if (ch < 0x20)
3651 return NULL; /* other control character - exit */ 3211 return NULL; /* other control character - exit */
3652 3212
3653 seen_esc = false; 3213 seen_esc = false;
3654 3214
3655 if (n >= STRING_MAX - 1) 3215 if (n >= STRING_MAX - 1)
3656 // stop at some sane length 3216 // stop at some sane length
3657 return NULL; 3217 return NULL;
3658 3218
3659 if (ch == C0_SYN)
3660 string[n++] = cmd_get8 ();
3661 else
3662 string[n++] = ch; 3219 string[n++] = ch;
3663 } 3220 }
3664 3221
3665 string[n++] = '\0'; 3222 string[n++] = '\0';
3666 3223
3667 ends_how = (ch == 0x5c ? C0_ESC : ch); 3224 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3674 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3231 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3675 */ 3232 */
3676void 3233void
3677rxvt_term::process_dcs_seq () 3234rxvt_term::process_dcs_seq ()
3678{ 3235{
3679 char *s;
3680 unicode_t eh;
3681
3682 /* 3236 /*
3683 * Not handled yet 3237 * Not handled yet
3684 */ 3238 */
3239
3240 unicode_t eh;
3685 s = get_to_st (eh); 3241 char *s = get_to_st (eh);
3686 if (s) 3242 if (s)
3687 free (s); 3243 free (s);
3688 3244
3689 return; 3245 return;
3690} 3246}
… …
3694 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3250 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3695 */ 3251 */
3696void 3252void
3697rxvt_term::process_osc_seq () 3253rxvt_term::process_osc_seq ()
3698{ 3254{
3699 unicode_t ch, eh;
3700 int arg; 3255 int arg;
3701 3256
3702 ch = cmd_getc (); 3257 unicode_t ch = cmd_getc ();
3703 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3258 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3704 arg = arg * 10 + (ch - '0'); 3259 arg = arg * 10 + (ch - '0');
3705 3260
3706 if (ch == ';') 3261 if (ch == ';')
3707 { 3262 {
3263 unicode_t eh;
3708 char *s = get_to_st (eh); 3264 char *s = get_to_st (eh);
3709 3265
3710 if (s) 3266 if (s)
3711 { 3267 {
3712 process_xterm_seq (arg, s, eh); 3268 process_xterm_seq (arg, s, eh);
… …
3719rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3275rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3720{ 3276{
3721 if (str[0] == '?' && !str[1]) 3277 if (str[0] == '?' && !str[1])
3722 { 3278 {
3723 rgba c; 3279 rgba c;
3724 pix_colors_focused[color].get (this, c); 3280 pix_colors_focused[color].get (c);
3725 3281
3726#if XFT 3282#if XFT
3727 if (c.a != rgba::MAX_CC) 3283 if (c.a != rgba::MAX_CC)
3728 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp); 3284 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3729 else 3285 else
… …
3736 3292
3737/* 3293/*
3738 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3294 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3739 */ 3295 */
3740void 3296void
3741rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3297rxvt_term::process_xterm_seq (int op, char *str, char resp)
3742{ 3298{
3743 int color; 3299 int color;
3744 char *buf, *name; 3300 char *buf, *name;
3745 bool query = str[0] == '?' && !str[1]; 3301 bool query = str[0] == '?' && !str[1];
3746 int saveop = op; 3302 int saveop = op;
3747 3303
3748 dLocal (Display *, xdisp); 3304 dLocal (Display *, dpy);
3749 3305
3750 assert (str != NULL); 3306 assert (str != NULL);
3307
3308 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3309 return;
3310
3751 switch (op) 3311 switch (op)
3752 { 3312 {
3753 case XTerm_name: 3313 case XTerm_name:
3754 set_title (str); 3314 set_title (str);
3755 /* FALLTHROUGH */ 3315 /* FALLTHROUGH */
… …
3769 unsigned long bytes_after; 3329 unsigned long bytes_after;
3770 unsigned char *value = 0; 3330 unsigned char *value = 0;
3771 const char *str = ""; 3331 const char *str = "";
3772 3332
3773 if (prop 3333 if (prop
3774 && XGetWindowProperty (xdisp, parent[0], 3334 && XGetWindowProperty (dpy, parent[0],
3775 prop, 0, 1<<16, 0, AnyPropertyType, 3335 prop, 0, 1<<16, 0, AnyPropertyType,
3776 &actual_type, &actual_format, 3336 &actual_type, &actual_format,
3777 &nitems, &bytes_after, &value) == Success 3337 &nitems, &bytes_after, &value) == Success
3778 && actual_type != None 3338 && actual_type != None
3779 && actual_format == 8) 3339 && actual_format == 8)
… …
3783 3343
3784 XFree (value); 3344 XFree (value);
3785 } 3345 }
3786 else 3346 else
3787 { 3347 {
3788 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3348 char *eq = strchr (str, '=');
3789 3349
3790 if (eq) 3350 if (eq)
3791 { 3351 {
3792 *eq = 0; 3352 *eq = 0;
3793 set_utf8_property (display->atom (str), eq + 1); 3353 set_utf8_property (display->atom (str), eq + 1);
3794 } 3354 }
3795 else 3355 else
3796 XDeleteProperty (xdisp, parent[0], 3356 XDeleteProperty (dpy, parent[0],
3797 display->atom (str)); 3357 display->atom (str));
3798 } 3358 }
3799 break; 3359 break;
3800 3360
3801 case XTerm_Color: 3361 case XTerm_Color:
… …
3814 *buf++ = '\0'; 3374 *buf++ = '\0';
3815 3375
3816 process_color_seq (op, color, name, resp); 3376 process_color_seq (op, color, name, resp);
3817 } 3377 }
3818 break; 3378 break;
3379 case Rxvt_restoreFG:
3819 case XTerm_Color00: 3380 case XTerm_Color00:
3820 process_color_seq (op, Color_fg, str, resp); 3381 process_color_seq (op, Color_fg, str, resp);
3821 break; 3382 break;
3383 case Rxvt_restoreBG:
3822 case XTerm_Color01: 3384 case XTerm_Color01:
3823 process_color_seq (op, Color_bg, str, resp); 3385 process_color_seq (op, Color_bg, str, resp);
3824 break; 3386 break;
3825#ifndef NO_CURSORCOLOR 3387#ifndef NO_CURSORCOLOR
3826 case XTerm_Color_cursor: 3388 case XTerm_Color_cursor:
… …
3831 process_color_seq (op, Color_pointer_fg, str, resp); 3393 process_color_seq (op, Color_pointer_fg, str, resp);
3832 break; 3394 break;
3833 case XTerm_Color_pointer_bg: 3395 case XTerm_Color_pointer_bg:
3834 process_color_seq (op, Color_pointer_bg, str, resp); 3396 process_color_seq (op, Color_pointer_bg, str, resp);
3835 break; 3397 break;
3398#ifdef OPTION_HC
3399 case XTerm_Color_HC:
3400 process_color_seq (op, Color_HC, str, resp);
3401 break;
3402 case XTerm_Color_HTC:
3403 process_color_seq (op, Color_HTC, str, resp);
3404 break;
3405#endif
3836#ifndef NO_BOLD_UNDERLINE_REVERSE 3406#ifndef NO_BOLD_UNDERLINE_REVERSE
3837 case XTerm_Color_RV:
3838 process_color_seq (op, Color_RV, str, resp);
3839 break;
3840 case Rxvt_Color_BD:
3841 case URxvt_Color_BD: 3407 case URxvt_Color_BD:
3842 process_color_seq (op, Color_BD, str, resp); 3408 process_color_seq (op, Color_BD, str, resp);
3843 break; 3409 break;
3844 case Rxvt_Color_UL:
3845 case URxvt_Color_UL: 3410 case URxvt_Color_UL:
3846 process_color_seq (op, Color_UL, str, resp); 3411 process_color_seq (op, Color_UL, str, resp);
3847 break; 3412 break;
3848 case URxvt_Color_IT: 3413 case URxvt_Color_IT:
3849 process_color_seq (op, Color_IT, str, resp); 3414 process_color_seq (op, Color_IT, str, resp);
3850 break; 3415 break;
3851#endif 3416#endif
3852#if TRANSPARENT && TINTING 3417 case URxvt_Color_border:
3418 process_color_seq (op, Color_border, str, resp);
3419 break;
3420#if ENABLE_TRANSPARENCY
3853 case URxvt_Color_tint: 3421 case URxvt_Color_tint:
3854 process_color_seq (op, Color_tint, str, resp); 3422 process_color_seq (op, Color_tint, str, resp);
3423 {
3424 bool changed = false;
3855 3425
3856 check_our_parents (); 3426 if (ISSET_PIXCOLOR (Color_tint))
3427 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3428 else
3429 changed = bgPixmap.unset_tint ();
3857 3430
3858 if (am_transparent) 3431 if (changed)
3859 want_full_refresh = want_refresh = 1; 3432 update_background ();
3433 }
3860 3434
3861 break; 3435 break;
3862#endif 3436#endif
3863 3437
3438#if BG_IMAGE_FROM_FILE
3864 case Rxvt_Pixmap: 3439 case Rxvt_Pixmap:
3865 { 3440 if (!strcmp (str, "?"))
3866 if (*str != ';')
3867 { 3441 {
3868#if XPM_BACKGROUND 3442 char str[256];
3869 scale_pixmap (""); /* reset to default scaling */ 3443
3870 set_bgPixmap (str); /* change pixmap */ 3444 sprintf (str, "[%dx%d+%d+%d]",
3871 scr_touch (true); 3445 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3872#endif 3446 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3447 process_xterm_seq (XTerm_title, str, CHAR_ST);
3873 } 3448 }
3874 3449 else
3450 {
3875 int changed = 0; 3451 int changed = 0;
3876 3452
3877 while ((str = strchr (str, ';')) != NULL) 3453 if (*str != ';')
3878 { 3454 {
3455 /* reset to default scaling :*/
3456 bgPixmap.unset_geometry ();
3457 if (bgPixmap.set_file (str)) /* change pixmap */
3458 changed++;
3459 str = strchr (str, ';');
3460 if (str == NULL)
3461 bgPixmap.set_defaultGeometry ();
3462 }
3463
3464 while (str)
3465 {
3879 str++; 3466 str++;
3880#if XPM_BACKGROUND 3467 if (bgPixmap.set_geometry (str))
3881 changed += scale_pixmap (str); 3468 changed++;
3882#endif 3469 str = strchr (str, ';');
3883 } 3470 }
3884 3471
3885 if (changed) 3472 if (changed)
3886 { 3473 update_background ();
3887#ifdef XPM_BACKGROUND
3888 resize_pixmap ();
3889 scr_touch (true);
3890#endif
3891 } 3474 }
3892 }
3893 break; 3475 break;
3894 3476#endif
3895 case Rxvt_restoreFG:
3896 set_window_color (Color_fg, str);
3897 break;
3898 case Rxvt_restoreBG:
3899 set_window_color (Color_bg, str);
3900 break;
3901 3477
3902 case XTerm_logfile: 3478 case XTerm_logfile:
3903 // TODO, when secure mode? 3479 // TODO, when secure mode?
3904 break; 3480 break;
3905 3481
… …
3923 case URxvt_italicFont: 3499 case URxvt_italicFont:
3924 case URxvt_boldItalicFont: 3500 case URxvt_boldItalicFont:
3925#endif 3501#endif
3926 if (query) 3502 if (query)
3927 tt_printf ("\33]%d;%-.250s%c", saveop, 3503 tt_printf ("\33]%d;%-.250s%c", saveop,
3928 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3504 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3929 ? fontset[op - URxvt_font]->fontdesc : "", 3505 ? fontset[op - URxvt_font]->fontdesc : "",
3930 resp); 3506 resp);
3931 else 3507 else
3932 { 3508 {
3933 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3509 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3947 break; 3523 break;
3948 3524
3949#if !ENABLE_MINIMAL 3525#if !ENABLE_MINIMAL
3950 case URxvt_locale: 3526 case URxvt_locale:
3951 if (query) 3527 if (query)
3952 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp); 3528 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3953 else 3529 else
3954 { 3530 {
3955 set_locale (str); 3531 set_locale (str);
3956 pty->set_utf8_mode (enc_utf8); 3532 pty->set_utf8_mode (enc_utf8);
3957 init_xlocale (); 3533 init_xlocale ();
… …
3972 break; 3548 break;
3973#endif 3549#endif
3974 3550
3975#if ENABLE_PERL 3551#if ENABLE_PERL
3976 case URxvt_perl: 3552 case URxvt_perl:
3977 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 3553 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3978 ; // no responses yet
3979 break; 3554 break;
3980#endif 3555#endif
3981 } 3556 }
3982} 3557}
3983/*----------------------------------------------------------------------*/ 3558/*----------------------------------------------------------------------*/
… …
4006 { 3581 {
4007 if (mode == 'r') 3582 if (mode == 'r')
4008 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3583 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
4009 else 3584 else
4010 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3585 state = (mode == 't') ? ! (priv_modes & bit) : mode;
4011 PrivMode (state, bit); 3586
3587 set_privmode (bit, state);
4012 } 3588 }
4013 3589
4014 return state; 3590 return state;
4015} 3591}
4016 3592
… …
4020{ 3596{
4021 unsigned int i, j; 3597 unsigned int i, j;
4022 int state; 3598 int state;
4023 3599
4024 static const struct 3600 static const struct
4025 { 3601 {
4026 const int argval; 3602 const int argval;
4027 const unsigned long bit; 3603 const unsigned long bit;
4028 }
4029
4030 argtopriv[] = { 3604 } argtopriv[] = {
4031 { 1, PrivMode_aplCUR }, 3605 { 1, PrivMode_aplCUR }, // DECCKM
4032 { 2, PrivMode_vt52 }, 3606 { 2, PrivMode_vt52 },
4033 { 3, PrivMode_132 }, 3607 { 3, PrivMode_132 }, // DECCOLM
4034 { 4, PrivMode_smoothScroll }, 3608 { 4, PrivMode_smoothScroll }, // DECSCLM
4035 { 5, PrivMode_rVideo }, 3609 { 5, PrivMode_rVideo }, // DECSCNM
4036 { 6, PrivMode_relOrigin }, 3610 { 6, PrivMode_relOrigin }, // DECOM
4037 { 7, PrivMode_Autowrap }, 3611 { 7, PrivMode_Autowrap }, // DECAWM
4038 // 8, bi-directional support mode 3612 // 8, auto-repeat keys // DECARM
4039 { 9, PrivMode_MouseX10 }, 3613 { 9, PrivMode_MouseX10 },
4040 // 18, 19 printing-related 3614 // 18 end FF to printer after print screen
3615 // 19 Print screen prints full screen/scorll region
4041 { 25, PrivMode_VisibleCursor }, 3616 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
4042#ifdef scrollBar_esc 3617#ifdef scrollBar_esc
4043 { scrollBar_esc, PrivMode_scrollBar }, 3618 { scrollBar_esc, PrivMode_scrollBar },
4044#endif 3619#endif
4045 { 35, PrivMode_ShiftKeys }, // rxvt extension 3620 { 35, PrivMode_ShiftKeys }, // rxvt extension
3621 // 38, tektronix mode // DECTEK
4046 { 40, PrivMode_132OK }, 3622 { 40, PrivMode_132OK },
4047 // 41 xterm more fixes NYI 3623 // 41 xterm more fixes NYI
4048 // 45 margin bell NYI 3624 // 45 margin bell NYI
4049 // 46 start logging 3625 // 46 start logging
4050 { 47, PrivMode_Screen }, 3626 { 47, PrivMode_Screen },
4051 { 66, PrivMode_aplKP }, 3627 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
4052#ifndef NO_BACKSPACE_KEY 3628#ifndef NO_BACKSPACE_KEY
4053 { 67, PrivMode_BackSpace }, 3629 { 67, PrivMode_BackSpace }, // DECBKM
4054#endif 3630#endif
4055 { 1000, PrivMode_MouseX11 }, 3631 { 1000, PrivMode_MouseX11 },
4056 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3632 { 1002, PrivMode_MouseBtnEvent },
4057 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3633 { 1003, PrivMode_MouseAnyEvent },
4058 // 1003 Use All Motion Mouse Tracking. NYI, TODO
4059 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3634 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4060 { 1011, PrivMode_Keypress }, // rxvt extension 3635 { 1011, PrivMode_Keypress }, // rxvt extension
4061 // 1035 enable modifiers for alt, numlock NYI 3636 // 1035 enable modifiers for alt, numlock NYI
4062 // 1036 send ESC for meta keys NYI 3637 // 1036 send ESC for meta keys NYI
4063 // 1037 send DEL for keypad delete NYI 3638 // 1037 send DEL for keypad delete NYI
4064 { 1047, PrivMode_Screen }, 3639 { 1047, PrivMode_Screen },
4065 // 1048 save and restore cursor 3640 // 1048 save and restore cursor
4066 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3641 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
4067 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3642 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3643 { 2004, PrivMode_BracketPaste },
4068 }; 3644 };
4069 3645
4070 if (nargs == 0) 3646 if (nargs == 0)
4071 return; 3647 return;
4072 3648
… …
4097 3673
4098 scr_touch (true); 3674 scr_touch (true);
4099 break; 3675 break;
4100#endif 3676#endif
4101 case 1048: /* alternative cursor save */ 3677 case 1048: /* alternative cursor save */
4102 case 1049:
4103 if (OPTION (Opt_secondaryScreen)) 3678 if (option (Opt_secondaryScreen))
4104 if (mode == 0) 3679 if (mode == 0)
4105 scr_cursor (RESTORE); 3680 scr_cursor (RESTORE);
4106 else if (mode == 1) 3681 else if (mode == 1)
4107 scr_cursor (SAVE); 3682 scr_cursor (SAVE);
4108 break; 3683 break;
… …
4116 case 2: /* VT52 mode */ 3691 case 2: /* VT52 mode */
4117 /* oddball mode. should be set regardless of set/reset 3692 /* oddball mode. should be set regardless of set/reset
4118 * parameter. Return from VT52 mode with an ESC < from 3693 * parameter. Return from VT52 mode with an ESC < from
4119 * within VT52 mode 3694 * within VT52 mode
4120 */ 3695 */
4121 PrivMode (1, PrivMode_vt52); 3696 set_privmode (PrivMode_vt52, 1);
4122 break; 3697 break;
4123 case 3: /* 80/132 */ 3698 case 3: /* 80/132 */
4124 if (priv_modes & PrivMode_132OK) 3699 if (priv_modes & PrivMode_132OK)
4125 set_widthheight (((state ? 132 : 80) * fwidth), height); 3700 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
4126 break; 3701 break;
4127 case 4: /* smooth scrolling */ 3702 case 4: /* smooth scrolling */
4128 set_option (Opt_jumpScroll, !state); 3703 set_option (Opt_jumpScroll, !state);
4129 break; 3704 break;
4130 case 5: /* reverse video */ 3705 case 5: /* reverse video */
… …
4137 scr_autowrap (state); 3712 scr_autowrap (state);
4138 break; 3713 break;
4139 /* case 8: - auto repeat, can't do on a per window basis */ 3714 /* case 8: - auto repeat, can't do on a per window basis */
4140 case 9: /* X10 mouse reporting */ 3715 case 9: /* X10 mouse reporting */
4141 if (state) /* orthogonal */ 3716 if (state) /* orthogonal */
4142 priv_modes &= ~PrivMode_MouseX11; 3717 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4143 break; 3718 break;
4144#ifdef scrollBar_esc 3719#ifdef scrollBar_esc
4145 case scrollBar_esc: 3720 case scrollBar_esc:
4146 if (scrollbar_mapping (state)) 3721 if (scrollBar.map (state))
4147 { 3722 {
4148 resize_all_windows (0, 0, 0); 3723 resize_all_windows (0, 0, 0);
4149 scr_touch (true); 3724 scr_touch (true);
4150 } 3725 }
4151 break; 3726 break;
… …
4160 break; 3735 break;
4161 /* case 66: - application key pad */ 3736 /* case 66: - application key pad */
4162 /* case 67: - backspace key */ 3737 /* case 67: - backspace key */
4163 case 1000: /* X11 mouse reporting */ 3738 case 1000: /* X11 mouse reporting */
4164 if (state) /* orthogonal */ 3739 if (state) /* orthogonal */
4165 priv_modes &= ~PrivMode_MouseX10; 3740 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4166 break; 3741 break;
4167#if 0
4168 case 1001: 3742 case 1002:
4169 break; /* X11 mouse highlighting */ 3743 case 1003:
4170#endif 3744 if (state)
3745 {
3746 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3747 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3748 vt_emask_mouse = PointerMotionMask;
3749 }
3750 else
3751 vt_emask_mouse = NoEventMask;
3752
3753 vt_select_input ();
3754 break;
4171 case 1010: /* scroll to bottom on TTY output inhibit */ 3755 case 1010: /* scroll to bottom on TTY output inhibit */
4172 set_option (Opt_scrollTtyOutput, !state); 3756 set_option (Opt_scrollTtyOutput, !state);
4173 break; 3757 break;
4174 case 1011: /* scroll to bottom on key press */ 3758 case 1011: /* scroll to bottom on key press */
4175 set_option (Opt_scrollTtyKeypress, state); 3759 set_option (Opt_scrollTtyKeypress, state);
4176 break; 3760 break;
4177 case 1047: /* secondary screen w/ clearing last */ 3761 case 1047: /* secondary screen w/ clearing last */
4178 if (OPTION (Opt_secondaryScreen)) 3762 if (option (Opt_secondaryScreen))
4179 if (current_screen != PRIMARY) 3763 if (!state)
4180 scr_erase_screen (2); 3764 scr_erase_screen (2);
3765
4181 scr_change_screen (state); 3766 scr_change_screen (state);
4182 break; 3767 break;
4183 case 1049: /* secondary screen w/ clearing first */ 3768 case 1049: /* secondary screen w/ clearing first */
3769 if (option (Opt_secondaryScreen))
3770 if (state)
3771 scr_cursor (SAVE);
3772
4184 scr_change_screen (state); 3773 scr_change_screen (state);
3774
4185 if (OPTION (Opt_secondaryScreen)) 3775 if (option (Opt_secondaryScreen))
4186 if (current_screen != PRIMARY) 3776 if (state)
4187 scr_erase_screen (2); 3777 scr_erase_screen (2);
3778 else
3779 scr_cursor (RESTORE);
4188 break; 3780 break;
4189 default: 3781 default:
4190 break; 3782 break;
4191 } 3783 }
4192 } 3784 }
… …
4352rxvt_term::process_graphics () 3944rxvt_term::process_graphics ()
4353{ 3945{
4354 unicode_t ch, cmd = cmd_getc (); 3946 unicode_t ch, cmd = cmd_getc ();
4355 3947
4356 if (cmd == 'Q') 3948 if (cmd == 'Q')
3949 {
4357 { /* query graphics */ 3950 /* query graphics */
4358 tt_printf ("\033G0\012"); /* no graphics */ 3951 tt_printf ("\033G0\012"); /* no graphics */
4359 return; 3952 return;
4360 } 3953 }
4361 /* swallow other graphics sequences until terminating ':' */ 3954 /* swallow other graphics sequences until terminating ':' */
4362 do 3955 do
… …
4412 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4005 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4413 4006
4414 memcpy (v_buffer + v_buflen, data, len); 4007 memcpy (v_buffer + v_buflen, data, len);
4415 v_buflen += len; 4008 v_buflen += len;
4416 4009
4417 pty_ev.set (EVENT_READ | EVENT_WRITE); 4010 pty_ev.set (ev::READ | ev::WRITE);
4418} 4011}
4419 4012
4420void rxvt_term::pty_write () 4013void rxvt_term::pty_write ()
4421{ 4014{
4422 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4015 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4427 4020
4428 if (v_buflen == 0) 4021 if (v_buflen == 0)
4429 { 4022 {
4430 free (v_buffer); 4023 free (v_buffer);
4431 v_buffer = 0; 4024 v_buffer = 0;
4432 v_buflen = 0;
4433 4025
4434 pty_ev.set (EVENT_READ); 4026 pty_ev.set (ev::READ);
4435 return; 4027 return;
4436 } 4028 }
4437 4029
4438 memmove (v_buffer, v_buffer + written, v_buflen); 4030 memmove (v_buffer, v_buffer + written, v_buflen);
4439 } 4031 }
4440 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4032 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4441 pty_ev.set (EVENT_READ); 4033 pty_ev.set (ev::READ);
4442} 4034}
4443 4035
4444/*----------------------- end-of-file (C source) -----------------------*/ 4036/*----------------------- end-of-file (C source) -----------------------*/
4445 4037

Diff Legend

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