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.226 by root, Sun Jan 1 15:03:49 2006 UTC vs.
Revision 1.435 by sf-exg, Wed Jan 6 12:10:44 2010 UTC

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

Diff Legend

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