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

Diff Legend

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