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.301 by root, Tue Jan 31 21:23:13 2006 UTC vs.
Revision 1.483 by sf-exg, Tue Apr 26 16:19:45 2011 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-2011 Marc Lehmann <schmorp@schmorp.de>
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/*}}} */
909 863
910#if defined (KEYSYM_RESOURCE) 864void
911unsigned int 865rxvt_term::key_release (XKeyEvent &ev)
912rxvt_term::cmd_write (const char *str, unsigned int count)
913{ 866{
914 unsigned int n, s; 867#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
868 KeySym keysym;
915 869
916 n = cmdbuf_ptr - cmdbuf_base; 870 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
917 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 871#endif
918 872
919 if (n > 0 && s < count) 873#if ENABLE_FRILLS || ISO_14755
874 // ISO 14755 support
875 if (iso14755buf)
876 if (iso14755buf & ISO_14755_52)
920 { 877 {
921 memmove (cmdbuf_base, cmdbuf_ptr, 878# if ISO_14755
922 (unsigned int) (cmdbuf_endp - cmdbuf_ptr)); 879 scr_overlay_off ();
923 cmdbuf_ptr = cmdbuf_base;
924 cmdbuf_endp -= n;
925 s += n;
926 }
927
928 if (count > s)
929 {
930 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
931 count = s;
932 }
933
934 for (; count--;)
935 *cmdbuf_endp++ = *str++;
936
937 cmd_parse ();
938
939 return 0;
940}
941#endif 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}
942 940
943void 941void
944rxvt_term::flush () 942rxvt_term::flush ()
945{ 943{
946 flush_ev.stop (); 944 flush_ev.stop ();
947 945
948#ifdef TRANSPARENT 946#ifdef HAVE_BG_PIXMAP
949 if (want_full_refresh) 947 if (bg_flags & BG_NEEDS_REFRESH)
950 { 948 {
951 want_full_refresh = 0; 949 bg_flags &= ~BG_NEEDS_REFRESH;
952 scr_clear ();
953 scr_touch (false); 950 scr_touch (false);
954 } 951 }
955#endif 952#endif
956 953
957 if (want_refresh) 954 if (want_refresh)
… …
993 } 990 }
994 while (row < end_row); 991 while (row < end_row);
995 } 992 }
996 993
997 scr_refresh (); 994 scr_refresh ();
998 scrollbar_show (1); 995 scrollBar.show (1);
999#ifdef USE_XIM 996#ifdef USE_XIM
1000 IMSendSpot (); 997 IMSendSpot ();
1001#endif 998#endif
1002 } 999 }
1003 1000
1004 display->flush (); 1001 display->flush ();
1005} 1002}
1006 1003
1004/* checks whether a refresh is requested and starts the refresh timer */
1007void 1005void
1008rxvt_term::check_cb (check_watcher &w) 1006rxvt_term::refresh_check ()
1007{
1008 if (want_refresh && !flush_ev.is_active ())
1009 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1010
1011 display->flush ();
1012}
1013
1014void
1015rxvt_term::flush_cb (ev::timer &w, int revents)
1009{ 1016{
1010 make_current (); 1017 make_current ();
1011 1018
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; 1019 refresh_count = 0;
1025 flush (); 1020 flush ();
1026} 1021}
1027 1022
1028#ifdef CURSOR_BLINK 1023#ifdef CURSOR_BLINK
1029void 1024void
1030rxvt_term::cursor_blink_cb (time_watcher &w) 1025rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1031{ 1026{
1032 hidden_cursor = !hidden_cursor; 1027 hidden_cursor = !hidden_cursor;
1033 want_refresh = 1; 1028 want_refresh = 1;
1034 1029 refresh_check ();
1035 w.start (w.at + CURSOR_BLINK_INTERVAL);
1036} 1030}
1037#endif 1031#endif
1038 1032
1039#ifdef TEXT_BLINK 1033#ifdef TEXT_BLINK
1040void 1034void
1041rxvt_term::text_blink_cb (time_watcher &w) 1035rxvt_term::text_blink_cb (ev::timer &w, int revents)
1042{ 1036{
1043 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1037 if (scr_refresh_rend (RS_Blink, RS_Blink))
1044 { 1038 {
1045 hidden_text = !hidden_text; 1039 hidden_text = !hidden_text;
1046 want_refresh = 1; 1040 want_refresh = 1;
1047 w.start (w.at + TEXT_BLINK_INTERVAL); 1041 refresh_check ();
1048 } 1042 }
1043 else
1044 w.stop ();
1049} 1045}
1050#endif 1046#endif
1051 1047
1052#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1048#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1053void 1049void
1054rxvt_term::cont_scroll_cb (time_watcher &w) 1050rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1055{ 1051{
1056 if ((scrollbar_isUp() || scrollbar_isDn()) && 1052 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1057 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1053 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1058 { 1054 {
1059 want_refresh = 1; 1055 want_refresh = 1;
1060 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1056 refresh_check ();
1061 } 1057 }
1058 else
1059 w.stop ();
1062} 1060}
1063#endif 1061#endif
1064 1062
1065#ifdef SELECTION_SCROLLING 1063#ifdef SELECTION_SCROLLING
1066void 1064void
1067rxvt_term::sel_scroll_cb (time_watcher &w) 1065rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1068{ 1066{
1069 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1067 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1070 { 1068 {
1071 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1069 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1072 want_refresh = 1; 1070 want_refresh = 1;
1073 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1071 refresh_check ();
1074 } 1072 }
1073 else
1074 w.stop ();
1075} 1075}
1076#endif 1076#endif
1077 1077
1078#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1078#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1079void 1079void
1080rxvt_term::slip_wheel_cb (time_watcher &w) 1080rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1081{ 1081{
1082 if (mouse_slip_wheel_speed == 0 1082 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 { 1083 {
1086 if (view_start == top_row || view_start == 0)
1087 mouse_slip_wheel_speed = 0;
1088
1089 want_refresh = 1; 1084 want_refresh = 1;
1090 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1085 refresh_check ();
1086 }
1087
1088 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1091 } 1089 {
1090 mouse_slip_wheel_speed = 0;
1091 w.stop ();
1092 }
1093}
1094#endif
1095
1096#if LINUX_YIELD_HACK
1097static struct event_handler
1098{
1099 ev::prepare yield_ev;
1100
1101 void yield_cb (ev::prepare &w, int revents)
1102 {
1103 // this should really be sched_yield(), but the linux guys thought
1104 // that giving a process calling sched_yield () less cpu time than
1105 // ones with high nice levels is a useful thing to do. It surely is is
1106 // allowed by the sus... as is returning ENOSYS.
1107 // since the linux guys additionally thought that breaking the only
1108 // known workaround against their unusable sched_yield hack is cool,
1109 // we just nanosleep a bit and hope for the best.
1110
1111 struct timespec ts = { 0, 1000 };
1112 nanosleep (&ts, 0);
1113
1114 w.stop ();
1115 }
1116
1117 event_handler ()
1118 : yield_ev (this, &event_handler::yield_cb)
1119 {
1120 }
1121} event_handler;
1122#endif
1123
1124/* make sure all the cmd data is at beginning of cmdbuf */
1125void
1126rxvt_term::cmdbuf_reify ()
1127{
1128 if (cmdbuf_ptr == cmdbuf_base)
1129 return;
1130
1131 ssize_t used = cmdbuf_endp - cmdbuf_ptr;
1132
1133 memmove (cmdbuf_base, cmdbuf_ptr, used);
1134 cmdbuf_ptr = cmdbuf_base;
1135 cmdbuf_endp = cmdbuf_ptr + used;
1136
1137}
1138
1139#if defined (KEYSYM_RESOURCE)
1140void
1141rxvt_term::cmdbuf_append (const char *str, size_t count)
1142{
1143 cmdbuf_reify ();
1144
1145 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1146
1147 if (count > avail)
1148 return;
1149
1150 memcpy (cmdbuf_endp, str, count);
1151 cmdbuf_endp += count;
1152
1153 cmd_parse ();
1092} 1154}
1093#endif 1155#endif
1094 1156
1095bool 1157bool
1096rxvt_term::pty_fill () 1158rxvt_term::pty_fill ()
1097{ 1159{
1098 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1160 cmdbuf_reify ();
1099 1161
1100 if (CBUFSIZ == n) 1162 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1101 { 1163
1102 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1164 if (!avail)
1103 n = 0;
1104 } 1165 {
1105 1166 // normally this indicates a "too long" command sequence - just drop the data we have
1106 memmove (cmdbuf_base, cmdbuf_ptr, n);
1107 cmdbuf_ptr = cmdbuf_base; 1167 cmdbuf_ptr = cmdbuf_base;
1108 cmdbuf_endp = cmdbuf_ptr + n; 1168 cmdbuf_endp = cmdbuf_ptr;
1169 avail = CBUFSIZ;
1170 }
1109 1171
1110 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1172 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1111 1173
1112 if (r > 0) 1174 if (r > 0)
1113 { 1175 {
1114 cmdbuf_endp += r; 1176 cmdbuf_endp += r;
1115 return true; 1177 return true;
1116 } 1178 }
1117 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1179 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1118 { 1180 {
1119#if HAVE_SCHED_YIELD 1181#if LINUX_YIELD_HACK
1120 if (display->is_local) 1182 if (display->is_local)
1121 event_handler.cw_yield.start (); 1183 event_handler.yield_ev.start ();
1122#endif 1184#endif
1123 } 1185 }
1124 else 1186 else
1125 { 1187 {
1126 pty_ev.stop (); 1188 pty_ev.stop ();
1127 1189
1128 if (!OPTION (Opt_hold)) 1190 if (!option (Opt_hold))
1129 destroy (); 1191 destroy ();
1130 } 1192 }
1131 1193
1132 return false; 1194 return false;
1133} 1195}
1134 1196
1135void 1197void
1136rxvt_term::pty_cb (io_watcher &w, short revents) 1198rxvt_term::pty_cb (ev::io &w, int revents)
1137{ 1199{
1138 make_current (); 1200 make_current ();
1139 1201
1140 if (revents & EVENT_READ) 1202 if (revents & ev::READ)
1141 // loop, but don't allow a single term to monopolize us 1203 // loop, but don't allow a single term to monopolize us
1142 while (pty_fill ()) 1204 for (int i = CBUFCNT; i-- && pty_fill (); )
1143 if (cmd_parse ()) 1205 cmd_parse ();
1144 break;
1145 1206
1146 if (revents & EVENT_WRITE) 1207 if (revents & ev::WRITE)
1147 pty_write (); 1208 pty_write ();
1209
1210 refresh_check ();
1148} 1211}
1149 1212
1150void 1213void
1151rxvt_term::pointer_unblank () 1214rxvt_term::pointer_unblank ()
1152{ 1215{
1153 XDefineCursor (xdisp, vt, TermWin_cursor); 1216 XDefineCursor (dpy, vt, TermWin_cursor);
1154 recolour_cursor (); 1217 recolour_cursor ();
1155 1218
1156#ifdef POINTER_BLANK 1219#ifdef POINTER_BLANK
1157 hidden_pointer = 0; 1220 hidden_pointer = 0;
1158 1221
1159 if (OPTION (Opt_pointerBlank)) 1222 if (option (Opt_pointerBlank))
1160 pointer_ev.start (NOW + pointerBlankDelay); 1223 pointer_ev.start (pointerBlankDelay);
1161#endif 1224#endif
1162} 1225}
1163 1226
1164#ifdef POINTER_BLANK 1227#ifdef POINTER_BLANK
1165void 1228void
1166rxvt_term::pointer_blank () 1229rxvt_term::pointer_blank ()
1167{ 1230{
1168 if (!OPTION (Opt_pointerBlank)) 1231 if (!option (Opt_pointerBlank))
1169 return; 1232 return;
1170 1233
1171 XDefineCursor (xdisp, vt, display->blank_cursor); 1234 XDefineCursor (dpy, vt, display->blank_cursor);
1172 XFlush (xdisp); 1235 XFlush (dpy);
1173 1236
1174 hidden_pointer = 1; 1237 hidden_pointer = 1;
1175} 1238}
1176 1239
1177void 1240void
1178rxvt_term::pointer_cb (time_watcher &w) 1241rxvt_term::pointer_cb (ev::timer &w, int revents)
1179{ 1242{
1180 make_current (); 1243 make_current ();
1181 1244
1182 pointer_blank (); 1245 pointer_blank ();
1183} 1246}
… …
1186void 1249void
1187rxvt_term::mouse_report (XButtonEvent &ev) 1250rxvt_term::mouse_report (XButtonEvent &ev)
1188{ 1251{
1189 int button_number, key_state = 0; 1252 int button_number, key_state = 0;
1190 int x, y; 1253 int x, y;
1254 int code = 32;
1191 1255
1192 x = ev.x; 1256 x = Pixel2Col (ev.x) + 1;
1193 y = ev.y; 1257 y = Pixel2Row (ev.y) + 1;
1194 pixel_position (&x, &y); 1258
1259 if (ev.type == MotionNotify)
1260 {
1261 if (x == mouse_row && y == mouse_col)
1262 return;
1263
1264 mouse_row = x;
1265 mouse_col = y;
1266 code += 32;
1267 }
1195 1268
1196 if (MEvent.button == AnyButton) 1269 if (MEvent.button == AnyButton)
1197 button_number = 3; 1270 button_number = 3;
1198 else 1271 else
1199 { 1272 {
1200 button_number = MEvent.button - Button1; 1273 button_number = MEvent.button - Button1;
1201 /* add 0x3D for wheel events, like xterm does */ 1274 /* add 0x3D for wheel events, like xterm does */
1202 if (button_number >= 3) 1275 if (button_number >= 3)
1203 button_number += (64 - 3); 1276 button_number += 64 - 3;
1204 } 1277 }
1205 1278
1206 if (priv_modes & PrivMode_MouseX10) 1279 if (priv_modes & PrivMode_MouseX10)
1207 { 1280 {
1208 /* 1281 /*
… …
1240 fputc ('A', stderr); 1313 fputc ('A', stderr);
1241 if (key_state & 32) 1314 if (key_state & 32)
1242 fputc ('2', stderr); 1315 fputc ('2', stderr);
1243 fprintf (stderr, "]: <%d>, %d/%d\n", 1316 fprintf (stderr, "]: <%d>, %d/%d\n",
1244 button_number, 1317 button_number,
1245 x + 1, 1318 x,
1246 y + 1); 1319 y);
1247#endif 1320#endif
1248 1321
1322#if ENABLE_FRILLS
1323 if (priv_modes & PrivMode_ExtMouseRight)
1324 tt_printf ("\033[%d;%d;%dM",
1325 code + button_number + key_state,
1326 x,
1327 y);
1328 else if (priv_modes & PrivMode_ExtModeMouse)
1329 tt_printf ("\033[M%c%lc%lc",
1330 code + button_number + key_state,
1331 wint_t (32 + x),
1332 wint_t (32 + y));
1333 else
1334#endif
1249 tt_printf ("\033[M%c%c%c", 1335 tt_printf ("\033[M%c%c%c",
1250 (32 + button_number + key_state), 1336 code + button_number + key_state,
1251 (32 + x + 1), 1337 32 + x,
1252 (32 + y + 1)); 1338 32 + y);
1253} 1339}
1254 1340
1255/*{{{ process an X event */ 1341/*{{{ process an X event */
1256void 1342void
1257rxvt_term::x_cb (XEvent &ev) 1343rxvt_term::x_cb (XEvent &ev)
1258{ 1344{
1259 make_current (); 1345 make_current ();
1260 1346
1261 dLocal (Display *, xdisp); 1347 dLocal (Display *, dpy);
1262 1348
1263 if (ev.xany.window == vt 1349 if (ev.xany.window == vt
1264 && SHOULD_INVOKE (HOOK_X_EVENT) 1350 && SHOULD_INVOKE (HOOK_X_EVENT)
1265 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1351 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1266 return; 1352 return;
… …
1271 unsigned int unused_mask; 1357 unsigned int unused_mask;
1272 1358
1273 switch (ev.type) 1359 switch (ev.type)
1274 { 1360 {
1275 case KeyPress: 1361 case KeyPress:
1276#if ISO_14755 1362 key_press (ev.xkey);
1277 if (!(iso14755buf & ISO_14755_52))
1278#endif
1279 lookup_key (ev.xkey);
1280
1281 break; 1363 break;
1282 1364
1283 case KeyRelease: 1365 case KeyRelease:
1284 { 1366 key_release (ev.xkey);
1285#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1286 KeySym keysym;
1287
1288 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1289#endif
1290
1291#if ENABLE_FRILLS || ISO_14755
1292 // ISO 14755 support
1293 if (iso14755buf)
1294 if (iso14755buf & ISO_14755_52)
1295 {
1296# if ENABLE_OVERLAY
1297 scr_overlay_off ();
1298# endif
1299# if ISO_14755
1300 // iso14755 part 5.2 handling: release time
1301 // first: controls
1302 if ((ev.xkey.state & ControlMask)
1303 && ((keysym >= 0x40 && keysym <= 0x5f)
1304 || (keysym >= 0x61 && keysym <= 0x7f)))
1305 {
1306 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1307 commit_iso14755 ();
1308 goto skip_switch;
1309 }
1310
1311 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1312 if (i[0] == keysym)
1313 {
1314 iso14755buf = ISO_14755_51 | i[1];
1315 commit_iso14755 ();
1316 goto skip_switch;
1317 }
1318
1319 scr_bell ();
1320# endif
1321 iso14755buf = 0;
1322 break;
1323 }
1324 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1325 {
1326# if ENABLE_OVERLAY
1327 scr_overlay_off ();
1328# endif
1329 if (iso14755buf & ISO_14755_51)
1330 commit_iso14755 ();
1331#if ISO_14755
1332 else if (iso14755buf & ISO_14755_STARTED)
1333 {
1334 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1335
1336 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1337 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1338 }
1339# endif
1340 else
1341 iso14755buf = 0;
1342 }
1343#endif
1344
1345 if (ev.xany.window == vt
1346 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1347 break;
1348
1349#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1350 if (!(ev.xkey.state & ControlMask))
1351 slip_wheel_ev.stop ();
1352 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1353 mouse_slip_wheel_speed = 0;
1354#endif
1355 break; 1367 break;
1356 }
1357 1368
1358 case ButtonPress: 1369 case ButtonPress:
1359 button_press (ev.xbutton); 1370 button_press (ev.xbutton);
1360 break; 1371 break;
1361 1372
… …
1376 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END))) 1387 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1377 destroy (); 1388 destroy ();
1378 } 1389 }
1379#if ENABLE_EWMH 1390#if ENABLE_EWMH
1380 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1391 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1381 XSendEvent (xdisp, ev.xclient.window = display->root, 1392 XSendEvent (dpy, ev.xclient.window = display->root,
1382 False, SubstructureRedirectMask | SubstructureNotifyMask, 1393 False, SubstructureRedirectMask | SubstructureNotifyMask,
1383 &ev); 1394 &ev);
1384#endif 1395#endif
1385 } 1396 }
1386 } 1397 }
… …
1392 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1403 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1393 focus_out (); 1404 focus_out ();
1394 } 1405 }
1395#endif 1406#endif
1396 } 1407 }
1397 break;
1398
1399 case MappingNotify:
1400 XRefreshKeyboardMapping (&ev.xmapping);
1401 break; 1408 break;
1402 1409
1403 /* 1410 /*
1404 * XXX: this is not the _current_ arrangement 1411 * XXX: this is not the _current_ arrangement
1405 * Here's my conclusion: 1412 * Here's my conclusion:
… …
1424 break; 1431 break;
1425 } 1432 }
1426 break; 1433 break;
1427 1434
1428 case FocusIn: 1435 case FocusIn:
1436 if (ev.xfocus.detail != NotifyInferior
1437 && ev.xfocus.detail != NotifyPointer
1438 && ev.xfocus.mode != NotifyGrab)
1429 focus_in (); 1439 focus_in ();
1430 break; 1440 break;
1431 1441
1432 case FocusOut: 1442 case FocusOut:
1443 if (ev.xfocus.detail != NotifyInferior
1444 && ev.xfocus.detail != NotifyPointer
1445 && ev.xfocus.mode != NotifyGrab)
1433 focus_out (); 1446 focus_out ();
1434 break; 1447 break;
1435 1448
1436 case ConfigureNotify: 1449 case ConfigureNotify:
1437 if (ev.xconfigure.window == parent[0]) 1450 if (ev.xconfigure.window == parent)
1438 { 1451 {
1439 while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev)) 1452 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1440 ; 1453 ;
1454
1455#ifdef HAVE_BG_PIXMAP
1456 bool moved = false;
1457 if (bg_window_position_sensitive ())
1458 {
1459 int x, y;
1460 if (ev.xconfigure.send_event)
1461 {
1462 x = ev.xconfigure.x;
1463 y = ev.xconfigure.y;
1464 }
1465 else
1466 get_window_origin (x, y);
1467
1468 if (bg_set_position (x, y)
1469 || !(bg_flags & BG_IS_VALID))
1470 moved = true;
1471 }
1472#endif
1441 1473
1442 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1474 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1443 { 1475 {
1444 seen_resize = 1; 1476 seen_resize = 1;
1445 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1477 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1446 } 1478 }
1479 else
1480 {
1481#ifdef HAVE_BG_PIXMAP
1482 if (moved)
1483 {
1484 if (mapped)
1485 update_background ();
1486 else
1487 bg_invalidate ();
1488 }
1489#endif
1490 }
1447 1491
1448 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1492 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1449
1450#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1451 if (OPTION (Opt_transparent))
1452 check_our_parents ();
1453#endif
1454 } 1493 }
1455 break; 1494 break;
1456 1495
1457 case PropertyNotify: 1496 case PropertyNotify:
1458 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1497 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1459 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1460 && ev.xproperty.state == PropertyNewValue)
1461 selection_property (ev.xproperty.window, ev.xproperty.atom);
1462
1463 break; 1498 break;
1464 1499
1465 case SelectionClear: 1500 case SelectionClear:
1466 selection_clear (); 1501 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1467 break;
1468
1469 case SelectionNotify:
1470 if (selection_wait == Sel_normal)
1471 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1472 break; 1502 break;
1473 1503
1474 case SelectionRequest: 1504 case SelectionRequest:
1475 selection_send (ev.xselectionrequest); 1505 selection_send (ev.xselectionrequest);
1476 break; 1506 break;
1477 1507
1478 case MapNotify: 1508 case MapNotify:
1509#ifdef HAVE_BG_PIXMAP
1510 /* This is needed specifically to fix the case of no window manager or a
1511 * non-reparenting window manager. In those cases we never get first
1512 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1513 * care of multiplicity of ConfigureNotify events arriving while WM does
1514 * reparenting.
1515 * We should not render background immediately, as there could be several
1516 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1517 * by scheduling background redraw as soon as we can, but giving a short
1518 * bit of time for ConfigureNotifies to arrive.
1519 * We should render background PRIOR to drawing any text, but AFTER all
1520 * of ConfigureNotifys for the best results.
1521 */
1522 if (!(bg_flags & BG_IS_VALID))
1523 update_background_ev.start (0.025);
1524#endif
1479 mapped = 1; 1525 mapped = 1;
1480#ifdef TEXT_BLINK 1526#ifdef TEXT_BLINK
1481 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1527 text_blink_ev.start ();
1482#endif 1528#endif
1483 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1529 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1484 break; 1530 break;
1485 1531
1486 case UnmapNotify: 1532 case UnmapNotify:
… …
1488#ifdef TEXT_BLINK 1534#ifdef TEXT_BLINK
1489 text_blink_ev.stop (); 1535 text_blink_ev.stop ();
1490#endif 1536#endif
1491 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1537 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1492 break; 1538 break;
1493
1494#ifdef TRANSPARENT
1495 case ReparentNotify:
1496 rootwin_cb (ev);
1497 break;
1498#endif /* TRANSPARENT */
1499 1539
1500 case GraphicsExpose: 1540 case GraphicsExpose:
1501 case Expose: 1541 case Expose:
1502 if (ev.xany.window == vt) 1542 if (ev.xany.window == vt)
1503 { 1543 {
1504 do 1544 do
1545 {
1505 scr_expose (ev.xexpose.x, ev.xexpose.y, 1546 scr_expose (ev.xexpose.x, ev.xexpose.y,
1506 ev.xexpose.width, ev.xexpose.height, False); 1547 ev.xexpose.width, ev.xexpose.height, false);
1548 }
1507 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev)); 1549 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1508 1550
1509 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1551 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1510 1552
1511 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev)) 1553 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1554 {
1512 scr_expose (ev.xexpose.x, ev.xexpose.y, 1555 scr_expose (ev.xexpose.x, ev.xexpose.y,
1513 ev.xexpose.width, ev.xexpose.height, False); 1556 ev.xexpose.width, ev.xexpose.height, false);
1557 }
1514 1558
1515 want_refresh = 1; 1559 want_refresh = 1;
1516 } 1560 }
1517 else 1561 else
1518 { 1562 {
1519 XEvent unused_event; 1563 XEvent unused_event;
1520 1564
1521 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event)) 1565 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1522 ; 1566 ;
1523 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event)) 1567 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1524 ; 1568 ;
1525 1569
1526 if (isScrollbarWindow (ev.xany.window)) 1570 if (scrollBar.state && ev.xany.window == scrollBar.win)
1527 { 1571 {
1528 scrollBar.setIdle (); 1572 scrollBar.state = STATE_IDLE;
1529 scrollbar_show (0); 1573 scrollBar.show (0);
1530 } 1574 }
1531
1532#ifdef TRANSPARENT
1533 if (am_transparent && ev.xany.window == parent[0])
1534 XClearWindow (xdisp, ev.xany.window);
1535#endif
1536 } 1575 }
1537 break; 1576 break;
1538 1577
1539 case MotionNotify: 1578 case MotionNotify:
1540#ifdef POINTER_BLANK 1579#ifdef POINTER_BLANK
1541 if (hidden_pointer) 1580 if (hidden_pointer)
1542 pointer_unblank (); 1581 pointer_unblank ();
1543#endif 1582#endif
1583 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1584 || priv_modes & PrivMode_MouseAnyEvent)
1585 mouse_report (ev.xbutton);
1544 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1586 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1545 break; 1587 break;
1546 1588
1547 if (ev.xany.window == vt) 1589 if (ev.xany.window == vt)
1548 { 1590 {
1549 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1591 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1550 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1592 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1551 ; // nop 1593 ; // nop
1552 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1594 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1553 { 1595 {
1554 while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev)) 1596 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1555 ; 1597 ;
1556 1598
1557 XQueryPointer (xdisp, vt, 1599 XQueryPointer (dpy, vt,
1558 &unused_root, &unused_child, 1600 &unused_root, &unused_child,
1559 &unused_root_x, &unused_root_y, 1601 &unused_root_x, &unused_root_y,
1560 &ev.xbutton.x, &ev.xbutton.y, 1602 &ev.xbutton.x, &ev.xbutton.y,
1561 &ev.xbutton.state); 1603 &ev.xbutton.state);
1562#ifdef MOUSE_THRESHOLD 1604#ifdef MOUSE_THRESHOLD
… …
1582 int dist; 1624 int dist;
1583 1625
1584 /* don't clobber the current delay if we are 1626 /* don't clobber the current delay if we are
1585 * already in the middle of scrolling. 1627 * already in the middle of scrolling.
1586 */ 1628 */
1587 if (!sel_scroll_ev.active) 1629 if (!sel_scroll_ev.is_active ())
1588 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1630 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1589 1631
1590 /* save the event params so we can highlight 1632 /* save the event params so we can highlight
1591 * the selection in the pending-scroll loop 1633 * the selection in the pending-scroll loop
1592 */ 1634 */
1593 selection_save_x = ev.xbutton.x; 1635 selection_save_x = ev.xbutton.x;
… …
1615 else 1657 else
1616 { 1658 {
1617 /* we are within the text window, so we 1659 /* we are within the text window, so we
1618 * shouldn't be scrolling 1660 * shouldn't be scrolling
1619 */ 1661 */
1620 if (sel_scroll_ev.active)
1621 sel_scroll_ev.stop(); 1662 sel_scroll_ev.stop();
1622 } 1663 }
1623#endif 1664#endif
1624#ifdef MOUSE_THRESHOLD 1665#ifdef MOUSE_THRESHOLD
1625 } 1666 }
1626#endif 1667#endif
1627 } 1668 }
1628 } 1669 }
1629 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1670 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1630 { 1671 {
1631 while (XCheckTypedWindowEvent (xdisp, scrollBar.win, 1672 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1632 MotionNotify, &ev)) 1673 MotionNotify, &ev))
1633 ; 1674 ;
1634 1675
1635 XQueryPointer (xdisp, scrollBar.win, 1676 XQueryPointer (dpy, scrollBar.win,
1636 &unused_root, &unused_child, 1677 &unused_root, &unused_child,
1637 &unused_root_x, &unused_root_y, 1678 &unused_root_x, &unused_root_y,
1638 &ev.xbutton.x, &ev.xbutton.y, 1679 &ev.xbutton.x, &ev.xbutton.y,
1639 &unused_mask); 1680 &unused_mask);
1640 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1681 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1641 scrollbar_size ()); 1682 scrollBar.size ());
1642 want_refresh = 1; 1683 want_refresh = 1;
1643 refresh_limit = 0;
1644 scrollbar_show (1); 1684 scrollBar.show (1);
1645 } 1685 }
1646 break; 1686 break;
1647 } 1687 }
1648 1688
1649skip_switch: ;
1650
1651#if defined(CURSOR_BLINK) 1689#if defined(CURSOR_BLINK)
1652 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1690 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1653 { 1691 {
1654 if (hidden_cursor) 1692 if (hidden_cursor)
1655 { 1693 {
1656 hidden_cursor = 0; 1694 hidden_cursor = 0;
1657 want_refresh = 1; 1695 want_refresh = 1;
1658 } 1696 }
1659 1697
1660 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1698 cursor_blink_ev.again ();
1661 } 1699 }
1662#endif 1700#endif
1663 1701
1664#if defined(POINTER_BLANK) 1702#if defined(POINTER_BLANK)
1665 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1703 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1666 { 1704 {
1667 if (ev.type == MotionNotify 1705 if (ev.type == MotionNotify
1668 || ev.type == ButtonPress 1706 || ev.type == ButtonPress
1669 || ev.type == ButtonRelease) 1707 || ev.type == ButtonRelease)
1670 if (hidden_pointer) 1708 if (hidden_pointer)
… …
1672 1710
1673 if (ev.type == KeyPress && hidden_pointer == 0) 1711 if (ev.type == KeyPress && hidden_pointer == 0)
1674 pointer_blank (); 1712 pointer_blank ();
1675 } 1713 }
1676#endif 1714#endif
1715
1716 refresh_check ();
1677} 1717}
1718
1719#if ENABLE_FRILLS
1720void
1721rxvt_term::set_urgency (bool enable)
1722{
1723 if (enable == urgency_hint)
1724 return;
1725
1726 if (XWMHints *h = XGetWMHints (dpy, parent))
1727 {
1728 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1729 XSetWMHints (dpy, parent, h);
1730 urgency_hint = enable;
1731 }
1732}
1733#endif
1678 1734
1679void 1735void
1680rxvt_term::focus_in () 1736rxvt_term::focus_in ()
1681{ 1737{
1682 if (!focus) 1738 if (!focus)
1683 { 1739 {
1684 focus = 1; 1740 focus = 1;
1685 want_refresh = 1; 1741 want_refresh = 1;
1686 1742
1687 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1688
1689#if USE_XIM 1743#if USE_XIM
1690 if (Input_Context != NULL) 1744 if (Input_Context != NULL)
1691 { 1745 {
1692 IMSetStatusPosition (); 1746 IMSetPosition ();
1693 XSetICFocus (Input_Context); 1747 XSetICFocus (Input_Context);
1694 } 1748 }
1695#endif 1749#endif
1696#if CURSOR_BLINK 1750#if CURSOR_BLINK
1697 if (OPTION (Opt_cursorBlink)) 1751 if (option (Opt_cursorBlink))
1698 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1752 cursor_blink_ev.again ();
1699#endif 1753#endif
1700#if OFF_FOCUS_FADING 1754#if OFF_FOCUS_FADING
1701 if (rs[Rs_fade]) 1755 if (rs[Rs_fade])
1702 { 1756 {
1703 pix_colors = pix_colors_focused; 1757 pix_colors = pix_colors_focused;
1704 scr_recolour (); 1758 scr_recolour ();
1705 } 1759 }
1706#endif 1760#endif
1761#if ENABLE_FRILLS
1762 if (option (Opt_urgentOnBell))
1763 set_urgency (0);
1764#endif
1765
1766 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1707 } 1767 }
1708} 1768}
1709 1769
1710void 1770void
1711rxvt_term::focus_out () 1771rxvt_term::focus_out ()
… …
1713 if (focus) 1773 if (focus)
1714 { 1774 {
1715 focus = 0; 1775 focus = 0;
1716 want_refresh = 1; 1776 want_refresh = 1;
1717 1777
1718 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1778#if ENABLE_FRILLS
1719 1779 if (option (Opt_urgentOnBell))
1780 set_urgency (0);
1781#endif
1720#if ENABLE_FRILLS || ISO_14755 1782#if ENABLE_FRILLS || ISO_14755
1721 if (iso14755buf) 1783 if (iso14755buf)
1722 { 1784 {
1723 iso14755buf = 0; 1785 iso14755buf = 0;
1724# if ENABLE_OVERLAY 1786# if ISO_14755
1725 scr_overlay_off (); 1787 scr_overlay_off ();
1726# endif 1788# endif
1727 } 1789 }
1728#endif 1790#endif
1729#if USE_XIM 1791#if USE_XIM
1730 if (Input_Context != NULL) 1792 if (Input_Context != NULL)
1731 XUnsetICFocus (Input_Context); 1793 XUnsetICFocus (Input_Context);
1732#endif 1794#endif
1733#if CURSOR_BLINK 1795#if CURSOR_BLINK
1734 if (OPTION (Opt_cursorBlink)) 1796 if (option (Opt_cursorBlink))
1735 cursor_blink_ev.stop (); 1797 cursor_blink_ev.stop ();
1798
1736 hidden_cursor = 0; 1799 hidden_cursor = 0;
1737#endif 1800#endif
1738#if OFF_FOCUS_FADING 1801#if OFF_FOCUS_FADING
1739 if (rs[Rs_fade]) 1802 if (rs[Rs_fade])
1740 { 1803 {
1741 pix_colors = pix_colors_unfocused; 1804 pix_colors = pix_colors_unfocused;
1742 scr_recolour (); 1805 scr_recolour ();
1743 } 1806 }
1744#endif 1807#endif
1808
1809 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1810 }
1811}
1812
1813void
1814rxvt_term::update_fade_color (unsigned int idx)
1815{
1816#if OFF_FOCUS_FADING
1817 if (rs[Rs_fade])
1745 } 1818 {
1819 rgba c;
1820 pix_colors [Color_fade].get (c);
1821 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1822 }
1823#endif
1746} 1824}
1747 1825
1748#if TRANSPARENT 1826#if ENABLE_TRANSPARENCY || ENABLE_PERL
1749void 1827void
1750rxvt_term::rootwin_cb (XEvent &ev) 1828rxvt_term::rootwin_cb (XEvent &ev)
1751{ 1829{
1752 make_current (); 1830 make_current ();
1753 1831
1832 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1833 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1834 return;
1835
1836# if ENABLE_TRANSPARENCY
1754 switch (ev.type) 1837 switch (ev.type)
1755 { 1838 {
1756 case PropertyNotify: 1839 case PropertyNotify:
1757 /* 1840 /*
1758 * if user used some Esetroot compatible prog to set the root bg, 1841 * if user used some Esetroot compatible prog to set the root bg,
1759 * use the property to determine the pixmap. We use it later on. 1842 * use the property to determine the pixmap. We use it later on.
1760 */ 1843 */
1761 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1844 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1762 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1845 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1763 return; 1846 {
1847 bg_set_root_pixmap ();
1848 update_background ();
1849 }
1764 1850
1765 /* FALLTHROUGH */
1766 case ReparentNotify:
1767 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1768 want_refresh = want_full_refresh = 1;
1769 break; 1851 break;
1770 } 1852 }
1853# endif
1854
1855 refresh_check ();
1771} 1856}
1772#endif 1857#endif
1773 1858
1774void 1859void
1775rxvt_term::button_press (XButtonEvent &ev) 1860rxvt_term::button_press (XButtonEvent &ev)
… …
1806 /* save the xbutton state (for ButtonRelease) */ 1891 /* save the xbutton state (for ButtonRelease) */
1807 MEvent.state = ev.state; 1892 MEvent.state = ev.state;
1808#ifdef MOUSE_REPORT_DOUBLECLICK 1893#ifdef MOUSE_REPORT_DOUBLECLICK
1809 if (ev.button == MEvent.button && clickintime) 1894 if (ev.button == MEvent.button && clickintime)
1810 { 1895 {
1811 /* same button, within alloted time */ 1896 /* same button, within allowed time */
1812 MEvent.clicks++; 1897 MEvent.clicks++;
1813 1898
1814 if (MEvent.clicks > 1) 1899 if (MEvent.clicks > 1)
1815 { 1900 {
1816 /* only report double clicks */ 1901 /* only report double clicks */
… …
1830 mouse_report (ev); 1915 mouse_report (ev);
1831 } 1916 }
1832#else 1917#else
1833 MEvent.button = ev.button; 1918 MEvent.button = ev.button;
1834 mouse_report (ev); 1919 mouse_report (ev);
1835#endif /* MOUSE_REPORT_DOUBLECLICK */ 1920#endif /* MOUSE_REPORT_DOUBLECLICK */
1836 1921
1837 } 1922 }
1838 else 1923 else
1839 { 1924 {
1840 if (ev.button != MEvent.button) 1925 if (ev.button != MEvent.button)
… …
1888 } 1973 }
1889 1974
1890 /* 1975 /*
1891 * Scrollbar window processing of button press 1976 * Scrollbar window processing of button press
1892 */ 1977 */
1893 if (isScrollbarWindow (ev.window)) 1978 if (scrollBar.state && ev.window == scrollBar.win)
1894 { 1979 {
1895 scrollBar.setIdle (); 1980 page_dirn direction = NO_DIR;
1981
1982 if (scrollBar.upButton (ev.y))
1983 direction = UP; /* up */
1984 else if (scrollBar.dnButton (ev.y))
1985 direction = DN; /* down */
1986
1987 scrollBar.state = STATE_IDLE;
1896 /* 1988 /*
1897 * Rxvt-style scrollbar: 1989 * Rxvt-style scrollbar:
1898 * move up if mouse is above slider 1990 * move up if mouse is above slider
1899 * move dn if mouse is below slider 1991 * move dn if mouse is below slider
1900 * 1992 *
… …
1909 /* 2001 /*
1910 * Mouse report disabled scrollbar: 2002 * Mouse report disabled scrollbar:
1911 * arrow buttons - send up/down 2003 * arrow buttons - send up/down
1912 * click on scrollbar - send pageup/down 2004 * click on scrollbar - send pageup/down
1913 */ 2005 */
1914 if ((scrollBar.style == R_SB_NEXT 2006 if (direction == UP)
1915 && scrollbarnext_upButton (ev.y))
1916 || (scrollBar.style == R_SB_RXVT
1917 && scrollbarrxvt_upButton (ev.y)))
1918 tt_printf ("\033[A"); 2007 tt_printf ("\033[A");
1919 else if ((scrollBar.style == R_SB_NEXT 2008 else if (direction == DN)
1920 && scrollbarnext_dnButton (ev.y))
1921 || (scrollBar.style == R_SB_RXVT
1922 && scrollbarrxvt_dnButton (ev.y)))
1923 tt_printf ("\033[B"); 2009 tt_printf ("\033[B");
1924 else 2010 else
1925 switch (ev.button) 2011 switch (ev.button)
1926 { 2012 {
1927 case Button2: 2013 case Button2:
… …
1934 tt_printf ("\033[5~"); 2020 tt_printf ("\033[5~");
1935 break; 2021 break;
1936 } 2022 }
1937 } 2023 }
1938 else 2024 else
1939#endif /* NO_SCROLLBAR_REPORT */ 2025#endif /* NO_SCROLLBAR_REPORT */
1940
1941 {
1942 char upordown = 0;
1943
1944 if (scrollBar.style == R_SB_NEXT)
1945 { 2026 {
1946 if (scrollbarnext_upButton (ev.y)) 2027 if (direction != NO_DIR)
1947 upordown = -1; /* up */
1948 else if (scrollbarnext_dnButton (ev.y))
1949 upordown = 1; /* down */
1950 }
1951 else if (scrollBar.style == R_SB_RXVT)
1952 {
1953 if (scrollbarrxvt_upButton (ev.y))
1954 upordown = -1; /* up */
1955 else if (scrollbarrxvt_dnButton (ev.y))
1956 upordown = 1; /* down */
1957 }
1958 if (upordown)
1959 { 2028 {
1960#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2029#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2030 if (!cont_scroll_ev.is_active ())
1961 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2031 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1962#endif 2032#endif
1963 if (scr_page (upordown < 0 ? UP : DN, 1)) 2033 if (scr_page (direction, 1))
1964 { 2034 {
1965 if (upordown < 0) 2035 if (direction == UP)
1966 scrollBar.setUp (); 2036 scrollBar.state = STATE_UP;
1967 else 2037 else
1968 scrollBar.setDn (); 2038 scrollBar.state = STATE_DOWN;
1969 } 2039 }
1970 } 2040 }
1971 else 2041 else
1972 switch (ev.button) 2042 switch (ev.button)
1973 { 2043 {
1974 case Button2: 2044 case Button2:
1975 switch (scrollbar_align) 2045 switch (scrollBar.align)
1976 { 2046 {
1977 case R_SB_ALIGN_TOP: 2047 case R_SB_ALIGN_TOP:
1978 csrO = 0; 2048 csrO = 0;
1979 break; 2049 break;
1980 case R_SB_ALIGN_CENTRE: 2050 case R_SB_ALIGN_CENTRE:
… …
1986 } 2056 }
1987 2057
1988 if (scrollBar.style == R_SB_XTERM 2058 if (scrollBar.style == R_SB_XTERM
1989 || scrollbar_above_slider (ev.y) 2059 || scrollbar_above_slider (ev.y)
1990 || scrollbar_below_slider (ev.y)) 2060 || scrollbar_below_slider (ev.y))
1991 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2061 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
1992 2062
1993 scrollBar.setMotion (); 2063 scrollBar.state = STATE_MOTION;
1994 break; 2064 break;
1995 2065
1996 case Button1: 2066 case Button1:
1997 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2067 if (scrollBar.align == R_SB_ALIGN_CENTRE)
1998 csrO = ev.y - scrollBar.top; 2068 csrO = ev.y - scrollBar.top;
1999 /* FALLTHROUGH */ 2069 /* FALLTHROUGH */
2000 2070
2001 case Button3: 2071 case Button3:
2002 if (scrollBar.style != R_SB_XTERM) 2072 if (scrollBar.style != R_SB_XTERM)
… …
2012 scr_page (DN, nrow - 1); 2082 scr_page (DN, nrow - 1);
2013# else 2083# else
2014 scr_page (DN, nrow / 4); 2084 scr_page (DN, nrow / 4);
2015# endif 2085# endif
2016 else 2086 else
2017 scrollBar.setMotion (); 2087 scrollBar.state = STATE_MOTION;
2018 } 2088 }
2019 else 2089 else
2020 { 2090 {
2021 scr_page ((ev.button == Button1 ? DN : UP), 2091 scr_page ((ev.button == Button1 ? DN : UP),
2022 (nrow 2092 (nrow
2023 * scrollbar_position (ev.y) 2093 * scrollbar_position (ev.y)
2024 / scrollbar_size ())); 2094 / scrollBar.size ()));
2025 } 2095 }
2026 2096
2027 break; 2097 break;
2028 } 2098 }
2029 } 2099 }
… …
2039 2109
2040 csrO = 0; /* reset csr Offset */ 2110 csrO = 0; /* reset csr Offset */
2041 if (!bypass_keystate) 2111 if (!bypass_keystate)
2042 reportmode = !! (priv_modes & PrivMode_mouse_report); 2112 reportmode = !! (priv_modes & PrivMode_mouse_report);
2043 2113
2044 if (scrollbar_isUpDn ()) 2114 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2045 { 2115 {
2046 scrollBar.setIdle (); 2116 scrollBar.state = STATE_IDLE;
2047 scrollbar_show (0); 2117 scrollBar.show (0);
2048 } 2118 }
2049 2119
2050#ifdef SELECTION_SCROLLING 2120#ifdef SELECTION_SCROLLING
2051 if (sel_scroll_ev.active)
2052 sel_scroll_ev.stop(); 2121 sel_scroll_ev.stop();
2053#endif 2122#endif
2054 2123
2055 if (ev.window == vt) 2124 if (ev.window == vt)
2056 { 2125 {
2057 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2126 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
… …
2081 mouse_report (ev); 2150 mouse_report (ev);
2082 } 2151 }
2083#else /* MOUSE_REPORT_DOUBLECLICK */ 2152#else /* MOUSE_REPORT_DOUBLECLICK */
2084 MEvent.button = AnyButton; 2153 MEvent.button = AnyButton;
2085 mouse_report (ev); 2154 mouse_report (ev);
2086#endif /* MOUSE_REPORT_DOUBLECLICK */ 2155#endif /* MOUSE_REPORT_DOUBLECLICK */
2087 return; 2156 return;
2088 } 2157 }
2089 2158
2090 /* 2159 /*
2091 * dumb hack to compensate for the failure of click-and-drag 2160 * dumb hack to compensate for the failure of click-and-drag
… …
2103 selection_make (ev.time); 2172 selection_make (ev.time);
2104 break; 2173 break;
2105 2174
2106 case Button2: 2175 case Button2:
2107 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2176 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2108 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary); 2177 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2109 break; 2178 break;
2110 2179
2111#ifdef MOUSE_WHEEL 2180#ifdef MOUSE_WHEEL
2112 case Button4: 2181 case Button4:
2113 case Button5: 2182 case Button5:
… …
2117 2186
2118 v = ev.button == Button4 ? UP : DN; 2187 v = ev.button == Button4 ? UP : DN;
2119 2188
2120 if (ev.state & ShiftMask) 2189 if (ev.state & ShiftMask)
2121 i = 1; 2190 i = 1;
2122 else if (OPTION (Opt_mouseWheelScrollPage)) 2191 else if (option (Opt_mouseWheelScrollPage))
2123 i = nrow - 1; 2192 i = nrow - 1;
2124 else 2193 else
2125 i = 5; 2194 i = 5;
2126 2195
2127# ifdef MOUSE_SLIP_WHEELING 2196# ifdef MOUSE_SLIP_WHEELING
… …
2129 { 2198 {
2130 mouse_slip_wheel_speed += v ? -1 : 1; 2199 mouse_slip_wheel_speed += v ? -1 : 1;
2131 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2200 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2132 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2201 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2133 2202
2134 if (slip_wheel_ev.at < NOW) 2203 if (!slip_wheel_ev.is_active ())
2135 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2204 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2136
2137 slip_wheel_ev.start ();
2138 } 2205 }
2139 else 2206 else
2207# endif
2140 { 2208 {
2141# endif
2142 scr_page (v, i); 2209 scr_page (v, i);
2143 scrollbar_show (1); 2210 scrollBar.show (1);
2144# ifdef MOUSE_SLIP_WHEELING
2145 } 2211 }
2146# endif
2147 } 2212 }
2148 break; 2213 break;
2149#endif 2214#endif
2150 } 2215 }
2151 } 2216 }
2152} 2217}
2153 2218
2154#ifdef TRANSPARENT
2155#if TINTING
2156/* taken from aterm-0.4.2 */
2157
2158typedef uint32_t RUINT32T;
2159
2160void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2161{
2162 int sh_r, sh_g, sh_b;
2163 RUINT32T mask_r, mask_g, mask_b;
2164 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2165 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2166 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2167 int i;
2168
2169 Visual *visual = term->visual;
2170
2171 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2172
2173 /* for convenience */
2174 mask_r = visual->red_mask;
2175 mask_g = visual->green_mask;
2176 mask_b = visual->blue_mask;
2177
2178 /* boring lookup table pre-initialization */
2179 switch (srcImage->bits_per_pixel) {
2180 case 15:
2181 if ((mask_r != 0x7c00) ||
2182 (mask_g != 0x03e0) ||
2183 (mask_b != 0x001f))
2184 return;
2185 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2186 lookup_r = lookup;
2187 lookup_g = lookup+32;
2188 lookup_b = lookup+32+32;
2189 sh_r = 10;
2190 sh_g = 5;
2191 sh_b = 0;
2192 break;
2193 case 16:
2194 if ((mask_r != 0xf800) ||
2195 (mask_g != 0x07e0) ||
2196 (mask_b != 0x001f))
2197 return;
2198 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2199 lookup_r = lookup;
2200 lookup_g = lookup+32;
2201 lookup_b = lookup+32+64;
2202 sh_r = 11;
2203 sh_g = 5;
2204 sh_b = 0;
2205 break;
2206 case 24:
2207 if ((mask_r != 0xff0000) ||
2208 (mask_g != 0x00ff00) ||
2209 (mask_b != 0x0000ff))
2210 return;
2211 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2212 lookup_r = lookup;
2213 lookup_g = lookup+256;
2214 lookup_b = lookup+256+256;
2215 sh_r = 16;
2216 sh_g = 8;
2217 sh_b = 0;
2218 break;
2219 case 32:
2220 if ((mask_r != 0xff0000) ||
2221 (mask_g != 0x00ff00) ||
2222 (mask_b != 0x0000ff))
2223 return;
2224 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2225 lookup_r = lookup;
2226 lookup_g = lookup+256;
2227 lookup_b = lookup+256+256;
2228 sh_r = 16;
2229 sh_g = 8;
2230 sh_b = 0;
2231 break;
2232 default:
2233 return; /* we do not support this color depth */
2234 }
2235
2236 /* prepare limits for color transformation (each channel is handled separately) */
2237 if (shade < 0) {
2238 shade = -shade;
2239 if (shade < 0) shade = 0;
2240 if (shade > 100) shade = 100;
2241
2242 lower_lim_r = 65535-rm;
2243 lower_lim_g = 65535-gm;
2244 lower_lim_b = 65535-bm;
2245
2246 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2247 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2248 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2249
2250 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2251 } else {
2252 if (shade < 0) shade = 0;
2253 if (shade > 100) shade = 100;
2254
2255 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2256
2257 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2258 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2259 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2260 }
2261
2262 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2263 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2264 {
2265 unsigned int tmp;
2266
2267 tmp = lower_lim_r;
2268 lower_lim_r = lower_lim_b;
2269 lower_lim_b = tmp;
2270
2271 tmp = upper_lim_r;
2272 upper_lim_r = upper_lim_b;
2273 upper_lim_b = tmp;
2274 }
2275
2276 /* fill our lookup tables */
2277 for (i = 0; i <= mask_r>>sh_r; i++)
2278 {
2279 RUINT32T tmp;
2280 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2281 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2282 lookup_r[i] = (tmp/65535)<<sh_r;
2283 }
2284 for (i = 0; i <= mask_g>>sh_g; i++)
2285 {
2286 RUINT32T tmp;
2287 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2288 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2289 lookup_g[i] = (tmp/65535)<<sh_g;
2290 }
2291 for (i = 0; i <= mask_b>>sh_b; i++)
2292 {
2293 RUINT32T tmp;
2294 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2295 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2296 lookup_b[i] = (tmp/65535)<<sh_b;
2297 }
2298
2299 /* apply table to input image (replacing colors by newly calculated ones) */
2300 switch (srcImage->bits_per_pixel)
2301 {
2302 case 15:
2303 {
2304 unsigned short *p1, *pf, *p, *pl;
2305 p1 = (unsigned short *) srcImage->data;
2306 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2307 while (p1 < pf)
2308 {
2309 p = p1;
2310 pl = p1 + srcImage->width;
2311 for (; p < pl; p++)
2312 {
2313 *p = lookup_r[(*p & 0x7c00)>>10] |
2314 lookup_g[(*p & 0x03e0)>> 5] |
2315 lookup_b[(*p & 0x001f)];
2316 }
2317 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2318 }
2319 break;
2320 }
2321 case 16:
2322 {
2323 unsigned short *p1, *pf, *p, *pl;
2324 p1 = (unsigned short *) srcImage->data;
2325 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2326 while (p1 < pf)
2327 {
2328 p = p1;
2329 pl = p1 + srcImage->width;
2330 for (; p < pl; p++)
2331 {
2332 *p = lookup_r[(*p & 0xf800)>>11] |
2333 lookup_g[(*p & 0x07e0)>> 5] |
2334 lookup_b[(*p & 0x001f)];
2335 }
2336 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2337 }
2338 break;
2339 }
2340 case 24:
2341 {
2342 unsigned char *p1, *pf, *p, *pl;
2343 p1 = (unsigned char *) srcImage->data;
2344 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2345 while (p1 < pf)
2346 {
2347 p = p1;
2348 pl = p1 + srcImage->width * 3;
2349 for (; p < pl; p += 3)
2350 {
2351 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2352 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2353 p[2] = lookup_r[(p[2] & 0x0000ff)];
2354 }
2355 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2356 }
2357 break;
2358 }
2359 case 32:
2360 {
2361 RUINT32T *p1, *pf, *p, *pl;
2362 p1 = (RUINT32T *) srcImage->data;
2363 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2364
2365 while (p1 < pf)
2366 {
2367 p = p1;
2368 pl = p1 + srcImage->width;
2369 for (; p < pl; p++)
2370 {
2371 *p = lookup_r[(*p & 0xff0000)>>16] |
2372 lookup_g[(*p & 0x00ff00)>> 8] |
2373 lookup_b[(*p & 0x0000ff)] |
2374 (*p & ~0xffffff);
2375 }
2376 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2377 }
2378 break;
2379 }
2380 }
2381
2382 free (lookup);
2383}
2384#endif
2385
2386/*
2387 * Check our parents are still who we think they are.
2388 * Do transparency updates if required
2389 */
2390int
2391rxvt_term::check_our_parents ()
2392{
2393 int i, pchanged, aformat, have_pixmap, rootdepth;
2394 unsigned long nitems, bytes_after;
2395 Atom atype;
2396 unsigned char *prop = NULL;
2397 Window root, oldp, *list;
2398 Pixmap rootpixmap = None;
2399 XWindowAttributes wattr, wrootattr;
2400
2401 pchanged = 0;
2402
2403 if (!OPTION (Opt_transparent))
2404 return pchanged; /* Don't try any more */
2405
2406 XGetWindowAttributes (xdisp, display->root, &wrootattr);
2407 rootdepth = wrootattr.depth;
2408
2409 XGetWindowAttributes (xdisp, parent[0], &wattr);
2410
2411 if (rootdepth != wattr.depth)
2412 {
2413 if (am_transparent)
2414 {
2415 pchanged = 1;
2416 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2417 am_transparent = am_pixmap_trans = 0;
2418 }
2419
2420 return pchanged; /* Don't try any more */
2421 }
2422
2423 /* Get all X ops out of the queue so that our information is up-to-date. */
2424 XSync (xdisp, False);
2425
2426 /*
2427 * Make the frame window set by the window manager have
2428 * the root background. Some window managers put multiple nested frame
2429 * windows for each client, so we have to take care about that.
2430 */
2431 i = (xa[XA_XROOTPMAP_ID]
2432 && XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
2433 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2434 &nitems, &bytes_after, &prop) == Success);
2435
2436 if (!i || prop == NULL)
2437 i = (xa[XA_ESETROOT_PMAP_ID]
2438 && XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2439 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2440 &nitems, &bytes_after, &prop) == Success);
2441
2442 if (!i || prop == NULL
2443#if TINTING
2444 || !ISSET_PIXCOLOR (Color_tint)
2445#endif
2446 )
2447 have_pixmap = 0;
2448 else
2449 {
2450 have_pixmap = 1;
2451 rootpixmap = *(Pixmap *)prop;
2452 XFree (prop);
2453 }
2454
2455 if (have_pixmap)
2456 {
2457 /*
2458 * Copy display->root pixmap transparency
2459 */
2460 int sx, sy, nx, ny;
2461 unsigned int nw, nh;
2462 Window cr;
2463 XImage *image;
2464 GC gc;
2465 XGCValues gcvalue;
2466
2467 XTranslateCoordinates (xdisp, parent[0], display->root,
2468 0, 0, &sx, &sy, &cr);
2469 nw = (unsigned int)szHint.width;
2470 nh = (unsigned int)szHint.height;
2471 nx = ny = 0;
2472
2473 if (sx < 0)
2474 {
2475 nw += sx;
2476 nx = -sx;
2477 sx = 0;
2478 }
2479
2480 if (sy < 0)
2481 {
2482 nh += sy;
2483 ny = -sy;
2484 sy = 0;
2485 }
2486
2487 min_it (nw, (unsigned int) (wrootattr.width - sx));
2488 min_it (nh, (unsigned int) (wrootattr.height - sy));
2489
2490 XSync (xdisp, False);
2491 allowedxerror = -1;
2492 image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2493
2494 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2495 /* XXX: may need a delay here? */
2496 allowedxerror = 0;
2497
2498 if (image == NULL)
2499 {
2500 if (am_transparent && am_pixmap_trans)
2501 {
2502 pchanged = 1;
2503 if (pixmap != None)
2504 {
2505 XFreePixmap (xdisp, pixmap);
2506 pixmap = None;
2507 }
2508 }
2509
2510 am_pixmap_trans = 0;
2511 }
2512 else
2513 {
2514 if (pixmap != None)
2515 XFreePixmap (xdisp, pixmap);
2516
2517#if TINTING
2518 if (ISSET_PIXCOLOR (Color_tint))
2519 {
2520 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2521
2522 rgba c;
2523 pix_colors_focused [Color_tint].get (c);
2524
2525 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2526 }
2527#endif
2528
2529 pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2530 gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2531 XPutImage (xdisp, pixmap, gc, image, 0, 0,
2532 nx, ny, image->width, image->height);
2533 XFreeGC (xdisp, gc);
2534 XDestroyImage (image);
2535 XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2536 XClearWindow (xdisp, parent[0]);
2537
2538 if (!am_transparent || !am_pixmap_trans)
2539 pchanged = 1;
2540
2541 am_transparent = am_pixmap_trans = 1;
2542 }
2543 }
2544
2545 if (am_pixmap_trans)
2546 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2547 else
2548 {
2549 unsigned int n;
2550 /*
2551 * InheritPixmap transparency
2552 */
2553 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2554 {
2555 oldp = parent[i];
2556 XQueryTree (xdisp, parent[i - 1], &root, &parent[i], &list, &n);
2557 XFree (list);
2558
2559 if (parent[i] == display->root)
2560 {
2561 if (oldp != None)
2562 pchanged = 1;
2563
2564 break;
2565 }
2566
2567 if (oldp != parent[i])
2568 pchanged = 1;
2569 }
2570
2571 n = 0;
2572
2573 if (pchanged)
2574 for (; n < (unsigned int)i; n++)
2575 {
2576 XGetWindowAttributes (xdisp, parent[n], &wattr);
2577
2578 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2579 {
2580 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2581 break;
2582 }
2583 }
2584
2585 if (n > (sizeof (parent) / sizeof (parent[0])))
2586 {
2587 XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2588 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2589 am_transparent = 0;
2590 /* XXX: also turn off Opt_transparent? */
2591 }
2592 else
2593 {
2594 for (n = 0; n < (unsigned int)i; n++)
2595 {
2596 XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2597 XClearWindow (xdisp, parent[n]);
2598 }
2599
2600 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2601 am_transparent = 1;
2602 }
2603
2604 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2605 parent[i] = None;
2606 }
2607
2608 if (scrollBar.win)
2609 {
2610 XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
2611 scrollBar.setIdle ();
2612 scrollbar_show (0);
2613 }
2614
2615 if (am_transparent)
2616 {
2617 want_refresh = want_full_refresh = 1;
2618 if (am_pixmap_trans)
2619 flush ();
2620 }
2621
2622 return pchanged;
2623}
2624#endif
2625
2626/*}}} */ 2219/*}}} */
2627 2220
2628bool 2221void
2629rxvt_term::cmd_parse () 2222rxvt_term::cmd_parse ()
2630{ 2223{
2631 bool flag = false;
2632 wchar_t ch = NOCHAR; 2224 wchar_t ch = NOCHAR;
2633 char *seq_begin; // remember start of esc-sequence here 2225 char *seq_begin; // remember start of esc-sequence here
2634 2226
2635 for (;;) 2227 for (;;)
2636 { 2228 {
2637 if (ch == NOCHAR) 2229 if (expect_false (ch == NOCHAR))
2638 { 2230 {
2639 seq_begin = cmdbuf_ptr; 2231 seq_begin = cmdbuf_ptr;
2640 ch = next_char (); 2232 ch = next_char ();
2641 2233
2642 if (ch == NOCHAR) 2234 if (ch == NOCHAR)
2643 break; 2235 break;
2644 } 2236 }
2645 2237
2646 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2238 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2647 { 2239 {
2648 if (!seen_input) 2240 if (expect_false (!seen_input))
2649 { 2241 {
2650 seen_input = 1; 2242 seen_input = 1;
2651 // many badly-written programs (e.g. jed) contain a race condition: 2243 // many badly-written programs (e.g. jed) contain a race condition:
2652 // they first read the screensize and then install a SIGWINCH handler. 2244 // they first read the screensize and then install a SIGWINCH handler.
2653 // some window managers resize the window early, and these programs 2245 // some window managers resize the window early, and these programs
… …
2666 wchar_t *str = buf; 2258 wchar_t *str = buf;
2667 wchar_t *eol = str + min (ncol, UBUFSIZ); 2259 wchar_t *eol = str + min (ncol, UBUFSIZ);
2668 2260
2669 for (;;) 2261 for (;;)
2670 { 2262 {
2671 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2263 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2672 break; 2264 break;
2673 2265
2674 *str++ = ch; 2266 *str++ = ch;
2675 2267
2676 if (ch == C0_LF || str >= eol) 2268 if (expect_false (ch == C0_LF || str >= eol))
2677 { 2269 {
2678 if (ch == C0_LF) 2270 if (ch == C0_LF)
2679 nlines++; 2271 nlines++;
2680 2272
2681 refresh_count++; 2273 refresh_count++;
2682 2274
2683 if (!OPTION (Opt_jumpScroll) 2275 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2684 || (refresh_count >= refresh_limit * (nrow - 1)))
2685 { 2276 {
2686 refreshnow = true;
2687 refresh_count = 0; 2277 refresh_count = 0;
2278
2279 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2280 {
2281 refreshnow = true;
2688 ch = NOCHAR; 2282 ch = NOCHAR;
2689 break; 2283 break;
2284 }
2690 } 2285 }
2691 2286
2692 // scr_add_lines only works for nlines <= nrow - 1. 2287 // scr_add_lines only works for nlines <= nrow - 1.
2693 if (nlines >= nrow - 1) 2288 if (nlines >= nrow - 1)
2694 { 2289 {
… …
2722 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2317 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2723 scr_add_lines (buf, str - buf, nlines); 2318 scr_add_lines (buf, str - buf, nlines);
2724 2319
2725 /* 2320 /*
2726 * If there have been a lot of new lines, then update the screen 2321 * If there have been a lot of new lines, then update the screen
2727 * What the heck I'll cheat and only refresh less than every page-full. 2322 * What the heck we'll cheat and only refresh less than every page-full.
2728 * the number of pages between refreshes is refresh_limit, which 2323 * if skipScroll is enabled.
2729 * is incremented here because we must be doing flat-out scrolling.
2730 */ 2324 */
2731 if (refreshnow) 2325 if (refreshnow)
2732 { 2326 {
2733 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2734 refresh_limit++;
2735 else
2736 {
2737 flag = true;
2738 scr_refresh (); 2327 scr_refresh ();
2739 want_refresh = 1; 2328 want_refresh = 1;
2740 }
2741 } 2329 }
2742
2743 } 2330 }
2744 else 2331 else
2745 { 2332 {
2746 try 2333 try
2747 { 2334 {
… …
2755 } 2342 }
2756 2343
2757 ch = NOCHAR; 2344 ch = NOCHAR;
2758 } 2345 }
2759 } 2346 }
2760
2761 return flag;
2762} 2347}
2763 2348
2764// read the next character 2349// read the next character
2765wchar_t 2350wchar_t
2766rxvt_term::next_char () NOTHROW 2351rxvt_term::next_char () NOTHROW
2767{ 2352{
2768 while (cmdbuf_ptr < cmdbuf_endp) 2353 while (cmdbuf_ptr < cmdbuf_endp)
2769 { 2354 {
2770 // assume 7-bit to be ascii ALWAYS 2355 // assume 7-bit to be ascii ALWAYS
2771 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2356 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2772 return *cmdbuf_ptr++; 2357 return *cmdbuf_ptr++;
2773 2358
2774 wchar_t wc; 2359 wchar_t wc;
2775 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2360 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2776 2361
… …
2780 cmdbuf_ptr = cmdbuf_endp; 2365 cmdbuf_ptr = cmdbuf_endp;
2781 break; 2366 break;
2782 } 2367 }
2783 2368
2784 if (len == (size_t)-1) 2369 if (len == (size_t)-1)
2370 {
2371 mbstate.reset (); // reset now undefined conversion state
2785 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2372 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2373 }
2786 2374
2787 // assume wchar == unicode 2375 // assume wchar == unicode
2788 cmdbuf_ptr += len; 2376 cmdbuf_ptr += len;
2789 return wc & UNICODE_MASK; 2377 return wc & UNICODE_MASK;
2790 } 2378 }
… …
2801 : NOCHAR; 2389 : NOCHAR;
2802} 2390}
2803 2391
2804static class out_of_input out_of_input; 2392static class out_of_input out_of_input;
2805 2393
2806/* rxvt_cmd_getc () - Return next input character */
2807/*
2808 * Return the next input character after first passing any keyboard input
2809 * to the command.
2810 */
2811wchar_t 2394wchar_t
2812rxvt_term::cmd_getc () THROW ((class out_of_input)) 2395rxvt_term::cmd_getc () THROW ((class out_of_input))
2813{ 2396{
2814 wchar_t c = next_char (); 2397 wchar_t c = next_char ();
2815 2398
… …
2834/*----------------------------------------------------------------------*/ 2417/*----------------------------------------------------------------------*/
2835#ifdef PRINTPIPE 2418#ifdef PRINTPIPE
2836FILE * 2419FILE *
2837rxvt_term::popen_printer () 2420rxvt_term::popen_printer ()
2838{ 2421{
2839 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2422 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2840 2423
2841 if (stream == NULL) 2424 if (stream == NULL)
2842 rxvt_warn ("can't open printer pipe, not printing.\n"); 2425 rxvt_warn ("can't open printer pipe, not printing.\n");
2843 2426
2844 return stream; 2427 return stream;
… …
2855 * simulate attached vt100 printer 2438 * simulate attached vt100 printer
2856 */ 2439 */
2857void 2440void
2858rxvt_term::process_print_pipe () 2441rxvt_term::process_print_pipe ()
2859{ 2442{
2860 int done; 2443 FILE *fd = popen_printer ();
2861 FILE *fd;
2862 2444
2863 if ((fd = popen_printer ()) == NULL) 2445 if (!fd)
2864 return; 2446 return;
2865 2447
2866 /* 2448 /*
2867 * 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
2868 * is received. 2450 * is received.
2869 */ 2451 */
2870 for (done = 0; !done;) 2452 for (int done = 0; !done; )
2871 { 2453 {
2872 unsigned char buf[8]; 2454 unsigned char buf[8];
2873 unicode_t ch; 2455 unicode_t ch;
2874 unsigned int i, len; 2456 unsigned int i, len;
2875 2457
… …
2894 { 2476 {
2895 if ((buf[len++] = cmd_getc ()) == 'i') 2477 if ((buf[len++] = cmd_getc ()) == 'i')
2896 break; /* done = 1 */ 2478 break; /* done = 1 */
2897 } 2479 }
2898 } 2480 }
2899 2481
2900 for (i = 0; i < len; i++) 2482 for (i = 0; i < len; i++)
2901 if (putc (buf[i], fd) == EOF) 2483 if (putc (buf[i], fd) == EOF)
2902 { 2484 {
2903 done = 1; 2485 done = 1;
2904 break; 2486 break;
… …
2906 } 2488 }
2907 } 2489 }
2908 2490
2909 pclose_printer (fd); 2491 pclose_printer (fd);
2910} 2492}
2911#endif /* PRINTPIPE */ 2493#endif /* PRINTPIPE */
2912/*}}} */ 2494/*}}} */
2913 2495
2914/* *INDENT-OFF* */ 2496/* *INDENT-OFF* */
2915enum { 2497enum {
2916 C1_40 = 0x40, 2498 C1_40 = 0x40,
… …
2966 process_dcs_seq (); 2548 process_dcs_seq ();
2967 break; 2549 break;
2968 case 0x9b: /* CSI */ 2550 case 0x9b: /* CSI */
2969 process_csi_seq (); 2551 process_csi_seq ();
2970 break; 2552 break;
2971 case 0x9d: /* CSI */ 2553 case 0x9d: /* OSC */
2972 process_osc_seq (); 2554 process_osc_seq ();
2973 break; 2555 break;
2974#endif 2556#endif
2975 } 2557 }
2976} 2558}
… …
3020 break; 2602 break;
3021 case 'Z': /* identify the terminal type */ 2603 case 'Z': /* identify the terminal type */
3022 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2604 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
3023 break; 2605 break;
3024 case '<': /* turn off VT52 mode */ 2606 case '<': /* turn off VT52 mode */
3025 PrivMode (0, PrivMode_vt52); 2607 set_privmode (PrivMode_vt52, 0);
3026 break; 2608 break;
3027 case 'F': /* use special graphics character set */ 2609 case 'F': /* use special graphics character set */
3028 case 'G': /* use regular character set */ 2610 case 'G': /* use regular character set */
3029 /* unimplemented */ 2611 /* unimplemented */
3030 break; 2612 break;
… …
3084 scr_forwardindex (); 2666 scr_forwardindex ();
3085 break; 2667 break;
3086#endif 2668#endif
3087 case '=': 2669 case '=':
3088 case '>': 2670 case '>':
3089 PrivMode ((ch == '='), PrivMode_aplKP); 2671 set_privmode (PrivMode_aplKP, ch == '=');
3090 break; 2672 break;
3091 2673
3092 case C1_40: 2674 case C1_40:
3093 cmd_getc (); 2675 cmd_getc ();
3094 break; 2676 break;
… …
3098 2680
3099 /* 8.3.87: NEXT LINE */ 2681 /* 8.3.87: NEXT LINE */
3100 case C1_NEL: /* ESC E */ 2682 case C1_NEL: /* ESC E */
3101 { 2683 {
3102 wchar_t nlcr[] = { C0_LF, C0_CR }; 2684 wchar_t nlcr[] = { C0_LF, C0_CR };
3103 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2685 scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1);
3104 } 2686 }
3105 break; 2687 break;
3106 2688
3107 /* kidnapped escape sequence: Should be 8.3.48 */ 2689 /* kidnapped escape sequence: Should be 8.3.48 */
3108 case C1_ESA: /* ESC G */ 2690 case C1_ESA: /* ESC G */
3109 process_graphics (); 2691 // used by original rxvt for rob nations own graphics mode
2692 if (cmd_getc () == 'Q')
2693 tt_printf ("\033G0\012"); /* query graphics - no graphics */
3110 break; 2694 break;
3111 2695
3112 /* 8.3.63: CHARACTER TABULATION SET */ 2696 /* 8.3.63: CHARACTER TABULATION SET */
3113 case C1_HTS: /* ESC H */ 2697 case C1_HTS: /* ESC H */
3114 scr_set_tab (1); 2698 scr_set_tab (1);
… …
3133 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2717 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3134 case C1_SCI: /* ESC Z */ 2718 case C1_SCI: /* ESC Z */
3135 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2719 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3136 break; /* steal obsolete ESC [ c */ 2720 break; /* steal obsolete ESC [ c */
3137 2721
3138 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2722 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
3139 case C1_CSI: /* ESC [ */ 2723 case C1_CSI: /* ESC [ */
3140 process_csi_seq (); 2724 process_csi_seq ();
3141 break; 2725 break;
3142 2726
3143 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2727 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
3144 case C1_OSC: /* ESC ] */ 2728 case C1_OSC: /* ESC ] */
3145 process_osc_seq (); 2729 process_osc_seq ();
3146 break; 2730 break;
3147 2731
3148 /* 8.3.106: RESET TO INITIAL STATE */ 2732 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
3149 case 'c': 2733 case 'c':
3150 mbstate.reset (); 2734 mbstate.reset ();
3151 scr_poweron (); 2735 scr_poweron ();
3152 scrollbar_show (1); 2736 scrollBar.show (1);
3153 break; 2737 break;
3154 2738
3155 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2739 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
3156 case 'n': 2740 case 'n':
3157 scr_charset_choose (2); 2741 scr_charset_choose (2);
… …
3177 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2761 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
3178 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2762 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
3179 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2763 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
3180}; 2764};
3181 2765
3182#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2766#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
3183 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2767 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
3184 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2768 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
3185#define get_byte_array_bit(array, bit) \ 2769#define get_byte_array_bit(array, bit) \
3186 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2770 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
3187 2771
3188const unsigned char csi_defaults[] = 2772static const unsigned char csi_defaults[] =
3189 { 2773 {
3190 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2774 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
3191 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2775 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
3192 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2776 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
3193 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2777 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
… …
3202rxvt_term::process_csi_seq () 2786rxvt_term::process_csi_seq ()
3203{ 2787{
3204 unicode_t ch, priv, i; 2788 unicode_t ch, priv, i;
3205 unsigned int nargs, p; 2789 unsigned int nargs, p;
3206 int n, ndef; 2790 int n, ndef;
3207 int arg[ESC_ARGS]; 2791 int arg[ESC_ARGS] = { };
3208 2792
3209 for (nargs = ESC_ARGS; nargs > 0;) 2793 nargs = 0;
3210 arg[--nargs] = 0;
3211 2794
3212 priv = 0; 2795 priv = 0;
3213 ch = cmd_getc (); 2796 ch = cmd_getc ();
3214 if (ch >= '<' && ch <= '?') 2797 if ((ch >= '<' && ch <= '?') || ch == '!')
2798 {
3215 { /* '<' '=' '>' '?' */ 2799 /* '<' '=' '>' '?' '!' */
3216 priv = ch; 2800 priv = ch;
3217 ch = cmd_getc (); 2801 ch = cmd_getc ();
3218 } 2802 }
3219 2803
3220 /* read any numerical arguments */ 2804 /* read any numerical arguments */
… …
3259 switch (priv) 2843 switch (priv)
3260 { 2844 {
3261 case '>': 2845 case '>':
3262 if (ch == CSI_DA) /* secondary device attributes */ 2846 if (ch == CSI_DA) /* secondary device attributes */
3263 { 2847 {
3264 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, 2848 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
3265 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2849 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3266 // 2850 //
3267 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2851 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3268 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2852 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
3269 // that we do not support xterm mouse reporting (should be 95 when we do). 2853 // versions.
3270 // 2854 //
3271 tt_printf ("\033[>%d;94;0c", 'U'); 2855 tt_printf ("\033[>%d;95;0c", 'U');
3272 } 2856 }
3273 break; 2857 break;
2858
3274 case '?': 2859 case '?':
3275 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2860 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3276 process_terminal_mode (ch, priv, nargs, arg); 2861 process_terminal_mode (ch, priv, nargs, arg);
3277 break; 2862 break;
2863
2864 case '!':
2865 if (ch == CSI_70)
2866 {
2867 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2868 scr_soft_reset ();
2869
2870 static const int pm_h[] = { 7, 25 };
2871 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2872
2873 process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h);
2874 process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l);
3278 } 2875 }
2876 break;
2877 }
2878
3279 return; 2879 return;
3280 } 2880 }
3281 2881
3282 switch (ch) 2882 switch (ch)
3283 { 2883 {
… …
3403 break; 3003 break;
3404 case 6: /* CPR requested */ 3004 case 6: /* CPR requested */
3405 scr_report_position (); 3005 scr_report_position ();
3406 break; 3006 break;
3407 case 7: /* unofficial extension */ 3007 case 7: /* unofficial extension */
3408 if (OPTION (Opt_insecure)) 3008 if (option (Opt_insecure))
3409 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3009 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3410 break; 3010 break;
3411 case 8: /* unofficial extension */ 3011 case 8: /* unofficial extension */
3412 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3012 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3413 break; 3013 break;
… …
3506{ 3106{
3507 int x, y; 3107 int x, y;
3508 XWindowAttributes wattr; 3108 XWindowAttributes wattr;
3509 Window wdummy; 3109 Window wdummy;
3510 3110
3511 dLocal (Display *, xdisp); 3111 dLocal (Display *, dpy);
3512 3112
3513 if (nargs == 0) 3113 if (nargs == 0)
3514 return; 3114 return;
3515 3115
3516 switch (args[0]) 3116 switch (args[0])
3517 { 3117 {
3518 /* 3118 /*
3519 * commands 3119 * commands
3520 */ 3120 */
3521 case 1: /* deiconify window */ 3121 case 1: /* deiconify window */
3522 XMapWindow (xdisp, parent[0]); 3122 XMapWindow (dpy, parent);
3523 break; 3123 break;
3524 case 2: /* iconify window */ 3124 case 2: /* iconify window */
3525 XIconifyWindow (xdisp, parent[0], display->screen); 3125 XIconifyWindow (dpy, parent, display->screen);
3526 break; 3126 break;
3527 case 3: /* set position (pixels) */ 3127 case 3: /* set position (pixels) */
3528 XMoveWindow (xdisp, parent[0], args[1], args[2]); 3128 XMoveWindow (dpy, parent, args[1], args[2]);
3529 break; 3129 break;
3530 case 4: /* set size (pixels) */ 3130 case 4: /* set size (pixels) */
3531 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3131 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3532 break; 3132 break;
3533 case 5: /* raise window */ 3133 case 5: /* raise window */
3534 XRaiseWindow (xdisp, parent[0]); 3134 XRaiseWindow (dpy, parent);
3535 break; 3135 break;
3536 case 6: /* lower window */ 3136 case 6: /* lower window */
3537 XLowerWindow (xdisp, parent[0]); 3137 XLowerWindow (dpy, parent);
3538 break; 3138 break;
3539 case 7: /* refresh window */ 3139 case 7: /* refresh window */
3540 scr_touch (true); 3140 scr_touch (true);
3541 break; 3141 break;
3542 case 8: /* set size (chars) */ 3142 case 8: /* set size (chars) */
… …
3553 3153
3554 /* 3154 /*
3555 * reports - some output format copied from XTerm 3155 * reports - some output format copied from XTerm
3556 */ 3156 */
3557 case 11: /* report window state */ 3157 case 11: /* report window state */
3558 XGetWindowAttributes (xdisp, parent[0], &wattr); 3158 XGetWindowAttributes (dpy, parent, &wattr);
3559 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3159 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3560 break; 3160 break;
3561 case 13: /* report window position */ 3161 case 13: /* report window position */
3562 XGetWindowAttributes (xdisp, parent[0], &wattr); 3162 XGetWindowAttributes (dpy, parent, &wattr);
3563 XTranslateCoordinates (xdisp, parent[0], wattr.root, 3163 XTranslateCoordinates (dpy, parent, wattr.root,
3564 -wattr.border_width, -wattr.border_width, 3164 -wattr.border_width, -wattr.border_width,
3565 &x, &y, &wdummy); 3165 &x, &y, &wdummy);
3566 tt_printf ("\033[3;%d;%dt", x, y); 3166 tt_printf ("\033[3;%d;%dt", x, y);
3567 break; 3167 break;
3568 case 14: /* report window size (pixels) */ 3168 case 14: /* report window size (pixels) */
3569 XGetWindowAttributes (xdisp, parent[0], &wattr); 3169 XGetWindowAttributes (dpy, parent, &wattr);
3570 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3170 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3571 break; 3171 break;
3572 case 18: /* report text area size (chars) */ 3172 case 18: /* report text area size (chars) */
3573 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3173 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3574 break; 3174 break;
… …
3576 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3176 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3577 break; 3177 break;
3578 case 20: /* report icon label */ 3178 case 20: /* report icon label */
3579 { 3179 {
3580 char *s; 3180 char *s;
3581 XGetIconName (xdisp, parent[0], &s); 3181 XGetIconName (dpy, parent, &s);
3582 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3182 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3583 XFree (s); 3183 XFree (s);
3584 } 3184 }
3585 break; 3185 break;
3586 case 21: /* report window title */ 3186 case 21: /* report window title */
3587 { 3187 {
3588 char *s; 3188 char *s;
3589 XFetchName (xdisp, parent[0], &s); 3189 XFetchName (dpy, parent, &s);
3590 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3190 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3591 XFree (s); 3191 XFree (s);
3592 } 3192 }
3593 break; 3193 break;
3594 } 3194 }
3595} 3195}
… …
3622 seen_esc = true; 3222 seen_esc = true;
3623 continue; 3223 continue;
3624 } 3224 }
3625 else if (ch == C0_BEL || ch == CHAR_ST) 3225 else if (ch == C0_BEL || ch == CHAR_ST)
3626 break; 3226 break;
3227 else if (ch == C0_SYN)
3228 ch = cmd_get8 ();
3627 else if (ch < 0x20) 3229 else if (ch < 0x20)
3628 return NULL; /* other control character - exit */ 3230 return NULL; /* other control character - exit */
3629 3231
3630 seen_esc = false; 3232 seen_esc = false;
3631 3233
3632 if (n >= STRING_MAX - 1) 3234 if (n >= STRING_MAX - 1)
3633 // stop at some sane length 3235 // stop at some sane length
3634 return NULL; 3236 return NULL;
3635 3237
3636 if (ch == C0_SYN)
3637 string[n++] = cmd_get8 ();
3638 else
3639 string[n++] = ch; 3238 string[n++] = ch;
3640 } 3239 }
3641 3240
3642 string[n++] = '\0'; 3241 string[n++] = '\0';
3643 3242
3644 ends_how = (ch == 0x5c ? C0_ESC : ch); 3243 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3651 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3250 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3652 */ 3251 */
3653void 3252void
3654rxvt_term::process_dcs_seq () 3253rxvt_term::process_dcs_seq ()
3655{ 3254{
3656 char *s;
3657 unicode_t eh;
3658
3659 /* 3255 /*
3660 * Not handled yet 3256 * Not handled yet
3661 */ 3257 */
3258
3259 unicode_t eh;
3662 s = get_to_st (eh); 3260 char *s = get_to_st (eh);
3663 if (s) 3261 if (s)
3664 free (s); 3262 free (s);
3665 3263
3666 return; 3264 return;
3667} 3265}
… …
3671 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3269 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3672 */ 3270 */
3673void 3271void
3674rxvt_term::process_osc_seq () 3272rxvt_term::process_osc_seq ()
3675{ 3273{
3676 unicode_t ch, eh;
3677 int arg; 3274 int arg;
3678 3275
3679 ch = cmd_getc (); 3276 unicode_t ch = cmd_getc ();
3680 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3277 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3681 arg = arg * 10 + (ch - '0'); 3278 arg = arg * 10 + (ch - '0');
3682 3279
3683 if (ch == ';') 3280 if (ch == ';')
3684 { 3281 {
3282 unicode_t eh;
3685 char *s = get_to_st (eh); 3283 char *s = get_to_st (eh);
3686 3284
3687 if (s) 3285 if (s)
3688 { 3286 {
3689 process_xterm_seq (arg, s, eh); 3287 process_xterm_seq (arg, s, eh);
… …
3713 3311
3714/* 3312/*
3715 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3313 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3716 */ 3314 */
3717void 3315void
3718rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3316rxvt_term::process_xterm_seq (int op, char *str, char resp)
3719{ 3317{
3720 int color; 3318 int color;
3721 char *buf, *name; 3319 char *buf, *name;
3722 bool query = str[0] == '?' && !str[1]; 3320 bool query = str[0] == '?' && !str[1];
3723 int saveop = op; 3321 int saveop = op;
3724 3322
3725 dLocal (Display *, xdisp); 3323 dLocal (Display *, dpy);
3726 3324
3727 assert (str != NULL); 3325 assert (str != NULL);
3326
3327 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3328 return;
3329
3728 switch (op) 3330 switch (op)
3729 { 3331 {
3730 case XTerm_name: 3332 case XTerm_name:
3731 set_title (str); 3333 set_title (str);
3732 /* FALLTHROUGH */ 3334 /* FALLTHROUGH */
… …
3746 unsigned long bytes_after; 3348 unsigned long bytes_after;
3747 unsigned char *value = 0; 3349 unsigned char *value = 0;
3748 const char *str = ""; 3350 const char *str = "";
3749 3351
3750 if (prop 3352 if (prop
3751 && XGetWindowProperty (xdisp, parent[0], 3353 && XGetWindowProperty (dpy, parent,
3752 prop, 0, 1<<16, 0, AnyPropertyType, 3354 prop, 0, 1<<16, 0, AnyPropertyType,
3753 &actual_type, &actual_format, 3355 &actual_type, &actual_format,
3754 &nitems, &bytes_after, &value) == Success 3356 &nitems, &bytes_after, &value) == Success
3755 && actual_type != None 3357 && actual_type != None
3756 && actual_format == 8) 3358 && actual_format == 8)
… …
3760 3362
3761 XFree (value); 3363 XFree (value);
3762 } 3364 }
3763 else 3365 else
3764 { 3366 {
3765 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3367 char *eq = strchr (str, '=');
3766 3368
3767 if (eq) 3369 if (eq)
3768 { 3370 {
3769 *eq = 0; 3371 *eq = 0;
3770 set_utf8_property (display->atom (str), eq + 1); 3372 set_utf8_property (display->atom (str), eq + 1);
3771 } 3373 }
3772 else 3374 else
3773 XDeleteProperty (xdisp, parent[0], 3375 XDeleteProperty (dpy, parent,
3774 display->atom (str)); 3376 display->atom (str));
3775 } 3377 }
3776 break; 3378 break;
3777 3379
3778 case XTerm_Color: 3380 case XTerm_Color:
… …
3791 *buf++ = '\0'; 3393 *buf++ = '\0';
3792 3394
3793 process_color_seq (op, color, name, resp); 3395 process_color_seq (op, color, name, resp);
3794 } 3396 }
3795 break; 3397 break;
3398 case Rxvt_restoreFG:
3796 case XTerm_Color00: 3399 case XTerm_Color00:
3797 process_color_seq (op, Color_fg, str, resp); 3400 process_color_seq (op, Color_fg, str, resp);
3798 break; 3401 break;
3402 case Rxvt_restoreBG:
3799 case XTerm_Color01: 3403 case XTerm_Color01:
3800 process_color_seq (op, Color_bg, str, resp); 3404 process_color_seq (op, Color_bg, str, resp);
3801 break; 3405 break;
3802#ifndef NO_CURSORCOLOR 3406#ifndef NO_CURSORCOLOR
3803 case XTerm_Color_cursor: 3407 case XTerm_Color_cursor:
… …
3808 process_color_seq (op, Color_pointer_fg, str, resp); 3412 process_color_seq (op, Color_pointer_fg, str, resp);
3809 break; 3413 break;
3810 case XTerm_Color_pointer_bg: 3414 case XTerm_Color_pointer_bg:
3811 process_color_seq (op, Color_pointer_bg, str, resp); 3415 process_color_seq (op, Color_pointer_bg, str, resp);
3812 break; 3416 break;
3417#ifdef OPTION_HC
3418 case XTerm_Color_HC:
3419 process_color_seq (op, Color_HC, str, resp);
3420 break;
3421 case XTerm_Color_HTC:
3422 process_color_seq (op, Color_HTC, str, resp);
3423 break;
3424#endif
3813#ifndef NO_BOLD_UNDERLINE_REVERSE 3425#ifndef NO_BOLD_UNDERLINE_REVERSE
3814 case XTerm_Color_RV:
3815 process_color_seq (op, Color_RV, str, resp);
3816 break;
3817 case Rxvt_Color_BD:
3818 case URxvt_Color_BD: 3426 case URxvt_Color_BD:
3819 process_color_seq (op, Color_BD, str, resp); 3427 process_color_seq (op, Color_BD, str, resp);
3820 break; 3428 break;
3821 case Rxvt_Color_UL:
3822 case URxvt_Color_UL: 3429 case URxvt_Color_UL:
3823 process_color_seq (op, Color_UL, str, resp); 3430 process_color_seq (op, Color_UL, str, resp);
3824 break; 3431 break;
3825 case URxvt_Color_IT: 3432 case URxvt_Color_IT:
3826 process_color_seq (op, Color_IT, str, resp); 3433 process_color_seq (op, Color_IT, str, resp);
3827 break; 3434 break;
3828#endif 3435#endif
3829#if TRANSPARENT && TINTING 3436 case URxvt_Color_border:
3437 process_color_seq (op, Color_border, str, resp);
3438 break;
3439#if ENABLE_TRANSPARENCY
3830 case URxvt_Color_tint: 3440 case URxvt_Color_tint:
3831 process_color_seq (op, Color_tint, str, resp); 3441 process_color_seq (op, Color_tint, str, resp);
3442 {
3443 bool changed = false;
3832 3444
3833 check_our_parents (); 3445 if (ISSET_PIXCOLOR (Color_tint))
3446 changed = bg_set_tint (pix_colors_focused [Color_tint]);
3834 3447
3835 if (am_transparent) 3448 if (changed)
3836 want_full_refresh = want_refresh = 1; 3449 update_background ();
3450 }
3837 3451
3838 break; 3452 break;
3839#endif 3453#endif
3840 3454
3455#if BG_IMAGE_FROM_FILE
3841 case Rxvt_Pixmap: 3456 case Rxvt_Pixmap:
3842 { 3457 if (!strcmp (str, "?"))
3843 if (*str != ';')
3844 { 3458 {
3845#if XPM_BACKGROUND 3459 char str[256];
3846 scale_pixmap (""); /* reset to default scaling */ 3460
3847 set_bgPixmap (str); /* change pixmap */ 3461 sprintf (str, "[%dx%d+%d+%d]",
3848 scr_touch (true); 3462 min (h_scale, 32767), min (v_scale, 32767),
3849#endif 3463 min (h_align, 32767), min (v_align, 32767));
3464 process_xterm_seq (XTerm_title, str, CHAR_ST);
3850 } 3465 }
3851 3466 else
3467 {
3852 int changed = 0; 3468 int changed = 0;
3853 3469
3854 while ((str = strchr (str, ';')) != NULL) 3470 if (*str != ';')
3855 { 3471 {
3472 if (bg_set_file (str)) /* change pixmap */
3473 {
3474 changed++;
3475 str = strchr (str, ';');
3476 if (str == NULL)
3477 bg_set_default_geometry ();
3478 else
3479 bg_set_geometry (str+1);
3480 }
3481 }
3482 else
3483 {
3856 str++; 3484 str++;
3857#if XPM_BACKGROUND 3485 if (bg_set_geometry (str, true))
3858 changed += scale_pixmap (str); 3486 changed++;
3859#endif
3860 } 3487 }
3861 3488
3862 if (changed) 3489 if (changed)
3863 { 3490 {
3864#ifdef XPM_BACKGROUND 3491 if (bg_window_position_sensitive ())
3865 resize_pixmap (); 3492 {
3866 scr_touch (true); 3493 int x, y;
3867#endif 3494 get_window_origin (x, y);
3495 bg_set_position (x, y);
3496 }
3497 update_background ();
3868 } 3498 }
3869 } 3499 }
3870 break; 3500 break;
3871 3501#endif
3872 case Rxvt_restoreFG:
3873 set_window_color (Color_fg, str);
3874 break;
3875 case Rxvt_restoreBG:
3876 set_window_color (Color_bg, str);
3877 break;
3878 3502
3879 case XTerm_logfile: 3503 case XTerm_logfile:
3880 // TODO, when secure mode? 3504 // TODO, when secure mode?
3881 break; 3505 break;
3882 3506
… …
3900 case URxvt_italicFont: 3524 case URxvt_italicFont:
3901 case URxvt_boldItalicFont: 3525 case URxvt_boldItalicFont:
3902#endif 3526#endif
3903 if (query) 3527 if (query)
3904 tt_printf ("\33]%d;%-.250s%c", saveop, 3528 tt_printf ("\33]%d;%-.250s%c", saveop,
3905 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3529 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3906 ? fontset[op - URxvt_font]->fontdesc : "", 3530 ? fontset[op - URxvt_font]->fontdesc : "",
3907 resp); 3531 resp);
3908 else 3532 else
3909 { 3533 {
3910 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3534 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3924 break; 3548 break;
3925 3549
3926#if !ENABLE_MINIMAL 3550#if !ENABLE_MINIMAL
3927 case URxvt_locale: 3551 case URxvt_locale:
3928 if (query) 3552 if (query)
3929 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);
3930 else 3554 else
3931 { 3555 {
3932 set_locale (str); 3556 set_locale (str);
3933 pty->set_utf8_mode (enc_utf8); 3557 pty->set_utf8_mode (enc_utf8);
3934 init_xlocale (); 3558 init_xlocale ();
… …
3949 break; 3573 break;
3950#endif 3574#endif
3951 3575
3952#if ENABLE_PERL 3576#if ENABLE_PERL
3953 case URxvt_perl: 3577 case URxvt_perl:
3954 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));
3955 ; // no responses yet
3956 break; 3579 break;
3957#endif 3580#endif
3958 } 3581 }
3959} 3582}
3960/*----------------------------------------------------------------------*/ 3583/*----------------------------------------------------------------------*/
… …
3983 { 3606 {
3984 if (mode == 'r') 3607 if (mode == 'r')
3985 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3608 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3986 else 3609 else
3987 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3610 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3988 PrivMode (state, bit); 3611
3612 set_privmode (bit, state);
3989 } 3613 }
3990 3614
3991 return state; 3615 return state;
3992} 3616}
3993 3617
… …
3997{ 3621{
3998 unsigned int i, j; 3622 unsigned int i, j;
3999 int state; 3623 int state;
4000 3624
4001 static const struct 3625 static const struct
4002 { 3626 {
4003 const int argval; 3627 const int argval;
4004 const unsigned long bit; 3628 const unsigned long bit;
4005 }
4006
4007 argtopriv[] = { 3629 } argtopriv[] = {
4008 { 1, PrivMode_aplCUR }, 3630 { 1, PrivMode_aplCUR }, // DECCKM
4009 { 2, PrivMode_vt52 }, 3631 { 2, PrivMode_vt52 },
4010 { 3, PrivMode_132 }, 3632 { 3, PrivMode_132 }, // DECCOLM
4011 { 4, PrivMode_smoothScroll }, 3633 { 4, PrivMode_smoothScroll }, // DECSCLM
4012 { 5, PrivMode_rVideo }, 3634 { 5, PrivMode_rVideo }, // DECSCNM
4013 { 6, PrivMode_relOrigin }, 3635 { 6, PrivMode_relOrigin }, // DECOM
4014 { 7, PrivMode_Autowrap }, 3636 { 7, PrivMode_Autowrap }, // DECAWM
4015 // 8, bi-directional support mode 3637 // 8, auto-repeat keys // DECARM
4016 { 9, PrivMode_MouseX10 }, 3638 { 9, PrivMode_MouseX10 },
4017 // 18, 19 printing-related 3639 // 18 end FF to printer after print screen
3640 // 19 Print screen prints full screen/scroll region
4018 { 25, PrivMode_VisibleCursor }, 3641 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
4019#ifdef scrollBar_esc 3642#ifdef scrollBar_esc
4020 { scrollBar_esc, PrivMode_scrollBar }, 3643 { scrollBar_esc, PrivMode_scrollBar },
4021#endif 3644#endif
4022 { 35, PrivMode_ShiftKeys }, // rxvt extension 3645 { 35, PrivMode_ShiftKeys }, // rxvt extension
3646 // 38, tektronix mode // DECTEK
4023 { 40, PrivMode_132OK }, 3647 { 40, PrivMode_132OK },
4024 // 41 xterm more fixes NYI 3648 // 41 xterm more fixes NYI
4025 // 45 margin bell NYI 3649 // 45 margin bell NYI
4026 // 46 start logging 3650 // 46 start logging
4027 { 47, PrivMode_Screen }, 3651 { 47, PrivMode_Screen },
4028 { 66, PrivMode_aplKP }, 3652 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
4029#ifndef NO_BACKSPACE_KEY 3653#ifndef NO_BACKSPACE_KEY
4030 { 67, PrivMode_BackSpace }, 3654 { 67, PrivMode_BackSpace }, // DECBKM
4031#endif 3655#endif
4032 { 1000, PrivMode_MouseX11 }, 3656 { 1000, PrivMode_MouseX11 },
4033 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3657 { 1002, PrivMode_MouseBtnEvent },
4034 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3658 { 1003, PrivMode_MouseAnyEvent },
4035 // 1003 Use All Motion Mouse Tracking. NYI, TODO 3659#if ENABLE_FRILLS
3660 { 1005, PrivMode_ExtModeMouse },
3661#endif
4036 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3662 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4037 { 1011, PrivMode_Keypress }, // rxvt extension 3663 { 1011, PrivMode_Keypress }, // rxvt extension
3664#if ENABLE_FRILLS
3665 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3666#endif
4038 // 1035 enable modifiers for alt, numlock NYI 3667 // 1035 enable modifiers for alt, numlock NYI
4039 // 1036 send ESC for meta keys NYI 3668 // 1036 send ESC for meta keys NYI
4040 // 1037 send DEL for keypad delete NYI 3669 // 1037 send DEL for keypad delete NYI
4041 { 1047, PrivMode_Screen }, 3670 { 1047, PrivMode_Screen },
4042 // 1048 save and restore cursor 3671 // 1048 save and restore cursor, implemented in code
4043 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3672 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
4044 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3673 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3674 { 2004, PrivMode_BracketPaste },
4045 }; 3675 };
4046 3676
4047 if (nargs == 0) 3677 if (nargs == 0)
4048 return; 3678 return;
4049 3679
… …
4056 for (i = 0; i < nargs; i++) 3686 for (i = 0; i < nargs; i++)
4057 { 3687 {
4058 state = -1; 3688 state = -1;
4059 3689
4060 /* basic handling */ 3690 /* basic handling */
4061 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3691 for (j = 0; j < ARRAY_LENGTH(argtopriv); j++)
4062 if (argtopriv[j].argval == arg[i]) 3692 if (argtopriv[j].argval == arg[i])
4063 { 3693 {
4064 state = privcases (mode, argtopriv[j].bit); 3694 state = privcases (mode, argtopriv[j].bit);
4065 break; 3695 break;
4066 } 3696 }
… …
4074 3704
4075 scr_touch (true); 3705 scr_touch (true);
4076 break; 3706 break;
4077#endif 3707#endif
4078 case 1048: /* alternative cursor save */ 3708 case 1048: /* alternative cursor save */
4079 case 1049:
4080 if (OPTION (Opt_secondaryScreen)) 3709 if (option (Opt_secondaryScreen))
4081 if (mode == 0) 3710 if (mode == 0)
4082 scr_cursor (RESTORE); 3711 scr_cursor (RESTORE);
4083 else if (mode == 1) 3712 else if (mode == 1)
4084 scr_cursor (SAVE); 3713 scr_cursor (SAVE);
4085 break; 3714 break;
… …
4093 case 2: /* VT52 mode */ 3722 case 2: /* VT52 mode */
4094 /* oddball mode. should be set regardless of set/reset 3723 /* oddball mode. should be set regardless of set/reset
4095 * parameter. Return from VT52 mode with an ESC < from 3724 * parameter. Return from VT52 mode with an ESC < from
4096 * within VT52 mode 3725 * within VT52 mode
4097 */ 3726 */
4098 PrivMode (1, PrivMode_vt52); 3727 set_privmode (PrivMode_vt52, 1);
4099 break; 3728 break;
4100 case 3: /* 80/132 */ 3729 case 3: /* 80/132 */
4101 if (priv_modes & PrivMode_132OK) 3730 if (priv_modes & PrivMode_132OK)
4102 set_widthheight (((state ? 132 : 80) * fwidth), height); 3731 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
4103 break; 3732 break;
4104 case 4: /* smooth scrolling */ 3733 case 4: /* smooth scrolling */
4105 set_option (Opt_jumpScroll, !state); 3734 set_option (Opt_jumpScroll, !state);
4106 break; 3735 break;
4107 case 5: /* reverse video */ 3736 case 5: /* reverse video */
… …
4114 scr_autowrap (state); 3743 scr_autowrap (state);
4115 break; 3744 break;
4116 /* case 8: - auto repeat, can't do on a per window basis */ 3745 /* case 8: - auto repeat, can't do on a per window basis */
4117 case 9: /* X10 mouse reporting */ 3746 case 9: /* X10 mouse reporting */
4118 if (state) /* orthogonal */ 3747 if (state) /* orthogonal */
4119 priv_modes &= ~PrivMode_MouseX11; 3748 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4120 break; 3749 break;
4121#ifdef scrollBar_esc 3750#ifdef scrollBar_esc
4122 case scrollBar_esc: 3751 case scrollBar_esc:
4123 if (scrollbar_mapping (state)) 3752 if (scrollBar.map (state))
4124 { 3753 {
4125 resize_all_windows (0, 0, 0); 3754 resize_all_windows (0, 0, 0);
4126 scr_touch (true); 3755 scr_touch (true);
4127 } 3756 }
4128 break; 3757 break;
… …
4137 break; 3766 break;
4138 /* case 66: - application key pad */ 3767 /* case 66: - application key pad */
4139 /* case 67: - backspace key */ 3768 /* case 67: - backspace key */
4140 case 1000: /* X11 mouse reporting */ 3769 case 1000: /* X11 mouse reporting */
4141 if (state) /* orthogonal */ 3770 if (state) /* orthogonal */
4142 priv_modes &= ~PrivMode_MouseX10; 3771 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4143 break; 3772 break;
4144#if 0
4145 case 1001: 3773 case 1002:
4146 break; /* X11 mouse highlighting */ 3774 case 1003:
4147#endif 3775 if (state)
3776 {
3777 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3778 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3779 mouse_row = mouse_col = 0;
3780 vt_emask_mouse = PointerMotionMask;
3781 }
3782 else
3783 vt_emask_mouse = NoEventMask;
3784
3785 vt_select_input ();
3786 break;
4148 case 1010: /* scroll to bottom on TTY output inhibit */ 3787 case 1010: /* scroll to bottom on TTY output inhibit */
4149 set_option (Opt_scrollTtyOutput, !state); 3788 set_option (Opt_scrollTtyOutput, !state);
4150 break; 3789 break;
4151 case 1011: /* scroll to bottom on key press */ 3790 case 1011: /* scroll to bottom on key press */
4152 set_option (Opt_scrollTtyKeypress, state); 3791 set_option (Opt_scrollTtyKeypress, state);
4153 break; 3792 break;
4154 case 1047: /* secondary screen w/ clearing last */ 3793 case 1047: /* secondary screen w/ clearing last */
4155 if (OPTION (Opt_secondaryScreen)) 3794 if (option (Opt_secondaryScreen))
4156 if (current_screen != PRIMARY) 3795 if (!state)
4157 scr_erase_screen (2); 3796 scr_erase_screen (2);
3797
4158 scr_change_screen (state); 3798 scr_change_screen (state);
4159 break; 3799 break;
4160 case 1049: /* secondary screen w/ clearing first */ 3800 case 1049: /* secondary screen w/ clearing first */
3801 if (option (Opt_secondaryScreen))
3802 if (state)
3803 scr_cursor (SAVE);
3804
4161 scr_change_screen (state); 3805 scr_change_screen (state);
3806
4162 if (OPTION (Opt_secondaryScreen)) 3807 if (option (Opt_secondaryScreen))
4163 if (current_screen != PRIMARY) 3808 if (state)
4164 scr_erase_screen (2); 3809 scr_erase_screen (2);
3810 else
3811 scr_cursor (RESTORE);
4165 break; 3812 break;
4166 default: 3813 default:
4167 break; 3814 break;
4168 } 3815 }
4169 } 3816 }
… …
4322 } 3969 }
4323 } 3970 }
4324} 3971}
4325/*}}} */ 3972/*}}} */
4326 3973
4327/*{{{ (do not) process Rob Nation's own graphics mode sequences */
4328void
4329rxvt_term::process_graphics ()
4330{
4331 unicode_t ch, cmd = cmd_getc ();
4332
4333 if (cmd == 'Q')
4334 { /* query graphics */
4335 tt_printf ("\033G0\012"); /* no graphics */
4336 return;
4337 }
4338 /* swallow other graphics sequences until terminating ':' */
4339 do
4340 ch = cmd_getc ();
4341 while (ch != ':');
4342}
4343/*}}} */
4344
4345/* ------------------------------------------------------------------------- */ 3974/* ------------------------------------------------------------------------- */
4346 3975
4347/* 3976/*
4348 * Send printf () formatted output to the command. 3977 * Send printf () formatted output to the command.
4349 * Only use for small amounts of data. 3978 * Only use for small amounts of data.
… …
4362 3991
4363/* ---------------------------------------------------------------------- */ 3992/* ---------------------------------------------------------------------- */
4364/* Write data to the pty as typed by the user, pasted with the mouse, 3993/* Write data to the pty as typed by the user, pasted with the mouse,
4365 * or generated by us in response to a query ESC sequence. 3994 * or generated by us in response to a query ESC sequence.
4366 */ 3995 */
4367const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3996static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4368 3997
4369void 3998void
4370rxvt_term::tt_write (const char *data, unsigned int len) 3999rxvt_term::tt_write (const char *data, unsigned int len)
4371{ 4000{
4372 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4001 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
4377 4006
4378 if (v_buflen == 0) 4007 if (v_buflen == 0)
4379 { 4008 {
4380 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4009 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4381 4010
4011 max_it (written, 0);
4012
4382 if ((unsigned int)written == len) 4013 if (written == len)
4383 return; 4014 return;
4384 4015
4385 data += written; 4016 data += written;
4386 len -= written; 4017 len -= written;
4387 } 4018 }
4388 4019
4389 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4020 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
4390 4021
4391 memcpy (v_buffer + v_buflen, data, len); 4022 memcpy (v_buffer + v_buflen, data, len);
4392 v_buflen += len; 4023 v_buflen += len;
4393 4024
4394 pty_ev.set (EVENT_READ | EVENT_WRITE); 4025 pty_ev.set (ev::READ | ev::WRITE);
4395} 4026}
4396 4027
4397void rxvt_term::pty_write () 4028void rxvt_term::pty_write ()
4398{ 4029{
4399 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4030 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4404 4035
4405 if (v_buflen == 0) 4036 if (v_buflen == 0)
4406 { 4037 {
4407 free (v_buffer); 4038 free (v_buffer);
4408 v_buffer = 0; 4039 v_buffer = 0;
4409 v_buflen = 0;
4410 4040
4411 pty_ev.set (EVENT_READ); 4041 pty_ev.set (ev::READ);
4412 return; 4042 return;
4413 } 4043 }
4414 4044
4415 memmove (v_buffer, v_buffer + written, v_buflen); 4045 memmove (v_buffer, v_buffer + written, v_buflen);
4416 } 4046 }
4417 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4047 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4418 pty_ev.set (EVENT_READ); 4048 pty_ev.set (ev::READ);
4419} 4049}
4420 4050
4421/*----------------------- end-of-file (C source) -----------------------*/ 4051/*----------------------- end-of-file (C source) -----------------------*/
4422 4052

Diff Legend

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