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.288 by root, Sat Jan 28 20:33:31 2006 UTC vs.
Revision 1.479 by root, Fri Feb 25 07:07:41 2011 UTC

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

Diff Legend

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