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

Diff Legend

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