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.275 by root, Fri Jan 20 10:35:25 2006 UTC vs.
Revision 1.446 by root, Fri Apr 2 19:27:38 2010 UTC

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

Diff Legend

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