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.287 by root, Sat Jan 28 20:08:05 2006 UTC vs.
Revision 1.476 by sf-exg, Fri Feb 11 01:24:46 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-2007 Marc Lehmann <pcg@goof.com>
31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
31 * 32 *
32 * This program is free software; you can redistribute it and/or modify 33 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 34 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 36 * (at your option) any later version.
… …
49#include "rxvt.h" 50#include "rxvt.h"
50#include "rxvtperl.h" 51#include "rxvtperl.h"
51#include "version.h" 52#include "version.h"
52#include "command.h" 53#include "command.h"
53 54
54#if HAVE_SCHED_YIELD
55#undef HAVE_SCHED_YIELD // disabled for the time being
56//# include <sched.h>
57#endif
58
59#ifdef KEYSYM_RESOURCE 55#ifdef KEYSYM_RESOURCE
60# include "keyboard.h" 56# include "keyboard.h"
61#endif 57#endif
62 58
63#include <csignal> 59#include <csignal>
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
… …
1130 cmdbuf_endp += r; 1176 cmdbuf_endp += r;
1131 return true; 1177 return true;
1132 } 1178 }
1133 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1179 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1134 { 1180 {
1135#if HAVE_SCHED_YIELD 1181#if LINUX_YIELD_HACK
1136 if (display->is_local) 1182 if (display->is_local)
1137 event_handler.cw_yield.start (); 1183 event_handler.yield_ev.start ();
1138#endif 1184#endif
1139 } 1185 }
1140 else 1186 else
1141 { 1187 {
1142 pty_ev.stop (); 1188 pty_ev.stop ();
1143 1189
1144 if (!OPTION (Opt_hold)) 1190 if (!option (Opt_hold))
1145 destroy (); 1191 destroy ();
1146 } 1192 }
1147 1193
1148 return false; 1194 return false;
1149} 1195}
1150 1196
1151void 1197void
1152rxvt_term::pty_cb (io_watcher &w, short revents) 1198rxvt_term::pty_cb (ev::io &w, int revents)
1153{ 1199{
1154 make_current (); 1200 make_current ();
1155 1201
1156 if (revents & EVENT_READ) 1202 if (revents & ev::READ)
1157 // loop, but don't allow a single term to monopolize us 1203 // loop, but don't allow a single term to monopolize us
1158 while (pty_fill ()) 1204 for (int i = CBUFCNT; i-- && pty_fill (); )
1159 if (cmd_parse ()) 1205 cmd_parse ();
1160 break;
1161 1206
1162 if (revents & EVENT_WRITE) 1207 if (revents & ev::WRITE)
1163 pty_write (); 1208 pty_write ();
1209
1210 refresh_check ();
1164} 1211}
1165 1212
1166void 1213void
1167rxvt_term::pointer_unblank () 1214rxvt_term::pointer_unblank ()
1168{ 1215{
1169 XDefineCursor (xdisp, vt, TermWin_cursor); 1216 XDefineCursor (dpy, vt, TermWin_cursor);
1170 recolour_cursor (); 1217 recolour_cursor ();
1171 1218
1172#ifdef POINTER_BLANK 1219#ifdef POINTER_BLANK
1173 hidden_pointer = 0; 1220 hidden_pointer = 0;
1174 1221
1175 if (OPTION (Opt_pointerBlank)) 1222 if (option (Opt_pointerBlank))
1176 pointer_ev.start (NOW + pointerBlankDelay); 1223 pointer_ev.start (pointerBlankDelay);
1177#endif 1224#endif
1178} 1225}
1179 1226
1180#ifdef POINTER_BLANK 1227#ifdef POINTER_BLANK
1181void 1228void
1182rxvt_term::pointer_blank () 1229rxvt_term::pointer_blank ()
1183{ 1230{
1184 if (!OPTION (Opt_pointerBlank)) 1231 if (!option (Opt_pointerBlank))
1185 return; 1232 return;
1186 1233
1187 XDefineCursor (xdisp, vt, display->blank_cursor); 1234 XDefineCursor (dpy, vt, display->blank_cursor);
1188 XFlush (xdisp); 1235 XFlush (dpy);
1189 1236
1190 hidden_pointer = 1; 1237 hidden_pointer = 1;
1191} 1238}
1192 1239
1193void 1240void
1194rxvt_term::pointer_cb (time_watcher &w) 1241rxvt_term::pointer_cb (ev::timer &w, int revents)
1195{ 1242{
1196 make_current (); 1243 make_current ();
1197 1244
1198 pointer_blank (); 1245 pointer_blank ();
1199} 1246}
… …
1202void 1249void
1203rxvt_term::mouse_report (XButtonEvent &ev) 1250rxvt_term::mouse_report (XButtonEvent &ev)
1204{ 1251{
1205 int button_number, key_state = 0; 1252 int button_number, key_state = 0;
1206 int x, y; 1253 int x, y;
1254 int code = 32;
1207 1255
1208 x = ev.x; 1256 x = Pixel2Col (ev.x) + 1;
1209 y = ev.y; 1257 y = Pixel2Row (ev.y) + 1;
1210 pixel_position (&x, &y); 1258
1259 if (ev.type == MotionNotify)
1260 {
1261 if (x == mouse_row && y == mouse_col)
1262 return;
1263
1264 mouse_row = x;
1265 mouse_col = y;
1266 code += 32;
1267 }
1211 1268
1212 if (MEvent.button == AnyButton) 1269 if (MEvent.button == AnyButton)
1213 button_number = 3; 1270 button_number = 3;
1214 else 1271 else
1215 { 1272 {
1216 button_number = MEvent.button - Button1; 1273 button_number = MEvent.button - Button1;
1217 /* add 0x3D for wheel events, like xterm does */ 1274 /* add 0x3D for wheel events, like xterm does */
1218 if (button_number >= 3) 1275 if (button_number >= 3)
1219 button_number += (64 - 3); 1276 button_number += 64 - 3;
1220 } 1277 }
1221 1278
1222 if (priv_modes & PrivMode_MouseX10) 1279 if (priv_modes & PrivMode_MouseX10)
1223 { 1280 {
1224 /* 1281 /*
… …
1256 fputc ('A', stderr); 1313 fputc ('A', stderr);
1257 if (key_state & 32) 1314 if (key_state & 32)
1258 fputc ('2', stderr); 1315 fputc ('2', stderr);
1259 fprintf (stderr, "]: <%d>, %d/%d\n", 1316 fprintf (stderr, "]: <%d>, %d/%d\n",
1260 button_number, 1317 button_number,
1261 x + 1, 1318 x,
1262 y + 1); 1319 y);
1263#endif 1320#endif
1264 1321
1322#if ENABLE_FRILLS
1323 if (priv_modes & PrivMode_ExtMouseRight)
1324 tt_printf ("\033[%d;%d;%dM",
1325 code + button_number + key_state,
1326 x,
1327 y);
1328 else if (priv_modes & PrivMode_ExtModeMouse)
1329 tt_printf ("\033[M%c%lc%lc",
1330 code + button_number + key_state,
1331 wint_t (32 + x),
1332 wint_t (32 + y));
1333 else
1334#endif
1265 tt_printf ("\033[M%c%c%c", 1335 tt_printf ("\033[M%c%c%c",
1266 (32 + button_number + key_state), 1336 code + button_number + key_state,
1267 (32 + x + 1), 1337 32 + x,
1268 (32 + y + 1)); 1338 32 + y);
1269} 1339}
1270 1340
1271/*{{{ process an X event */ 1341/*{{{ process an X event */
1272void 1342void
1273rxvt_term::x_cb (XEvent &ev) 1343rxvt_term::x_cb (XEvent &ev)
1274{ 1344{
1275 make_current (); 1345 make_current ();
1276 1346
1277 dLocal (Display *, xdisp); 1347 dLocal (Display *, dpy);
1278 1348
1279 if (ev.xany.window == vt 1349 if (ev.xany.window == vt
1280 && SHOULD_INVOKE (HOOK_X_EVENT) 1350 && SHOULD_INVOKE (HOOK_X_EVENT)
1281 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1351 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1282 return; 1352 return;
… …
1287 unsigned int unused_mask; 1357 unsigned int unused_mask;
1288 1358
1289 switch (ev.type) 1359 switch (ev.type)
1290 { 1360 {
1291 case KeyPress: 1361 case KeyPress:
1292#if ISO_14755 1362 key_press (ev.xkey);
1293 if (!(iso14755buf & ISO_14755_52))
1294#endif
1295 lookup_key (ev.xkey);
1296
1297 break; 1363 break;
1298 1364
1299 case KeyRelease: 1365 case KeyRelease:
1300 { 1366 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; 1367 break;
1372 }
1373 1368
1374 case ButtonPress: 1369 case ButtonPress:
1375 button_press (ev.xbutton); 1370 button_press (ev.xbutton);
1376 break; 1371 break;
1377 1372
… …
1392 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END))) 1387 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1393 destroy (); 1388 destroy ();
1394 } 1389 }
1395#if ENABLE_EWMH 1390#if ENABLE_EWMH
1396 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1391 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1397 XSendEvent (xdisp, ev.xclient.window = display->root, 1392 XSendEvent (dpy, ev.xclient.window = display->root,
1398 False, SubstructureRedirectMask | SubstructureNotifyMask, 1393 False, SubstructureRedirectMask | SubstructureNotifyMask,
1399 &ev); 1394 &ev);
1400#endif 1395#endif
1401 } 1396 }
1402 } 1397 }
… …
1408 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1403 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1409 focus_out (); 1404 focus_out ();
1410 } 1405 }
1411#endif 1406#endif
1412 } 1407 }
1413 break;
1414
1415 case MappingNotify:
1416 XRefreshKeyboardMapping (&ev.xmapping);
1417 break; 1408 break;
1418 1409
1419 /* 1410 /*
1420 * XXX: this is not the _current_ arrangement 1411 * XXX: this is not the _current_ arrangement
1421 * Here's my conclusion: 1412 * Here's my conclusion:
… …
1440 break; 1431 break;
1441 } 1432 }
1442 break; 1433 break;
1443 1434
1444 case FocusIn: 1435 case FocusIn:
1436 if (ev.xfocus.detail != NotifyInferior
1437 && ev.xfocus.detail != NotifyPointer
1438 && ev.xfocus.mode != NotifyGrab)
1445 focus_in (); 1439 focus_in ();
1446 break; 1440 break;
1447 1441
1448 case FocusOut: 1442 case FocusOut:
1443 if (ev.xfocus.detail != NotifyInferior
1444 && ev.xfocus.detail != NotifyPointer
1445 && ev.xfocus.mode != NotifyGrab)
1449 focus_out (); 1446 focus_out ();
1450 break; 1447 break;
1451 1448
1452 case ConfigureNotify: 1449 case ConfigureNotify:
1453 if (ev.xconfigure.window == parent[0]) 1450 if (ev.xconfigure.window == parent[0])
1454 { 1451 {
1455 while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev)) 1452 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1456 ; 1453 ;
1454
1455#ifdef HAVE_BG_PIXMAP
1456 bool moved = false;
1457 if (bg_window_position_sensitive ())
1458 {
1459 int x, y;
1460 if (ev.xconfigure.send_event)
1461 {
1462 x = ev.xconfigure.x;
1463 y = ev.xconfigure.y;
1464 }
1465 else
1466 get_window_origin (x, y);
1467
1468 if (bg_set_position (x, y)
1469 || !(bg_flags & BG_IS_VALID))
1470 moved = true;
1471 }
1472#endif
1457 1473
1458 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1474 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1459 { 1475 {
1460 seen_resize = 1; 1476 seen_resize = 1;
1461 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1477 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1462 } 1478 }
1479 else
1480 {
1481#ifdef HAVE_BG_PIXMAP
1482 if (moved)
1483 {
1484 if (mapped)
1485 update_background ();
1486 else
1487 bg_invalidate ();
1488 }
1489#endif
1490 }
1463 1491
1464 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1492 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 } 1493 }
1471 break; 1494 break;
1472 1495
1473 case PropertyNotify: 1496 case PropertyNotify:
1474 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1497 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; 1498 break;
1480 1499
1481 case SelectionClear: 1500 case SelectionClear:
1482 selection_clear (); 1501 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; 1502 break;
1489 1503
1490 case SelectionRequest: 1504 case SelectionRequest:
1491 selection_send (ev.xselectionrequest); 1505 selection_send (ev.xselectionrequest);
1492 break; 1506 break;
1493 1507
1494 case MapNotify: 1508 case MapNotify:
1509#ifdef HAVE_BG_PIXMAP
1510 /* This is needed specifically to fix the case of no window manager or a
1511 * non-reparenting window manager. In those cases we never get first
1512 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1513 * care of multiplicity of ConfigureNotify events arriving while WM does
1514 * reparenting.
1515 * We should not render background immediately, as there could be several
1516 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1517 * by scheduling background redraw as soon as we can, but giving a short
1518 * bit of time for ConfigureNotifies to arrive.
1519 * We should render background PRIOR to drawing any text, but AFTER all
1520 * of ConfigureNotifys for the best results.
1521 */
1522 if (!(bg_flags & BG_IS_VALID))
1523 update_background_ev.start (0.025);
1524#endif
1495 mapped = 1; 1525 mapped = 1;
1496#ifdef TEXT_BLINK 1526#ifdef TEXT_BLINK
1497 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1527 text_blink_ev.start ();
1498#endif 1528#endif
1499 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1529 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1500 break; 1530 break;
1501 1531
1502 case UnmapNotify: 1532 case UnmapNotify:
… …
1504#ifdef TEXT_BLINK 1534#ifdef TEXT_BLINK
1505 text_blink_ev.stop (); 1535 text_blink_ev.stop ();
1506#endif 1536#endif
1507 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1537 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1508 break; 1538 break;
1509
1510#ifdef TRANSPARENT
1511 case ReparentNotify:
1512 rootwin_cb (ev);
1513 break;
1514#endif /* TRANSPARENT */
1515 1539
1516 case GraphicsExpose: 1540 case GraphicsExpose:
1517 case Expose: 1541 case Expose:
1518 if (ev.xany.window == vt) 1542 if (ev.xany.window == vt)
1519 { 1543 {
1520 do 1544 do
1545 {
1521 scr_expose (ev.xexpose.x, ev.xexpose.y, 1546 scr_expose (ev.xexpose.x, ev.xexpose.y,
1522 ev.xexpose.width, ev.xexpose.height, False); 1547 ev.xexpose.width, ev.xexpose.height, false);
1548 }
1523 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev)); 1549 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1524 1550
1525 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1551 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1526 1552
1527 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev)) 1553 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1554 {
1528 scr_expose (ev.xexpose.x, ev.xexpose.y, 1555 scr_expose (ev.xexpose.x, ev.xexpose.y,
1529 ev.xexpose.width, ev.xexpose.height, False); 1556 ev.xexpose.width, ev.xexpose.height, false);
1557 }
1530 1558
1531 want_refresh = 1; 1559 want_refresh = 1;
1532 } 1560 }
1533 else 1561 else
1534 { 1562 {
1535 XEvent unused_event; 1563 XEvent unused_event;
1536 1564
1537 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event)) 1565 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1538 ; 1566 ;
1539 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event)) 1567 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1540 ; 1568 ;
1541 1569
1542 if (isScrollbarWindow (ev.xany.window)) 1570 if (scrollBar.state && ev.xany.window == scrollBar.win)
1543 { 1571 {
1544 scrollBar.setIdle (); 1572 scrollBar.state = STATE_IDLE;
1545 scrollbar_show (0); 1573 scrollBar.show (0);
1546 } 1574 }
1547
1548#ifdef TRANSPARENT
1549 if (am_transparent && ev.xany.window == parent[0])
1550 XClearWindow (xdisp, ev.xany.window);
1551#endif
1552 } 1575 }
1553 break; 1576 break;
1554 1577
1555 case MotionNotify: 1578 case MotionNotify:
1556#ifdef POINTER_BLANK 1579#ifdef POINTER_BLANK
1557 if (hidden_pointer) 1580 if (hidden_pointer)
1558 pointer_unblank (); 1581 pointer_unblank ();
1559#endif 1582#endif
1583 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1584 || priv_modes & PrivMode_MouseAnyEvent)
1585 mouse_report (ev.xbutton);
1560 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1586 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1561 break; 1587 break;
1562 1588
1563 if (ev.xany.window == vt) 1589 if (ev.xany.window == vt)
1564 { 1590 {
1565 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1591 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1566 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1592 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1567 ; // nop 1593 ; // nop
1568 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1594 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1569 { 1595 {
1570 while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev)) 1596 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1571 ; 1597 ;
1572 1598
1573 XQueryPointer (xdisp, vt, 1599 XQueryPointer (dpy, vt,
1574 &unused_root, &unused_child, 1600 &unused_root, &unused_child,
1575 &unused_root_x, &unused_root_y, 1601 &unused_root_x, &unused_root_y,
1576 &ev.xbutton.x, &ev.xbutton.y, 1602 &ev.xbutton.x, &ev.xbutton.y,
1577 &ev.xbutton.state); 1603 &ev.xbutton.state);
1578#ifdef MOUSE_THRESHOLD 1604#ifdef MOUSE_THRESHOLD
… …
1598 int dist; 1624 int dist;
1599 1625
1600 /* don't clobber the current delay if we are 1626 /* don't clobber the current delay if we are
1601 * already in the middle of scrolling. 1627 * already in the middle of scrolling.
1602 */ 1628 */
1603 if (!sel_scroll_ev.active) 1629 if (!sel_scroll_ev.is_active ())
1604 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1630 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1605 1631
1606 /* save the event params so we can highlight 1632 /* save the event params so we can highlight
1607 * the selection in the pending-scroll loop 1633 * the selection in the pending-scroll loop
1608 */ 1634 */
1609 selection_save_x = ev.xbutton.x; 1635 selection_save_x = ev.xbutton.x;
… …
1631 else 1657 else
1632 { 1658 {
1633 /* we are within the text window, so we 1659 /* we are within the text window, so we
1634 * shouldn't be scrolling 1660 * shouldn't be scrolling
1635 */ 1661 */
1636 if (sel_scroll_ev.active)
1637 sel_scroll_ev.stop(); 1662 sel_scroll_ev.stop();
1638 } 1663 }
1639#endif 1664#endif
1640#ifdef MOUSE_THRESHOLD 1665#ifdef MOUSE_THRESHOLD
1641 } 1666 }
1642#endif 1667#endif
1643 } 1668 }
1644 } 1669 }
1645 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1670 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1646 { 1671 {
1647 while (XCheckTypedWindowEvent (xdisp, scrollBar.win, 1672 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1648 MotionNotify, &ev)) 1673 MotionNotify, &ev))
1649 ; 1674 ;
1650 1675
1651 XQueryPointer (xdisp, scrollBar.win, 1676 XQueryPointer (dpy, scrollBar.win,
1652 &unused_root, &unused_child, 1677 &unused_root, &unused_child,
1653 &unused_root_x, &unused_root_y, 1678 &unused_root_x, &unused_root_y,
1654 &ev.xbutton.x, &ev.xbutton.y, 1679 &ev.xbutton.x, &ev.xbutton.y,
1655 &unused_mask); 1680 &unused_mask);
1656 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1681 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1657 scrollbar_size ()); 1682 scrollBar.size ());
1658 want_refresh = 1; 1683 want_refresh = 1;
1659 refresh_limit = 0;
1660 scrollbar_show (1); 1684 scrollBar.show (1);
1661 } 1685 }
1662 break; 1686 break;
1663 } 1687 }
1664 1688
1665skip_switch: ;
1666
1667#if defined(CURSOR_BLINK) 1689#if defined(CURSOR_BLINK)
1668 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1690 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1669 { 1691 {
1670 if (hidden_cursor) 1692 if (hidden_cursor)
1671 { 1693 {
1672 hidden_cursor = 0; 1694 hidden_cursor = 0;
1673 want_refresh = 1; 1695 want_refresh = 1;
1674 } 1696 }
1675 1697
1676 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1698 cursor_blink_ev.again ();
1677 } 1699 }
1678#endif 1700#endif
1679 1701
1680#if defined(POINTER_BLANK) 1702#if defined(POINTER_BLANK)
1681 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1703 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1682 { 1704 {
1683 if (ev.type == MotionNotify 1705 if (ev.type == MotionNotify
1684 || ev.type == ButtonPress 1706 || ev.type == ButtonPress
1685 || ev.type == ButtonRelease) 1707 || ev.type == ButtonRelease)
1686 if (hidden_pointer) 1708 if (hidden_pointer)
… …
1688 1710
1689 if (ev.type == KeyPress && hidden_pointer == 0) 1711 if (ev.type == KeyPress && hidden_pointer == 0)
1690 pointer_blank (); 1712 pointer_blank ();
1691 } 1713 }
1692#endif 1714#endif
1715
1716 refresh_check ();
1693} 1717}
1718
1719#if ENABLE_FRILLS
1720void
1721rxvt_term::set_urgency (bool enable)
1722{
1723 if (enable == urgency_hint)
1724 return;
1725
1726 if (XWMHints *h = XGetWMHints (dpy, parent[0]))
1727 {
1728 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1729 XSetWMHints (dpy, parent[0], h);
1730 urgency_hint = enable;
1731 }
1732}
1733#endif
1694 1734
1695void 1735void
1696rxvt_term::focus_in () 1736rxvt_term::focus_in ()
1697{ 1737{
1698 if (!focus) 1738 if (!focus)
1699 { 1739 {
1700 focus = 1; 1740 focus = 1;
1701 want_refresh = 1; 1741 want_refresh = 1;
1702 1742
1703 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1704
1705#if USE_XIM 1743#if USE_XIM
1706 if (Input_Context != NULL) 1744 if (Input_Context != NULL)
1707 { 1745 {
1708 IMSetStatusPosition (); 1746 IMSetPosition ();
1709 XSetICFocus (Input_Context); 1747 XSetICFocus (Input_Context);
1710 } 1748 }
1711#endif 1749#endif
1712#if CURSOR_BLINK 1750#if CURSOR_BLINK
1713 if (OPTION (Opt_cursorBlink)) 1751 if (option (Opt_cursorBlink))
1714 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1752 cursor_blink_ev.again ();
1715#endif 1753#endif
1716#if OFF_FOCUS_FADING 1754#if OFF_FOCUS_FADING
1717 if (rs[Rs_fade]) 1755 if (rs[Rs_fade])
1718 { 1756 {
1719 pix_colors = pix_colors_focused; 1757 pix_colors = pix_colors_focused;
1720 scr_recolour (); 1758 scr_recolour ();
1721 } 1759 }
1722#endif 1760#endif
1761#if ENABLE_FRILLS
1762 if (option (Opt_urgentOnBell))
1763 set_urgency (0);
1764#endif
1765
1766 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1723 } 1767 }
1724} 1768}
1725 1769
1726void 1770void
1727rxvt_term::focus_out () 1771rxvt_term::focus_out ()
… …
1729 if (focus) 1773 if (focus)
1730 { 1774 {
1731 focus = 0; 1775 focus = 0;
1732 want_refresh = 1; 1776 want_refresh = 1;
1733 1777
1734 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1778#if ENABLE_FRILLS
1735 1779 if (option (Opt_urgentOnBell))
1780 set_urgency (0);
1781#endif
1736#if ENABLE_FRILLS || ISO_14755 1782#if ENABLE_FRILLS || ISO_14755
1737 if (iso14755buf) 1783 if (iso14755buf)
1738 { 1784 {
1739 iso14755buf = 0; 1785 iso14755buf = 0;
1740# if ENABLE_OVERLAY 1786# if ISO_14755
1741 scr_overlay_off (); 1787 scr_overlay_off ();
1742# endif 1788# endif
1743 } 1789 }
1744#endif 1790#endif
1745#if USE_XIM 1791#if USE_XIM
1746 if (Input_Context != NULL) 1792 if (Input_Context != NULL)
1747 XUnsetICFocus (Input_Context); 1793 XUnsetICFocus (Input_Context);
1748#endif 1794#endif
1749#if CURSOR_BLINK 1795#if CURSOR_BLINK
1750 if (OPTION (Opt_cursorBlink)) 1796 if (option (Opt_cursorBlink))
1751 cursor_blink_ev.stop (); 1797 cursor_blink_ev.stop ();
1798
1752 hidden_cursor = 0; 1799 hidden_cursor = 0;
1753#endif 1800#endif
1754#if OFF_FOCUS_FADING 1801#if OFF_FOCUS_FADING
1755 if (rs[Rs_fade]) 1802 if (rs[Rs_fade])
1756 { 1803 {
1757 pix_colors = pix_colors_unfocused; 1804 pix_colors = pix_colors_unfocused;
1758 scr_recolour (); 1805 scr_recolour ();
1759 } 1806 }
1760#endif 1807#endif
1808
1809 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1810 }
1811}
1812
1813void
1814rxvt_term::update_fade_color (unsigned int idx)
1815{
1816#if OFF_FOCUS_FADING
1817 if (rs[Rs_fade])
1761 } 1818 {
1819 rgba c;
1820 pix_colors [Color_fade].get (c);
1821 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1822 }
1823#endif
1762} 1824}
1763 1825
1764#if TRANSPARENT 1826#if ENABLE_TRANSPARENCY || ENABLE_PERL
1765void 1827void
1766rxvt_term::rootwin_cb (XEvent &ev) 1828rxvt_term::rootwin_cb (XEvent &ev)
1767{ 1829{
1768 make_current (); 1830 make_current ();
1769 1831
1832 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1833 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1834 return;
1835
1836# if ENABLE_TRANSPARENCY
1770 switch (ev.type) 1837 switch (ev.type)
1771 { 1838 {
1772 case PropertyNotify: 1839 case PropertyNotify:
1773 /* 1840 /*
1774 * if user used some Esetroot compatible prog to set the root bg, 1841 * 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. 1842 * use the property to determine the pixmap. We use it later on.
1776 */ 1843 */
1777 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1844 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1778 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1845 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1779 return; 1846 {
1847 bg_set_root_pixmap ();
1848 update_background ();
1849 }
1780 1850
1781 /* FALLTHROUGH */
1782 case ReparentNotify:
1783 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1784 want_refresh = want_full_refresh = 1;
1785 break; 1851 break;
1786 } 1852 }
1853# endif
1854
1855 refresh_check ();
1787} 1856}
1788#endif 1857#endif
1789 1858
1790void 1859void
1791rxvt_term::button_press (XButtonEvent &ev) 1860rxvt_term::button_press (XButtonEvent &ev)
… …
1822 /* save the xbutton state (for ButtonRelease) */ 1891 /* save the xbutton state (for ButtonRelease) */
1823 MEvent.state = ev.state; 1892 MEvent.state = ev.state;
1824#ifdef MOUSE_REPORT_DOUBLECLICK 1893#ifdef MOUSE_REPORT_DOUBLECLICK
1825 if (ev.button == MEvent.button && clickintime) 1894 if (ev.button == MEvent.button && clickintime)
1826 { 1895 {
1827 /* same button, within alloted time */ 1896 /* same button, within allowed time */
1828 MEvent.clicks++; 1897 MEvent.clicks++;
1829 1898
1830 if (MEvent.clicks > 1) 1899 if (MEvent.clicks > 1)
1831 { 1900 {
1832 /* only report double clicks */ 1901 /* only report double clicks */
… …
1846 mouse_report (ev); 1915 mouse_report (ev);
1847 } 1916 }
1848#else 1917#else
1849 MEvent.button = ev.button; 1918 MEvent.button = ev.button;
1850 mouse_report (ev); 1919 mouse_report (ev);
1851#endif /* MOUSE_REPORT_DOUBLECLICK */ 1920#endif /* MOUSE_REPORT_DOUBLECLICK */
1852 1921
1853 } 1922 }
1854 else 1923 else
1855 { 1924 {
1856 if (ev.button != MEvent.button) 1925 if (ev.button != MEvent.button)
… …
1904 } 1973 }
1905 1974
1906 /* 1975 /*
1907 * Scrollbar window processing of button press 1976 * Scrollbar window processing of button press
1908 */ 1977 */
1909 if (isScrollbarWindow (ev.window)) 1978 if (scrollBar.state && ev.window == scrollBar.win)
1910 { 1979 {
1911 scrollBar.setIdle (); 1980 page_dirn direction = NO_DIR;
1981
1982 if (scrollBar.upButton (ev.y))
1983 direction = UP; /* up */
1984 else if (scrollBar.dnButton (ev.y))
1985 direction = DN; /* down */
1986
1987 scrollBar.state = STATE_IDLE;
1912 /* 1988 /*
1913 * Rxvt-style scrollbar: 1989 * Rxvt-style scrollbar:
1914 * move up if mouse is above slider 1990 * move up if mouse is above slider
1915 * move dn if mouse is below slider 1991 * move dn if mouse is below slider
1916 * 1992 *
… …
1925 /* 2001 /*
1926 * Mouse report disabled scrollbar: 2002 * Mouse report disabled scrollbar:
1927 * arrow buttons - send up/down 2003 * arrow buttons - send up/down
1928 * click on scrollbar - send pageup/down 2004 * click on scrollbar - send pageup/down
1929 */ 2005 */
1930 if ((scrollBar.style == R_SB_NEXT 2006 if (direction == UP)
1931 && scrollbarnext_upButton (ev.y))
1932 || (scrollBar.style == R_SB_RXVT
1933 && scrollbarrxvt_upButton (ev.y)))
1934 tt_printf ("\033[A"); 2007 tt_printf ("\033[A");
1935 else if ((scrollBar.style == R_SB_NEXT 2008 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"); 2009 tt_printf ("\033[B");
1940 else 2010 else
1941 switch (ev.button) 2011 switch (ev.button)
1942 { 2012 {
1943 case Button2: 2013 case Button2:
… …
1950 tt_printf ("\033[5~"); 2020 tt_printf ("\033[5~");
1951 break; 2021 break;
1952 } 2022 }
1953 } 2023 }
1954 else 2024 else
1955#endif /* NO_SCROLLBAR_REPORT */ 2025#endif /* NO_SCROLLBAR_REPORT */
1956
1957 {
1958 char upordown = 0;
1959
1960 if (scrollBar.style == R_SB_NEXT)
1961 { 2026 {
1962 if (scrollbarnext_upButton (ev.y)) 2027 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 { 2028 {
1976#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2029#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2030 if (!cont_scroll_ev.is_active ())
1977 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2031 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1978#endif 2032#endif
1979 if (scr_page (upordown < 0 ? UP : DN, 1)) 2033 if (scr_page (direction, 1))
1980 { 2034 {
1981 if (upordown < 0) 2035 if (direction == UP)
1982 scrollBar.setUp (); 2036 scrollBar.state = STATE_UP;
1983 else 2037 else
1984 scrollBar.setDn (); 2038 scrollBar.state = STATE_DOWN;
1985 } 2039 }
1986 } 2040 }
1987 else 2041 else
1988 switch (ev.button) 2042 switch (ev.button)
1989 { 2043 {
1990 case Button2: 2044 case Button2:
1991 switch (scrollbar_align) 2045 switch (scrollBar.align)
1992 { 2046 {
1993 case R_SB_ALIGN_TOP: 2047 case R_SB_ALIGN_TOP:
1994 csrO = 0; 2048 csrO = 0;
1995 break; 2049 break;
1996 case R_SB_ALIGN_CENTRE: 2050 case R_SB_ALIGN_CENTRE:
… …
2002 } 2056 }
2003 2057
2004 if (scrollBar.style == R_SB_XTERM 2058 if (scrollBar.style == R_SB_XTERM
2005 || scrollbar_above_slider (ev.y) 2059 || scrollbar_above_slider (ev.y)
2006 || scrollbar_below_slider (ev.y)) 2060 || scrollbar_below_slider (ev.y))
2007 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2061 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2008 2062
2009 scrollBar.setMotion (); 2063 scrollBar.state = STATE_MOTION;
2010 break; 2064 break;
2011 2065
2012 case Button1: 2066 case Button1:
2013 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2067 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2014 csrO = ev.y - scrollBar.top; 2068 csrO = ev.y - scrollBar.top;
2015 /* FALLTHROUGH */ 2069 /* FALLTHROUGH */
2016 2070
2017 case Button3: 2071 case Button3:
2018 if (scrollBar.style != R_SB_XTERM) 2072 if (scrollBar.style != R_SB_XTERM)
… …
2028 scr_page (DN, nrow - 1); 2082 scr_page (DN, nrow - 1);
2029# else 2083# else
2030 scr_page (DN, nrow / 4); 2084 scr_page (DN, nrow / 4);
2031# endif 2085# endif
2032 else 2086 else
2033 scrollBar.setMotion (); 2087 scrollBar.state = STATE_MOTION;
2034 } 2088 }
2035 else 2089 else
2036 { 2090 {
2037 scr_page ((ev.button == Button1 ? DN : UP), 2091 scr_page ((ev.button == Button1 ? DN : UP),
2038 (nrow 2092 (nrow
2039 * scrollbar_position (ev.y) 2093 * scrollbar_position (ev.y)
2040 / scrollbar_size ())); 2094 / scrollBar.size ()));
2041 } 2095 }
2042 2096
2043 break; 2097 break;
2044 } 2098 }
2045 } 2099 }
… …
2055 2109
2056 csrO = 0; /* reset csr Offset */ 2110 csrO = 0; /* reset csr Offset */
2057 if (!bypass_keystate) 2111 if (!bypass_keystate)
2058 reportmode = !! (priv_modes & PrivMode_mouse_report); 2112 reportmode = !! (priv_modes & PrivMode_mouse_report);
2059 2113
2060 if (scrollbar_isUpDn ()) 2114 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2061 { 2115 {
2062 scrollBar.setIdle (); 2116 scrollBar.state = STATE_IDLE;
2063 scrollbar_show (0); 2117 scrollBar.show (0);
2064 } 2118 }
2065 2119
2066#ifdef SELECTION_SCROLLING 2120#ifdef SELECTION_SCROLLING
2067 if (sel_scroll_ev.active)
2068 sel_scroll_ev.stop(); 2121 sel_scroll_ev.stop();
2069#endif 2122#endif
2070 2123
2071 if (ev.window == vt) 2124 if (ev.window == vt)
2072 { 2125 {
2073 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2126 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
… …
2097 mouse_report (ev); 2150 mouse_report (ev);
2098 } 2151 }
2099#else /* MOUSE_REPORT_DOUBLECLICK */ 2152#else /* MOUSE_REPORT_DOUBLECLICK */
2100 MEvent.button = AnyButton; 2153 MEvent.button = AnyButton;
2101 mouse_report (ev); 2154 mouse_report (ev);
2102#endif /* MOUSE_REPORT_DOUBLECLICK */ 2155#endif /* MOUSE_REPORT_DOUBLECLICK */
2103 return; 2156 return;
2104 } 2157 }
2105 2158
2106 /* 2159 /*
2107 * dumb hack to compensate for the failure of click-and-drag 2160 * dumb hack to compensate for the failure of click-and-drag
… …
2119 selection_make (ev.time); 2172 selection_make (ev.time);
2120 break; 2173 break;
2121 2174
2122 case Button2: 2175 case Button2:
2123 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2176 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); 2177 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2125 break; 2178 break;
2126 2179
2127#ifdef MOUSE_WHEEL 2180#ifdef MOUSE_WHEEL
2128 case Button4: 2181 case Button4:
2129 case Button5: 2182 case Button5:
… …
2133 2186
2134 v = ev.button == Button4 ? UP : DN; 2187 v = ev.button == Button4 ? UP : DN;
2135 2188
2136 if (ev.state & ShiftMask) 2189 if (ev.state & ShiftMask)
2137 i = 1; 2190 i = 1;
2138 else if (OPTION (Opt_mouseWheelScrollPage)) 2191 else if (option (Opt_mouseWheelScrollPage))
2139 i = nrow - 1; 2192 i = nrow - 1;
2140 else 2193 else
2141 i = 5; 2194 i = 5;
2142 2195
2143# ifdef MOUSE_SLIP_WHEELING 2196# ifdef MOUSE_SLIP_WHEELING
… …
2145 { 2198 {
2146 mouse_slip_wheel_speed += v ? -1 : 1; 2199 mouse_slip_wheel_speed += v ? -1 : 1;
2147 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2200 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2148 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2201 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2149 2202
2150 if (slip_wheel_ev.at < NOW) 2203 if (!slip_wheel_ev.is_active ())
2151 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2204 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2152
2153 slip_wheel_ev.start ();
2154 } 2205 }
2155 else 2206 else
2207# endif
2156 { 2208 {
2157# endif
2158 scr_page (v, i); 2209 scr_page (v, i);
2159 scrollbar_show (1); 2210 scrollBar.show (1);
2160# ifdef MOUSE_SLIP_WHEELING
2161 } 2211 }
2162# endif
2163 } 2212 }
2164 break; 2213 break;
2165#endif 2214#endif
2166 } 2215 }
2167 } 2216 }
2168} 2217}
2169 2218
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/*}}} */ 2219/*}}} */
2645 2220
2646bool 2221void
2647rxvt_term::cmd_parse () 2222rxvt_term::cmd_parse ()
2648{ 2223{
2649 bool flag = false;
2650 wchar_t ch = NOCHAR; 2224 wchar_t ch = NOCHAR;
2651 char *seq_begin; // remember start of esc-sequence here 2225 char *seq_begin; // remember start of esc-sequence here
2652 2226
2653 for (;;) 2227 for (;;)
2654 { 2228 {
2655 if (ch == NOCHAR) 2229 if (expect_false (ch == NOCHAR))
2656 { 2230 {
2657 seq_begin = cmdbuf_ptr; 2231 seq_begin = cmdbuf_ptr;
2658 ch = next_char (); 2232 ch = next_char ();
2659 2233
2660 if (ch == NOCHAR) 2234 if (ch == NOCHAR)
2661 break; 2235 break;
2662 } 2236 }
2663 2237
2664 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2238 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2665 { 2239 {
2666 if (!seen_input) 2240 if (expect_false (!seen_input))
2667 { 2241 {
2668 seen_input = 1; 2242 seen_input = 1;
2669 // many badly-written programs (e.g. jed) contain a race condition: 2243 // many badly-written programs (e.g. jed) contain a race condition:
2670 // they first read the screensize and then install a SIGWINCH handler. 2244 // they first read the screensize and then install a SIGWINCH handler.
2671 // some window managers resize the window early, and these programs 2245 // some window managers resize the window early, and these programs
… …
2684 wchar_t *str = buf; 2258 wchar_t *str = buf;
2685 wchar_t *eol = str + min (ncol, UBUFSIZ); 2259 wchar_t *eol = str + min (ncol, UBUFSIZ);
2686 2260
2687 for (;;) 2261 for (;;)
2688 { 2262 {
2689 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2263 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2690 break; 2264 break;
2691 2265
2692 *str++ = ch; 2266 *str++ = ch;
2693 2267
2694 if (ch == C0_LF || str >= eol) 2268 if (expect_false (ch == C0_LF || str >= eol))
2695 { 2269 {
2696 if (ch == C0_LF) 2270 if (ch == C0_LF)
2697 nlines++; 2271 nlines++;
2698 2272
2699 refresh_count++; 2273 refresh_count++;
2700 2274
2701 if (!OPTION (Opt_jumpScroll) 2275 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2702 || (refresh_count >= refresh_limit * (nrow - 1)))
2703 { 2276 {
2704 refreshnow = true;
2705 refresh_count = 0; 2277 refresh_count = 0;
2278
2279 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2280 {
2281 refreshnow = true;
2706 ch = NOCHAR; 2282 ch = NOCHAR;
2707 break; 2283 break;
2284 }
2708 } 2285 }
2709 2286
2710 // scr_add_lines only works for nlines <= nrow - 1. 2287 // scr_add_lines only works for nlines <= nrow - 1.
2711 if (nlines >= nrow - 1) 2288 if (nlines >= nrow - 1)
2712 { 2289 {
… …
2740 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2317 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2741 scr_add_lines (buf, str - buf, nlines); 2318 scr_add_lines (buf, str - buf, nlines);
2742 2319
2743 /* 2320 /*
2744 * If there have been a lot of new lines, then update the screen 2321 * 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. 2322 * 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 2323 * if skipScroll is enabled.
2747 * is incremented here because we must be doing flat-out scrolling.
2748 */ 2324 */
2749 if (refreshnow) 2325 if (refreshnow)
2750 { 2326 {
2751 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2752 refresh_limit++;
2753 else
2754 {
2755 flag = true;
2756 scr_refresh (); 2327 scr_refresh ();
2757 want_refresh = 1; 2328 want_refresh = 1;
2758 }
2759 } 2329 }
2760
2761 } 2330 }
2762 else 2331 else
2763 { 2332 {
2764 try 2333 try
2765 { 2334 {
… …
2773 } 2342 }
2774 2343
2775 ch = NOCHAR; 2344 ch = NOCHAR;
2776 } 2345 }
2777 } 2346 }
2778
2779 return flag;
2780} 2347}
2781 2348
2782// read the next character 2349// read the next character
2783wchar_t 2350wchar_t
2784rxvt_term::next_char () NOTHROW 2351rxvt_term::next_char () NOTHROW
2785{ 2352{
2786 while (cmdbuf_ptr < cmdbuf_endp) 2353 while (cmdbuf_ptr < cmdbuf_endp)
2787 { 2354 {
2788 // assume 7-bit to be ascii ALWAYS 2355 // assume 7-bit to be ascii ALWAYS
2789 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2356 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2790 return *cmdbuf_ptr++; 2357 return *cmdbuf_ptr++;
2791 2358
2792 wchar_t wc; 2359 wchar_t wc;
2793 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2360 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2794 2361
… …
2798 cmdbuf_ptr = cmdbuf_endp; 2365 cmdbuf_ptr = cmdbuf_endp;
2799 break; 2366 break;
2800 } 2367 }
2801 2368
2802 if (len == (size_t)-1) 2369 if (len == (size_t)-1)
2370 {
2371 mbstate.reset (); // reset now undefined conversion state
2803 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2372 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2373 }
2804 2374
2805 // assume wchar == unicode 2375 // assume wchar == unicode
2806 cmdbuf_ptr += len; 2376 cmdbuf_ptr += len;
2807 return wc & UNICODE_MASK; 2377 return wc & UNICODE_MASK;
2808 } 2378 }
… …
2852/*----------------------------------------------------------------------*/ 2422/*----------------------------------------------------------------------*/
2853#ifdef PRINTPIPE 2423#ifdef PRINTPIPE
2854FILE * 2424FILE *
2855rxvt_term::popen_printer () 2425rxvt_term::popen_printer ()
2856{ 2426{
2857 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2427 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2858 2428
2859 if (stream == NULL) 2429 if (stream == NULL)
2860 rxvt_warn ("can't open printer pipe, not printing.\n"); 2430 rxvt_warn ("can't open printer pipe, not printing.\n");
2861 2431
2862 return stream; 2432 return stream;
… …
2873 * simulate attached vt100 printer 2443 * simulate attached vt100 printer
2874 */ 2444 */
2875void 2445void
2876rxvt_term::process_print_pipe () 2446rxvt_term::process_print_pipe ()
2877{ 2447{
2878 int done; 2448 FILE *fd = popen_printer ();
2879 FILE *fd;
2880 2449
2881 if ((fd = popen_printer ()) == NULL) 2450 if (!fd)
2882 return; 2451 return;
2883 2452
2884 /* 2453 /*
2885 * Send all input to the printer until either ESC[4i or ESC[?4i 2454 * Send all input to the printer until either ESC[4i or ESC[?4i
2886 * is received. 2455 * is received.
2887 */ 2456 */
2888 for (done = 0; !done;) 2457 for (int done = 0; !done; )
2889 { 2458 {
2890 unsigned char buf[8]; 2459 unsigned char buf[8];
2891 unicode_t ch; 2460 unicode_t ch;
2892 unsigned int i, len; 2461 unsigned int i, len;
2893 2462
… …
2912 { 2481 {
2913 if ((buf[len++] = cmd_getc ()) == 'i') 2482 if ((buf[len++] = cmd_getc ()) == 'i')
2914 break; /* done = 1 */ 2483 break; /* done = 1 */
2915 } 2484 }
2916 } 2485 }
2917 2486
2918 for (i = 0; i < len; i++) 2487 for (i = 0; i < len; i++)
2919 if (putc (buf[i], fd) == EOF) 2488 if (putc (buf[i], fd) == EOF)
2920 { 2489 {
2921 done = 1; 2490 done = 1;
2922 break; 2491 break;
… …
2924 } 2493 }
2925 } 2494 }
2926 2495
2927 pclose_printer (fd); 2496 pclose_printer (fd);
2928} 2497}
2929#endif /* PRINTPIPE */ 2498#endif /* PRINTPIPE */
2930/*}}} */ 2499/*}}} */
2931 2500
2932/* *INDENT-OFF* */ 2501/* *INDENT-OFF* */
2933enum { 2502enum {
2934 C1_40 = 0x40, 2503 C1_40 = 0x40,
… …
2984 process_dcs_seq (); 2553 process_dcs_seq ();
2985 break; 2554 break;
2986 case 0x9b: /* CSI */ 2555 case 0x9b: /* CSI */
2987 process_csi_seq (); 2556 process_csi_seq ();
2988 break; 2557 break;
2989 case 0x9d: /* CSI */ 2558 case 0x9d: /* OSC */
2990 process_osc_seq (); 2559 process_osc_seq ();
2991 break; 2560 break;
2992#endif 2561#endif
2993 } 2562 }
2994} 2563}
… …
3038 break; 2607 break;
3039 case 'Z': /* identify the terminal type */ 2608 case 'Z': /* identify the terminal type */
3040 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2609 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
3041 break; 2610 break;
3042 case '<': /* turn off VT52 mode */ 2611 case '<': /* turn off VT52 mode */
3043 PrivMode (0, PrivMode_vt52); 2612 set_privmode (PrivMode_vt52, 0);
3044 break; 2613 break;
3045 case 'F': /* use special graphics character set */ 2614 case 'F': /* use special graphics character set */
3046 case 'G': /* use regular character set */ 2615 case 'G': /* use regular character set */
3047 /* unimplemented */ 2616 /* unimplemented */
3048 break; 2617 break;
… …
3084 scr_charset_set (2, (unsigned int)cmd_getc ()); 2653 scr_charset_set (2, (unsigned int)cmd_getc ());
3085 break; 2654 break;
3086 case '+': 2655 case '+':
3087 scr_charset_set (3, (unsigned int)cmd_getc ()); 2656 scr_charset_set (3, (unsigned int)cmd_getc ());
3088 break; 2657 break;
3089#if ENABLE_FRILLS 2658#if !ENABLE_MINIMAL
3090 case '6': 2659 case '6':
3091 scr_backindex (); 2660 scr_backindex ();
3092 break; 2661 break;
3093#endif 2662#endif
3094 case '7': 2663 case '7':
3095 scr_cursor (SAVE); 2664 scr_cursor (SAVE);
3096 break; 2665 break;
3097 case '8': 2666 case '8':
3098 scr_cursor (RESTORE); 2667 scr_cursor (RESTORE);
3099 break; 2668 break;
3100#if ENABLE_FRILLS 2669#if !ENABLE_MINIMAL
3101 case '9': 2670 case '9':
3102 scr_forwardindex (); 2671 scr_forwardindex ();
3103 break; 2672 break;
3104#endif 2673#endif
3105 case '=': 2674 case '=':
3106 case '>': 2675 case '>':
3107 PrivMode ((ch == '='), PrivMode_aplKP); 2676 set_privmode (PrivMode_aplKP, ch == '=');
3108 break; 2677 break;
3109 2678
3110 case C1_40: 2679 case C1_40:
3111 cmd_getc (); 2680 cmd_getc ();
3112 break; 2681 break;
… …
3116 2685
3117 /* 8.3.87: NEXT LINE */ 2686 /* 8.3.87: NEXT LINE */
3118 case C1_NEL: /* ESC E */ 2687 case C1_NEL: /* ESC E */
3119 { 2688 {
3120 wchar_t nlcr[] = { C0_LF, C0_CR }; 2689 wchar_t nlcr[] = { C0_LF, C0_CR };
3121 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2690 scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1);
3122 } 2691 }
3123 break; 2692 break;
3124 2693
3125 /* kidnapped escape sequence: Should be 8.3.48 */ 2694 /* kidnapped escape sequence: Should be 8.3.48 */
3126 case C1_ESA: /* ESC G */ 2695 case C1_ESA: /* ESC G */
… …
3151 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2720 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3152 case C1_SCI: /* ESC Z */ 2721 case C1_SCI: /* ESC Z */
3153 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2722 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3154 break; /* steal obsolete ESC [ c */ 2723 break; /* steal obsolete ESC [ c */
3155 2724
3156 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2725 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
3157 case C1_CSI: /* ESC [ */ 2726 case C1_CSI: /* ESC [ */
3158 process_csi_seq (); 2727 process_csi_seq ();
3159 break; 2728 break;
3160 2729
3161 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2730 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
3162 case C1_OSC: /* ESC ] */ 2731 case C1_OSC: /* ESC ] */
3163 process_osc_seq (); 2732 process_osc_seq ();
3164 break; 2733 break;
3165 2734
3166 /* 8.3.106: RESET TO INITIAL STATE */ 2735 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
3167 case 'c': 2736 case 'c':
3168 mbstate.reset (); 2737 mbstate.reset ();
3169 scr_poweron (); 2738 scr_poweron ();
3170 scrollbar_show (1); 2739 scrollBar.show (1);
3171 break; 2740 break;
3172 2741
3173 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2742 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
3174 case 'n': 2743 case 'n':
3175 scr_charset_choose (2); 2744 scr_charset_choose (2);
… …
3195 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2764 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 , 2765 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 2766 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
3198}; 2767};
3199 2768
3200#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2769#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
3201 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2770 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
3202 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2771 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
3203#define get_byte_array_bit(array, bit) \ 2772#define get_byte_array_bit(array, bit) \
3204 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2773 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
3205 2774
3206const unsigned char csi_defaults[] = 2775static const unsigned char csi_defaults[] =
3207 { 2776 {
3208 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2777 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, */ 2778 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, */ 2779 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, [, \, ], ^, _, */ 2780 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
… …
3220rxvt_term::process_csi_seq () 2789rxvt_term::process_csi_seq ()
3221{ 2790{
3222 unicode_t ch, priv, i; 2791 unicode_t ch, priv, i;
3223 unsigned int nargs, p; 2792 unsigned int nargs, p;
3224 int n, ndef; 2793 int n, ndef;
3225 int arg[ESC_ARGS]; 2794 int arg[ESC_ARGS] = { };
3226 2795
3227 for (nargs = ESC_ARGS; nargs > 0;) 2796 nargs = 0;
3228 arg[--nargs] = 0;
3229 2797
3230 priv = 0; 2798 priv = 0;
3231 ch = cmd_getc (); 2799 ch = cmd_getc ();
3232 if (ch >= '<' && ch <= '?') 2800 if ((ch >= '<' && ch <= '?') || ch == '!')
2801 {
3233 { /* '<' '=' '>' '?' */ 2802 /* '<' '=' '>' '?' '!' */
3234 priv = ch; 2803 priv = ch;
3235 ch = cmd_getc (); 2804 ch = cmd_getc ();
3236 } 2805 }
3237 2806
3238 /* read any numerical arguments */ 2807 /* read any numerical arguments */
… …
3277 switch (priv) 2846 switch (priv)
3278 { 2847 {
3279 case '>': 2848 case '>':
3280 if (ch == CSI_DA) /* secondary device attributes */ 2849 if (ch == CSI_DA) /* secondary device attributes */
3281 { 2850 {
3282 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, 2851 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
3283 // 'U' for rxvt-unicode <= 7.2, and Mm85 (e.g. 7385 for 7.3) for later versions. 2852 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3284 // 2853 //
3285 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2854 // 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 2855 // 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). 2856 // versions.
3288 // 2857 //
3289 tt_printf ("\033[>%c%c85;94;0c", VERSION[0], VERSION[2]); 2858 tt_printf ("\033[>%d;95;0c", 'U');
3290 } 2859 }
3291 break; 2860 break;
2861
3292 case '?': 2862 case '?':
3293 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2863 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3294 process_terminal_mode (ch, priv, nargs, arg); 2864 process_terminal_mode (ch, priv, nargs, arg);
3295 break; 2865 break;
2866
2867 case '!':
2868 if (ch == CSI_70)
2869 {
2870 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2871 scr_soft_reset ();
2872
2873 static const int pm_h[] = { 7, 25 };
2874 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2875
2876 process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h);
2877 process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l);
3296 } 2878 }
2879 break;
2880 }
2881
3297 return; 2882 return;
3298 } 2883 }
3299 2884
3300 switch (ch) 2885 switch (ch)
3301 { 2886 {
… …
3421 break; 3006 break;
3422 case 6: /* CPR requested */ 3007 case 6: /* CPR requested */
3423 scr_report_position (); 3008 scr_report_position ();
3424 break; 3009 break;
3425 case 7: /* unofficial extension */ 3010 case 7: /* unofficial extension */
3426 if (OPTION (Opt_insecure)) 3011 if (option (Opt_insecure))
3427 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3012 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3428 break; 3013 break;
3429 case 8: /* unofficial extension */ 3014 case 8: /* unofficial extension */
3430 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3015 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3431 break; 3016 break;
… …
3498 break; 3083 break;
3499 case CSI_75: 3084 case CSI_75:
3500 scr_cursor (RESTORE); 3085 scr_cursor (RESTORE);
3501 break; 3086 break;
3502 3087
3503#if ENABLE_FRILLS 3088#if !ENABLE_MINIMAL
3504 case CSI_74: 3089 case CSI_74:
3505 process_window_ops (arg, nargs); 3090 process_window_ops (arg, nargs);
3506 break; 3091 break;
3507#endif 3092#endif
3508 3093
… …
3515 break; 3100 break;
3516 } 3101 }
3517} 3102}
3518/*}}} */ 3103/*}}} */
3519 3104
3520#if ENABLE_FRILLS 3105#if !ENABLE_MINIMAL
3521/* ARGSUSED */ 3106/* ARGSUSED */
3522void 3107void
3523rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3108rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3524{ 3109{
3525 int x, y; 3110 int x, y;
3526 XWindowAttributes wattr; 3111 XWindowAttributes wattr;
3527 Window wdummy; 3112 Window wdummy;
3528 3113
3529 dLocal (Display *, xdisp); 3114 dLocal (Display *, dpy);
3530 3115
3531 if (nargs == 0) 3116 if (nargs == 0)
3532 return; 3117 return;
3533 3118
3534 switch (args[0]) 3119 switch (args[0])
3535 { 3120 {
3536 /* 3121 /*
3537 * commands 3122 * commands
3538 */ 3123 */
3539 case 1: /* deiconify window */ 3124 case 1: /* deiconify window */
3540 XMapWindow (xdisp, parent[0]); 3125 XMapWindow (dpy, parent[0]);
3541 break; 3126 break;
3542 case 2: /* iconify window */ 3127 case 2: /* iconify window */
3543 XIconifyWindow (xdisp, parent[0], display->screen); 3128 XIconifyWindow (dpy, parent[0], display->screen);
3544 break; 3129 break;
3545 case 3: /* set position (pixels) */ 3130 case 3: /* set position (pixels) */
3546 XMoveWindow (xdisp, parent[0], args[1], args[2]); 3131 XMoveWindow (dpy, parent[0], args[1], args[2]);
3547 break; 3132 break;
3548 case 4: /* set size (pixels) */ 3133 case 4: /* set size (pixels) */
3549 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3134 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3550 break; 3135 break;
3551 case 5: /* raise window */ 3136 case 5: /* raise window */
3552 XRaiseWindow (xdisp, parent[0]); 3137 XRaiseWindow (dpy, parent[0]);
3553 break; 3138 break;
3554 case 6: /* lower window */ 3139 case 6: /* lower window */
3555 XLowerWindow (xdisp, parent[0]); 3140 XLowerWindow (dpy, parent[0]);
3556 break; 3141 break;
3557 case 7: /* refresh window */ 3142 case 7: /* refresh window */
3558 scr_touch (true); 3143 scr_touch (true);
3559 break; 3144 break;
3560 case 8: /* set size (chars) */ 3145 case 8: /* set size (chars) */
… …
3567 if (args[0] >= 24) /* set height (chars) */ 3152 if (args[0] >= 24) /* set height (chars) */
3568 set_widthheight ((unsigned int)width, 3153 set_widthheight ((unsigned int)width,
3569 (unsigned int) (args[1] * fheight)); 3154 (unsigned int) (args[1] * fheight));
3570 break; 3155 break;
3571 3156
3572
3573 /* 3157 /*
3574 * reports - some output format copied from XTerm 3158 * reports - some output format copied from XTerm
3575 */ 3159 */
3576 case 11: /* report window state */ 3160 case 11: /* report window state */
3577 XGetWindowAttributes (xdisp, parent[0], &wattr); 3161 XGetWindowAttributes (dpy, parent[0], &wattr);
3578 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3162 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3579 break; 3163 break;
3580 case 13: /* report window position */ 3164 case 13: /* report window position */
3581 XGetWindowAttributes (xdisp, parent[0], &wattr); 3165 XGetWindowAttributes (dpy, parent[0], &wattr);
3582 XTranslateCoordinates (xdisp, parent[0], wattr.root, 3166 XTranslateCoordinates (dpy, parent[0], wattr.root,
3583 -wattr.border_width, -wattr.border_width, 3167 -wattr.border_width, -wattr.border_width,
3584 &x, &y, &wdummy); 3168 &x, &y, &wdummy);
3585 tt_printf ("\033[3;%d;%dt", x, y); 3169 tt_printf ("\033[3;%d;%dt", x, y);
3586 break; 3170 break;
3587 case 14: /* report window size (pixels) */ 3171 case 14: /* report window size (pixels) */
3588 XGetWindowAttributes (xdisp, parent[0], &wattr); 3172 XGetWindowAttributes (dpy, parent[0], &wattr);
3589 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3173 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3590 break; 3174 break;
3591 case 18: /* report text area size (chars) */ 3175 case 18: /* report text area size (chars) */
3592 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3176 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3593 break; 3177 break;
… …
3595 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3179 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3596 break; 3180 break;
3597 case 20: /* report icon label */ 3181 case 20: /* report icon label */
3598 { 3182 {
3599 char *s; 3183 char *s;
3600 XGetIconName (xdisp, parent[0], &s); 3184 XGetIconName (dpy, parent[0], &s);
3601 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3185 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3602 XFree (s); 3186 XFree (s);
3603 } 3187 }
3604 break; 3188 break;
3605 case 21: /* report window title */ 3189 case 21: /* report window title */
3606 { 3190 {
3607 char *s; 3191 char *s;
3608 XFetchName (xdisp, parent[0], &s); 3192 XFetchName (dpy, parent[0], &s);
3609 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3193 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3610 XFree (s); 3194 XFree (s);
3611 } 3195 }
3612 break; 3196 break;
3613 } 3197 }
3614} 3198}
… …
3641 seen_esc = true; 3225 seen_esc = true;
3642 continue; 3226 continue;
3643 } 3227 }
3644 else if (ch == C0_BEL || ch == CHAR_ST) 3228 else if (ch == C0_BEL || ch == CHAR_ST)
3645 break; 3229 break;
3230 else if (ch == C0_SYN)
3231 ch = cmd_get8 ();
3646 else if (ch < 0x20) 3232 else if (ch < 0x20)
3647 return NULL; /* other control character - exit */ 3233 return NULL; /* other control character - exit */
3648 3234
3649 seen_esc = false; 3235 seen_esc = false;
3650 3236
3651 if (n >= STRING_MAX - 1) 3237 if (n >= STRING_MAX - 1)
3652 // stop at some sane length 3238 // stop at some sane length
3653 return NULL; 3239 return NULL;
3654 3240
3655 if (ch == C0_SYN)
3656 string[n++] = cmd_get8 ();
3657 else
3658 string[n++] = ch; 3241 string[n++] = ch;
3659 } 3242 }
3660 3243
3661 string[n++] = '\0'; 3244 string[n++] = '\0';
3662 3245
3663 ends_how = (ch == 0x5c ? C0_ESC : ch); 3246 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3670 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3253 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3671 */ 3254 */
3672void 3255void
3673rxvt_term::process_dcs_seq () 3256rxvt_term::process_dcs_seq ()
3674{ 3257{
3675 char *s;
3676 unicode_t eh;
3677
3678 /* 3258 /*
3679 * Not handled yet 3259 * Not handled yet
3680 */ 3260 */
3261
3262 unicode_t eh;
3681 s = get_to_st (eh); 3263 char *s = get_to_st (eh);
3682 if (s) 3264 if (s)
3683 free (s); 3265 free (s);
3684 3266
3685 return; 3267 return;
3686} 3268}
… …
3690 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3272 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3691 */ 3273 */
3692void 3274void
3693rxvt_term::process_osc_seq () 3275rxvt_term::process_osc_seq ()
3694{ 3276{
3695 unicode_t ch, eh;
3696 int arg; 3277 int arg;
3697 3278
3698 ch = cmd_getc (); 3279 unicode_t ch = cmd_getc ();
3699 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3280 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3700 arg = arg * 10 + (ch - '0'); 3281 arg = arg * 10 + (ch - '0');
3701 3282
3702 if (ch == ';') 3283 if (ch == ';')
3703 { 3284 {
3285 unicode_t eh;
3704 char *s = get_to_st (eh); 3286 char *s = get_to_st (eh);
3705 3287
3706 if (s) 3288 if (s)
3707 { 3289 {
3708 process_xterm_seq (arg, s, eh); 3290 process_xterm_seq (arg, s, eh);
… …
3714void 3296void
3715rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3297rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3716{ 3298{
3717 if (str[0] == '?' && !str[1]) 3299 if (str[0] == '?' && !str[1])
3718 { 3300 {
3719 unsigned short r, g, b; 3301 rgba c;
3720 pix_colors_focused[color].get (this, r, g, b); 3302 pix_colors_focused[color].get (c);
3303
3304#if XFT
3305 if (c.a != rgba::MAX_CC)
3306 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3307 else
3308#endif
3721 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3309 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3722 } 3310 }
3723 else 3311 else
3724 set_window_color (color, str); 3312 set_window_color (color, str);
3725} 3313}
3726 3314
3727/* 3315/*
3728 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3316 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3729 */ 3317 */
3730void 3318void
3731rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3319rxvt_term::process_xterm_seq (int op, char *str, char resp)
3732{ 3320{
3733 int color; 3321 int color;
3734 char *buf, *name; 3322 char *buf, *name;
3735 bool query = str[0] == '?' && !str[1]; 3323 bool query = str[0] == '?' && !str[1];
3736 int saveop = op; 3324 int saveop = op;
3737 3325
3738 dLocal (Display *, xdisp); 3326 dLocal (Display *, dpy);
3739 3327
3740 assert (str != NULL); 3328 assert (str != NULL);
3329
3330 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3331 return;
3332
3741 switch (op) 3333 switch (op)
3742 { 3334 {
3743 case XTerm_name: 3335 case XTerm_name:
3744 set_title (str); 3336 set_title (str);
3745 /* FALLTHROUGH */ 3337 /* FALLTHROUGH */
… …
3759 unsigned long bytes_after; 3351 unsigned long bytes_after;
3760 unsigned char *value = 0; 3352 unsigned char *value = 0;
3761 const char *str = ""; 3353 const char *str = "";
3762 3354
3763 if (prop 3355 if (prop
3764 && XGetWindowProperty (xdisp, parent[0], 3356 && XGetWindowProperty (dpy, parent[0],
3765 prop, 0, 1<<16, 0, AnyPropertyType, 3357 prop, 0, 1<<16, 0, AnyPropertyType,
3766 &actual_type, &actual_format, 3358 &actual_type, &actual_format,
3767 &nitems, &bytes_after, &value) == Success 3359 &nitems, &bytes_after, &value) == Success
3768 && actual_type != None 3360 && actual_type != None
3769 && actual_format == 8) 3361 && actual_format == 8)
3770 str = (const char *)(value); 3362 str = (const char *)(value);
3771 3363
3772 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3364 tt_printf ("\033]%d;%s%c", op, str, resp);
3773 3365
3774 XFree (value); 3366 XFree (value);
3775 } 3367 }
3776 else 3368 else
3777 { 3369 {
3778 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3370 char *eq = strchr (str, '=');
3779 3371
3780 if (eq) 3372 if (eq)
3781 { 3373 {
3782 *eq = 0; 3374 *eq = 0;
3783 set_utf8_property (display->atom (str), eq + 1); 3375 set_utf8_property (display->atom (str), eq + 1);
3784 } 3376 }
3785 else 3377 else
3786 XDeleteProperty (xdisp, parent[0], 3378 XDeleteProperty (dpy, parent[0],
3787 display->atom (str)); 3379 display->atom (str));
3788 } 3380 }
3789 break; 3381 break;
3790 3382
3791 case XTerm_Color: 3383 case XTerm_Color:
… …
3801 break; 3393 break;
3802 3394
3803 if ((buf = strchr (name, ';')) != NULL) 3395 if ((buf = strchr (name, ';')) != NULL)
3804 *buf++ = '\0'; 3396 *buf++ = '\0';
3805 3397
3806 if (name[0] == '?' && !name[1]) 3398 process_color_seq (op, color, name, resp);
3399 }
3400 break;
3401 case Rxvt_restoreFG:
3402 case XTerm_Color00:
3403 process_color_seq (op, Color_fg, str, resp);
3404 break;
3405 case Rxvt_restoreBG:
3406 case XTerm_Color01:
3407 process_color_seq (op, Color_bg, str, resp);
3408 break;
3409#ifndef NO_CURSORCOLOR
3410 case XTerm_Color_cursor:
3411 process_color_seq (op, Color_cursor, str, resp);
3412 break;
3413#endif
3414 case XTerm_Color_pointer_fg:
3415 process_color_seq (op, Color_pointer_fg, str, resp);
3416 break;
3417 case XTerm_Color_pointer_bg:
3418 process_color_seq (op, Color_pointer_bg, str, resp);
3419 break;
3420#ifdef OPTION_HC
3421 case XTerm_Color_HC:
3422 process_color_seq (op, Color_HC, str, resp);
3423 break;
3424 case XTerm_Color_HTC:
3425 process_color_seq (op, Color_HTC, str, resp);
3426 break;
3427#endif
3428#ifndef NO_BOLD_UNDERLINE_REVERSE
3429 case URxvt_Color_BD:
3430 process_color_seq (op, Color_BD, str, resp);
3431 break;
3432 case URxvt_Color_UL:
3433 process_color_seq (op, Color_UL, str, resp);
3434 break;
3435 case URxvt_Color_IT:
3436 process_color_seq (op, Color_IT, str, resp);
3437 break;
3438#endif
3439 case URxvt_Color_border:
3440 process_color_seq (op, Color_border, str, resp);
3441 break;
3442#if ENABLE_TRANSPARENCY
3443 case URxvt_Color_tint:
3444 process_color_seq (op, Color_tint, str, resp);
3445 {
3446 bool changed = false;
3447
3448 if (ISSET_PIXCOLOR (Color_tint))
3449 changed = bg_set_tint (pix_colors_focused [Color_tint]);
3450
3451 if (changed)
3452 update_background ();
3453 }
3454
3455 break;
3456#endif
3457
3458#if BG_IMAGE_FROM_FILE
3459 case Rxvt_Pixmap:
3460 if (!strcmp (str, "?"))
3461 {
3462 char str[256];
3463
3464 sprintf (str, "[%dx%d+%d+%d]",
3465 min (h_scale, 32767), min (v_scale, 32767),
3466 min (h_align, 32767), min (v_align, 32767));
3467 process_xterm_seq (XTerm_title, str, CHAR_ST);
3468 }
3469 else
3470 {
3471 int changed = 0;
3472
3473 if (*str != ';')
3807 { 3474 {
3808 unsigned short r, g, b; 3475 if (bg_set_file (str)) /* change pixmap */
3809 pix_colors_focused[color].get (this, r, g, b); 3476 {
3810 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3477 changed++;
3478 str = strchr (str, ';');
3479 if (str == NULL)
3480 bg_set_default_geometry ();
3481 else
3482 bg_set_geometry (str+1);
3483 }
3811 } 3484 }
3812 else 3485 else
3813 set_window_color (color, name); 3486 {
3487 str++;
3488 if (bg_set_geometry (str, true))
3489 changed++;
3490 }
3491
3492 if (changed)
3493 {
3494 if (bg_window_position_sensitive ())
3495 {
3496 int x, y;
3497 get_window_origin (x, y);
3498 bg_set_position (x, y);
3499 }
3500 update_background ();
3501 }
3814 } 3502 }
3815 break; 3503 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 3504#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 3505
3896 case XTerm_logfile: 3506 case XTerm_logfile:
3897 // TODO, when secure mode? 3507 // TODO, when secure mode?
3898 break; 3508 break;
3899 3509
… …
3917 case URxvt_italicFont: 3527 case URxvt_italicFont:
3918 case URxvt_boldItalicFont: 3528 case URxvt_boldItalicFont:
3919#endif 3529#endif
3920 if (query) 3530 if (query)
3921 tt_printf ("\33]%d;%-.250s%c", saveop, 3531 tt_printf ("\33]%d;%-.250s%c", saveop,
3922 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3532 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3923 ? fontset[op - URxvt_font]->fontdesc : "", 3533 ? fontset[op - URxvt_font]->fontdesc : "",
3924 resp); 3534 resp);
3925 else 3535 else
3926 { 3536 {
3927 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3537 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3930 allocated.push_back ((void *)res); 3540 allocated.push_back ((void *)res);
3931 set_fonts (); 3541 set_fonts ();
3932 } 3542 }
3933 break; 3543 break;
3934 3544
3935#if ENABLE_FRILLS 3545 case URxvt_version:
3546 if (query)
3547 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3548 op,
3549 rs[Rs_name], VERSION[0], VERSION[2],
3550 resp);
3551 break;
3552
3553#if !ENABLE_MINIMAL
3936 case URxvt_locale: 3554 case URxvt_locale:
3937 if (query) 3555 if (query)
3938 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3556 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3939 else 3557 else
3940 { 3558 {
3941 set_locale (str); 3559 set_locale (str);
3942 pty->set_utf8_mode (enc_utf8); 3560 pty->set_utf8_mode (enc_utf8);
3943 init_xlocale (); 3561 init_xlocale ();
… …
3958 break; 3576 break;
3959#endif 3577#endif
3960 3578
3961#if ENABLE_PERL 3579#if ENABLE_PERL
3962 case URxvt_perl: 3580 case URxvt_perl:
3963 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 3581 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3964 ; // no responses yet
3965 break; 3582 break;
3966#endif 3583#endif
3967 } 3584 }
3968} 3585}
3969/*----------------------------------------------------------------------*/ 3586/*----------------------------------------------------------------------*/
… …
3992 { 3609 {
3993 if (mode == 'r') 3610 if (mode == 'r')
3994 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3611 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3995 else 3612 else
3996 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3613 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3997 PrivMode (state, bit); 3614
3615 set_privmode (bit, state);
3998 } 3616 }
3999 3617
4000 return state; 3618 return state;
4001} 3619}
4002 3620
… …
4006{ 3624{
4007 unsigned int i, j; 3625 unsigned int i, j;
4008 int state; 3626 int state;
4009 3627
4010 static const struct 3628 static const struct
4011 { 3629 {
4012 const int argval; 3630 const int argval;
4013 const unsigned long bit; 3631 const unsigned long bit;
4014 }
4015
4016 argtopriv[] = { 3632 } argtopriv[] = {
4017 { 1, PrivMode_aplCUR }, 3633 { 1, PrivMode_aplCUR }, // DECCKM
4018 { 2, PrivMode_vt52 }, 3634 { 2, PrivMode_vt52 },
4019 { 3, PrivMode_132 }, 3635 { 3, PrivMode_132 }, // DECCOLM
4020 { 4, PrivMode_smoothScroll }, 3636 { 4, PrivMode_smoothScroll }, // DECSCLM
4021 { 5, PrivMode_rVideo }, 3637 { 5, PrivMode_rVideo }, // DECSCNM
4022 { 6, PrivMode_relOrigin }, 3638 { 6, PrivMode_relOrigin }, // DECOM
4023 { 7, PrivMode_Autowrap }, 3639 { 7, PrivMode_Autowrap }, // DECAWM
4024 // 8, bi-directional support mode 3640 // 8, auto-repeat keys // DECARM
4025 { 9, PrivMode_MouseX10 }, 3641 { 9, PrivMode_MouseX10 },
4026 // 18, 19 printing-related 3642 // 18 end FF to printer after print screen
3643 // 19 Print screen prints full screen/scroll region
4027 { 25, PrivMode_VisibleCursor }, 3644 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
4028#ifdef scrollBar_esc 3645#ifdef scrollBar_esc
4029 { scrollBar_esc, PrivMode_scrollBar }, 3646 { scrollBar_esc, PrivMode_scrollBar },
4030#endif 3647#endif
4031 { 35, PrivMode_ShiftKeys }, // rxvt extension 3648 { 35, PrivMode_ShiftKeys }, // rxvt extension
3649 // 38, tektronix mode // DECTEK
4032 { 40, PrivMode_132OK }, 3650 { 40, PrivMode_132OK },
4033 // 41 xterm more fixes NYI 3651 // 41 xterm more fixes NYI
4034 // 45 margin bell NYI 3652 // 45 margin bell NYI
4035 // 46 start logging 3653 // 46 start logging
4036 { 47, PrivMode_Screen }, 3654 { 47, PrivMode_Screen },
4037 { 66, PrivMode_aplKP }, 3655 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
4038#ifndef NO_BACKSPACE_KEY 3656#ifndef NO_BACKSPACE_KEY
4039 { 67, PrivMode_BackSpace }, 3657 { 67, PrivMode_BackSpace }, // DECBKM
4040#endif 3658#endif
4041 { 1000, PrivMode_MouseX11 }, 3659 { 1000, PrivMode_MouseX11 },
4042 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3660 { 1002, PrivMode_MouseBtnEvent },
4043 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3661 { 1003, PrivMode_MouseAnyEvent },
4044 // 1003 Use All Motion Mouse Tracking. NYI, TODO 3662#if ENABLE_FRILLS
3663 { 1005, PrivMode_ExtModeMouse },
3664#endif
4045 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3665 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4046 { 1011, PrivMode_Keypress }, // rxvt extension 3666 { 1011, PrivMode_Keypress }, // rxvt extension
3667#if ENABLE_FRILLS
3668 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3669#endif
4047 // 1035 enable modifiers for alt, numlock NYI 3670 // 1035 enable modifiers for alt, numlock NYI
4048 // 1036 send ESC for meta keys NYI 3671 // 1036 send ESC for meta keys NYI
4049 // 1037 send DEL for keypad delete NYI 3672 // 1037 send DEL for keypad delete NYI
4050 { 1047, PrivMode_Screen }, 3673 { 1047, PrivMode_Screen },
4051 // 1048 save and restore cursor 3674 // 1048 save and restore cursor, implemented in code
4052 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3675 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
4053 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3676 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3677 { 2004, PrivMode_BracketPaste },
4054 }; 3678 };
4055 3679
4056 if (nargs == 0) 3680 if (nargs == 0)
4057 return; 3681 return;
4058 3682
… …
4065 for (i = 0; i < nargs; i++) 3689 for (i = 0; i < nargs; i++)
4066 { 3690 {
4067 state = -1; 3691 state = -1;
4068 3692
4069 /* basic handling */ 3693 /* basic handling */
4070 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3694 for (j = 0; j < ARRAY_LENGTH(argtopriv); j++)
4071 if (argtopriv[j].argval == arg[i]) 3695 if (argtopriv[j].argval == arg[i])
4072 { 3696 {
4073 state = privcases (mode, argtopriv[j].bit); 3697 state = privcases (mode, argtopriv[j].bit);
4074 break; 3698 break;
4075 } 3699 }
… …
4083 3707
4084 scr_touch (true); 3708 scr_touch (true);
4085 break; 3709 break;
4086#endif 3710#endif
4087 case 1048: /* alternative cursor save */ 3711 case 1048: /* alternative cursor save */
4088 case 1049:
4089 if (OPTION (Opt_secondaryScreen)) 3712 if (option (Opt_secondaryScreen))
4090 if (mode == 0) 3713 if (mode == 0)
4091 scr_cursor (RESTORE); 3714 scr_cursor (RESTORE);
4092 else if (mode == 1) 3715 else if (mode == 1)
4093 scr_cursor (SAVE); 3716 scr_cursor (SAVE);
4094 break; 3717 break;
… …
4102 case 2: /* VT52 mode */ 3725 case 2: /* VT52 mode */
4103 /* oddball mode. should be set regardless of set/reset 3726 /* oddball mode. should be set regardless of set/reset
4104 * parameter. Return from VT52 mode with an ESC < from 3727 * parameter. Return from VT52 mode with an ESC < from
4105 * within VT52 mode 3728 * within VT52 mode
4106 */ 3729 */
4107 PrivMode (1, PrivMode_vt52); 3730 set_privmode (PrivMode_vt52, 1);
4108 break; 3731 break;
4109 case 3: /* 80/132 */ 3732 case 3: /* 80/132 */
4110 if (priv_modes & PrivMode_132OK) 3733 if (priv_modes & PrivMode_132OK)
4111 set_widthheight (((state ? 132 : 80) * fwidth), height); 3734 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
4112 break; 3735 break;
4113 case 4: /* smooth scrolling */ 3736 case 4: /* smooth scrolling */
4114 set_option (Opt_jumpScroll, !state); 3737 set_option (Opt_jumpScroll, !state);
4115 break; 3738 break;
4116 case 5: /* reverse video */ 3739 case 5: /* reverse video */
… …
4123 scr_autowrap (state); 3746 scr_autowrap (state);
4124 break; 3747 break;
4125 /* case 8: - auto repeat, can't do on a per window basis */ 3748 /* case 8: - auto repeat, can't do on a per window basis */
4126 case 9: /* X10 mouse reporting */ 3749 case 9: /* X10 mouse reporting */
4127 if (state) /* orthogonal */ 3750 if (state) /* orthogonal */
4128 priv_modes &= ~PrivMode_MouseX11; 3751 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4129 break; 3752 break;
4130#ifdef scrollBar_esc 3753#ifdef scrollBar_esc
4131 case scrollBar_esc: 3754 case scrollBar_esc:
4132 if (scrollbar_mapping (state)) 3755 if (scrollBar.map (state))
4133 { 3756 {
4134 resize_all_windows (0, 0, 0); 3757 resize_all_windows (0, 0, 0);
4135 scr_touch (true); 3758 scr_touch (true);
4136 } 3759 }
4137 break; 3760 break;
… …
4146 break; 3769 break;
4147 /* case 66: - application key pad */ 3770 /* case 66: - application key pad */
4148 /* case 67: - backspace key */ 3771 /* case 67: - backspace key */
4149 case 1000: /* X11 mouse reporting */ 3772 case 1000: /* X11 mouse reporting */
4150 if (state) /* orthogonal */ 3773 if (state) /* orthogonal */
4151 priv_modes &= ~PrivMode_MouseX10; 3774 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4152 break; 3775 break;
4153#if 0
4154 case 1001: 3776 case 1002:
4155 break; /* X11 mouse highlighting */ 3777 case 1003:
4156#endif 3778 if (state)
3779 {
3780 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3781 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3782 mouse_row = mouse_col = 0;
3783 vt_emask_mouse = PointerMotionMask;
3784 }
3785 else
3786 vt_emask_mouse = NoEventMask;
3787
3788 vt_select_input ();
3789 break;
4157 case 1010: /* scroll to bottom on TTY output inhibit */ 3790 case 1010: /* scroll to bottom on TTY output inhibit */
4158 set_option (Opt_scrollTtyOutput, !state); 3791 set_option (Opt_scrollTtyOutput, !state);
4159 break; 3792 break;
4160 case 1011: /* scroll to bottom on key press */ 3793 case 1011: /* scroll to bottom on key press */
4161 set_option (Opt_scrollTtyKeypress, state); 3794 set_option (Opt_scrollTtyKeypress, state);
4162 break; 3795 break;
4163 case 1047: /* secondary screen w/ clearing last */ 3796 case 1047: /* secondary screen w/ clearing last */
4164 if (OPTION (Opt_secondaryScreen)) 3797 if (option (Opt_secondaryScreen))
4165 if (current_screen != PRIMARY) 3798 if (!state)
4166 scr_erase_screen (2); 3799 scr_erase_screen (2);
3800
4167 scr_change_screen (state); 3801 scr_change_screen (state);
4168 break; 3802 break;
4169 case 1049: /* secondary screen w/ clearing first */ 3803 case 1049: /* secondary screen w/ clearing first */
3804 if (option (Opt_secondaryScreen))
3805 if (state)
3806 scr_cursor (SAVE);
3807
4170 scr_change_screen (state); 3808 scr_change_screen (state);
3809
4171 if (OPTION (Opt_secondaryScreen)) 3810 if (option (Opt_secondaryScreen))
4172 if (current_screen != PRIMARY) 3811 if (state)
4173 scr_erase_screen (2); 3812 scr_erase_screen (2);
3813 else
3814 scr_cursor (RESTORE);
4174 break; 3815 break;
4175 default: 3816 default:
4176 break; 3817 break;
4177 } 3818 }
4178 } 3819 }
… …
4304 scr_color (Color_bg, Color_bg); 3945 scr_color (Color_bg, Color_bg);
4305 break; 3946 break;
4306 3947
4307 //case 50: // not variable spacing 3948 //case 50: // not variable spacing
4308 3949
4309#if ENABLE_FRILLS 3950#if !ENABLE_MINIMAL
4310 case 90: 3951 case 90:
4311 case 91: /* set bright fg color */ 3952 case 91: /* set bright fg color */
4312 case 92: 3953 case 92:
4313 case 93: 3954 case 93:
4314 case 94: 3955 case 94:
… …
4338rxvt_term::process_graphics () 3979rxvt_term::process_graphics ()
4339{ 3980{
4340 unicode_t ch, cmd = cmd_getc (); 3981 unicode_t ch, cmd = cmd_getc ();
4341 3982
4342 if (cmd == 'Q') 3983 if (cmd == 'Q')
3984 {
4343 { /* query graphics */ 3985 /* query graphics */
4344 tt_printf ("\033G0\012"); /* no graphics */ 3986 tt_printf ("\033G0\012"); /* no graphics */
4345 return; 3987 return;
4346 } 3988 }
4347 /* swallow other graphics sequences until terminating ':' */ 3989 /* swallow other graphics sequences until terminating ':' */
4348 do 3990 do
… …
4371 4013
4372/* ---------------------------------------------------------------------- */ 4014/* ---------------------------------------------------------------------- */
4373/* Write data to the pty as typed by the user, pasted with the mouse, 4015/* Write data to the pty as typed by the user, pasted with the mouse,
4374 * or generated by us in response to a query ESC sequence. 4016 * or generated by us in response to a query ESC sequence.
4375 */ 4017 */
4376const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4018static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4377 4019
4378void 4020void
4379rxvt_term::tt_write (const char *data, unsigned int len) 4021rxvt_term::tt_write (const char *data, unsigned int len)
4380{ 4022{
4381 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4023 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
4393 4035
4394 data += written; 4036 data += written;
4395 len -= written; 4037 len -= written;
4396 } 4038 }
4397 4039
4398 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4040 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
4399 4041
4400 memcpy (v_buffer + v_buflen, data, len); 4042 memcpy (v_buffer + v_buflen, data, len);
4401 v_buflen += len; 4043 v_buflen += len;
4402 4044
4403 pty_ev.set (EVENT_READ | EVENT_WRITE); 4045 pty_ev.set (ev::READ | ev::WRITE);
4404} 4046}
4405 4047
4406void rxvt_term::pty_write () 4048void rxvt_term::pty_write ()
4407{ 4049{
4408 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4050 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4413 4055
4414 if (v_buflen == 0) 4056 if (v_buflen == 0)
4415 { 4057 {
4416 free (v_buffer); 4058 free (v_buffer);
4417 v_buffer = 0; 4059 v_buffer = 0;
4418 v_buflen = 0;
4419 4060
4420 pty_ev.set (EVENT_READ); 4061 pty_ev.set (ev::READ);
4421 return; 4062 return;
4422 } 4063 }
4423 4064
4424 memmove (v_buffer, v_buffer + written, v_buflen); 4065 memmove (v_buffer, v_buffer + written, v_buflen);
4425 } 4066 }
4426 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4067 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4427 pty_ev.set (EVENT_READ); 4068 pty_ev.set (ev::READ);
4428} 4069}
4429 4070
4430/*----------------------- end-of-file (C source) -----------------------*/ 4071/*----------------------- end-of-file (C source) -----------------------*/
4431 4072

Diff Legend

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