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

Diff Legend

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