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.284 by root, Wed Jan 25 02:42:06 2006 UTC vs.
Revision 1.451 by root, Sun May 23 00:37:19 2010 UTC

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

Diff Legend

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