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.283 by root, Tue Jan 24 19:40:12 2006 UTC vs.
Revision 1.470 by sf-exg, Sun Jan 9 23:48:37 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 (bgPixmap.flags & bgPixmap_t::hasChanged)
948 { 981 {
949 want_full_refresh = 0; 982 bgPixmap.flags &= ~bgPixmap_t::hasChanged;
950 scr_clear (); 983// scr_clear (true); This needs to be researched further!
951 scr_touch (false); 984 scr_touch (false);
952 } 985 }
953#endif 986#endif
954 987
955 if (want_refresh) 988 if (want_refresh)
… …
991 } 1024 }
992 while (row < end_row); 1025 while (row < end_row);
993 } 1026 }
994 1027
995 scr_refresh (); 1028 scr_refresh ();
996 scrollbar_show (1); 1029 scrollBar.show (1);
997#ifdef USE_XIM 1030#ifdef USE_XIM
998 IMSendSpot (); 1031 IMSendSpot ();
999#endif 1032#endif
1000 } 1033 }
1001 1034
1002 display->flush (); 1035 display->flush ();
1003} 1036}
1004 1037
1038/* checks whether a refresh is requested and starts the refresh timer */
1005void 1039void
1006rxvt_term::check_cb (check_watcher &w) 1040rxvt_term::refresh_check ()
1041{
1042 if (want_refresh && !flush_ev.is_active ())
1043 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1044
1045 display->flush ();
1046}
1047
1048void
1049rxvt_term::flush_cb (ev::timer &w, int revents)
1007{ 1050{
1008 make_current (); 1051 make_current ();
1009 1052
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; 1053 refresh_count = 0;
1023 flush (); 1054 flush ();
1024} 1055}
1025 1056
1026#ifdef CURSOR_BLINK 1057#ifdef CURSOR_BLINK
1027void 1058void
1028rxvt_term::cursor_blink_cb (time_watcher &w) 1059rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1029{ 1060{
1030 hidden_cursor = !hidden_cursor; 1061 hidden_cursor = !hidden_cursor;
1031 want_refresh = 1; 1062 want_refresh = 1;
1032 1063 refresh_check ();
1033 w.start (w.at + CURSOR_BLINK_INTERVAL);
1034} 1064}
1035#endif 1065#endif
1036 1066
1037#ifdef TEXT_BLINK 1067#ifdef TEXT_BLINK
1038void 1068void
1039rxvt_term::text_blink_cb (time_watcher &w) 1069rxvt_term::text_blink_cb (ev::timer &w, int revents)
1040{ 1070{
1041 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1071 if (scr_refresh_rend (RS_Blink, RS_Blink))
1042 { 1072 {
1043 hidden_text = !hidden_text; 1073 hidden_text = !hidden_text;
1044 want_refresh = 1; 1074 want_refresh = 1;
1045 w.start (w.at + TEXT_BLINK_INTERVAL); 1075 refresh_check ();
1046 } 1076 }
1077 else
1078 w.stop ();
1047} 1079}
1048#endif 1080#endif
1049 1081
1050#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1082#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1051void 1083void
1052rxvt_term::cont_scroll_cb (time_watcher &w) 1084rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1053{ 1085{
1054 if ((scrollbar_isUp() || scrollbar_isDn()) && 1086 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1055 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1087 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1056 { 1088 {
1057 want_refresh = 1; 1089 want_refresh = 1;
1058 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1090 refresh_check ();
1059 } 1091 }
1092 else
1093 w.stop ();
1060} 1094}
1061#endif 1095#endif
1062 1096
1063#ifdef SELECTION_SCROLLING 1097#ifdef SELECTION_SCROLLING
1064void 1098void
1065rxvt_term::sel_scroll_cb (time_watcher &w) 1099rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1066{ 1100{
1067 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1101 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1068 { 1102 {
1069 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1103 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1070 want_refresh = 1; 1104 want_refresh = 1;
1071 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1105 refresh_check ();
1072 } 1106 }
1107 else
1108 w.stop ();
1073} 1109}
1074#endif 1110#endif
1075 1111
1076#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1112#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1077void 1113void
1078rxvt_term::slip_wheel_cb (time_watcher &w) 1114rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1079{ 1115{
1080 if (mouse_slip_wheel_speed == 0 1116 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 { 1117 {
1084 if (view_start == top_row || view_start == 0)
1085 mouse_slip_wheel_speed = 0;
1086
1087 want_refresh = 1; 1118 want_refresh = 1;
1088 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1119 refresh_check ();
1120 }
1121
1122 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1089 } 1123 {
1124 mouse_slip_wheel_speed = 0;
1125 w.stop ();
1126 }
1090} 1127}
1091#endif 1128#endif
1092 1129
1093#if HAVE_SCHED_YIELD 1130#if LINUX_YIELD_HACK
1094static struct event_handler 1131static struct event_handler
1095{ 1132{
1096 check_watcher cw_yield; 1133 ev::prepare yield_ev;
1097 1134
1098 void yield (check_watcher &w) 1135 void yield_cb (ev::prepare &w, int revents)
1099 { 1136 {
1100 sched_yield (); 1137 // this should really be sched_yield(), but the linux guys thought
1138 // that giving a process calling sched_yield () less cpu time than
1139 // ones with high nice levels is a useful thing to do. It surely is is
1140 // allowed by the sus... as is returning ENOSYS.
1141 // since the linux guys additionally thought that breaking the only
1142 // known workaround against their unusable sched_yield hack is cool,
1143 // we just nanosleep a bit and hope for the best.
1144
1145 struct timespec ts = { 0, 1000 };
1146 nanosleep (&ts, 0);
1147
1101 w.stop (); 1148 w.stop ();
1102 } 1149 }
1103 1150
1104 event_handler () 1151 event_handler ()
1105 : cw_yield (this, &event_handler::yield) 1152 : yield_ev (this, &event_handler::yield_cb)
1106 { 1153 {
1107 } 1154 }
1108} event_handler; 1155} event_handler;
1109#endif 1156#endif
1110 1157
… …
1130 cmdbuf_endp += r; 1177 cmdbuf_endp += r;
1131 return true; 1178 return true;
1132 } 1179 }
1133 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1180 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1134 { 1181 {
1135#if HAVE_SCHED_YIELD 1182#if LINUX_YIELD_HACK
1136 if (display->is_local) 1183 if (display->is_local)
1137 event_handler.cw_yield.start (); 1184 event_handler.yield_ev.start ();
1138#endif 1185#endif
1139 } 1186 }
1140 else 1187 else
1141 { 1188 {
1142 pty_ev.stop (); 1189 pty_ev.stop ();
1143 1190
1144 if (!OPTION (Opt_hold)) 1191 if (!option (Opt_hold))
1145 destroy (); 1192 destroy ();
1146 } 1193 }
1147 1194
1148 return false; 1195 return false;
1149} 1196}
1150 1197
1151void 1198void
1152rxvt_term::pty_cb (io_watcher &w, short revents) 1199rxvt_term::pty_cb (ev::io &w, int revents)
1153{ 1200{
1154 make_current (); 1201 make_current ();
1155 1202
1156 if (revents & EVENT_READ) 1203 if (revents & ev::READ)
1157 // loop, but don't allow a single term to monopolize us 1204 // loop, but don't allow a single term to monopolize us
1158 while (pty_fill ()) 1205 for (int i = CBUFCNT; i-- && pty_fill (); )
1159 if (cmd_parse ()) 1206 cmd_parse ();
1160 break;
1161 1207
1162 if (revents & EVENT_WRITE) 1208 if (revents & ev::WRITE)
1163 pty_write (); 1209 pty_write ();
1210
1211 refresh_check ();
1164} 1212}
1165 1213
1166void 1214void
1167rxvt_term::pointer_unblank () 1215rxvt_term::pointer_unblank ()
1168{ 1216{
1169 XDefineCursor (display->display, vt, TermWin_cursor); 1217 XDefineCursor (dpy, vt, TermWin_cursor);
1170 recolour_cursor (); 1218 recolour_cursor ();
1171 1219
1172#ifdef POINTER_BLANK 1220#ifdef POINTER_BLANK
1173 hidden_pointer = 0; 1221 hidden_pointer = 0;
1174 1222
1175 if (OPTION (Opt_pointerBlank)) 1223 if (option (Opt_pointerBlank))
1176 pointer_ev.start (NOW + pointerBlankDelay); 1224 pointer_ev.start (pointerBlankDelay);
1177#endif 1225#endif
1178} 1226}
1179 1227
1180#ifdef POINTER_BLANK 1228#ifdef POINTER_BLANK
1181void 1229void
1182rxvt_term::pointer_blank () 1230rxvt_term::pointer_blank ()
1183{ 1231{
1184 if (!OPTION (Opt_pointerBlank)) 1232 if (!option (Opt_pointerBlank))
1185 return; 1233 return;
1186 1234
1187 XDefineCursor (display->display, vt, display->blank_cursor); 1235 XDefineCursor (dpy, vt, display->blank_cursor);
1188 XFlush (display->display); 1236 XFlush (dpy);
1189 1237
1190 hidden_pointer = 1; 1238 hidden_pointer = 1;
1191} 1239}
1192 1240
1193void 1241void
1194rxvt_term::pointer_cb (time_watcher &w) 1242rxvt_term::pointer_cb (ev::timer &w, int revents)
1195{ 1243{
1196 make_current (); 1244 make_current ();
1197 1245
1198 pointer_blank (); 1246 pointer_blank ();
1199} 1247}
… …
1202void 1250void
1203rxvt_term::mouse_report (XButtonEvent &ev) 1251rxvt_term::mouse_report (XButtonEvent &ev)
1204{ 1252{
1205 int button_number, key_state = 0; 1253 int button_number, key_state = 0;
1206 int x, y; 1254 int x, y;
1255 int code = 32;
1207 1256
1208 x = ev.x; 1257 x = Pixel2Col (ev.x) + 1;
1209 y = ev.y; 1258 y = Pixel2Row (ev.y) + 1;
1210 pixel_position (&x, &y); 1259
1260 if (ev.type == MotionNotify)
1261 {
1262 if (x == mouse_row && y == mouse_col)
1263 return;
1264
1265 mouse_row = x;
1266 mouse_col = y;
1267 code += 32;
1268 }
1211 1269
1212 if (MEvent.button == AnyButton) 1270 if (MEvent.button == AnyButton)
1213 button_number = 3; 1271 button_number = 3;
1214 else 1272 else
1215 { 1273 {
1216 button_number = MEvent.button - Button1; 1274 button_number = MEvent.button - Button1;
1217 /* add 0x3D for wheel events, like xterm does */ 1275 /* add 0x3D for wheel events, like xterm does */
1218 if (button_number >= 3) 1276 if (button_number >= 3)
1219 button_number += (64 - 3); 1277 button_number += 64 - 3;
1220 } 1278 }
1221 1279
1222 if (priv_modes & PrivMode_MouseX10) 1280 if (priv_modes & PrivMode_MouseX10)
1223 { 1281 {
1224 /* 1282 /*
… …
1256 fputc ('A', stderr); 1314 fputc ('A', stderr);
1257 if (key_state & 32) 1315 if (key_state & 32)
1258 fputc ('2', stderr); 1316 fputc ('2', stderr);
1259 fprintf (stderr, "]: <%d>, %d/%d\n", 1317 fprintf (stderr, "]: <%d>, %d/%d\n",
1260 button_number, 1318 button_number,
1261 x + 1, 1319 x,
1262 y + 1); 1320 y);
1263#endif 1321#endif
1264 1322
1323#if ENABLE_FRILLS
1324 if (priv_modes & PrivMode_ExtMouseRight)
1325 tt_printf ("\033[%d;%d;%dM",
1326 code + button_number + key_state,
1327 x,
1328 y);
1329 else if (priv_modes & PrivMode_ExtModeMouse)
1330 tt_printf ("\033[M%c%lc%lc",
1331 code + button_number + key_state,
1332 wint_t (32 + x),
1333 wint_t (32 + y));
1334 else
1335#endif
1265 tt_printf ("\033[M%c%c%c", 1336 tt_printf ("\033[M%c%c%c",
1266 (32 + button_number + key_state), 1337 code + button_number + key_state,
1267 (32 + x + 1), 1338 32 + x,
1268 (32 + y + 1)); 1339 32 + y);
1269} 1340}
1270
1271#ifdef USING_W11LIB
1272void
1273rxvt_W11_process_x_event (XEvent *ev)
1274{
1275 rxvt_t *r = rxvt_get_r ();
1276
1277 x_cb (*ev);
1278}
1279#endif
1280 1341
1281/*{{{ process an X event */ 1342/*{{{ process an X event */
1282void 1343void
1283rxvt_term::x_cb (XEvent &ev) 1344rxvt_term::x_cb (XEvent &ev)
1284{ 1345{
1285 make_current (); 1346 make_current ();
1286 1347
1287 dDisp; 1348 dLocal (Display *, dpy);
1288 1349
1289 if (ev.xany.window == vt 1350 if (ev.xany.window == vt
1290 && SHOULD_INVOKE (HOOK_X_EVENT) 1351 && SHOULD_INVOKE (HOOK_X_EVENT)
1291 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1352 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1292 return; 1353 return;
… …
1297 unsigned int unused_mask; 1358 unsigned int unused_mask;
1298 1359
1299 switch (ev.type) 1360 switch (ev.type)
1300 { 1361 {
1301 case KeyPress: 1362 case KeyPress:
1302#if ISO_14755 1363 key_press (ev.xkey);
1303 if (!(iso14755buf & ISO_14755_52))
1304#endif
1305 lookup_key (ev.xkey);
1306
1307 break; 1364 break;
1308 1365
1309 case KeyRelease: 1366 case KeyRelease:
1310 { 1367 key_release (ev.xkey);
1311#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1312 KeySym keysym;
1313
1314 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1315#endif
1316
1317#if ENABLE_FRILLS || ISO_14755
1318 // ISO 14755 support
1319 if (iso14755buf)
1320 if (iso14755buf & ISO_14755_52)
1321 {
1322# if ENABLE_OVERLAY
1323 scr_overlay_off ();
1324# endif
1325# if ISO_14755
1326 // iso14755 part 5.2 handling: release time
1327 // first: controls
1328 if ((ev.xkey.state & ControlMask)
1329 && ((keysym >= 0x40 && keysym <= 0x5f)
1330 || (keysym >= 0x61 && keysym <= 0x7f)))
1331 {
1332 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1333 commit_iso14755 ();
1334 goto skip_switch;
1335 }
1336
1337 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1338 if (i[0] == keysym)
1339 {
1340 iso14755buf = ISO_14755_51 | i[1];
1341 commit_iso14755 ();
1342 goto skip_switch;
1343 }
1344
1345 scr_bell ();
1346# endif
1347 iso14755buf = 0;
1348 break;
1349 }
1350 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1351 {
1352# if ENABLE_OVERLAY
1353 scr_overlay_off ();
1354# endif
1355 if (iso14755buf & ISO_14755_51)
1356 commit_iso14755 ();
1357#if ISO_14755
1358 else if (iso14755buf & ISO_14755_STARTED)
1359 {
1360 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1361
1362 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1363 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1364 }
1365# endif
1366 else
1367 iso14755buf = 0;
1368 }
1369#endif
1370
1371 if (ev.xany.window == vt
1372 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1373 break;
1374
1375#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1376 if (!(ev.xkey.state & ControlMask))
1377 slip_wheel_ev.stop ();
1378 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1379 mouse_slip_wheel_speed = 0;
1380#endif
1381 break; 1368 break;
1382 }
1383 1369
1384 case ButtonPress: 1370 case ButtonPress:
1385 button_press (ev.xbutton); 1371 button_press (ev.xbutton);
1386 break; 1372 break;
1387 1373
… …
1402 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END))) 1388 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1403 destroy (); 1389 destroy ();
1404 } 1390 }
1405#if ENABLE_EWMH 1391#if ENABLE_EWMH
1406 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1392 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1407 XSendEvent (disp, ev.xclient.window = display->root, 1393 XSendEvent (dpy, ev.xclient.window = display->root,
1408 False, SubstructureRedirectMask | SubstructureNotifyMask, 1394 False, SubstructureRedirectMask | SubstructureNotifyMask,
1409 &ev); 1395 &ev);
1410#endif 1396#endif
1411 } 1397 }
1412 } 1398 }
… …
1418 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1404 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1419 focus_out (); 1405 focus_out ();
1420 } 1406 }
1421#endif 1407#endif
1422 } 1408 }
1423 break;
1424
1425 case MappingNotify:
1426 XRefreshKeyboardMapping (&ev.xmapping);
1427 break; 1409 break;
1428 1410
1429 /* 1411 /*
1430 * XXX: this is not the _current_ arrangement 1412 * XXX: this is not the _current_ arrangement
1431 * Here's my conclusion: 1413 * Here's my conclusion:
… …
1450 break; 1432 break;
1451 } 1433 }
1452 break; 1434 break;
1453 1435
1454 case FocusIn: 1436 case FocusIn:
1437 if (ev.xfocus.detail != NotifyInferior
1438 && ev.xfocus.detail != NotifyPointer
1439 && ev.xfocus.mode != NotifyGrab)
1455 focus_in (); 1440 focus_in ();
1456 break; 1441 break;
1457 1442
1458 case FocusOut: 1443 case FocusOut:
1444 if (ev.xfocus.detail != NotifyInferior
1445 && ev.xfocus.detail != NotifyPointer
1446 && ev.xfocus.mode != NotifyGrab)
1459 focus_out (); 1447 focus_out ();
1460 break; 1448 break;
1461 1449
1462 case ConfigureNotify: 1450 case ConfigureNotify:
1463 if (ev.xconfigure.window == parent[0]) 1451 if (ev.xconfigure.window == parent[0])
1464 { 1452 {
1465 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1453 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1466 ; 1454 ;
1455
1456#ifdef HAVE_BG_PIXMAP
1457 bool moved = false;
1458 if (bgPixmap.window_position_sensitive ())
1459 {
1460 int x, y;
1461 if (ev.xconfigure.send_event)
1462 {
1463 x = ev.xconfigure.x;
1464 y = ev.xconfigure.y;
1465 }
1466 else
1467 get_window_origin (x, y);
1468
1469 if (bgPixmap.set_position (x, y)
1470 || (bgPixmap.flags & bgPixmap_t::isInvalid))
1471 moved = true;
1472 }
1473#endif
1467 1474
1468 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1475 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1469 { 1476 {
1470 seen_resize = 1; 1477 seen_resize = 1;
1471 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1478 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1472 } 1479 }
1480 else
1481 {
1482#ifdef HAVE_BG_PIXMAP
1483 if (moved)
1484 {
1485 if (mapped)
1486 update_background ();
1487 else
1488 bgPixmap.invalidate ();
1489 }
1490#endif
1491 }
1473 1492
1474 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1493 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1475
1476#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1477 if (OPTION (Opt_transparent))
1478 check_our_parents ();
1479#endif
1480 } 1494 }
1481 break; 1495 break;
1482 1496
1483 case PropertyNotify: 1497 case PropertyNotify:
1484 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1498 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
… …
1487 selection_property (ev.xproperty.window, ev.xproperty.atom); 1501 selection_property (ev.xproperty.window, ev.xproperty.atom);
1488 1502
1489 break; 1503 break;
1490 1504
1491 case SelectionClear: 1505 case SelectionClear:
1492 selection_clear (); 1506 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1493 break; 1507 break;
1494 1508
1495 case SelectionNotify: 1509 case SelectionNotify:
1496 if (selection_wait == Sel_normal) 1510 if (selection_wait == Sel_normal)
1497 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1511 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
… …
1500 case SelectionRequest: 1514 case SelectionRequest:
1501 selection_send (ev.xselectionrequest); 1515 selection_send (ev.xselectionrequest);
1502 break; 1516 break;
1503 1517
1504 case MapNotify: 1518 case MapNotify:
1519#ifdef HAVE_BG_PIXMAP
1520 /* This is needed specifically to fix the case of no window manager or a
1521 * non-reparenting window manager. In those cases we never get first
1522 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1523 * care of multiplicity of ConfigureNotify events arriving while WM does
1524 * reparenting.
1525 * We should not render background immediately, as there could be several
1526 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1527 * by scheduling background redraw as soon as we can, but giving a short
1528 * bit of time for ConfigureNotifies to arrive.
1529 * We should render background PRIOR to drawing any text, but AFTER all
1530 * of ConfigureNotifys for the best results.
1531 */
1532 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1533 update_background_ev.start (0.025);
1534#endif
1505 mapped = 1; 1535 mapped = 1;
1506#ifdef TEXT_BLINK 1536#ifdef TEXT_BLINK
1507 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1537 text_blink_ev.start ();
1508#endif 1538#endif
1509 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1539 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1510 break; 1540 break;
1511 1541
1512 case UnmapNotify: 1542 case UnmapNotify:
… …
1514#ifdef TEXT_BLINK 1544#ifdef TEXT_BLINK
1515 text_blink_ev.stop (); 1545 text_blink_ev.stop ();
1516#endif 1546#endif
1517 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1547 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1518 break; 1548 break;
1519
1520#ifdef TRANSPARENT
1521 case ReparentNotify:
1522 rootwin_cb (ev);
1523 break;
1524#endif /* TRANSPARENT */
1525 1549
1526 case GraphicsExpose: 1550 case GraphicsExpose:
1527 case Expose: 1551 case Expose:
1528 if (ev.xany.window == vt) 1552 if (ev.xany.window == vt)
1529 { 1553 {
1530 do 1554 do
1555 {
1531 scr_expose (ev.xexpose.x, ev.xexpose.y, 1556 scr_expose (ev.xexpose.x, ev.xexpose.y,
1532 ev.xexpose.width, ev.xexpose.height, False); 1557 ev.xexpose.width, ev.xexpose.height, False);
1558 }
1533 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1559 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1534 1560
1535 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1561 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1536 1562
1537 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1563 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1564 {
1538 scr_expose (ev.xexpose.x, ev.xexpose.y, 1565 scr_expose (ev.xexpose.x, ev.xexpose.y,
1539 ev.xexpose.width, ev.xexpose.height, False); 1566 ev.xexpose.width, ev.xexpose.height, False);
1567 }
1540 1568
1541 want_refresh = 1; 1569 want_refresh = 1;
1542 } 1570 }
1543 else 1571 else
1544 { 1572 {
1545 XEvent unused_event; 1573 XEvent unused_event;
1546 1574
1547 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1575 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1548 ; 1576 ;
1549 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1577 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1550 ; 1578 ;
1551 1579
1552 if (isScrollbarWindow (ev.xany.window)) 1580 if (scrollBar.state && ev.xany.window == scrollBar.win)
1553 { 1581 {
1554 scrollBar.setIdle (); 1582 scrollBar.state = STATE_IDLE;
1555 scrollbar_show (0); 1583 scrollBar.show (0);
1556 } 1584 }
1557
1558#ifdef TRANSPARENT
1559 if (am_transparent && ev.xany.window == parent[0])
1560 XClearWindow (disp, ev.xany.window);
1561#endif
1562 } 1585 }
1563 break; 1586 break;
1564 1587
1565 case MotionNotify: 1588 case MotionNotify:
1566#ifdef POINTER_BLANK 1589#ifdef POINTER_BLANK
1567 if (hidden_pointer) 1590 if (hidden_pointer)
1568 pointer_unblank (); 1591 pointer_unblank ();
1569#endif 1592#endif
1593 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1594 || priv_modes & PrivMode_MouseAnyEvent)
1595 mouse_report (ev.xbutton);
1570 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1596 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1571 break; 1597 break;
1572 1598
1573 if (ev.xany.window == vt) 1599 if (ev.xany.window == vt)
1574 { 1600 {
1575 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1601 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1576 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1602 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1577 ; // nop 1603 ; // nop
1578 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1604 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1579 { 1605 {
1580 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1606 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1581 ; 1607 ;
1582 1608
1583 XQueryPointer (disp, vt, 1609 XQueryPointer (dpy, vt,
1584 &unused_root, &unused_child, 1610 &unused_root, &unused_child,
1585 &unused_root_x, &unused_root_y, 1611 &unused_root_x, &unused_root_y,
1586 &ev.xbutton.x, &ev.xbutton.y, 1612 &ev.xbutton.x, &ev.xbutton.y,
1587 &ev.xbutton.state); 1613 &ev.xbutton.state);
1588#ifdef MOUSE_THRESHOLD 1614#ifdef MOUSE_THRESHOLD
… …
1608 int dist; 1634 int dist;
1609 1635
1610 /* don't clobber the current delay if we are 1636 /* don't clobber the current delay if we are
1611 * already in the middle of scrolling. 1637 * already in the middle of scrolling.
1612 */ 1638 */
1613 if (!sel_scroll_ev.active) 1639 if (!sel_scroll_ev.is_active ())
1614 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1640 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1615 1641
1616 /* save the event params so we can highlight 1642 /* save the event params so we can highlight
1617 * the selection in the pending-scroll loop 1643 * the selection in the pending-scroll loop
1618 */ 1644 */
1619 selection_save_x = ev.xbutton.x; 1645 selection_save_x = ev.xbutton.x;
… …
1641 else 1667 else
1642 { 1668 {
1643 /* we are within the text window, so we 1669 /* we are within the text window, so we
1644 * shouldn't be scrolling 1670 * shouldn't be scrolling
1645 */ 1671 */
1646 if (sel_scroll_ev.active)
1647 sel_scroll_ev.stop(); 1672 sel_scroll_ev.stop();
1648 } 1673 }
1649#endif 1674#endif
1650#ifdef MOUSE_THRESHOLD 1675#ifdef MOUSE_THRESHOLD
1651 } 1676 }
1652#endif 1677#endif
1653 } 1678 }
1654 } 1679 }
1655 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1680 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1656 { 1681 {
1657 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1682 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1658 MotionNotify, &ev)) 1683 MotionNotify, &ev))
1659 ; 1684 ;
1660 1685
1661 XQueryPointer (disp, scrollBar.win, 1686 XQueryPointer (dpy, scrollBar.win,
1662 &unused_root, &unused_child, 1687 &unused_root, &unused_child,
1663 &unused_root_x, &unused_root_y, 1688 &unused_root_x, &unused_root_y,
1664 &ev.xbutton.x, &ev.xbutton.y, 1689 &ev.xbutton.x, &ev.xbutton.y,
1665 &unused_mask); 1690 &unused_mask);
1666 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1691 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1667 scrollbar_size ()); 1692 scrollBar.size ());
1668 want_refresh = 1; 1693 want_refresh = 1;
1669 refresh_limit = 0;
1670 scrollbar_show (1); 1694 scrollBar.show (1);
1671 } 1695 }
1672 break; 1696 break;
1673 } 1697 }
1674 1698
1675skip_switch: ;
1676
1677#if defined(CURSOR_BLINK) 1699#if defined(CURSOR_BLINK)
1678 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1700 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1679 { 1701 {
1680 if (hidden_cursor) 1702 if (hidden_cursor)
1681 { 1703 {
1682 hidden_cursor = 0; 1704 hidden_cursor = 0;
1683 want_refresh = 1; 1705 want_refresh = 1;
1684 } 1706 }
1685 1707
1686 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1708 cursor_blink_ev.again ();
1687 } 1709 }
1688#endif 1710#endif
1689 1711
1690#if defined(POINTER_BLANK) 1712#if defined(POINTER_BLANK)
1691 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1713 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1692 { 1714 {
1693 if (ev.type == MotionNotify 1715 if (ev.type == MotionNotify
1694 || ev.type == ButtonPress 1716 || ev.type == ButtonPress
1695 || ev.type == ButtonRelease) 1717 || ev.type == ButtonRelease)
1696 if (hidden_pointer) 1718 if (hidden_pointer)
… …
1698 1720
1699 if (ev.type == KeyPress && hidden_pointer == 0) 1721 if (ev.type == KeyPress && hidden_pointer == 0)
1700 pointer_blank (); 1722 pointer_blank ();
1701 } 1723 }
1702#endif 1724#endif
1725
1726 refresh_check ();
1703} 1727}
1728
1729#if ENABLE_FRILLS
1730void
1731rxvt_term::set_urgency (bool enable)
1732{
1733 if (enable == urgency_hint)
1734 return;
1735
1736 if (XWMHints *h = XGetWMHints (dpy, parent[0]))
1737 {
1738 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1739 XSetWMHints (dpy, parent[0], h);
1740 urgency_hint = enable;
1741 }
1742}
1743#endif
1704 1744
1705void 1745void
1706rxvt_term::focus_in () 1746rxvt_term::focus_in ()
1707{ 1747{
1708 if (!focus) 1748 if (!focus)
1709 { 1749 {
1710 focus = 1; 1750 focus = 1;
1711 want_refresh = 1; 1751 want_refresh = 1;
1712 1752
1713 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1714
1715#if USE_XIM 1753#if USE_XIM
1716 if (Input_Context != NULL) 1754 if (Input_Context != NULL)
1717 { 1755 {
1718 IMSetStatusPosition (); 1756 IMSetPosition ();
1719 XSetICFocus (Input_Context); 1757 XSetICFocus (Input_Context);
1720 } 1758 }
1721#endif 1759#endif
1722#if CURSOR_BLINK 1760#if CURSOR_BLINK
1723 if (OPTION (Opt_cursorBlink)) 1761 if (option (Opt_cursorBlink))
1724 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1762 cursor_blink_ev.again ();
1725#endif 1763#endif
1726#if OFF_FOCUS_FADING 1764#if OFF_FOCUS_FADING
1727 if (rs[Rs_fade]) 1765 if (rs[Rs_fade])
1728 { 1766 {
1729 pix_colors = pix_colors_focused; 1767 pix_colors = pix_colors_focused;
1730 scr_recolour (); 1768 scr_recolour ();
1731 } 1769 }
1732#endif 1770#endif
1771#if ENABLE_FRILLS
1772 if (option (Opt_urgentOnBell))
1773 set_urgency (0);
1774#endif
1775
1776 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1733 } 1777 }
1734} 1778}
1735 1779
1736void 1780void
1737rxvt_term::focus_out () 1781rxvt_term::focus_out ()
… …
1739 if (focus) 1783 if (focus)
1740 { 1784 {
1741 focus = 0; 1785 focus = 0;
1742 want_refresh = 1; 1786 want_refresh = 1;
1743 1787
1744 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1788#if ENABLE_FRILLS
1745 1789 if (option (Opt_urgentOnBell))
1790 set_urgency (0);
1791#endif
1746#if ENABLE_FRILLS || ISO_14755 1792#if ENABLE_FRILLS || ISO_14755
1747 if (iso14755buf) 1793 if (iso14755buf)
1748 { 1794 {
1749 iso14755buf = 0; 1795 iso14755buf = 0;
1750# if ENABLE_OVERLAY 1796# if ISO_14755
1751 scr_overlay_off (); 1797 scr_overlay_off ();
1752# endif 1798# endif
1753 } 1799 }
1754#endif 1800#endif
1755#if USE_XIM 1801#if USE_XIM
1756 if (Input_Context != NULL) 1802 if (Input_Context != NULL)
1757 XUnsetICFocus (Input_Context); 1803 XUnsetICFocus (Input_Context);
1758#endif 1804#endif
1759#if CURSOR_BLINK 1805#if CURSOR_BLINK
1760 if (OPTION (Opt_cursorBlink)) 1806 if (option (Opt_cursorBlink))
1761 cursor_blink_ev.stop (); 1807 cursor_blink_ev.stop ();
1808
1762 hidden_cursor = 0; 1809 hidden_cursor = 0;
1763#endif 1810#endif
1764#if OFF_FOCUS_FADING 1811#if OFF_FOCUS_FADING
1765 if (rs[Rs_fade]) 1812 if (rs[Rs_fade])
1766 { 1813 {
1767 pix_colors = pix_colors_unfocused; 1814 pix_colors = pix_colors_unfocused;
1768 scr_recolour (); 1815 scr_recolour ();
1769 } 1816 }
1770#endif 1817#endif
1818
1819 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1820 }
1821}
1822
1823void
1824rxvt_term::update_fade_color (unsigned int idx)
1825{
1826#if OFF_FOCUS_FADING
1827 if (rs[Rs_fade])
1771 } 1828 {
1829 rgba c;
1830 pix_colors [Color_fade].get (c);
1831 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1832 }
1833#endif
1772} 1834}
1773 1835
1774#if TRANSPARENT 1836#if ENABLE_TRANSPARENCY || ENABLE_PERL
1775void 1837void
1776rxvt_term::rootwin_cb (XEvent &ev) 1838rxvt_term::rootwin_cb (XEvent &ev)
1777{ 1839{
1778 make_current (); 1840 make_current ();
1779 1841
1842 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1843 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1844 return;
1845
1846# if ENABLE_TRANSPARENCY
1780 switch (ev.type) 1847 switch (ev.type)
1781 { 1848 {
1782 case PropertyNotify: 1849 case PropertyNotify:
1783 /* 1850 /*
1784 * if user used some Esetroot compatible prog to set the root bg, 1851 * if user used some Esetroot compatible prog to set the root bg,
1785 * use the property to determine the pixmap. We use it later on. 1852 * use the property to determine the pixmap. We use it later on.
1786 */ 1853 */
1787 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1854 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1788 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1855 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1789 return; 1856 {
1857 bgPixmap.set_root_pixmap ();
1858 update_background ();
1859 }
1790 1860
1791 /* FALLTHROUGH */
1792 case ReparentNotify:
1793 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1794 want_refresh = want_full_refresh = 1;
1795 break; 1861 break;
1796 } 1862 }
1863# endif
1864
1865 refresh_check ();
1797} 1866}
1798#endif 1867#endif
1799 1868
1800void 1869void
1801rxvt_term::button_press (XButtonEvent &ev) 1870rxvt_term::button_press (XButtonEvent &ev)
… …
1832 /* save the xbutton state (for ButtonRelease) */ 1901 /* save the xbutton state (for ButtonRelease) */
1833 MEvent.state = ev.state; 1902 MEvent.state = ev.state;
1834#ifdef MOUSE_REPORT_DOUBLECLICK 1903#ifdef MOUSE_REPORT_DOUBLECLICK
1835 if (ev.button == MEvent.button && clickintime) 1904 if (ev.button == MEvent.button && clickintime)
1836 { 1905 {
1837 /* same button, within alloted time */ 1906 /* same button, within allowed time */
1838 MEvent.clicks++; 1907 MEvent.clicks++;
1839 1908
1840 if (MEvent.clicks > 1) 1909 if (MEvent.clicks > 1)
1841 { 1910 {
1842 /* only report double clicks */ 1911 /* only report double clicks */
… …
1856 mouse_report (ev); 1925 mouse_report (ev);
1857 } 1926 }
1858#else 1927#else
1859 MEvent.button = ev.button; 1928 MEvent.button = ev.button;
1860 mouse_report (ev); 1929 mouse_report (ev);
1861#endif /* MOUSE_REPORT_DOUBLECLICK */ 1930#endif /* MOUSE_REPORT_DOUBLECLICK */
1862 1931
1863 } 1932 }
1864 else 1933 else
1865 { 1934 {
1866 if (ev.button != MEvent.button) 1935 if (ev.button != MEvent.button)
… …
1914 } 1983 }
1915 1984
1916 /* 1985 /*
1917 * Scrollbar window processing of button press 1986 * Scrollbar window processing of button press
1918 */ 1987 */
1919 if (isScrollbarWindow (ev.window)) 1988 if (scrollBar.state && ev.window == scrollBar.win)
1920 { 1989 {
1921 scrollBar.setIdle (); 1990 page_dirn direction = NO_DIR;
1991
1992 if (scrollBar.upButton (ev.y))
1993 direction = UP; /* up */
1994 else if (scrollBar.dnButton (ev.y))
1995 direction = DN; /* down */
1996
1997 scrollBar.state = STATE_IDLE;
1922 /* 1998 /*
1923 * Rxvt-style scrollbar: 1999 * Rxvt-style scrollbar:
1924 * move up if mouse is above slider 2000 * move up if mouse is above slider
1925 * move dn if mouse is below slider 2001 * move dn if mouse is below slider
1926 * 2002 *
… …
1935 /* 2011 /*
1936 * Mouse report disabled scrollbar: 2012 * Mouse report disabled scrollbar:
1937 * arrow buttons - send up/down 2013 * arrow buttons - send up/down
1938 * click on scrollbar - send pageup/down 2014 * click on scrollbar - send pageup/down
1939 */ 2015 */
1940 if ((scrollBar.style == R_SB_NEXT 2016 if (direction == UP)
1941 && scrollbarnext_upButton (ev.y))
1942 || (scrollBar.style == R_SB_RXVT
1943 && scrollbarrxvt_upButton (ev.y)))
1944 tt_printf ("\033[A"); 2017 tt_printf ("\033[A");
1945 else if ((scrollBar.style == R_SB_NEXT 2018 else if (direction == DN)
1946 && scrollbarnext_dnButton (ev.y))
1947 || (scrollBar.style == R_SB_RXVT
1948 && scrollbarrxvt_dnButton (ev.y)))
1949 tt_printf ("\033[B"); 2019 tt_printf ("\033[B");
1950 else 2020 else
1951 switch (ev.button) 2021 switch (ev.button)
1952 { 2022 {
1953 case Button2: 2023 case Button2:
… …
1960 tt_printf ("\033[5~"); 2030 tt_printf ("\033[5~");
1961 break; 2031 break;
1962 } 2032 }
1963 } 2033 }
1964 else 2034 else
1965#endif /* NO_SCROLLBAR_REPORT */ 2035#endif /* NO_SCROLLBAR_REPORT */
1966
1967 {
1968 char upordown = 0;
1969
1970 if (scrollBar.style == R_SB_NEXT)
1971 { 2036 {
1972 if (scrollbarnext_upButton (ev.y)) 2037 if (direction != NO_DIR)
1973 upordown = -1; /* up */
1974 else if (scrollbarnext_dnButton (ev.y))
1975 upordown = 1; /* down */
1976 }
1977 else if (scrollBar.style == R_SB_RXVT)
1978 {
1979 if (scrollbarrxvt_upButton (ev.y))
1980 upordown = -1; /* up */
1981 else if (scrollbarrxvt_dnButton (ev.y))
1982 upordown = 1; /* down */
1983 }
1984 if (upordown)
1985 { 2038 {
1986#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2039#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2040 if (!cont_scroll_ev.is_active ())
1987 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2041 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1988#endif 2042#endif
1989 if (scr_page (upordown < 0 ? UP : DN, 1)) 2043 if (scr_page (direction, 1))
1990 { 2044 {
1991 if (upordown < 0) 2045 if (direction == UP)
1992 scrollBar.setUp (); 2046 scrollBar.state = STATE_UP;
1993 else 2047 else
1994 scrollBar.setDn (); 2048 scrollBar.state = STATE_DOWN;
1995 } 2049 }
1996 } 2050 }
1997 else 2051 else
1998 switch (ev.button) 2052 switch (ev.button)
1999 { 2053 {
2000 case Button2: 2054 case Button2:
2001 switch (scrollbar_align) 2055 switch (scrollBar.align)
2002 { 2056 {
2003 case R_SB_ALIGN_TOP: 2057 case R_SB_ALIGN_TOP:
2004 csrO = 0; 2058 csrO = 0;
2005 break; 2059 break;
2006 case R_SB_ALIGN_CENTRE: 2060 case R_SB_ALIGN_CENTRE:
… …
2012 } 2066 }
2013 2067
2014 if (scrollBar.style == R_SB_XTERM 2068 if (scrollBar.style == R_SB_XTERM
2015 || scrollbar_above_slider (ev.y) 2069 || scrollbar_above_slider (ev.y)
2016 || scrollbar_below_slider (ev.y)) 2070 || scrollbar_below_slider (ev.y))
2017 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2071 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2018 2072
2019 scrollBar.setMotion (); 2073 scrollBar.state = STATE_MOTION;
2020 break; 2074 break;
2021 2075
2022 case Button1: 2076 case Button1:
2023 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2077 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2024 csrO = ev.y - scrollBar.top; 2078 csrO = ev.y - scrollBar.top;
2025 /* FALLTHROUGH */ 2079 /* FALLTHROUGH */
2026 2080
2027 case Button3: 2081 case Button3:
2028 if (scrollBar.style != R_SB_XTERM) 2082 if (scrollBar.style != R_SB_XTERM)
… …
2038 scr_page (DN, nrow - 1); 2092 scr_page (DN, nrow - 1);
2039# else 2093# else
2040 scr_page (DN, nrow / 4); 2094 scr_page (DN, nrow / 4);
2041# endif 2095# endif
2042 else 2096 else
2043 scrollBar.setMotion (); 2097 scrollBar.state = STATE_MOTION;
2044 } 2098 }
2045 else 2099 else
2046 { 2100 {
2047 scr_page ((ev.button == Button1 ? DN : UP), 2101 scr_page ((ev.button == Button1 ? DN : UP),
2048 (nrow 2102 (nrow
2049 * scrollbar_position (ev.y) 2103 * scrollbar_position (ev.y)
2050 / scrollbar_size ())); 2104 / scrollBar.size ()));
2051 } 2105 }
2052 2106
2053 break; 2107 break;
2054 } 2108 }
2055 } 2109 }
… …
2065 2119
2066 csrO = 0; /* reset csr Offset */ 2120 csrO = 0; /* reset csr Offset */
2067 if (!bypass_keystate) 2121 if (!bypass_keystate)
2068 reportmode = !! (priv_modes & PrivMode_mouse_report); 2122 reportmode = !! (priv_modes & PrivMode_mouse_report);
2069 2123
2070 if (scrollbar_isUpDn ()) 2124 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2071 { 2125 {
2072 scrollBar.setIdle (); 2126 scrollBar.state = STATE_IDLE;
2073 scrollbar_show (0); 2127 scrollBar.show (0);
2074 } 2128 }
2075 2129
2076#ifdef SELECTION_SCROLLING 2130#ifdef SELECTION_SCROLLING
2077 if (sel_scroll_ev.active)
2078 sel_scroll_ev.stop(); 2131 sel_scroll_ev.stop();
2079#endif 2132#endif
2080 2133
2081 if (ev.window == vt) 2134 if (ev.window == vt)
2082 { 2135 {
2083 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2136 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
… …
2107 mouse_report (ev); 2160 mouse_report (ev);
2108 } 2161 }
2109#else /* MOUSE_REPORT_DOUBLECLICK */ 2162#else /* MOUSE_REPORT_DOUBLECLICK */
2110 MEvent.button = AnyButton; 2163 MEvent.button = AnyButton;
2111 mouse_report (ev); 2164 mouse_report (ev);
2112#endif /* MOUSE_REPORT_DOUBLECLICK */ 2165#endif /* MOUSE_REPORT_DOUBLECLICK */
2113 return; 2166 return;
2114 } 2167 }
2115 2168
2116 /* 2169 /*
2117 * dumb hack to compensate for the failure of click-and-drag 2170 * dumb hack to compensate for the failure of click-and-drag
… …
2129 selection_make (ev.time); 2182 selection_make (ev.time);
2130 break; 2183 break;
2131 2184
2132 case Button2: 2185 case Button2:
2133 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2186 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2134 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary); 2187 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2135 break; 2188 break;
2136 2189
2137#ifdef MOUSE_WHEEL 2190#ifdef MOUSE_WHEEL
2138 case Button4: 2191 case Button4:
2139 case Button5: 2192 case Button5:
… …
2143 2196
2144 v = ev.button == Button4 ? UP : DN; 2197 v = ev.button == Button4 ? UP : DN;
2145 2198
2146 if (ev.state & ShiftMask) 2199 if (ev.state & ShiftMask)
2147 i = 1; 2200 i = 1;
2148 else if (OPTION (Opt_mouseWheelScrollPage)) 2201 else if (option (Opt_mouseWheelScrollPage))
2149 i = nrow - 1; 2202 i = nrow - 1;
2150 else 2203 else
2151 i = 5; 2204 i = 5;
2152 2205
2153# ifdef MOUSE_SLIP_WHEELING 2206# ifdef MOUSE_SLIP_WHEELING
… …
2155 { 2208 {
2156 mouse_slip_wheel_speed += v ? -1 : 1; 2209 mouse_slip_wheel_speed += v ? -1 : 1;
2157 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2210 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2158 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2211 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2159 2212
2160 if (slip_wheel_ev.at < NOW) 2213 if (!slip_wheel_ev.is_active ())
2161 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2214 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2162
2163 slip_wheel_ev.start ();
2164 } 2215 }
2165 else 2216 else
2217# endif
2166 { 2218 {
2167# endif
2168 scr_page (v, i); 2219 scr_page (v, i);
2169 scrollbar_show (1); 2220 scrollBar.show (1);
2170# ifdef MOUSE_SLIP_WHEELING
2171 } 2221 }
2172# endif
2173 } 2222 }
2174 break; 2223 break;
2175#endif 2224#endif
2176 } 2225 }
2177 } 2226 }
2178} 2227}
2179 2228
2180#ifdef TRANSPARENT
2181#if TINTING
2182/* taken from aterm-0.4.2 */
2183
2184typedef uint32_t RUINT32T;
2185
2186void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2187{
2188 int sh_r, sh_g, sh_b;
2189 RUINT32T mask_r, mask_g, mask_b;
2190 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2191 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2192 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2193 int i;
2194
2195 Visual *visual = display->visual;
2196
2197 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2198
2199 /* for convenience */
2200 mask_r = visual->red_mask;
2201 mask_g = visual->green_mask;
2202 mask_b = visual->blue_mask;
2203
2204 /* boring lookup table pre-initialization */
2205 switch (srcImage->bits_per_pixel) {
2206 case 15:
2207 if ((mask_r != 0x7c00) ||
2208 (mask_g != 0x03e0) ||
2209 (mask_b != 0x001f))
2210 return;
2211 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2212 lookup_r = lookup;
2213 lookup_g = lookup+32;
2214 lookup_b = lookup+32+32;
2215 sh_r = 10;
2216 sh_g = 5;
2217 sh_b = 0;
2218 break;
2219 case 16:
2220 if ((mask_r != 0xf800) ||
2221 (mask_g != 0x07e0) ||
2222 (mask_b != 0x001f))
2223 return;
2224 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2225 lookup_r = lookup;
2226 lookup_g = lookup+32;
2227 lookup_b = lookup+32+64;
2228 sh_r = 11;
2229 sh_g = 5;
2230 sh_b = 0;
2231 break;
2232 case 24:
2233 if ((mask_r != 0xff0000) ||
2234 (mask_g != 0x00ff00) ||
2235 (mask_b != 0x0000ff))
2236 return;
2237 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2238 lookup_r = lookup;
2239 lookup_g = lookup+256;
2240 lookup_b = lookup+256+256;
2241 sh_r = 16;
2242 sh_g = 8;
2243 sh_b = 0;
2244 break;
2245 case 32:
2246 if ((mask_r != 0xff0000) ||
2247 (mask_g != 0x00ff00) ||
2248 (mask_b != 0x0000ff))
2249 return;
2250 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2251 lookup_r = lookup;
2252 lookup_g = lookup+256;
2253 lookup_b = lookup+256+256;
2254 sh_r = 16;
2255 sh_g = 8;
2256 sh_b = 0;
2257 break;
2258 default:
2259 return; /* we do not support this color depth */
2260 }
2261
2262 /* prepare limits for color transformation (each channel is handled separately) */
2263 if (shade < 0) {
2264 shade = -shade;
2265 if (shade < 0) shade = 0;
2266 if (shade > 100) shade = 100;
2267
2268 lower_lim_r = 65535-rm;
2269 lower_lim_g = 65535-gm;
2270 lower_lim_b = 65535-bm;
2271
2272 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2273 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2274 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2275
2276 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2277 } else {
2278 if (shade < 0) shade = 0;
2279 if (shade > 100) shade = 100;
2280
2281 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2282
2283 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2284 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2285 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2286 }
2287
2288 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2289 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2290 {
2291 unsigned int tmp;
2292
2293 tmp = lower_lim_r;
2294 lower_lim_r = lower_lim_b;
2295 lower_lim_b = tmp;
2296
2297 tmp = upper_lim_r;
2298 upper_lim_r = upper_lim_b;
2299 upper_lim_b = tmp;
2300 }
2301
2302 /* fill our lookup tables */
2303 for (i = 0; i <= mask_r>>sh_r; i++)
2304 {
2305 RUINT32T tmp;
2306 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2307 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2308 lookup_r[i] = (tmp/65535)<<sh_r;
2309 }
2310 for (i = 0; i <= mask_g>>sh_g; i++)
2311 {
2312 RUINT32T tmp;
2313 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2314 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2315 lookup_g[i] = (tmp/65535)<<sh_g;
2316 }
2317 for (i = 0; i <= mask_b>>sh_b; i++)
2318 {
2319 RUINT32T tmp;
2320 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2321 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2322 lookup_b[i] = (tmp/65535)<<sh_b;
2323 }
2324
2325 /* apply table to input image (replacing colors by newly calculated ones) */
2326 switch (srcImage->bits_per_pixel)
2327 {
2328 case 15:
2329 {
2330 unsigned short *p1, *pf, *p, *pl;
2331 p1 = (unsigned short *) srcImage->data;
2332 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2333 while (p1 < pf)
2334 {
2335 p = p1;
2336 pl = p1 + srcImage->width;
2337 for (; p < pl; p++)
2338 {
2339 *p = lookup_r[(*p & 0x7c00)>>10] |
2340 lookup_g[(*p & 0x03e0)>> 5] |
2341 lookup_b[(*p & 0x001f)];
2342 }
2343 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2344 }
2345 break;
2346 }
2347 case 16:
2348 {
2349 unsigned short *p1, *pf, *p, *pl;
2350 p1 = (unsigned short *) srcImage->data;
2351 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2352 while (p1 < pf)
2353 {
2354 p = p1;
2355 pl = p1 + srcImage->width;
2356 for (; p < pl; p++)
2357 {
2358 *p = lookup_r[(*p & 0xf800)>>11] |
2359 lookup_g[(*p & 0x07e0)>> 5] |
2360 lookup_b[(*p & 0x001f)];
2361 }
2362 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2363 }
2364 break;
2365 }
2366 case 24:
2367 {
2368 unsigned char *p1, *pf, *p, *pl;
2369 p1 = (unsigned char *) srcImage->data;
2370 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2371 while (p1 < pf)
2372 {
2373 p = p1;
2374 pl = p1 + srcImage->width * 3;
2375 for (; p < pl; p += 3)
2376 {
2377 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2378 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2379 p[2] = lookup_r[(p[2] & 0x0000ff)];
2380 }
2381 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2382 }
2383 break;
2384 }
2385 case 32:
2386 {
2387 RUINT32T *p1, *pf, *p, *pl;
2388 p1 = (RUINT32T *) srcImage->data;
2389 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2390
2391 while (p1 < pf)
2392 {
2393 p = p1;
2394 pl = p1 + srcImage->width;
2395 for (; p < pl; p++)
2396 {
2397 *p = lookup_r[(*p & 0xff0000)>>16] |
2398 lookup_g[(*p & 0x00ff00)>> 8] |
2399 lookup_b[(*p & 0x0000ff)] |
2400 (*p & ~0xffffff);
2401 }
2402 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2403 }
2404 break;
2405 }
2406 }
2407
2408 free (lookup);
2409}
2410#endif
2411
2412/*
2413 * Check our parents are still who we think they are.
2414 * Do transparency updates if required
2415 */
2416int
2417rxvt_term::check_our_parents ()
2418{
2419 int i, pchanged, aformat, have_pixmap, rootdepth;
2420 unsigned long nitems, bytes_after;
2421 Atom atype;
2422 unsigned char *prop = NULL;
2423 Window root, oldp, *list;
2424 Pixmap rootpixmap = None;
2425 XWindowAttributes wattr, wrootattr;
2426 dDisp;
2427
2428 pchanged = 0;
2429
2430 if (!OPTION (Opt_transparent))
2431 return pchanged; /* Don't try any more */
2432
2433 XGetWindowAttributes (disp, display->root, &wrootattr);
2434 rootdepth = wrootattr.depth;
2435
2436 XGetWindowAttributes (disp, parent[0], &wattr);
2437
2438 if (rootdepth != wattr.depth)
2439 {
2440 if (am_transparent)
2441 {
2442 pchanged = 1;
2443 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2444 am_transparent = am_pixmap_trans = 0;
2445 }
2446
2447 return pchanged; /* Don't try any more */
2448 }
2449
2450 /* Get all X ops out of the queue so that our information is up-to-date. */
2451 XSync (disp, False);
2452
2453 /*
2454 * Make the frame window set by the window manager have
2455 * the root background. Some window managers put multiple nested frame
2456 * windows for each client, so we have to take care about that.
2457 */
2458 i = (xa[XA_XROOTPMAP_ID]
2459 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2460 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2461 &nitems, &bytes_after, &prop) == Success);
2462
2463 if (!i || prop == NULL)
2464 i = (xa[XA_ESETROOT_PMAP_ID]
2465 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2466 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2467 &nitems, &bytes_after, &prop) == Success);
2468
2469 if (!i || prop == NULL
2470#if TINTING
2471 || !rs[Rs_color + Color_tint]
2472#endif
2473 )
2474 have_pixmap = 0;
2475 else
2476 {
2477 have_pixmap = 1;
2478 rootpixmap = *(Pixmap *)prop;
2479 XFree (prop);
2480 }
2481
2482 if (have_pixmap)
2483 {
2484 /*
2485 * Copy display->root pixmap transparency
2486 */
2487 int sx, sy, nx, ny;
2488 unsigned int nw, nh;
2489 Window cr;
2490 XImage *image;
2491 GC gc;
2492 XGCValues gcvalue;
2493
2494 XTranslateCoordinates (disp, parent[0], display->root,
2495 0, 0, &sx, &sy, &cr);
2496 nw = (unsigned int)szHint.width;
2497 nh = (unsigned int)szHint.height;
2498 nx = ny = 0;
2499
2500 if (sx < 0)
2501 {
2502 nw += sx;
2503 nx = -sx;
2504 sx = 0;
2505 }
2506
2507 if (sy < 0)
2508 {
2509 nh += sy;
2510 ny = -sy;
2511 sy = 0;
2512 }
2513
2514 min_it (nw, (unsigned int) (wrootattr.width - sx));
2515 min_it (nh, (unsigned int) (wrootattr.height - sy));
2516
2517 XSync (disp, False);
2518 allowedxerror = -1;
2519 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2520
2521 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2522 /* XXX: may need a delay here? */
2523 allowedxerror = 0;
2524
2525 if (image == NULL)
2526 {
2527 if (am_transparent && am_pixmap_trans)
2528 {
2529 pchanged = 1;
2530 if (pixmap != None)
2531 {
2532 XFreePixmap (disp, pixmap);
2533 pixmap = None;
2534 }
2535 }
2536
2537 am_pixmap_trans = 0;
2538 }
2539 else
2540 {
2541 if (pixmap != None)
2542 XFreePixmap (disp, pixmap);
2543
2544#if TINTING
2545 if (ISSET_PIXCOLOR (Color_tint))
2546 {
2547 unsigned short rm, gm, bm;
2548 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2549
2550 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2551
2552 ShadeXImage (display, image, shade, rm, gm, bm);
2553 }
2554#endif
2555
2556 pixmap = XCreatePixmap (disp, vt,
2557 szHint.width, szHint.height, image->depth);
2558 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2559 XPutImage (disp, pixmap, gc, image, 0, 0,
2560 nx, ny, image->width, image->height);
2561 XFreeGC (disp, gc);
2562 XDestroyImage (image);
2563 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2564 XClearWindow (disp, parent[0]);
2565
2566 if (!am_transparent || !am_pixmap_trans)
2567 pchanged = 1;
2568
2569 am_transparent = am_pixmap_trans = 1;
2570 }
2571 }
2572
2573 if (am_pixmap_trans)
2574 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2575 else
2576 {
2577 unsigned int n;
2578 /*
2579 * InheritPixmap transparency
2580 */
2581 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2582 {
2583 oldp = parent[i];
2584 XQueryTree (disp, parent[i - 1], &root,
2585 &parent[i], &list, &n);
2586 XFree (list);
2587
2588 if (parent[i] == display->root)
2589 {
2590 if (oldp != None)
2591 pchanged = 1;
2592
2593 break;
2594 }
2595
2596 if (oldp != parent[i])
2597 pchanged = 1;
2598 }
2599
2600 n = 0;
2601
2602 if (pchanged)
2603 {
2604 for (; n < (unsigned int)i; n++)
2605 {
2606 XGetWindowAttributes (disp, parent[n], &wattr);
2607 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2608 {
2609 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2610 break;
2611 }
2612 }
2613 }
2614
2615 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2616 {
2617 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2618 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2619 am_transparent = 0;
2620 /* XXX: also turn off Opt_transparent? */
2621 }
2622 else
2623 {
2624 for (n = 0; n < (unsigned int)i; n++)
2625 {
2626 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2627 XClearWindow (disp, parent[n]);
2628 }
2629
2630 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2631 am_transparent = 1;
2632 }
2633
2634 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2635 parent[i] = None;
2636 }
2637
2638 if (scrollBar.win)
2639 {
2640 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2641 scrollBar.setIdle ();
2642 scrollbar_show (0);
2643 }
2644
2645 if (am_transparent)
2646 {
2647 want_refresh = want_full_refresh = 1;
2648 if (am_pixmap_trans)
2649 flush ();
2650 }
2651
2652 return pchanged;
2653}
2654#endif
2655
2656/*}}} */ 2229/*}}} */
2657 2230
2658bool 2231void
2659rxvt_term::cmd_parse () 2232rxvt_term::cmd_parse ()
2660{ 2233{
2661 bool flag = false;
2662 wchar_t ch = NOCHAR; 2234 wchar_t ch = NOCHAR;
2663 char *seq_begin; // remember start of esc-sequence here 2235 char *seq_begin; // remember start of esc-sequence here
2664 2236
2665 for (;;) 2237 for (;;)
2666 { 2238 {
2667 if (ch == NOCHAR) 2239 if (expect_false (ch == NOCHAR))
2668 { 2240 {
2669 seq_begin = cmdbuf_ptr; 2241 seq_begin = cmdbuf_ptr;
2670 ch = next_char (); 2242 ch = next_char ();
2671 2243
2672 if (ch == NOCHAR) 2244 if (ch == NOCHAR)
2673 break; 2245 break;
2674 } 2246 }
2675 2247
2676 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2248 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2677 { 2249 {
2678 if (!seen_input) 2250 if (expect_false (!seen_input))
2679 { 2251 {
2680 seen_input = 1; 2252 seen_input = 1;
2681 // many badly-written programs (e.g. jed) contain a race condition: 2253 // many badly-written programs (e.g. jed) contain a race condition:
2682 // they first read the screensize and then install a SIGWINCH handler. 2254 // they first read the screensize and then install a SIGWINCH handler.
2683 // some window managers resize the window early, and these programs 2255 // some window managers resize the window early, and these programs
… …
2696 wchar_t *str = buf; 2268 wchar_t *str = buf;
2697 wchar_t *eol = str + min (ncol, UBUFSIZ); 2269 wchar_t *eol = str + min (ncol, UBUFSIZ);
2698 2270
2699 for (;;) 2271 for (;;)
2700 { 2272 {
2701 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2273 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2702 break; 2274 break;
2703 2275
2704 *str++ = ch; 2276 *str++ = ch;
2705 2277
2706 if (ch == C0_LF || str >= eol) 2278 if (expect_false (ch == C0_LF || str >= eol))
2707 { 2279 {
2708 if (ch == C0_LF) 2280 if (ch == C0_LF)
2709 nlines++; 2281 nlines++;
2710 2282
2711 refresh_count++; 2283 refresh_count++;
2712 2284
2713 if (!OPTION (Opt_jumpScroll) 2285 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2714 || (refresh_count >= refresh_limit * (nrow - 1)))
2715 { 2286 {
2716 refreshnow = true;
2717 refresh_count = 0; 2287 refresh_count = 0;
2288
2289 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2290 {
2291 refreshnow = true;
2718 ch = NOCHAR; 2292 ch = NOCHAR;
2719 break; 2293 break;
2294 }
2720 } 2295 }
2721 2296
2722 // scr_add_lines only works for nlines <= nrow - 1. 2297 // scr_add_lines only works for nlines <= nrow - 1.
2723 if (nlines >= nrow - 1) 2298 if (nlines >= nrow - 1)
2724 { 2299 {
… …
2752 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2327 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2753 scr_add_lines (buf, str - buf, nlines); 2328 scr_add_lines (buf, str - buf, nlines);
2754 2329
2755 /* 2330 /*
2756 * If there have been a lot of new lines, then update the screen 2331 * If there have been a lot of new lines, then update the screen
2757 * What the heck I'll cheat and only refresh less than every page-full. 2332 * What the heck we'll cheat and only refresh less than every page-full.
2758 * the number of pages between refreshes is refresh_limit, which 2333 * if skipScroll is enabled.
2759 * is incremented here because we must be doing flat-out scrolling.
2760 */ 2334 */
2761 if (refreshnow) 2335 if (refreshnow)
2762 { 2336 {
2763 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2764 refresh_limit++;
2765 else
2766 {
2767 flag = true;
2768 scr_refresh (); 2337 scr_refresh ();
2769 want_refresh = 1; 2338 want_refresh = 1;
2770 }
2771 } 2339 }
2772
2773 } 2340 }
2774 else 2341 else
2775 { 2342 {
2776 try 2343 try
2777 { 2344 {
… …
2785 } 2352 }
2786 2353
2787 ch = NOCHAR; 2354 ch = NOCHAR;
2788 } 2355 }
2789 } 2356 }
2790
2791 return flag;
2792} 2357}
2793 2358
2794// read the next character 2359// read the next character
2795wchar_t 2360wchar_t
2796rxvt_term::next_char () NOTHROW 2361rxvt_term::next_char () NOTHROW
2797{ 2362{
2798 while (cmdbuf_ptr < cmdbuf_endp) 2363 while (cmdbuf_ptr < cmdbuf_endp)
2799 { 2364 {
2800 // assume 7-bit to be ascii ALWAYS 2365 // assume 7-bit to be ascii ALWAYS
2801 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2366 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2802 return *cmdbuf_ptr++; 2367 return *cmdbuf_ptr++;
2803 2368
2804 wchar_t wc; 2369 wchar_t wc;
2805 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2370 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2806 2371
… …
2810 cmdbuf_ptr = cmdbuf_endp; 2375 cmdbuf_ptr = cmdbuf_endp;
2811 break; 2376 break;
2812 } 2377 }
2813 2378
2814 if (len == (size_t)-1) 2379 if (len == (size_t)-1)
2380 {
2381 mbstate.reset (); // reset now undefined conversion state
2815 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2382 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2383 }
2816 2384
2817 // assume wchar == unicode 2385 // assume wchar == unicode
2818 cmdbuf_ptr += len; 2386 cmdbuf_ptr += len;
2819 return wc & UNICODE_MASK; 2387 return wc & UNICODE_MASK;
2820 } 2388 }
… …
2864/*----------------------------------------------------------------------*/ 2432/*----------------------------------------------------------------------*/
2865#ifdef PRINTPIPE 2433#ifdef PRINTPIPE
2866FILE * 2434FILE *
2867rxvt_term::popen_printer () 2435rxvt_term::popen_printer ()
2868{ 2436{
2869 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2437 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2870 2438
2871 if (stream == NULL) 2439 if (stream == NULL)
2872 rxvt_warn ("can't open printer pipe, not printing.\n"); 2440 rxvt_warn ("can't open printer pipe, not printing.\n");
2873 2441
2874 return stream; 2442 return stream;
… …
2885 * simulate attached vt100 printer 2453 * simulate attached vt100 printer
2886 */ 2454 */
2887void 2455void
2888rxvt_term::process_print_pipe () 2456rxvt_term::process_print_pipe ()
2889{ 2457{
2890 int done; 2458 FILE *fd = popen_printer ();
2891 FILE *fd;
2892 2459
2893 if ((fd = popen_printer ()) == NULL) 2460 if (!fd)
2894 return; 2461 return;
2895 2462
2896 /* 2463 /*
2897 * Send all input to the printer until either ESC[4i or ESC[?4i 2464 * Send all input to the printer until either ESC[4i or ESC[?4i
2898 * is received. 2465 * is received.
2899 */ 2466 */
2900 for (done = 0; !done;) 2467 for (int done = 0; !done; )
2901 { 2468 {
2902 unsigned char buf[8]; 2469 unsigned char buf[8];
2903 unicode_t ch; 2470 unicode_t ch;
2904 unsigned int i, len; 2471 unsigned int i, len;
2905 2472
… …
2924 { 2491 {
2925 if ((buf[len++] = cmd_getc ()) == 'i') 2492 if ((buf[len++] = cmd_getc ()) == 'i')
2926 break; /* done = 1 */ 2493 break; /* done = 1 */
2927 } 2494 }
2928 } 2495 }
2929 2496
2930 for (i = 0; i < len; i++) 2497 for (i = 0; i < len; i++)
2931 if (putc (buf[i], fd) == EOF) 2498 if (putc (buf[i], fd) == EOF)
2932 { 2499 {
2933 done = 1; 2500 done = 1;
2934 break; 2501 break;
… …
2936 } 2503 }
2937 } 2504 }
2938 2505
2939 pclose_printer (fd); 2506 pclose_printer (fd);
2940} 2507}
2941#endif /* PRINTPIPE */ 2508#endif /* PRINTPIPE */
2942/*}}} */ 2509/*}}} */
2943 2510
2944/* *INDENT-OFF* */ 2511/* *INDENT-OFF* */
2945enum { 2512enum {
2946 C1_40 = 0x40, 2513 C1_40 = 0x40,
… …
2996 process_dcs_seq (); 2563 process_dcs_seq ();
2997 break; 2564 break;
2998 case 0x9b: /* CSI */ 2565 case 0x9b: /* CSI */
2999 process_csi_seq (); 2566 process_csi_seq ();
3000 break; 2567 break;
3001 case 0x9d: /* CSI */ 2568 case 0x9d: /* OSC */
3002 process_osc_seq (); 2569 process_osc_seq ();
3003 break; 2570 break;
3004#endif 2571#endif
3005 } 2572 }
3006} 2573}
… …
3050 break; 2617 break;
3051 case 'Z': /* identify the terminal type */ 2618 case 'Z': /* identify the terminal type */
3052 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2619 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
3053 break; 2620 break;
3054 case '<': /* turn off VT52 mode */ 2621 case '<': /* turn off VT52 mode */
3055 PrivMode (0, PrivMode_vt52); 2622 set_privmode (PrivMode_vt52, 0);
3056 break; 2623 break;
3057 case 'F': /* use special graphics character set */ 2624 case 'F': /* use special graphics character set */
3058 case 'G': /* use regular character set */ 2625 case 'G': /* use regular character set */
3059 /* unimplemented */ 2626 /* unimplemented */
3060 break; 2627 break;
… …
3096 scr_charset_set (2, (unsigned int)cmd_getc ()); 2663 scr_charset_set (2, (unsigned int)cmd_getc ());
3097 break; 2664 break;
3098 case '+': 2665 case '+':
3099 scr_charset_set (3, (unsigned int)cmd_getc ()); 2666 scr_charset_set (3, (unsigned int)cmd_getc ());
3100 break; 2667 break;
3101#if ENABLE_FRILLS 2668#if !ENABLE_MINIMAL
3102 case '6': 2669 case '6':
3103 scr_backindex (); 2670 scr_backindex ();
3104 break; 2671 break;
3105#endif 2672#endif
3106 case '7': 2673 case '7':
3107 scr_cursor (SAVE); 2674 scr_cursor (SAVE);
3108 break; 2675 break;
3109 case '8': 2676 case '8':
3110 scr_cursor (RESTORE); 2677 scr_cursor (RESTORE);
3111 break; 2678 break;
3112#if ENABLE_FRILLS 2679#if !ENABLE_MINIMAL
3113 case '9': 2680 case '9':
3114 scr_forwardindex (); 2681 scr_forwardindex ();
3115 break; 2682 break;
3116#endif 2683#endif
3117 case '=': 2684 case '=':
3118 case '>': 2685 case '>':
3119 PrivMode ((ch == '='), PrivMode_aplKP); 2686 set_privmode (PrivMode_aplKP, ch == '=');
3120 break; 2687 break;
3121 2688
3122 case C1_40: 2689 case C1_40:
3123 cmd_getc (); 2690 cmd_getc ();
3124 break; 2691 break;
… …
3128 2695
3129 /* 8.3.87: NEXT LINE */ 2696 /* 8.3.87: NEXT LINE */
3130 case C1_NEL: /* ESC E */ 2697 case C1_NEL: /* ESC E */
3131 { 2698 {
3132 wchar_t nlcr[] = { C0_LF, C0_CR }; 2699 wchar_t nlcr[] = { C0_LF, C0_CR };
3133 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2700 scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1);
3134 } 2701 }
3135 break; 2702 break;
3136 2703
3137 /* kidnapped escape sequence: Should be 8.3.48 */ 2704 /* kidnapped escape sequence: Should be 8.3.48 */
3138 case C1_ESA: /* ESC G */ 2705 case C1_ESA: /* ESC G */
… …
3163 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2730 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3164 case C1_SCI: /* ESC Z */ 2731 case C1_SCI: /* ESC Z */
3165 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2732 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3166 break; /* steal obsolete ESC [ c */ 2733 break; /* steal obsolete ESC [ c */
3167 2734
3168 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2735 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
3169 case C1_CSI: /* ESC [ */ 2736 case C1_CSI: /* ESC [ */
3170 process_csi_seq (); 2737 process_csi_seq ();
3171 break; 2738 break;
3172 2739
3173 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2740 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
3174 case C1_OSC: /* ESC ] */ 2741 case C1_OSC: /* ESC ] */
3175 process_osc_seq (); 2742 process_osc_seq ();
3176 break; 2743 break;
3177 2744
3178 /* 8.3.106: RESET TO INITIAL STATE */ 2745 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
3179 case 'c': 2746 case 'c':
3180 mbstate.reset (); 2747 mbstate.reset ();
3181 scr_poweron (); 2748 scr_poweron ();
3182 scrollbar_show (1); 2749 scrollBar.show (1);
3183 break; 2750 break;
3184 2751
3185 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2752 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
3186 case 'n': 2753 case 'n':
3187 scr_charset_choose (2); 2754 scr_charset_choose (2);
… …
3207 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2774 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
3208 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2775 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
3209 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2776 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
3210}; 2777};
3211 2778
3212#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2779#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
3213 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2780 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
3214 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2781 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
3215#define get_byte_array_bit(array, bit) \ 2782#define get_byte_array_bit(array, bit) \
3216 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2783 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
3217 2784
3218const unsigned char csi_defaults[] = 2785static const unsigned char csi_defaults[] =
3219 { 2786 {
3220 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2787 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
3221 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2788 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
3222 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2789 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
3223 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2790 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
… …
3232rxvt_term::process_csi_seq () 2799rxvt_term::process_csi_seq ()
3233{ 2800{
3234 unicode_t ch, priv, i; 2801 unicode_t ch, priv, i;
3235 unsigned int nargs, p; 2802 unsigned int nargs, p;
3236 int n, ndef; 2803 int n, ndef;
3237 int arg[ESC_ARGS]; 2804 int arg[ESC_ARGS] = { };
3238 2805
3239 for (nargs = ESC_ARGS; nargs > 0;) 2806 nargs = 0;
3240 arg[--nargs] = 0;
3241 2807
3242 priv = 0; 2808 priv = 0;
3243 ch = cmd_getc (); 2809 ch = cmd_getc ();
3244 if (ch >= '<' && ch <= '?') 2810 if ((ch >= '<' && ch <= '?') || ch == '!')
2811 {
3245 { /* '<' '=' '>' '?' */ 2812 /* '<' '=' '>' '?' '!' */
3246 priv = ch; 2813 priv = ch;
3247 ch = cmd_getc (); 2814 ch = cmd_getc ();
3248 } 2815 }
3249 2816
3250 /* read any numerical arguments */ 2817 /* read any numerical arguments */
… …
3289 switch (priv) 2856 switch (priv)
3290 { 2857 {
3291 case '>': 2858 case '>':
3292 if (ch == CSI_DA) /* secondary device attributes */ 2859 if (ch == CSI_DA) /* secondary device attributes */
3293 { 2860 {
3294 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, 2861 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
3295 // 'U' for rxvt-unicode <= 7.2, and Mm85 (e.g. 7385 for 7.3) for later versions. 2862 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3296 // 2863 //
3297 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2864 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3298 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2865 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
3299 // that we do not support xterm mouse reporting (should be 95 when we do). 2866 // versions.
3300 // 2867 //
3301 tt_printf ("\033[>%c%c85;94;0c", VERSION[0], VERSION[1]); 2868 tt_printf ("\033[>%d;95;0c", 'U');
3302 } 2869 }
3303 break; 2870 break;
2871
3304 case '?': 2872 case '?':
3305 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2873 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3306 process_terminal_mode (ch, priv, nargs, arg); 2874 process_terminal_mode (ch, priv, nargs, arg);
3307 break; 2875 break;
2876
2877 case '!':
2878 if (ch == CSI_70)
2879 {
2880 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2881 scr_soft_reset ();
2882
2883 static const int pm_h[] = { 7, 25 };
2884 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2885
2886 process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h);
2887 process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l);
3308 } 2888 }
2889 break;
2890 }
2891
3309 return; 2892 return;
3310 } 2893 }
3311 2894
3312 switch (ch) 2895 switch (ch)
3313 { 2896 {
… …
3433 break; 3016 break;
3434 case 6: /* CPR requested */ 3017 case 6: /* CPR requested */
3435 scr_report_position (); 3018 scr_report_position ();
3436 break; 3019 break;
3437 case 7: /* unofficial extension */ 3020 case 7: /* unofficial extension */
3438 if (OPTION (Opt_insecure)) 3021 if (option (Opt_insecure))
3439 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3022 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3440 break; 3023 break;
3441 case 8: /* unofficial extension */ 3024 case 8: /* unofficial extension */
3442 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3025 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3443 break; 3026 break;
… …
3510 break; 3093 break;
3511 case CSI_75: 3094 case CSI_75:
3512 scr_cursor (RESTORE); 3095 scr_cursor (RESTORE);
3513 break; 3096 break;
3514 3097
3515#if ENABLE_FRILLS 3098#if !ENABLE_MINIMAL
3516 case CSI_74: 3099 case CSI_74:
3517 process_window_ops (arg, nargs); 3100 process_window_ops (arg, nargs);
3518 break; 3101 break;
3519#endif 3102#endif
3520 3103
… …
3527 break; 3110 break;
3528 } 3111 }
3529} 3112}
3530/*}}} */ 3113/*}}} */
3531 3114
3532#if ENABLE_FRILLS 3115#if !ENABLE_MINIMAL
3533/* ARGSUSED */ 3116/* ARGSUSED */
3534void 3117void
3535rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3118rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3536{ 3119{
3537 int x, y; 3120 int x, y;
3538 XWindowAttributes wattr; 3121 XWindowAttributes wattr;
3539 Window wdummy; 3122 Window wdummy;
3540 dDisp; 3123
3124 dLocal (Display *, dpy);
3541 3125
3542 if (nargs == 0) 3126 if (nargs == 0)
3543 return; 3127 return;
3544 3128
3545 switch (args[0]) 3129 switch (args[0])
3546 { 3130 {
3547 /* 3131 /*
3548 * commands 3132 * commands
3549 */ 3133 */
3550 case 1: /* deiconify window */ 3134 case 1: /* deiconify window */
3551 XMapWindow (disp, parent[0]); 3135 XMapWindow (dpy, parent[0]);
3552 break; 3136 break;
3553 case 2: /* iconify window */ 3137 case 2: /* iconify window */
3554 XIconifyWindow (disp, parent[0], display->screen); 3138 XIconifyWindow (dpy, parent[0], display->screen);
3555 break; 3139 break;
3556 case 3: /* set position (pixels) */ 3140 case 3: /* set position (pixels) */
3557 XMoveWindow (disp, parent[0], args[1], args[2]); 3141 XMoveWindow (dpy, parent[0], args[1], args[2]);
3558 break; 3142 break;
3559 case 4: /* set size (pixels) */ 3143 case 4: /* set size (pixels) */
3560 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3144 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3561 break; 3145 break;
3562 case 5: /* raise window */ 3146 case 5: /* raise window */
3563 XRaiseWindow (disp, parent[0]); 3147 XRaiseWindow (dpy, parent[0]);
3564 break; 3148 break;
3565 case 6: /* lower window */ 3149 case 6: /* lower window */
3566 XLowerWindow (disp, parent[0]); 3150 XLowerWindow (dpy, parent[0]);
3567 break; 3151 break;
3568 case 7: /* refresh window */ 3152 case 7: /* refresh window */
3569 scr_touch (true); 3153 scr_touch (true);
3570 break; 3154 break;
3571 case 8: /* set size (chars) */ 3155 case 8: /* set size (chars) */
… …
3578 if (args[0] >= 24) /* set height (chars) */ 3162 if (args[0] >= 24) /* set height (chars) */
3579 set_widthheight ((unsigned int)width, 3163 set_widthheight ((unsigned int)width,
3580 (unsigned int) (args[1] * fheight)); 3164 (unsigned int) (args[1] * fheight));
3581 break; 3165 break;
3582 3166
3583
3584 /* 3167 /*
3585 * reports - some output format copied from XTerm 3168 * reports - some output format copied from XTerm
3586 */ 3169 */
3587 case 11: /* report window state */ 3170 case 11: /* report window state */
3588 XGetWindowAttributes (disp, parent[0], &wattr); 3171 XGetWindowAttributes (dpy, parent[0], &wattr);
3589 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3172 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3590 break; 3173 break;
3591 case 13: /* report window position */ 3174 case 13: /* report window position */
3592 XGetWindowAttributes (disp, parent[0], &wattr); 3175 XGetWindowAttributes (dpy, parent[0], &wattr);
3593 XTranslateCoordinates (disp, parent[0], wattr.root, 3176 XTranslateCoordinates (dpy, parent[0], wattr.root,
3594 -wattr.border_width, -wattr.border_width, 3177 -wattr.border_width, -wattr.border_width,
3595 &x, &y, &wdummy); 3178 &x, &y, &wdummy);
3596 tt_printf ("\033[3;%d;%dt", x, y); 3179 tt_printf ("\033[3;%d;%dt", x, y);
3597 break; 3180 break;
3598 case 14: /* report window size (pixels) */ 3181 case 14: /* report window size (pixels) */
3599 XGetWindowAttributes (disp, parent[0], &wattr); 3182 XGetWindowAttributes (dpy, parent[0], &wattr);
3600 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3183 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3601 break; 3184 break;
3602 case 18: /* report text area size (chars) */ 3185 case 18: /* report text area size (chars) */
3603 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3186 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3604 break; 3187 break;
… …
3606 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3189 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3607 break; 3190 break;
3608 case 20: /* report icon label */ 3191 case 20: /* report icon label */
3609 { 3192 {
3610 char *s; 3193 char *s;
3611 XGetIconName (disp, parent[0], &s); 3194 XGetIconName (dpy, parent[0], &s);
3612 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3195 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3613 XFree (s); 3196 XFree (s);
3614 } 3197 }
3615 break; 3198 break;
3616 case 21: /* report window title */ 3199 case 21: /* report window title */
3617 { 3200 {
3618 char *s; 3201 char *s;
3619 XFetchName (disp, parent[0], &s); 3202 XFetchName (dpy, parent[0], &s);
3620 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3203 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3621 XFree (s); 3204 XFree (s);
3622 } 3205 }
3623 break; 3206 break;
3624 } 3207 }
3625} 3208}
… …
3652 seen_esc = true; 3235 seen_esc = true;
3653 continue; 3236 continue;
3654 } 3237 }
3655 else if (ch == C0_BEL || ch == CHAR_ST) 3238 else if (ch == C0_BEL || ch == CHAR_ST)
3656 break; 3239 break;
3240 else if (ch == C0_SYN)
3241 ch = cmd_get8 ();
3657 else if (ch < 0x20) 3242 else if (ch < 0x20)
3658 return NULL; /* other control character - exit */ 3243 return NULL; /* other control character - exit */
3659 3244
3660 seen_esc = false; 3245 seen_esc = false;
3661 3246
3662 if (n >= STRING_MAX - 1) 3247 if (n >= STRING_MAX - 1)
3663 // stop at some sane length 3248 // stop at some sane length
3664 return NULL; 3249 return NULL;
3665 3250
3666 if (ch == C0_SYN)
3667 string[n++] = cmd_get8 ();
3668 else
3669 string[n++] = ch; 3251 string[n++] = ch;
3670 } 3252 }
3671 3253
3672 string[n++] = '\0'; 3254 string[n++] = '\0';
3673 3255
3674 ends_how = (ch == 0x5c ? C0_ESC : ch); 3256 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3681 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3263 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3682 */ 3264 */
3683void 3265void
3684rxvt_term::process_dcs_seq () 3266rxvt_term::process_dcs_seq ()
3685{ 3267{
3686 char *s;
3687 unicode_t eh;
3688
3689 /* 3268 /*
3690 * Not handled yet 3269 * Not handled yet
3691 */ 3270 */
3271
3272 unicode_t eh;
3692 s = get_to_st (eh); 3273 char *s = get_to_st (eh);
3693 if (s) 3274 if (s)
3694 free (s); 3275 free (s);
3695 3276
3696 return; 3277 return;
3697} 3278}
… …
3701 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3282 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3702 */ 3283 */
3703void 3284void
3704rxvt_term::process_osc_seq () 3285rxvt_term::process_osc_seq ()
3705{ 3286{
3706 unicode_t ch, eh;
3707 int arg; 3287 int arg;
3708 3288
3709 ch = cmd_getc (); 3289 unicode_t ch = cmd_getc ();
3710 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3290 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3711 arg = arg * 10 + (ch - '0'); 3291 arg = arg * 10 + (ch - '0');
3712 3292
3713 if (ch == ';') 3293 if (ch == ';')
3714 { 3294 {
3295 unicode_t eh;
3715 char *s = get_to_st (eh); 3296 char *s = get_to_st (eh);
3716 3297
3717 if (s) 3298 if (s)
3718 { 3299 {
3719 process_xterm_seq (arg, s, eh); 3300 process_xterm_seq (arg, s, eh);
… …
3725void 3306void
3726rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3307rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3727{ 3308{
3728 if (str[0] == '?' && !str[1]) 3309 if (str[0] == '?' && !str[1])
3729 { 3310 {
3730 unsigned short r, g, b; 3311 rgba c;
3731 pix_colors_focused[color].get (display, r, g, b); 3312 pix_colors_focused[color].get (c);
3313
3314#if XFT
3315 if (c.a != rgba::MAX_CC)
3316 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3317 else
3318#endif
3732 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3319 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3733 } 3320 }
3734 else 3321 else
3735 set_window_color (color, str); 3322 set_window_color (color, str);
3736} 3323}
3737 3324
3738/* 3325/*
3739 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3326 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3740 */ 3327 */
3741void 3328void
3742rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3329rxvt_term::process_xterm_seq (int op, char *str, char resp)
3743{ 3330{
3744 int color; 3331 int color;
3745 char *buf, *name; 3332 char *buf, *name;
3746 bool query = str[0] == '?' && !str[1]; 3333 bool query = str[0] == '?' && !str[1];
3747 int saveop = op; 3334 int saveop = op;
3748 dDisp; 3335
3336 dLocal (Display *, dpy);
3749 3337
3750 assert (str != NULL); 3338 assert (str != NULL);
3339
3340 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3341 return;
3342
3751 switch (op) 3343 switch (op)
3752 { 3344 {
3753 case XTerm_name: 3345 case XTerm_name:
3754 set_title (str); 3346 set_title (str);
3755 /* FALLTHROUGH */ 3347 /* FALLTHROUGH */
… …
3769 unsigned long bytes_after; 3361 unsigned long bytes_after;
3770 unsigned char *value = 0; 3362 unsigned char *value = 0;
3771 const char *str = ""; 3363 const char *str = "";
3772 3364
3773 if (prop 3365 if (prop
3774 && XGetWindowProperty (disp, parent[0], 3366 && XGetWindowProperty (dpy, parent[0],
3775 prop, 0, 1<<16, 0, AnyPropertyType, 3367 prop, 0, 1<<16, 0, AnyPropertyType,
3776 &actual_type, &actual_format, 3368 &actual_type, &actual_format,
3777 &nitems, &bytes_after, &value) == Success 3369 &nitems, &bytes_after, &value) == Success
3778 && actual_type != None 3370 && actual_type != None
3779 && actual_format == 8) 3371 && actual_format == 8)
3780 str = (const char *)(value); 3372 str = (const char *)(value);
3781 3373
3782 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3374 tt_printf ("\033]%d;%s%c", op, str, resp);
3783 3375
3784 XFree (value); 3376 XFree (value);
3785 } 3377 }
3786 else 3378 else
3787 { 3379 {
3788 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3380 char *eq = strchr (str, '=');
3789 3381
3790 if (eq) 3382 if (eq)
3791 { 3383 {
3792 *eq = 0; 3384 *eq = 0;
3793 set_utf8_property (display->atom (str), eq + 1); 3385 set_utf8_property (display->atom (str), eq + 1);
3794 } 3386 }
3795 else 3387 else
3796 XDeleteProperty (disp, parent[0], 3388 XDeleteProperty (dpy, parent[0],
3797 display->atom (str)); 3389 display->atom (str));
3798 } 3390 }
3799 break; 3391 break;
3800 3392
3801 case XTerm_Color: 3393 case XTerm_Color:
… …
3811 break; 3403 break;
3812 3404
3813 if ((buf = strchr (name, ';')) != NULL) 3405 if ((buf = strchr (name, ';')) != NULL)
3814 *buf++ = '\0'; 3406 *buf++ = '\0';
3815 3407
3816 if (name[0] == '?' && !name[1]) 3408 process_color_seq (op, color, name, resp);
3409 }
3410 break;
3411 case Rxvt_restoreFG:
3412 case XTerm_Color00:
3413 process_color_seq (op, Color_fg, str, resp);
3414 break;
3415 case Rxvt_restoreBG:
3416 case XTerm_Color01:
3417 process_color_seq (op, Color_bg, str, resp);
3418 break;
3419#ifndef NO_CURSORCOLOR
3420 case XTerm_Color_cursor:
3421 process_color_seq (op, Color_cursor, str, resp);
3422 break;
3423#endif
3424 case XTerm_Color_pointer_fg:
3425 process_color_seq (op, Color_pointer_fg, str, resp);
3426 break;
3427 case XTerm_Color_pointer_bg:
3428 process_color_seq (op, Color_pointer_bg, str, resp);
3429 break;
3430#ifdef OPTION_HC
3431 case XTerm_Color_HC:
3432 process_color_seq (op, Color_HC, str, resp);
3433 break;
3434 case XTerm_Color_HTC:
3435 process_color_seq (op, Color_HTC, str, resp);
3436 break;
3437#endif
3438#ifndef NO_BOLD_UNDERLINE_REVERSE
3439 case URxvt_Color_BD:
3440 process_color_seq (op, Color_BD, str, resp);
3441 break;
3442 case URxvt_Color_UL:
3443 process_color_seq (op, Color_UL, str, resp);
3444 break;
3445 case URxvt_Color_IT:
3446 process_color_seq (op, Color_IT, str, resp);
3447 break;
3448#endif
3449 case URxvt_Color_border:
3450 process_color_seq (op, Color_border, str, resp);
3451 break;
3452#if ENABLE_TRANSPARENCY
3453 case URxvt_Color_tint:
3454 process_color_seq (op, Color_tint, str, resp);
3455 {
3456 bool changed = false;
3457
3458 if (ISSET_PIXCOLOR (Color_tint))
3459 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3460
3461 if (changed)
3462 update_background ();
3463 }
3464
3465 break;
3466#endif
3467
3468#if BG_IMAGE_FROM_FILE
3469 case Rxvt_Pixmap:
3470 if (!strcmp (str, "?"))
3471 {
3472 char str[256];
3473
3474 sprintf (str, "[%dx%d+%d+%d]",
3475 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3476 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3477 process_xterm_seq (XTerm_title, str, CHAR_ST);
3478 }
3479 else
3480 {
3481 int changed = 0;
3482
3483 if (*str != ';')
3817 { 3484 {
3818 unsigned short r, g, b; 3485 if (bgPixmap.set_file (str)) /* change pixmap */
3819 pix_colors_focused[color].get (display, r, g, b); 3486 {
3820 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3487 changed++;
3488 str = strchr (str, ';');
3489 if (str == NULL)
3490 bgPixmap.set_defaultGeometry ();
3491 else
3492 bgPixmap.set_geometry (str+1);
3493 }
3821 } 3494 }
3822 else 3495 else
3823 set_window_color (color, name); 3496 {
3497 str++;
3498 if (bgPixmap.set_geometry (str, true))
3499 changed++;
3500 }
3501
3502 if (changed)
3503 {
3504 if (bgPixmap.window_position_sensitive ())
3505 {
3506 int x, y;
3507 get_window_origin (x, y);
3508 bgPixmap.set_position (x, y);
3509 }
3510 update_background ();
3511 }
3824 } 3512 }
3825 break; 3513 break;
3826 case XTerm_Color00:
3827 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3828 break;
3829 case XTerm_Color01:
3830 process_color_seq (XTerm_Color01, Color_bg, str, resp);
3831 break;
3832#ifndef NO_CURSORCOLOR
3833 case XTerm_Color_cursor:
3834 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3835 break;
3836#endif 3514#endif
3837 case XTerm_Color_pointer_fg:
3838 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);
3839 break;
3840 case XTerm_Color_pointer_bg:
3841 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3842 break;
3843#ifndef NO_BOLD_UNDERLINE_REVERSE
3844 case XTerm_Color_RV:
3845 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3846 break;
3847 case Rxvt_Color_BD:
3848 case URxvt_Color_BD:
3849 process_color_seq (op, Color_BD, str, resp);
3850 break;
3851 case Rxvt_Color_UL:
3852 case URxvt_Color_UL:
3853 process_color_seq (op, Color_UL, str, resp);
3854 break;
3855 case URxvt_Color_IT:
3856 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3857 break;
3858#endif
3859#if TRANSPARENT && TINTING
3860 case URxvt_Color_tint:
3861 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3862 check_our_parents ();
3863 if (am_transparent)
3864 want_full_refresh = want_refresh = 1;
3865 break;
3866#endif
3867
3868 case Rxvt_Pixmap:
3869 {
3870 if (*str != ';')
3871 {
3872#if XPM_BACKGROUND
3873 scale_pixmap (""); /* reset to default scaling */
3874 set_bgPixmap (str); /* change pixmap */
3875 scr_touch (true);
3876#endif
3877 }
3878
3879 int changed = 0;
3880
3881 while ((str = strchr (str, ';')) != NULL)
3882 {
3883 str++;
3884#if XPM_BACKGROUND
3885 changed += scale_pixmap (str);
3886#endif
3887 }
3888
3889 if (changed)
3890 {
3891#ifdef XPM_BACKGROUND
3892 resize_pixmap ();
3893 scr_touch (true);
3894#endif
3895 }
3896 }
3897 break;
3898
3899 case Rxvt_restoreFG:
3900 set_window_color (Color_fg, str);
3901 break;
3902 case Rxvt_restoreBG:
3903 set_window_color (Color_bg, str);
3904 break;
3905 3515
3906 case XTerm_logfile: 3516 case XTerm_logfile:
3907 // TODO, when secure mode? 3517 // TODO, when secure mode?
3908 break; 3518 break;
3909 3519
… …
3927 case URxvt_italicFont: 3537 case URxvt_italicFont:
3928 case URxvt_boldItalicFont: 3538 case URxvt_boldItalicFont:
3929#endif 3539#endif
3930 if (query) 3540 if (query)
3931 tt_printf ("\33]%d;%-.250s%c", saveop, 3541 tt_printf ("\33]%d;%-.250s%c", saveop,
3932 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3542 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3933 ? fontset[op - URxvt_font]->fontdesc : "", 3543 ? fontset[op - URxvt_font]->fontdesc : "",
3934 resp); 3544 resp);
3935 else 3545 else
3936 { 3546 {
3937 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3547 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3940 allocated.push_back ((void *)res); 3550 allocated.push_back ((void *)res);
3941 set_fonts (); 3551 set_fonts ();
3942 } 3552 }
3943 break; 3553 break;
3944 3554
3945#if ENABLE_FRILLS 3555 case URxvt_version:
3556 if (query)
3557 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3558 op,
3559 rs[Rs_name], VERSION[0], VERSION[2],
3560 resp);
3561 break;
3562
3563#if !ENABLE_MINIMAL
3946 case URxvt_locale: 3564 case URxvt_locale:
3947 if (query) 3565 if (query)
3948 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3566 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3949 else 3567 else
3950 { 3568 {
3951 set_locale (str); 3569 set_locale (str);
3952 pty->set_utf8_mode (enc_utf8); 3570 pty->set_utf8_mode (enc_utf8);
3953 init_xlocale (); 3571 init_xlocale ();
… …
3968 break; 3586 break;
3969#endif 3587#endif
3970 3588
3971#if ENABLE_PERL 3589#if ENABLE_PERL
3972 case URxvt_perl: 3590 case URxvt_perl:
3973 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 3591 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3974 ; // no responses yet
3975 break; 3592 break;
3976#endif 3593#endif
3977 } 3594 }
3978} 3595}
3979/*----------------------------------------------------------------------*/ 3596/*----------------------------------------------------------------------*/
… …
4002 { 3619 {
4003 if (mode == 'r') 3620 if (mode == 'r')
4004 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3621 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
4005 else 3622 else
4006 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3623 state = (mode == 't') ? ! (priv_modes & bit) : mode;
4007 PrivMode (state, bit); 3624
3625 set_privmode (bit, state);
4008 } 3626 }
4009 3627
4010 return state; 3628 return state;
4011} 3629}
4012 3630
… …
4016{ 3634{
4017 unsigned int i, j; 3635 unsigned int i, j;
4018 int state; 3636 int state;
4019 3637
4020 static const struct 3638 static const struct
4021 { 3639 {
4022 const int argval; 3640 const int argval;
4023 const unsigned long bit; 3641 const unsigned long bit;
4024 }
4025
4026 argtopriv[] = { 3642 } argtopriv[] = {
4027 { 1, PrivMode_aplCUR }, 3643 { 1, PrivMode_aplCUR }, // DECCKM
4028 { 2, PrivMode_vt52 }, 3644 { 2, PrivMode_vt52 },
4029 { 3, PrivMode_132 }, 3645 { 3, PrivMode_132 }, // DECCOLM
4030 { 4, PrivMode_smoothScroll }, 3646 { 4, PrivMode_smoothScroll }, // DECSCLM
4031 { 5, PrivMode_rVideo }, 3647 { 5, PrivMode_rVideo }, // DECSCNM
4032 { 6, PrivMode_relOrigin }, 3648 { 6, PrivMode_relOrigin }, // DECOM
4033 { 7, PrivMode_Autowrap }, 3649 { 7, PrivMode_Autowrap }, // DECAWM
4034 // 8, bi-directional support mode 3650 // 8, auto-repeat keys // DECARM
4035 { 9, PrivMode_MouseX10 }, 3651 { 9, PrivMode_MouseX10 },
4036 // 18, 19 printing-related 3652 // 18 end FF to printer after print screen
3653 // 19 Print screen prints full screen/scroll region
4037 { 25, PrivMode_VisibleCursor }, 3654 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
4038#ifdef scrollBar_esc 3655#ifdef scrollBar_esc
4039 { scrollBar_esc, PrivMode_scrollBar }, 3656 { scrollBar_esc, PrivMode_scrollBar },
4040#endif 3657#endif
4041 { 35, PrivMode_ShiftKeys }, // rxvt extension 3658 { 35, PrivMode_ShiftKeys }, // rxvt extension
3659 // 38, tektronix mode // DECTEK
4042 { 40, PrivMode_132OK }, 3660 { 40, PrivMode_132OK },
4043 // 41 xterm more fixes NYI 3661 // 41 xterm more fixes NYI
4044 // 45 margin bell NYI 3662 // 45 margin bell NYI
4045 // 46 start logging 3663 // 46 start logging
4046 { 47, PrivMode_Screen }, 3664 { 47, PrivMode_Screen },
4047 { 66, PrivMode_aplKP }, 3665 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
4048#ifndef NO_BACKSPACE_KEY 3666#ifndef NO_BACKSPACE_KEY
4049 { 67, PrivMode_BackSpace }, 3667 { 67, PrivMode_BackSpace }, // DECBKM
4050#endif 3668#endif
4051 { 1000, PrivMode_MouseX11 }, 3669 { 1000, PrivMode_MouseX11 },
4052 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3670 { 1002, PrivMode_MouseBtnEvent },
4053 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3671 { 1003, PrivMode_MouseAnyEvent },
4054 // 1003 Use All Motion Mouse Tracking. NYI, TODO 3672#if ENABLE_FRILLS
3673 { 1005, PrivMode_ExtModeMouse },
3674#endif
4055 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3675 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4056 { 1011, PrivMode_Keypress }, // rxvt extension 3676 { 1011, PrivMode_Keypress }, // rxvt extension
3677#if ENABLE_FRILLS
3678 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3679#endif
4057 // 1035 enable modifiers for alt, numlock NYI 3680 // 1035 enable modifiers for alt, numlock NYI
4058 // 1036 send ESC for meta keys NYI 3681 // 1036 send ESC for meta keys NYI
4059 // 1037 send DEL for keypad delete NYI 3682 // 1037 send DEL for keypad delete NYI
4060 { 1047, PrivMode_Screen }, 3683 { 1047, PrivMode_Screen },
4061 // 1048 save and restore cursor 3684 // 1048 save and restore cursor, implemented in code
4062 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3685 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
4063 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3686 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3687 { 2004, PrivMode_BracketPaste },
4064 }; 3688 };
4065 3689
4066 if (nargs == 0) 3690 if (nargs == 0)
4067 return; 3691 return;
4068 3692
… …
4075 for (i = 0; i < nargs; i++) 3699 for (i = 0; i < nargs; i++)
4076 { 3700 {
4077 state = -1; 3701 state = -1;
4078 3702
4079 /* basic handling */ 3703 /* basic handling */
4080 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3704 for (j = 0; j < ARRAY_LENGTH(argtopriv); j++)
4081 if (argtopriv[j].argval == arg[i]) 3705 if (argtopriv[j].argval == arg[i])
4082 { 3706 {
4083 state = privcases (mode, argtopriv[j].bit); 3707 state = privcases (mode, argtopriv[j].bit);
4084 break; 3708 break;
4085 } 3709 }
… …
4093 3717
4094 scr_touch (true); 3718 scr_touch (true);
4095 break; 3719 break;
4096#endif 3720#endif
4097 case 1048: /* alternative cursor save */ 3721 case 1048: /* alternative cursor save */
4098 case 1049:
4099 if (OPTION (Opt_secondaryScreen)) 3722 if (option (Opt_secondaryScreen))
4100 if (mode == 0) 3723 if (mode == 0)
4101 scr_cursor (RESTORE); 3724 scr_cursor (RESTORE);
4102 else if (mode == 1) 3725 else if (mode == 1)
4103 scr_cursor (SAVE); 3726 scr_cursor (SAVE);
4104 break; 3727 break;
… …
4112 case 2: /* VT52 mode */ 3735 case 2: /* VT52 mode */
4113 /* oddball mode. should be set regardless of set/reset 3736 /* oddball mode. should be set regardless of set/reset
4114 * parameter. Return from VT52 mode with an ESC < from 3737 * parameter. Return from VT52 mode with an ESC < from
4115 * within VT52 mode 3738 * within VT52 mode
4116 */ 3739 */
4117 PrivMode (1, PrivMode_vt52); 3740 set_privmode (PrivMode_vt52, 1);
4118 break; 3741 break;
4119 case 3: /* 80/132 */ 3742 case 3: /* 80/132 */
4120 if (priv_modes & PrivMode_132OK) 3743 if (priv_modes & PrivMode_132OK)
4121 set_widthheight (((state ? 132 : 80) * fwidth), height); 3744 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
4122 break; 3745 break;
4123 case 4: /* smooth scrolling */ 3746 case 4: /* smooth scrolling */
4124 set_option (Opt_jumpScroll, !state); 3747 set_option (Opt_jumpScroll, !state);
4125 break; 3748 break;
4126 case 5: /* reverse video */ 3749 case 5: /* reverse video */
… …
4133 scr_autowrap (state); 3756 scr_autowrap (state);
4134 break; 3757 break;
4135 /* case 8: - auto repeat, can't do on a per window basis */ 3758 /* case 8: - auto repeat, can't do on a per window basis */
4136 case 9: /* X10 mouse reporting */ 3759 case 9: /* X10 mouse reporting */
4137 if (state) /* orthogonal */ 3760 if (state) /* orthogonal */
4138 priv_modes &= ~PrivMode_MouseX11; 3761 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4139 break; 3762 break;
4140#ifdef scrollBar_esc 3763#ifdef scrollBar_esc
4141 case scrollBar_esc: 3764 case scrollBar_esc:
4142 if (scrollbar_mapping (state)) 3765 if (scrollBar.map (state))
4143 { 3766 {
4144 resize_all_windows (0, 0, 0); 3767 resize_all_windows (0, 0, 0);
4145 scr_touch (true); 3768 scr_touch (true);
4146 } 3769 }
4147 break; 3770 break;
… …
4156 break; 3779 break;
4157 /* case 66: - application key pad */ 3780 /* case 66: - application key pad */
4158 /* case 67: - backspace key */ 3781 /* case 67: - backspace key */
4159 case 1000: /* X11 mouse reporting */ 3782 case 1000: /* X11 mouse reporting */
4160 if (state) /* orthogonal */ 3783 if (state) /* orthogonal */
4161 priv_modes &= ~PrivMode_MouseX10; 3784 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4162 break; 3785 break;
4163#if 0
4164 case 1001: 3786 case 1002:
4165 break; /* X11 mouse highlighting */ 3787 case 1003:
4166#endif 3788 if (state)
3789 {
3790 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3791 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3792 mouse_row = mouse_col = 0;
3793 vt_emask_mouse = PointerMotionMask;
3794 }
3795 else
3796 vt_emask_mouse = NoEventMask;
3797
3798 vt_select_input ();
3799 break;
4167 case 1010: /* scroll to bottom on TTY output inhibit */ 3800 case 1010: /* scroll to bottom on TTY output inhibit */
4168 set_option (Opt_scrollTtyOutput, !state); 3801 set_option (Opt_scrollTtyOutput, !state);
4169 break; 3802 break;
4170 case 1011: /* scroll to bottom on key press */ 3803 case 1011: /* scroll to bottom on key press */
4171 set_option (Opt_scrollTtyKeypress, state); 3804 set_option (Opt_scrollTtyKeypress, state);
4172 break; 3805 break;
4173 case 1047: /* secondary screen w/ clearing last */ 3806 case 1047: /* secondary screen w/ clearing last */
4174 if (OPTION (Opt_secondaryScreen)) 3807 if (option (Opt_secondaryScreen))
4175 if (current_screen != PRIMARY) 3808 if (!state)
4176 scr_erase_screen (2); 3809 scr_erase_screen (2);
3810
4177 scr_change_screen (state); 3811 scr_change_screen (state);
4178 break; 3812 break;
4179 case 1049: /* secondary screen w/ clearing first */ 3813 case 1049: /* secondary screen w/ clearing first */
3814 if (option (Opt_secondaryScreen))
3815 if (state)
3816 scr_cursor (SAVE);
3817
4180 scr_change_screen (state); 3818 scr_change_screen (state);
3819
4181 if (OPTION (Opt_secondaryScreen)) 3820 if (option (Opt_secondaryScreen))
4182 if (current_screen != PRIMARY) 3821 if (state)
4183 scr_erase_screen (2); 3822 scr_erase_screen (2);
3823 else
3824 scr_cursor (RESTORE);
4184 break; 3825 break;
4185 default: 3826 default:
4186 break; 3827 break;
4187 } 3828 }
4188 } 3829 }
… …
4314 scr_color (Color_bg, Color_bg); 3955 scr_color (Color_bg, Color_bg);
4315 break; 3956 break;
4316 3957
4317 //case 50: // not variable spacing 3958 //case 50: // not variable spacing
4318 3959
4319#if ENABLE_FRILLS 3960#if !ENABLE_MINIMAL
4320 case 90: 3961 case 90:
4321 case 91: /* set bright fg color */ 3962 case 91: /* set bright fg color */
4322 case 92: 3963 case 92:
4323 case 93: 3964 case 93:
4324 case 94: 3965 case 94:
… …
4348rxvt_term::process_graphics () 3989rxvt_term::process_graphics ()
4349{ 3990{
4350 unicode_t ch, cmd = cmd_getc (); 3991 unicode_t ch, cmd = cmd_getc ();
4351 3992
4352 if (cmd == 'Q') 3993 if (cmd == 'Q')
3994 {
4353 { /* query graphics */ 3995 /* query graphics */
4354 tt_printf ("\033G0\012"); /* no graphics */ 3996 tt_printf ("\033G0\012"); /* no graphics */
4355 return; 3997 return;
4356 } 3998 }
4357 /* swallow other graphics sequences until terminating ':' */ 3999 /* swallow other graphics sequences until terminating ':' */
4358 do 4000 do
… …
4381 4023
4382/* ---------------------------------------------------------------------- */ 4024/* ---------------------------------------------------------------------- */
4383/* Write data to the pty as typed by the user, pasted with the mouse, 4025/* Write data to the pty as typed by the user, pasted with the mouse,
4384 * or generated by us in response to a query ESC sequence. 4026 * or generated by us in response to a query ESC sequence.
4385 */ 4027 */
4386const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4028static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4387 4029
4388void 4030void
4389rxvt_term::tt_write (const char *data, unsigned int len) 4031rxvt_term::tt_write (const char *data, unsigned int len)
4390{ 4032{
4391 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4033 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
4403 4045
4404 data += written; 4046 data += written;
4405 len -= written; 4047 len -= written;
4406 } 4048 }
4407 4049
4408 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4050 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
4409 4051
4410 memcpy (v_buffer + v_buflen, data, len); 4052 memcpy (v_buffer + v_buflen, data, len);
4411 v_buflen += len; 4053 v_buflen += len;
4412 4054
4413 pty_ev.set (EVENT_READ | EVENT_WRITE); 4055 pty_ev.set (ev::READ | ev::WRITE);
4414} 4056}
4415 4057
4416void rxvt_term::pty_write () 4058void rxvt_term::pty_write ()
4417{ 4059{
4418 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4060 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4423 4065
4424 if (v_buflen == 0) 4066 if (v_buflen == 0)
4425 { 4067 {
4426 free (v_buffer); 4068 free (v_buffer);
4427 v_buffer = 0; 4069 v_buffer = 0;
4428 v_buflen = 0;
4429 4070
4430 pty_ev.set (EVENT_READ); 4071 pty_ev.set (ev::READ);
4431 return; 4072 return;
4432 } 4073 }
4433 4074
4434 memmove (v_buffer, v_buffer + written, v_buflen); 4075 memmove (v_buffer, v_buffer + written, v_buflen);
4435 } 4076 }
4436 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4077 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4437 pty_ev.set (EVENT_READ); 4078 pty_ev.set (ev::READ);
4438} 4079}
4439 4080
4440/*----------------------- end-of-file (C source) -----------------------*/ 4081/*----------------------- end-of-file (C source) -----------------------*/
4441 4082

Diff Legend

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