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.276 by root, Fri Jan 20 11:02:46 2006 UTC vs.
Revision 1.479 by root, Fri Feb 25 07:07:41 2011 UTC

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

Diff Legend

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