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.272 by root, Thu Jan 19 16:22:12 2006 UTC vs.
Revision 1.458 by sf-exg, Thu Nov 18 17:28:12 2010 UTC

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

Diff Legend

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