ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.275 by root, Fri Jan 20 10:35:25 2006 UTC vs.
Revision 1.460 by sf-exg, Fri Nov 19 23:29:30 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);
1222 y = ev.y; 1258 y = Pixel2Row (ev.y);
1223 pixel_position (&x, &y); 1259 if (ev.type == MotionNotify)
1260 {
1261 if (x == mouse_row && y == mouse_col)
1262 return;
1263 mouse_row = x;
1264 mouse_col = y;
1265 code += 32;
1266 }
1224 1267
1225 if (MEvent.button == AnyButton) 1268 if (MEvent.button == AnyButton)
1226 button_number = 3; 1269 button_number = 3;
1227 else 1270 else
1228 { 1271 {
… …
1274 x + 1, 1317 x + 1,
1275 y + 1); 1318 y + 1);
1276#endif 1319#endif
1277 1320
1278 tt_printf ("\033[M%c%c%c", 1321 tt_printf ("\033[M%c%c%c",
1279 (32 + button_number + key_state), 1322 (code + button_number + key_state),
1280 (32 + x + 1), 1323 (32 + x + 1),
1281 (32 + y + 1)); 1324 (32 + y + 1));
1282} 1325}
1283 1326
1284#ifdef USING_W11LIB
1285void
1286rxvt_W11_process_x_event (XEvent *ev)
1287{
1288 rxvt_t *r = rxvt_get_r ();
1289
1290 x_cb (*ev);
1291}
1292#endif
1293
1294/*{{{ process an X event */ 1327/*{{{ process an X event */
1295void 1328void
1296rxvt_term::x_cb (XEvent &ev) 1329rxvt_term::x_cb (XEvent &ev)
1297{ 1330{
1298 make_current (); 1331 make_current ();
1299 1332
1300 dDisp; 1333 dLocal (Display *, dpy);
1301 1334
1302 if (ev.xany.window == vt 1335 if (ev.xany.window == vt
1303 && SHOULD_INVOKE (HOOK_X_EVENT) 1336 && SHOULD_INVOKE (HOOK_X_EVENT)
1304 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1337 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1305 return; 1338 return;
… …
1310 unsigned int unused_mask; 1343 unsigned int unused_mask;
1311 1344
1312 switch (ev.type) 1345 switch (ev.type)
1313 { 1346 {
1314 case KeyPress: 1347 case KeyPress:
1315#if ISO_14755 1348 key_press (ev.xkey);
1316 if (!(iso14755buf & ISO_14755_52))
1317#endif
1318 lookup_key (ev.xkey);
1319
1320 break; 1349 break;
1321 1350
1322 case KeyRelease: 1351 case KeyRelease:
1323 { 1352 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; 1353 break;
1395 }
1396 1354
1397 case ButtonPress: 1355 case ButtonPress:
1398 button_press (ev.xbutton); 1356 button_press (ev.xbutton);
1399 break; 1357 break;
1400 1358
… …
1402 button_release (ev.xbutton); 1360 button_release (ev.xbutton);
1403 break; 1361 break;
1404 1362
1405 case ClientMessage: 1363 case ClientMessage:
1406 if (ev.xclient.format == 32 1364 if (ev.xclient.format == 32
1407 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1365 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1408 { 1366 {
1367 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1368 {
1369 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1370 {
1409 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1371 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1372 {
1373 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1410 destroy (); 1374 destroy ();
1375 }
1411#if ENABLE_EWMH 1376#if ENABLE_EWMH
1412 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1377 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1413 XSendEvent (disp, ev.xclient.window = display->root, 1378 XSendEvent (dpy, ev.xclient.window = display->root,
1414 False, SubstructureRedirectMask | SubstructureNotifyMask, 1379 False, SubstructureRedirectMask | SubstructureNotifyMask,
1415 &ev); 1380 &ev);
1381#endif
1382 }
1383 }
1384#if ENABLE_XEMBED
1385 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1386 {
1387 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1388 focus_in ();
1389 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1390 focus_out ();
1391 }
1416#endif 1392#endif
1417 } 1393 }
1418#if ENABLE_XEMBED
1419 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1420 {
1421 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1422 focus_in ();
1423 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1424 focus_out ();
1425 }
1426#endif
1427#ifdef OFFIX_DND
1428 /* OffiX Dnd (drag 'n' drop) protocol */
1429 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1430 && (ev.xclient.data.l[0] == DndFile
1431 || ev.xclient.data.l[0] == DndDir
1432 || ev.xclient.data.l[0] == DndLink))
1433 {
1434 /* Get Dnd data */
1435 Atom ActualType;
1436 int ActualFormat;
1437 unsigned char *data;
1438 unsigned long Size, RemainingBytes;
1439
1440 XGetWindowProperty (disp, display->root,
1441 xa[XA_DNDSELECTION],
1442 0L, 1000000L,
1443 False, AnyPropertyType,
1444 &ActualType, &ActualFormat,
1445 &Size, &RemainingBytes,
1446 &data);
1447 set_string_property (XA_CUT_BUFFER0, data);
1448 XFree (data);
1449 selection_paste (display->root, XA_CUT_BUFFER0, true);
1450 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1451 }
1452#endif /* OFFIX_DND */
1453 break;
1454
1455 case MappingNotify:
1456 XRefreshKeyboardMapping (&ev.xmapping);
1457 break; 1394 break;
1458 1395
1459 /* 1396 /*
1460 * XXX: this is not the _current_ arrangement 1397 * XXX: this is not the _current_ arrangement
1461 * Here's my conclusion: 1398 * Here's my conclusion:
… …
1480 break; 1417 break;
1481 } 1418 }
1482 break; 1419 break;
1483 1420
1484 case FocusIn: 1421 case FocusIn:
1422 if (ev.xfocus.detail != NotifyInferior
1423 && ev.xfocus.detail != NotifyPointer
1424 && ev.xfocus.mode != NotifyGrab)
1485 focus_in (); 1425 focus_in ();
1486 break; 1426 break;
1487 1427
1488 case FocusOut: 1428 case FocusOut:
1429 if (ev.xfocus.detail != NotifyInferior
1430 && ev.xfocus.detail != NotifyPointer
1431 && ev.xfocus.mode != NotifyGrab)
1489 focus_out (); 1432 focus_out ();
1490 break; 1433 break;
1491 1434
1492 case ConfigureNotify: 1435 case ConfigureNotify:
1493 if (ev.xconfigure.window == parent[0]) 1436 if (ev.xconfigure.window == parent[0])
1494 { 1437 {
1495 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1438 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1496 ; 1439 ;
1440
1441#ifdef HAVE_BG_PIXMAP
1442 bool moved = false;
1443 if (bgPixmap.window_position_sensitive ())
1444 {
1445 int x, y;
1446 if (ev.xconfigure.send_event)
1447 {
1448 x = ev.xconfigure.x;
1449 y = ev.xconfigure.y;
1450 }
1451 else
1452 get_window_origin (x, y);
1453
1454 if (bgPixmap.set_position (x, y)
1455 || (bgPixmap.flags & bgPixmap_t::isInvalid))
1456 moved = true;
1457 }
1458#endif
1497 1459
1498 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1460 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1499 { 1461 {
1500 seen_resize = 1; 1462 seen_resize = 1;
1501 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1463 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1502 } 1464 }
1465 else
1466 {
1467#ifdef HAVE_BG_PIXMAP
1468 if (moved)
1469 {
1470 if (mapped)
1471 update_background ();
1472 else
1473 bgPixmap.invalidate ();
1474 }
1475#endif
1476 }
1503 1477
1504 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1478 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1505
1506#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1507 if (OPTION (Opt_transparent))
1508 check_our_parents ();
1509#endif
1510 } 1479 }
1511 break; 1480 break;
1512 1481
1513 case PropertyNotify: 1482 case PropertyNotify:
1483 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1514 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1484 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1515 && ev.xproperty.state == PropertyNewValue) 1485 && ev.xproperty.state == PropertyNewValue)
1516 selection_property (ev.xproperty.window, ev.xproperty.atom); 1486 selection_property (ev.xproperty.window, ev.xproperty.atom);
1517 1487
1518 break; 1488 break;
1519 1489
1520 case SelectionClear: 1490 case SelectionClear:
1521 selection_clear (); 1491 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1522 break; 1492 break;
1523 1493
1524 case SelectionNotify: 1494 case SelectionNotify:
1525 if (selection_wait == Sel_normal) 1495 if (selection_wait == Sel_normal)
1526 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1496 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
… …
1529 case SelectionRequest: 1499 case SelectionRequest:
1530 selection_send (ev.xselectionrequest); 1500 selection_send (ev.xselectionrequest);
1531 break; 1501 break;
1532 1502
1533 case MapNotify: 1503 case MapNotify:
1504#ifdef HAVE_BG_PIXMAP
1505 /* This is needed specifically to fix the case of no window manager or a
1506 * non-reparenting window manager. In those cases we never get first
1507 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1508 * care of multiplicity of ConfigureNotify events arriving while WM does
1509 * reparenting.
1510 * We should not render background immediately, as there could be several
1511 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1512 * by scheduling background redraw as soon as we can, but giving a short
1513 * bit of time for ConfigureNotifies to arrive.
1514 * We should render background PRIOR to drawing any text, but AFTER all
1515 * of ConfigureNotifys for the best results.
1516 */
1517 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1518 update_background_ev.start (0.025);
1519#endif
1534 mapped = 1; 1520 mapped = 1;
1535#ifdef TEXT_BLINK 1521#ifdef TEXT_BLINK
1536 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1522 text_blink_ev.start ();
1537#endif 1523#endif
1538 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1524 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1539 break; 1525 break;
1540 1526
1541 case UnmapNotify: 1527 case UnmapNotify:
… …
1543#ifdef TEXT_BLINK 1529#ifdef TEXT_BLINK
1544 text_blink_ev.stop (); 1530 text_blink_ev.stop ();
1545#endif 1531#endif
1546 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1532 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1547 break; 1533 break;
1548
1549#ifdef TRANSPARENT
1550 case ReparentNotify:
1551 rootwin_cb (ev);
1552 break;
1553#endif /* TRANSPARENT */
1554 1534
1555 case GraphicsExpose: 1535 case GraphicsExpose:
1556 case Expose: 1536 case Expose:
1557 if (ev.xany.window == vt) 1537 if (ev.xany.window == vt)
1558 { 1538 {
1559 do 1539 do
1540 {
1560 scr_expose (ev.xexpose.x, ev.xexpose.y, 1541 scr_expose (ev.xexpose.x, ev.xexpose.y,
1561 ev.xexpose.width, ev.xexpose.height, False); 1542 ev.xexpose.width, ev.xexpose.height, False);
1543 }
1562 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1544 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1563 1545
1564 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1546 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1565 1547
1566 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1548 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1549 {
1567 scr_expose (ev.xexpose.x, ev.xexpose.y, 1550 scr_expose (ev.xexpose.x, ev.xexpose.y,
1568 ev.xexpose.width, ev.xexpose.height, False); 1551 ev.xexpose.width, ev.xexpose.height, False);
1552 }
1569 1553
1570 want_refresh = 1; 1554 want_refresh = 1;
1571 } 1555 }
1572 else 1556 else
1573 { 1557 {
1574 XEvent unused_event; 1558 XEvent unused_event;
1575 1559
1576 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1560 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1577 ; 1561 ;
1578 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1562 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1579 ; 1563 ;
1580 1564
1581 if (isScrollbarWindow (ev.xany.window)) 1565 if (scrollBar.state && ev.xany.window == scrollBar.win)
1582 { 1566 {
1583 scrollBar.setIdle (); 1567 scrollBar.state = STATE_IDLE;
1584 scrollbar_show (0); 1568 scrollBar.show (0);
1585 } 1569 }
1586
1587#ifdef TRANSPARENT
1588 if (am_transparent && ev.xany.window == parent[0])
1589 XClearWindow (disp, ev.xany.window);
1590#endif
1591 } 1570 }
1592 break; 1571 break;
1593 1572
1594 case MotionNotify: 1573 case MotionNotify:
1595#ifdef POINTER_BLANK 1574#ifdef POINTER_BLANK
1596 if (hidden_pointer) 1575 if (hidden_pointer)
1597 pointer_unblank (); 1576 pointer_unblank ();
1598#endif 1577#endif
1578 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1579 || priv_modes & PrivMode_MouseAnyEvent)
1580 mouse_report (ev.xbutton);
1599 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1581 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1600 break; 1582 break;
1601 1583
1602 if (ev.xany.window == vt) 1584 if (ev.xany.window == vt)
1603 { 1585 {
1604 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1586 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1605 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1587 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1606 ; // nop 1588 ; // nop
1607 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1589 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1608 { 1590 {
1609 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1591 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1610 ; 1592 ;
1611 1593
1612 XQueryPointer (disp, vt, 1594 XQueryPointer (dpy, vt,
1613 &unused_root, &unused_child, 1595 &unused_root, &unused_child,
1614 &unused_root_x, &unused_root_y, 1596 &unused_root_x, &unused_root_y,
1615 &ev.xbutton.x, &ev.xbutton.y, 1597 &ev.xbutton.x, &ev.xbutton.y,
1616 &ev.xbutton.state); 1598 &ev.xbutton.state);
1617#ifdef MOUSE_THRESHOLD 1599#ifdef MOUSE_THRESHOLD
… …
1637 int dist; 1619 int dist;
1638 1620
1639 /* don't clobber the current delay if we are 1621 /* don't clobber the current delay if we are
1640 * already in the middle of scrolling. 1622 * already in the middle of scrolling.
1641 */ 1623 */
1642 if (!sel_scroll_ev.active) 1624 if (!sel_scroll_ev.is_active ())
1643 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1625 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1644 1626
1645 /* save the event params so we can highlight 1627 /* save the event params so we can highlight
1646 * the selection in the pending-scroll loop 1628 * the selection in the pending-scroll loop
1647 */ 1629 */
1648 selection_save_x = ev.xbutton.x; 1630 selection_save_x = ev.xbutton.x;
… …
1670 else 1652 else
1671 { 1653 {
1672 /* we are within the text window, so we 1654 /* we are within the text window, so we
1673 * shouldn't be scrolling 1655 * shouldn't be scrolling
1674 */ 1656 */
1675 if (sel_scroll_ev.active)
1676 sel_scroll_ev.stop(); 1657 sel_scroll_ev.stop();
1677 } 1658 }
1678#endif 1659#endif
1679#ifdef MOUSE_THRESHOLD 1660#ifdef MOUSE_THRESHOLD
1680 } 1661 }
1681#endif 1662#endif
1682 } 1663 }
1683 } 1664 }
1684 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1665 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1685 { 1666 {
1686 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1667 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1687 MotionNotify, &ev)) 1668 MotionNotify, &ev))
1688 ; 1669 ;
1689 1670
1690 XQueryPointer (disp, scrollBar.win, 1671 XQueryPointer (dpy, scrollBar.win,
1691 &unused_root, &unused_child, 1672 &unused_root, &unused_child,
1692 &unused_root_x, &unused_root_y, 1673 &unused_root_x, &unused_root_y,
1693 &ev.xbutton.x, &ev.xbutton.y, 1674 &ev.xbutton.x, &ev.xbutton.y,
1694 &unused_mask); 1675 &unused_mask);
1695 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1676 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1696 scrollbar_size ()); 1677 scrollBar.size ());
1697 want_refresh = 1; 1678 want_refresh = 1;
1698 refresh_limit = 0;
1699 scrollbar_show (1); 1679 scrollBar.show (1);
1700 } 1680 }
1701 break; 1681 break;
1702 } 1682 }
1703 1683
1704skip_switch: ;
1705
1706#if defined(CURSOR_BLINK) 1684#if defined(CURSOR_BLINK)
1707 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1685 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1708 { 1686 {
1709 if (hidden_cursor) 1687 if (hidden_cursor)
1710 { 1688 {
1711 hidden_cursor = 0; 1689 hidden_cursor = 0;
1712 want_refresh = 1; 1690 want_refresh = 1;
1713 } 1691 }
1714 1692
1715 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1693 cursor_blink_ev.again ();
1716 } 1694 }
1717#endif 1695#endif
1718 1696
1719#if defined(POINTER_BLANK) 1697#if defined(POINTER_BLANK)
1720 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1698 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1721 { 1699 {
1722 if (ev.type == MotionNotify 1700 if (ev.type == MotionNotify
1723 || ev.type == ButtonPress 1701 || ev.type == ButtonPress
1724 || ev.type == ButtonRelease) 1702 || ev.type == ButtonRelease)
1725 if (hidden_pointer) 1703 if (hidden_pointer)
… …
1727 1705
1728 if (ev.type == KeyPress && hidden_pointer == 0) 1706 if (ev.type == KeyPress && hidden_pointer == 0)
1729 pointer_blank (); 1707 pointer_blank ();
1730 } 1708 }
1731#endif 1709#endif
1710
1711 refresh_check ();
1732} 1712}
1713
1714#if ENABLE_FRILLS
1715void
1716rxvt_term::set_urgency (bool enable)
1717{
1718 if (enable == urgency_hint)
1719 return;
1720
1721 if (XWMHints *h = XGetWMHints (dpy, parent[0]))
1722 {
1723 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1724 XSetWMHints (dpy, parent[0], h);
1725 urgency_hint = enable;
1726 }
1727}
1728#endif
1733 1729
1734void 1730void
1735rxvt_term::focus_in () 1731rxvt_term::focus_in ()
1736{ 1732{
1737 if (!focus) 1733 if (!focus)
1738 { 1734 {
1739 focus = 1; 1735 focus = 1;
1740 want_refresh = 1; 1736 want_refresh = 1;
1741 1737
1742 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1743
1744#if USE_XIM 1738#if USE_XIM
1745 if (Input_Context != NULL) 1739 if (Input_Context != NULL)
1746 { 1740 {
1747 IMSetStatusPosition (); 1741 IMSetPosition ();
1748 XSetICFocus (Input_Context); 1742 XSetICFocus (Input_Context);
1749 } 1743 }
1750#endif 1744#endif
1751#if CURSOR_BLINK 1745#if CURSOR_BLINK
1752 if (OPTION (Opt_cursorBlink)) 1746 if (option (Opt_cursorBlink))
1753 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1747 cursor_blink_ev.again ();
1754#endif 1748#endif
1755#if OFF_FOCUS_FADING 1749#if OFF_FOCUS_FADING
1756 if (rs[Rs_fade]) 1750 if (rs[Rs_fade])
1757 { 1751 {
1758 pix_colors = pix_colors_focused; 1752 pix_colors = pix_colors_focused;
1759 scr_recolour (); 1753 scr_recolour ();
1760 } 1754 }
1761#endif 1755#endif
1756#if ENABLE_FRILLS
1757 if (option (Opt_urgentOnBell))
1758 set_urgency (0);
1759#endif
1760
1761 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1762 } 1762 }
1763} 1763}
1764 1764
1765void 1765void
1766rxvt_term::focus_out () 1766rxvt_term::focus_out ()
… …
1768 if (focus) 1768 if (focus)
1769 { 1769 {
1770 focus = 0; 1770 focus = 0;
1771 want_refresh = 1; 1771 want_refresh = 1;
1772 1772
1773 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1773#if ENABLE_FRILLS
1774 1774 if (option (Opt_urgentOnBell))
1775 set_urgency (0);
1776#endif
1775#if ENABLE_FRILLS || ISO_14755 1777#if ENABLE_FRILLS || ISO_14755
1776 if (iso14755buf) 1778 if (iso14755buf)
1777 { 1779 {
1778 iso14755buf = 0; 1780 iso14755buf = 0;
1779# if ENABLE_OVERLAY 1781# if ISO_14755
1780 scr_overlay_off (); 1782 scr_overlay_off ();
1781# endif 1783# endif
1782 } 1784 }
1783#endif 1785#endif
1784#if USE_XIM 1786#if USE_XIM
1785 if (Input_Context != NULL) 1787 if (Input_Context != NULL)
1786 XUnsetICFocus (Input_Context); 1788 XUnsetICFocus (Input_Context);
1787#endif 1789#endif
1788#if CURSOR_BLINK 1790#if CURSOR_BLINK
1789 if (OPTION (Opt_cursorBlink)) 1791 if (option (Opt_cursorBlink))
1790 cursor_blink_ev.stop (); 1792 cursor_blink_ev.stop ();
1793
1791 hidden_cursor = 0; 1794 hidden_cursor = 0;
1792#endif 1795#endif
1793#if OFF_FOCUS_FADING 1796#if OFF_FOCUS_FADING
1794 if (rs[Rs_fade]) 1797 if (rs[Rs_fade])
1795 { 1798 {
1796 pix_colors = pix_colors_unfocused; 1799 pix_colors = pix_colors_unfocused;
1797 scr_recolour (); 1800 scr_recolour ();
1798 } 1801 }
1799#endif 1802#endif
1803
1804 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1805 }
1806}
1807
1808void
1809rxvt_term::update_fade_color (unsigned int idx)
1810{
1811#if OFF_FOCUS_FADING
1812 if (rs[Rs_fade])
1800 } 1813 {
1814 rgba c;
1815 pix_colors [Color_fade].get (c);
1816 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1817 }
1818#endif
1801} 1819}
1802 1820
1803#if TRANSPARENT 1821#if ENABLE_TRANSPARENCY || ENABLE_PERL
1804void 1822void
1805rxvt_term::rootwin_cb (XEvent &ev) 1823rxvt_term::rootwin_cb (XEvent &ev)
1806{ 1824{
1807 make_current (); 1825 make_current ();
1808 1826
1827 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1828 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1829 return;
1830
1831# if ENABLE_TRANSPARENCY
1809 switch (ev.type) 1832 switch (ev.type)
1810 { 1833 {
1811 case PropertyNotify: 1834 case PropertyNotify:
1812 /* 1835 /*
1813 * if user used some Esetroot compatible prog to set the root bg, 1836 * if user used some Esetroot compatible prog to set the root bg,
1814 * use the property to determine the pixmap. We use it later on. 1837 * use the property to determine the pixmap. We use it later on.
1815 */ 1838 */
1816 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1839 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1817 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1840 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1818 return; 1841 {
1842 bgPixmap.set_root_pixmap ();
1843 update_background ();
1844 }
1819 1845
1820 /* FALLTHROUGH */
1821 case ReparentNotify:
1822 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1823 want_refresh = want_full_refresh = 1;
1824 break; 1846 break;
1825 } 1847 }
1848# endif
1849
1850 refresh_check ();
1826} 1851}
1827#endif 1852#endif
1828 1853
1829void 1854void
1830rxvt_term::button_press (XButtonEvent &ev) 1855rxvt_term::button_press (XButtonEvent &ev)
… …
1839 /* 1864 /*
1840 * VT window processing of button press 1865 * VT window processing of button press
1841 */ 1866 */
1842 if (ev.window == vt) 1867 if (ev.window == vt)
1843 { 1868 {
1869 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1870 return;
1871
1844#if ISO_14755 1872#if ISO_14755
1845 // 5.4 1873 // 5.4
1846 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1874 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1847 { 1875 {
1848 iso14755_54 (ev.x, ev.y); 1876 iso14755_54 (ev.x, ev.y);
… …
1858 /* save the xbutton state (for ButtonRelease) */ 1886 /* save the xbutton state (for ButtonRelease) */
1859 MEvent.state = ev.state; 1887 MEvent.state = ev.state;
1860#ifdef MOUSE_REPORT_DOUBLECLICK 1888#ifdef MOUSE_REPORT_DOUBLECLICK
1861 if (ev.button == MEvent.button && clickintime) 1889 if (ev.button == MEvent.button && clickintime)
1862 { 1890 {
1863 /* same button, within alloted time */ 1891 /* same button, within allowed time */
1864 MEvent.clicks++; 1892 MEvent.clicks++;
1865 1893
1866 if (MEvent.clicks > 1) 1894 if (MEvent.clicks > 1)
1867 { 1895 {
1868 /* only report double clicks */ 1896 /* only report double clicks */
… …
1882 mouse_report (ev); 1910 mouse_report (ev);
1883 } 1911 }
1884#else 1912#else
1885 MEvent.button = ev.button; 1913 MEvent.button = ev.button;
1886 mouse_report (ev); 1914 mouse_report (ev);
1887#endif /* MOUSE_REPORT_DOUBLECLICK */ 1915#endif /* MOUSE_REPORT_DOUBLECLICK */
1888 1916
1889 } 1917 }
1890 else 1918 else
1891 { 1919 {
1892 if (ev.button != MEvent.button) 1920 if (ev.button != MEvent.button)
1893 MEvent.clicks = 0; 1921 MEvent.clicks = 0;
1894 1922
1895 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1896 switch (ev.button) 1923 switch (ev.button)
1897 { 1924 {
1898 case Button1: 1925 case Button1:
1899 /* allow meta + click to select rectangular areas */ 1926 /* allow meta + click to select rectangular areas */
1900 /* should be done in screen.C */ 1927 /* should be done in screen.C */
1901#if ENABLE_FRILLS 1928#if ENABLE_FRILLS
1902 selection.rect = !!(ev.state & ModMetaMask); 1929 selection.rect = !!(ev.state & ModMetaMask);
1903#else 1930#else
1904 selection.rect = false; 1931 selection.rect = false;
1905#endif 1932#endif
1906 1933
1907 /* allow shift+left click to extend selection */ 1934 /* allow shift+left click to extend selection */
1908 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report)) 1935 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1909 { 1936 {
1910 if (MEvent.button == Button1 && clickintime) 1937 if (MEvent.button == Button1 && clickintime)
1911 selection_rotate (ev.x, ev.y); 1938 selection_rotate (ev.x, ev.y);
1912 else 1939 else
1913 selection_extend (ev.x, ev.y, 1); 1940 selection_extend (ev.x, ev.y, 1);
1914 } 1941 }
1915 else 1942 else
1916 { 1943 {
1917 if (MEvent.button == Button1 && clickintime) 1944 if (MEvent.button == Button1 && clickintime)
1918 MEvent.clicks++; 1945 MEvent.clicks++;
1919 else 1946 else
1920 MEvent.clicks = 1; 1947 MEvent.clicks = 1;
1921 1948
1922 selection_click (MEvent.clicks, ev.x, ev.y); 1949 selection_click (MEvent.clicks, ev.x, ev.y);
1923 } 1950 }
1924 1951
1925 MEvent.button = Button1; 1952 MEvent.button = Button1;
1926 break; 1953 break;
1927 1954
1928 case Button3: 1955 case Button3:
1929 if (MEvent.button == Button3 && clickintime) 1956 if (MEvent.button == Button3 && clickintime)
1930 selection_rotate (ev.x, ev.y); 1957 selection_rotate (ev.x, ev.y);
1931 else 1958 else
1932 selection_extend (ev.x, ev.y, 1); 1959 selection_extend (ev.x, ev.y, 1);
1933 1960
1934 MEvent.button = Button3; 1961 MEvent.button = Button3;
1935 break; 1962 break;
1936 } 1963 }
1937 } 1964 }
1938 1965
1939 MEvent.time = ev.time; 1966 MEvent.time = ev.time;
1940 return; 1967 return;
1941 } 1968 }
1942 1969
1943 /* 1970 /*
1944 * Scrollbar window processing of button press 1971 * Scrollbar window processing of button press
1945 */ 1972 */
1946 if (isScrollbarWindow (ev.window)) 1973 if (scrollBar.state && ev.window == scrollBar.win)
1947 { 1974 {
1948 scrollBar.setIdle (); 1975 page_dirn direction = NO_DIR;
1976
1977 if (scrollBar.upButton (ev.y))
1978 direction = UP; /* up */
1979 else if (scrollBar.dnButton (ev.y))
1980 direction = DN; /* down */
1981
1982 scrollBar.state = STATE_IDLE;
1949 /* 1983 /*
1950 * Rxvt-style scrollbar: 1984 * Rxvt-style scrollbar:
1951 * move up if mouse is above slider 1985 * move up if mouse is above slider
1952 * move dn if mouse is below slider 1986 * move dn if mouse is below slider
1953 * 1987 *
… …
1962 /* 1996 /*
1963 * Mouse report disabled scrollbar: 1997 * Mouse report disabled scrollbar:
1964 * arrow buttons - send up/down 1998 * arrow buttons - send up/down
1965 * click on scrollbar - send pageup/down 1999 * click on scrollbar - send pageup/down
1966 */ 2000 */
1967 if ((scrollBar.style == R_SB_NEXT 2001 if (direction == UP)
1968 && scrollbarnext_upButton (ev.y))
1969 || (scrollBar.style == R_SB_RXVT
1970 && scrollbarrxvt_upButton (ev.y)))
1971 tt_printf ("\033[A"); 2002 tt_printf ("\033[A");
1972 else if ((scrollBar.style == R_SB_NEXT 2003 else if (direction == DN)
1973 && scrollbarnext_dnButton (ev.y))
1974 || (scrollBar.style == R_SB_RXVT
1975 && scrollbarrxvt_dnButton (ev.y)))
1976 tt_printf ("\033[B"); 2004 tt_printf ("\033[B");
1977 else 2005 else
1978 switch (ev.button) 2006 switch (ev.button)
1979 { 2007 {
1980 case Button2: 2008 case Button2:
… …
1987 tt_printf ("\033[5~"); 2015 tt_printf ("\033[5~");
1988 break; 2016 break;
1989 } 2017 }
1990 } 2018 }
1991 else 2019 else
1992#endif /* NO_SCROLLBAR_REPORT */ 2020#endif /* NO_SCROLLBAR_REPORT */
1993
1994 {
1995 char upordown = 0;
1996
1997 if (scrollBar.style == R_SB_NEXT)
1998 { 2021 {
1999 if (scrollbarnext_upButton (ev.y)) 2022 if (direction != NO_DIR)
2000 upordown = -1; /* up */
2001 else if (scrollbarnext_dnButton (ev.y))
2002 upordown = 1; /* down */
2003 }
2004 else if (scrollBar.style == R_SB_RXVT)
2005 {
2006 if (scrollbarrxvt_upButton (ev.y))
2007 upordown = -1; /* up */
2008 else if (scrollbarrxvt_dnButton (ev.y))
2009 upordown = 1; /* down */
2010 }
2011 if (upordown)
2012 { 2023 {
2013#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2024#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2025 if (!cont_scroll_ev.is_active ())
2014 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2026 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2015#endif 2027#endif
2016 if (scr_page (upordown < 0 ? UP : DN, 1)) 2028 if (scr_page (direction, 1))
2017 { 2029 {
2018 if (upordown < 0) 2030 if (direction == UP)
2019 scrollBar.setUp (); 2031 scrollBar.state = STATE_UP;
2020 else 2032 else
2021 scrollBar.setDn (); 2033 scrollBar.state = STATE_DOWN;
2022 } 2034 }
2023 } 2035 }
2024 else 2036 else
2025 switch (ev.button) 2037 switch (ev.button)
2026 { 2038 {
2027 case Button2: 2039 case Button2:
2028 switch (scrollbar_align) 2040 switch (scrollBar.align)
2029 { 2041 {
2030 case R_SB_ALIGN_TOP: 2042 case R_SB_ALIGN_TOP:
2031 csrO = 0; 2043 csrO = 0;
2032 break; 2044 break;
2033 case R_SB_ALIGN_CENTRE: 2045 case R_SB_ALIGN_CENTRE:
… …
2039 } 2051 }
2040 2052
2041 if (scrollBar.style == R_SB_XTERM 2053 if (scrollBar.style == R_SB_XTERM
2042 || scrollbar_above_slider (ev.y) 2054 || scrollbar_above_slider (ev.y)
2043 || scrollbar_below_slider (ev.y)) 2055 || scrollbar_below_slider (ev.y))
2044 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2056 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2045 2057
2046 scrollBar.setMotion (); 2058 scrollBar.state = STATE_MOTION;
2047 break; 2059 break;
2048 2060
2049 case Button1: 2061 case Button1:
2050 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2062 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2051 csrO = ev.y - scrollBar.top; 2063 csrO = ev.y - scrollBar.top;
2052 /* FALLTHROUGH */ 2064 /* FALLTHROUGH */
2053 2065
2054 case Button3: 2066 case Button3:
2055 if (scrollBar.style != R_SB_XTERM) 2067 if (scrollBar.style != R_SB_XTERM)
… …
2065 scr_page (DN, nrow - 1); 2077 scr_page (DN, nrow - 1);
2066# else 2078# else
2067 scr_page (DN, nrow / 4); 2079 scr_page (DN, nrow / 4);
2068# endif 2080# endif
2069 else 2081 else
2070 scrollBar.setMotion (); 2082 scrollBar.state = STATE_MOTION;
2071 } 2083 }
2072 else 2084 else
2073 { 2085 {
2074 scr_page ((ev.button == Button1 ? DN : UP), 2086 scr_page ((ev.button == Button1 ? DN : UP),
2075 (nrow 2087 (nrow
2076 * scrollbar_position (ev.y) 2088 * scrollbar_position (ev.y)
2077 / scrollbar_size ())); 2089 / scrollBar.size ()));
2078 } 2090 }
2079 2091
2080 break; 2092 break;
2081 } 2093 }
2082 } 2094 }
… …
2092 2104
2093 csrO = 0; /* reset csr Offset */ 2105 csrO = 0; /* reset csr Offset */
2094 if (!bypass_keystate) 2106 if (!bypass_keystate)
2095 reportmode = !! (priv_modes & PrivMode_mouse_report); 2107 reportmode = !! (priv_modes & PrivMode_mouse_report);
2096 2108
2097 if (scrollbar_isUpDn ()) 2109 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2098 { 2110 {
2099 scrollBar.setIdle (); 2111 scrollBar.state = STATE_IDLE;
2100 scrollbar_show (0); 2112 scrollBar.show (0);
2101 } 2113 }
2102 2114
2103#ifdef SELECTION_SCROLLING 2115#ifdef SELECTION_SCROLLING
2104 if (sel_scroll_ev.active)
2105 sel_scroll_ev.stop(); 2116 sel_scroll_ev.stop();
2106#endif 2117#endif
2107 2118
2108 if (ev.window == vt) 2119 if (ev.window == vt)
2109 { 2120 {
2121 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2122 return;
2123
2110#if ISO_14755 2124#if ISO_14755
2111 // 5.4 2125 // 5.4
2112 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2126 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2113 return; 2127 return;
2114#endif 2128#endif
2129
2115 if (reportmode) 2130 if (reportmode)
2116 { 2131 {
2117 /* mouse report from vt window */ 2132 /* mouse report from vt window */
2118 /* don't report release of wheel "buttons" */ 2133 /* don't report release of wheel "buttons" */
2119 if (ev.button >= 4) 2134 if (ev.button >= 4)
… …
2130 mouse_report (ev); 2145 mouse_report (ev);
2131 } 2146 }
2132#else /* MOUSE_REPORT_DOUBLECLICK */ 2147#else /* MOUSE_REPORT_DOUBLECLICK */
2133 MEvent.button = AnyButton; 2148 MEvent.button = AnyButton;
2134 mouse_report (ev); 2149 mouse_report (ev);
2135#endif /* MOUSE_REPORT_DOUBLECLICK */ 2150#endif /* MOUSE_REPORT_DOUBLECLICK */
2136 return; 2151 return;
2137 } 2152 }
2138 2153
2139 /* 2154 /*
2140 * dumb hack to compensate for the failure of click-and-drag 2155 * dumb hack to compensate for the failure of click-and-drag
… …
2143 if (priv_modes & PrivMode_mouse_report 2158 if (priv_modes & PrivMode_mouse_report
2144 && bypass_keystate 2159 && bypass_keystate
2145 && ev.button == Button1 && MEvent.clicks <= 1) 2160 && ev.button == Button1 && MEvent.clicks <= 1)
2146 selection_extend (ev.x, ev.y, 0); 2161 selection_extend (ev.x, ev.y, 0);
2147 2162
2148 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2149 return;
2150
2151 switch (ev.button) 2163 switch (ev.button)
2152 { 2164 {
2153 case Button1: 2165 case Button1:
2154 case Button3: 2166 case Button3:
2155 selection_make (ev.time); 2167 selection_make (ev.time);
2156 break; 2168 break;
2157 2169
2158 case Button2: 2170 case Button2:
2159 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2171 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2160 selection_request (ev.time, ev.state & ShiftMask ? Sel_Clipboard : Sel_Primary); 2172 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2161 break; 2173 break;
2162 2174
2163#ifdef MOUSE_WHEEL 2175#ifdef MOUSE_WHEEL
2164 case Button4: 2176 case Button4:
2165 case Button5: 2177 case Button5:
… …
2169 2181
2170 v = ev.button == Button4 ? UP : DN; 2182 v = ev.button == Button4 ? UP : DN;
2171 2183
2172 if (ev.state & ShiftMask) 2184 if (ev.state & ShiftMask)
2173 i = 1; 2185 i = 1;
2174 else if (OPTION (Opt_mouseWheelScrollPage)) 2186 else if (option (Opt_mouseWheelScrollPage))
2175 i = nrow - 1; 2187 i = nrow - 1;
2176 else 2188 else
2177 i = 5; 2189 i = 5;
2178 2190
2179# ifdef MOUSE_SLIP_WHEELING 2191# ifdef MOUSE_SLIP_WHEELING
… …
2181 { 2193 {
2182 mouse_slip_wheel_speed += v ? -1 : 1; 2194 mouse_slip_wheel_speed += v ? -1 : 1;
2183 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2195 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2184 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2196 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2185 2197
2186 if (slip_wheel_ev.at < NOW) 2198 if (!slip_wheel_ev.is_active ())
2187 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2199 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2188
2189 slip_wheel_ev.start ();
2190 } 2200 }
2191 else 2201 else
2202# endif
2192 { 2203 {
2193# endif
2194 scr_page (v, i); 2204 scr_page (v, i);
2195 scrollbar_show (1); 2205 scrollBar.show (1);
2196# ifdef MOUSE_SLIP_WHEELING
2197 } 2206 }
2198# endif
2199 } 2207 }
2200 break; 2208 break;
2201#endif 2209#endif
2202 } 2210 }
2203 } 2211 }
2204} 2212}
2205 2213
2206#ifdef TRANSPARENT
2207#if TINTING
2208/* taken from aterm-0.4.2 */
2209
2210typedef uint32_t RUINT32T;
2211
2212void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2213{
2214 int sh_r, sh_g, sh_b;
2215 RUINT32T mask_r, mask_g, mask_b;
2216 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2217 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2218 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2219 int i;
2220
2221 Visual *visual = display->visual;
2222
2223 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2224
2225 /* for convenience */
2226 mask_r = visual->red_mask;
2227 mask_g = visual->green_mask;
2228 mask_b = visual->blue_mask;
2229
2230 /* boring lookup table pre-initialization */
2231 switch (srcImage->bits_per_pixel) {
2232 case 15:
2233 if ((mask_r != 0x7c00) ||
2234 (mask_g != 0x03e0) ||
2235 (mask_b != 0x001f))
2236 return;
2237 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2238 lookup_r = lookup;
2239 lookup_g = lookup+32;
2240 lookup_b = lookup+32+32;
2241 sh_r = 10;
2242 sh_g = 5;
2243 sh_b = 0;
2244 break;
2245 case 16:
2246 if ((mask_r != 0xf800) ||
2247 (mask_g != 0x07e0) ||
2248 (mask_b != 0x001f))
2249 return;
2250 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2251 lookup_r = lookup;
2252 lookup_g = lookup+32;
2253 lookup_b = lookup+32+64;
2254 sh_r = 11;
2255 sh_g = 5;
2256 sh_b = 0;
2257 break;
2258 case 24:
2259 if ((mask_r != 0xff0000) ||
2260 (mask_g != 0x00ff00) ||
2261 (mask_b != 0x0000ff))
2262 return;
2263 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2264 lookup_r = lookup;
2265 lookup_g = lookup+256;
2266 lookup_b = lookup+256+256;
2267 sh_r = 16;
2268 sh_g = 8;
2269 sh_b = 0;
2270 break;
2271 case 32:
2272 if ((mask_r != 0xff0000) ||
2273 (mask_g != 0x00ff00) ||
2274 (mask_b != 0x0000ff))
2275 return;
2276 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2277 lookup_r = lookup;
2278 lookup_g = lookup+256;
2279 lookup_b = lookup+256+256;
2280 sh_r = 16;
2281 sh_g = 8;
2282 sh_b = 0;
2283 break;
2284 default:
2285 return; /* we do not support this color depth */
2286 }
2287
2288 /* prepare limits for color transformation (each channel is handled separately) */
2289 if (shade < 0) {
2290 shade = -shade;
2291 if (shade < 0) shade = 0;
2292 if (shade > 100) shade = 100;
2293
2294 lower_lim_r = 65535-rm;
2295 lower_lim_g = 65535-gm;
2296 lower_lim_b = 65535-bm;
2297
2298 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2299 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2300 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2301
2302 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2303 } else {
2304 if (shade < 0) shade = 0;
2305 if (shade > 100) shade = 100;
2306
2307 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2308
2309 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2310 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2311 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2312 }
2313
2314 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2315 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2316 {
2317 unsigned int tmp;
2318
2319 tmp = lower_lim_r;
2320 lower_lim_r = lower_lim_b;
2321 lower_lim_b = tmp;
2322
2323 tmp = upper_lim_r;
2324 upper_lim_r = upper_lim_b;
2325 upper_lim_b = tmp;
2326 }
2327
2328 /* fill our lookup tables */
2329 for (i = 0; i <= mask_r>>sh_r; i++)
2330 {
2331 RUINT32T tmp;
2332 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2333 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2334 lookup_r[i] = (tmp/65535)<<sh_r;
2335 }
2336 for (i = 0; i <= mask_g>>sh_g; i++)
2337 {
2338 RUINT32T tmp;
2339 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2340 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2341 lookup_g[i] = (tmp/65535)<<sh_g;
2342 }
2343 for (i = 0; i <= mask_b>>sh_b; i++)
2344 {
2345 RUINT32T tmp;
2346 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2347 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2348 lookup_b[i] = (tmp/65535)<<sh_b;
2349 }
2350
2351 /* apply table to input image (replacing colors by newly calculated ones) */
2352 switch (srcImage->bits_per_pixel)
2353 {
2354 case 15:
2355 {
2356 unsigned short *p1, *pf, *p, *pl;
2357 p1 = (unsigned short *) srcImage->data;
2358 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2359 while (p1 < pf)
2360 {
2361 p = p1;
2362 pl = p1 + srcImage->width;
2363 for (; p < pl; p++)
2364 {
2365 *p = lookup_r[(*p & 0x7c00)>>10] |
2366 lookup_g[(*p & 0x03e0)>> 5] |
2367 lookup_b[(*p & 0x001f)];
2368 }
2369 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2370 }
2371 break;
2372 }
2373 case 16:
2374 {
2375 unsigned short *p1, *pf, *p, *pl;
2376 p1 = (unsigned short *) srcImage->data;
2377 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2378 while (p1 < pf)
2379 {
2380 p = p1;
2381 pl = p1 + srcImage->width;
2382 for (; p < pl; p++)
2383 {
2384 *p = lookup_r[(*p & 0xf800)>>11] |
2385 lookup_g[(*p & 0x07e0)>> 5] |
2386 lookup_b[(*p & 0x001f)];
2387 }
2388 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2389 }
2390 break;
2391 }
2392 case 24:
2393 {
2394 unsigned char *p1, *pf, *p, *pl;
2395 p1 = (unsigned char *) srcImage->data;
2396 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2397 while (p1 < pf)
2398 {
2399 p = p1;
2400 pl = p1 + srcImage->width * 3;
2401 for (; p < pl; p += 3)
2402 {
2403 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2404 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2405 p[2] = lookup_r[(p[2] & 0x0000ff)];
2406 }
2407 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2408 }
2409 break;
2410 }
2411 case 32:
2412 {
2413 RUINT32T *p1, *pf, *p, *pl;
2414 p1 = (RUINT32T *) srcImage->data;
2415 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2416
2417 while (p1 < pf)
2418 {
2419 p = p1;
2420 pl = p1 + srcImage->width;
2421 for (; p < pl; p++)
2422 {
2423 *p = lookup_r[(*p & 0xff0000)>>16] |
2424 lookup_g[(*p & 0x00ff00)>> 8] |
2425 lookup_b[(*p & 0x0000ff)] |
2426 (*p & ~0xffffff);
2427 }
2428 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2429 }
2430 break;
2431 }
2432 }
2433
2434 free (lookup);
2435}
2436#endif
2437
2438/*
2439 * Check our parents are still who we think they are.
2440 * Do transparency updates if required
2441 */
2442int
2443rxvt_term::check_our_parents ()
2444{
2445 int i, pchanged, aformat, have_pixmap, rootdepth;
2446 unsigned long nitems, bytes_after;
2447 Atom atype;
2448 unsigned char *prop = NULL;
2449 Window root, oldp, *list;
2450 Pixmap rootpixmap = None;
2451 XWindowAttributes wattr, wrootattr;
2452 dDisp;
2453
2454 pchanged = 0;
2455
2456 if (!OPTION (Opt_transparent))
2457 return pchanged; /* Don't try any more */
2458
2459 XGetWindowAttributes (disp, display->root, &wrootattr);
2460 rootdepth = wrootattr.depth;
2461
2462 XGetWindowAttributes (disp, parent[0], &wattr);
2463
2464 if (rootdepth != wattr.depth)
2465 {
2466 if (am_transparent)
2467 {
2468 pchanged = 1;
2469 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2470 am_transparent = am_pixmap_trans = 0;
2471 }
2472
2473 return pchanged; /* Don't try any more */
2474 }
2475
2476 /* Get all X ops out of the queue so that our information is up-to-date. */
2477 XSync (disp, False);
2478
2479 /*
2480 * Make the frame window set by the window manager have
2481 * the root background. Some window managers put multiple nested frame
2482 * windows for each client, so we have to take care about that.
2483 */
2484 i = (xa[XA_XROOTPMAP_ID]
2485 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2486 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2487 &nitems, &bytes_after, &prop) == Success);
2488
2489 if (!i || prop == NULL)
2490 i = (xa[XA_ESETROOT_PMAP_ID]
2491 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2492 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2493 &nitems, &bytes_after, &prop) == Success);
2494
2495 if (!i || prop == NULL
2496#if TINTING
2497 || !rs[Rs_color + Color_tint]
2498#endif
2499 )
2500 have_pixmap = 0;
2501 else
2502 {
2503 have_pixmap = 1;
2504 rootpixmap = *(Pixmap *)prop;
2505 XFree (prop);
2506 }
2507
2508 if (have_pixmap)
2509 {
2510 /*
2511 * Copy display->root pixmap transparency
2512 */
2513 int sx, sy, nx, ny;
2514 unsigned int nw, nh;
2515 Window cr;
2516 XImage *image;
2517 GC gc;
2518 XGCValues gcvalue;
2519
2520 XTranslateCoordinates (disp, parent[0], display->root,
2521 0, 0, &sx, &sy, &cr);
2522 nw = (unsigned int)szHint.width;
2523 nh = (unsigned int)szHint.height;
2524 nx = ny = 0;
2525
2526 if (sx < 0)
2527 {
2528 nw += sx;
2529 nx = -sx;
2530 sx = 0;
2531 }
2532
2533 if (sy < 0)
2534 {
2535 nh += sy;
2536 ny = -sy;
2537 sy = 0;
2538 }
2539
2540 min_it (nw, (unsigned int) (wrootattr.width - sx));
2541 min_it (nh, (unsigned int) (wrootattr.height - sy));
2542
2543 XSync (disp, False);
2544 allowedxerror = -1;
2545 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2546
2547 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2548 /* XXX: may need a delay here? */
2549 allowedxerror = 0;
2550
2551 if (image == NULL)
2552 {
2553 if (am_transparent && am_pixmap_trans)
2554 {
2555 pchanged = 1;
2556 if (pixmap != None)
2557 {
2558 XFreePixmap (disp, pixmap);
2559 pixmap = None;
2560 }
2561 }
2562
2563 am_pixmap_trans = 0;
2564 }
2565 else
2566 {
2567 if (pixmap != None)
2568 XFreePixmap (disp, pixmap);
2569
2570#if TINTING
2571 if (ISSET_PIXCOLOR (Color_tint))
2572 {
2573 unsigned short rm, gm, bm;
2574 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2575
2576 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2577
2578 ShadeXImage (display, image, shade, rm, gm, bm);
2579 }
2580#endif
2581
2582 pixmap = XCreatePixmap (disp, vt,
2583 szHint.width, szHint.height, image->depth);
2584 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2585 XPutImage (disp, pixmap, gc, image, 0, 0,
2586 nx, ny, image->width, image->height);
2587 XFreeGC (disp, gc);
2588 XDestroyImage (image);
2589 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2590 XClearWindow (disp, parent[0]);
2591
2592 if (!am_transparent || !am_pixmap_trans)
2593 pchanged = 1;
2594
2595 am_transparent = am_pixmap_trans = 1;
2596 }
2597 }
2598
2599 if (am_pixmap_trans)
2600 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2601 else
2602 {
2603 unsigned int n;
2604 /*
2605 * InheritPixmap transparency
2606 */
2607 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2608 {
2609 oldp = parent[i];
2610 XQueryTree (disp, parent[i - 1], &root,
2611 &parent[i], &list, &n);
2612 XFree (list);
2613
2614 if (parent[i] == display->root)
2615 {
2616 if (oldp != None)
2617 pchanged = 1;
2618
2619 break;
2620 }
2621
2622 if (oldp != parent[i])
2623 pchanged = 1;
2624 }
2625
2626 n = 0;
2627
2628 if (pchanged)
2629 {
2630 for (; n < (unsigned int)i; n++)
2631 {
2632 XGetWindowAttributes (disp, parent[n], &wattr);
2633 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2634 {
2635 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2636 break;
2637 }
2638 }
2639 }
2640
2641 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2642 {
2643 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2644 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2645 am_transparent = 0;
2646 /* XXX: also turn off Opt_transparent? */
2647 }
2648 else
2649 {
2650#if WAIT_FOR_WM
2651 /* wait (an arbitrary period) for the WM to do its thing
2652 * needed for fvwm2.2.2 (and before?) */
2653 sleep (1);
2654#endif
2655 for (n = 0; n < (unsigned int)i; n++)
2656 {
2657 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2658 XClearWindow (disp, parent[n]);
2659 }
2660
2661 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2662 am_transparent = 1;
2663 }
2664
2665 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2666 parent[i] = None;
2667 }
2668
2669 if (scrollBar.win)
2670 {
2671 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2672 scrollBar.setIdle ();
2673 scrollbar_show (0);
2674 }
2675
2676 if (am_transparent)
2677 {
2678 want_refresh = want_full_refresh = 1;
2679 if (am_pixmap_trans)
2680 flush ();
2681 }
2682
2683 return pchanged;
2684}
2685#endif
2686
2687/*}}} */ 2214/*}}} */
2688 2215
2689bool 2216void
2690rxvt_term::cmd_parse () 2217rxvt_term::cmd_parse ()
2691{ 2218{
2692 bool flag = false;
2693 wchar_t ch = NOCHAR; 2219 wchar_t ch = NOCHAR;
2694 char *seq_begin; // remember start of esc-sequence here 2220 char *seq_begin; // remember start of esc-sequence here
2695 2221
2696 for (;;) 2222 for (;;)
2697 { 2223 {
2698 if (ch == NOCHAR) 2224 if (expect_false (ch == NOCHAR))
2699 { 2225 {
2700 seq_begin = cmdbuf_ptr; 2226 seq_begin = cmdbuf_ptr;
2701 ch = next_char (); 2227 ch = next_char ();
2702 2228
2703 if (ch == NOCHAR) 2229 if (ch == NOCHAR)
2704 break; 2230 break;
2705 } 2231 }
2706 2232
2707 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2233 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2708 { 2234 {
2709 if (!seen_input) 2235 if (expect_false (!seen_input))
2710 { 2236 {
2711 seen_input = 1; 2237 seen_input = 1;
2712 // many badly-written programs (e.g. jed) contain a race condition: 2238 // many badly-written programs (e.g. jed) contain a race condition:
2713 // they first read the screensize and then install a SIGWINCH handler. 2239 // they first read the screensize and then install a SIGWINCH handler.
2714 // some window managers resize the window early, and these programs 2240 // some window managers resize the window early, and these programs
… …
2727 wchar_t *str = buf; 2253 wchar_t *str = buf;
2728 wchar_t *eol = str + min (ncol, UBUFSIZ); 2254 wchar_t *eol = str + min (ncol, UBUFSIZ);
2729 2255
2730 for (;;) 2256 for (;;)
2731 { 2257 {
2732 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2258 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2733 break; 2259 break;
2734 2260
2735 *str++ = ch; 2261 *str++ = ch;
2736 2262
2737 if (ch == C0_LF || str >= eol) 2263 if (expect_false (ch == C0_LF || str >= eol))
2738 { 2264 {
2739 if (ch == C0_LF) 2265 if (ch == C0_LF)
2740 nlines++; 2266 nlines++;
2741 2267
2742 refresh_count++; 2268 refresh_count++;
2743 2269
2744 if (!OPTION (Opt_jumpScroll) 2270 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2745 || (refresh_count >= refresh_limit * (nrow - 1)))
2746 { 2271 {
2747 refreshnow = true;
2748 refresh_count = 0; 2272 refresh_count = 0;
2273
2274 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2275 {
2276 refreshnow = true;
2749 ch = NOCHAR; 2277 ch = NOCHAR;
2750 break; 2278 break;
2279 }
2751 } 2280 }
2752 2281
2753 // scr_add_lines only works for nlines <= nrow - 1. 2282 // scr_add_lines only works for nlines <= nrow - 1.
2754 if (nlines >= nrow - 1) 2283 if (nlines >= nrow - 1)
2755 { 2284 {
… …
2783 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2312 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2784 scr_add_lines (buf, str - buf, nlines); 2313 scr_add_lines (buf, str - buf, nlines);
2785 2314
2786 /* 2315 /*
2787 * If there have been a lot of new lines, then update the screen 2316 * If there have been a lot of new lines, then update the screen
2788 * What the heck I'll cheat and only refresh less than every page-full. 2317 * What the heck we'll cheat and only refresh less than every page-full.
2789 * the number of pages between refreshes is refresh_limit, which 2318 * if skipScroll is enabled.
2790 * is incremented here because we must be doing flat-out scrolling.
2791 */ 2319 */
2792 if (refreshnow) 2320 if (refreshnow)
2793 { 2321 {
2794 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2795 refresh_limit++;
2796 else
2797 {
2798 flag = true;
2799 scr_refresh (); 2322 scr_refresh ();
2800 want_refresh = 1; 2323 want_refresh = 1;
2801 }
2802 } 2324 }
2803
2804 } 2325 }
2805 else 2326 else
2806 { 2327 {
2807 try 2328 try
2808 { 2329 {
… …
2816 } 2337 }
2817 2338
2818 ch = NOCHAR; 2339 ch = NOCHAR;
2819 } 2340 }
2820 } 2341 }
2821
2822 return flag;
2823} 2342}
2824 2343
2825// read the next character 2344// read the next character
2826wchar_t 2345wchar_t
2827rxvt_term::next_char () NOTHROW 2346rxvt_term::next_char () NOTHROW
2828{ 2347{
2829 while (cmdbuf_ptr < cmdbuf_endp) 2348 while (cmdbuf_ptr < cmdbuf_endp)
2830 { 2349 {
2831 // assume 7-bit to be ascii ALWAYS 2350 // assume 7-bit to be ascii ALWAYS
2832 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2351 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2833 return *cmdbuf_ptr++; 2352 return *cmdbuf_ptr++;
2834 2353
2835 wchar_t wc; 2354 wchar_t wc;
2836 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2355 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2837 2356
… …
2841 cmdbuf_ptr = cmdbuf_endp; 2360 cmdbuf_ptr = cmdbuf_endp;
2842 break; 2361 break;
2843 } 2362 }
2844 2363
2845 if (len == (size_t)-1) 2364 if (len == (size_t)-1)
2365 {
2366 mbstate.reset (); // reset now undefined conversion state
2846 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2367 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2368 }
2847 2369
2848 // assume wchar == unicode 2370 // assume wchar == unicode
2849 cmdbuf_ptr += len; 2371 cmdbuf_ptr += len;
2850 return wc & UNICODE_MASK; 2372 return wc & UNICODE_MASK;
2851 } 2373 }
… …
2895/*----------------------------------------------------------------------*/ 2417/*----------------------------------------------------------------------*/
2896#ifdef PRINTPIPE 2418#ifdef PRINTPIPE
2897FILE * 2419FILE *
2898rxvt_term::popen_printer () 2420rxvt_term::popen_printer ()
2899{ 2421{
2900 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2422 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2901 2423
2902 if (stream == NULL) 2424 if (stream == NULL)
2903 rxvt_warn ("can't open printer pipe, not printing.\n"); 2425 rxvt_warn ("can't open printer pipe, not printing.\n");
2904 2426
2905 return stream; 2427 return stream;
… …
2916 * simulate attached vt100 printer 2438 * simulate attached vt100 printer
2917 */ 2439 */
2918void 2440void
2919rxvt_term::process_print_pipe () 2441rxvt_term::process_print_pipe ()
2920{ 2442{
2921 int done; 2443 FILE *fd = popen_printer ();
2922 FILE *fd;
2923 2444
2924 if ((fd = popen_printer ()) == NULL) 2445 if (!fd)
2925 return; 2446 return;
2926 2447
2927 /* 2448 /*
2928 * Send all input to the printer until either ESC[4i or ESC[?4i 2449 * Send all input to the printer until either ESC[4i or ESC[?4i
2929 * is received. 2450 * is received.
2930 */ 2451 */
2931 for (done = 0; !done;) 2452 for (int done = 0; !done; )
2932 { 2453 {
2933 unsigned char buf[8]; 2454 unsigned char buf[8];
2934 unicode_t ch; 2455 unicode_t ch;
2935 unsigned int i, len; 2456 unsigned int i, len;
2936 2457
… …
2955 { 2476 {
2956 if ((buf[len++] = cmd_getc ()) == 'i') 2477 if ((buf[len++] = cmd_getc ()) == 'i')
2957 break; /* done = 1 */ 2478 break; /* done = 1 */
2958 } 2479 }
2959 } 2480 }
2960 2481
2961 for (i = 0; i < len; i++) 2482 for (i = 0; i < len; i++)
2962 if (putc (buf[i], fd) == EOF) 2483 if (putc (buf[i], fd) == EOF)
2963 { 2484 {
2964 done = 1; 2485 done = 1;
2965 break; 2486 break;
… …
2967 } 2488 }
2968 } 2489 }
2969 2490
2970 pclose_printer (fd); 2491 pclose_printer (fd);
2971} 2492}
2972#endif /* PRINTPIPE */ 2493#endif /* PRINTPIPE */
2973/*}}} */ 2494/*}}} */
2974 2495
2975/* *INDENT-OFF* */ 2496/* *INDENT-OFF* */
2976enum { 2497enum {
2977 C1_40 = 0x40, 2498 C1_40 = 0x40,
… …
3027 process_dcs_seq (); 2548 process_dcs_seq ();
3028 break; 2549 break;
3029 case 0x9b: /* CSI */ 2550 case 0x9b: /* CSI */
3030 process_csi_seq (); 2551 process_csi_seq ();
3031 break; 2552 break;
3032 case 0x9d: /* CSI */ 2553 case 0x9d: /* OSC */
3033 process_osc_seq (); 2554 process_osc_seq ();
3034 break; 2555 break;
3035#endif 2556#endif
3036 } 2557 }
3037} 2558}
… …
3081 break; 2602 break;
3082 case 'Z': /* identify the terminal type */ 2603 case 'Z': /* identify the terminal type */
3083 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2604 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
3084 break; 2605 break;
3085 case '<': /* turn off VT52 mode */ 2606 case '<': /* turn off VT52 mode */
3086 PrivMode (0, PrivMode_vt52); 2607 set_privmode (PrivMode_vt52, 0);
3087 break; 2608 break;
3088 case 'F': /* use special graphics character set */ 2609 case 'F': /* use special graphics character set */
3089 case 'G': /* use regular character set */ 2610 case 'G': /* use regular character set */
3090 /* unimplemented */ 2611 /* unimplemented */
3091 break; 2612 break;
… …
3127 scr_charset_set (2, (unsigned int)cmd_getc ()); 2648 scr_charset_set (2, (unsigned int)cmd_getc ());
3128 break; 2649 break;
3129 case '+': 2650 case '+':
3130 scr_charset_set (3, (unsigned int)cmd_getc ()); 2651 scr_charset_set (3, (unsigned int)cmd_getc ());
3131 break; 2652 break;
3132#if ENABLE_FRILLS 2653#if !ENABLE_MINIMAL
3133 case '6': 2654 case '6':
3134 scr_backindex (); 2655 scr_backindex ();
3135 break; 2656 break;
3136#endif 2657#endif
3137 case '7': 2658 case '7':
3138 scr_cursor (SAVE); 2659 scr_cursor (SAVE);
3139 break; 2660 break;
3140 case '8': 2661 case '8':
3141 scr_cursor (RESTORE); 2662 scr_cursor (RESTORE);
3142 break; 2663 break;
3143#if ENABLE_FRILLS 2664#if !ENABLE_MINIMAL
3144 case '9': 2665 case '9':
3145 scr_forwardindex (); 2666 scr_forwardindex ();
3146 break; 2667 break;
3147#endif 2668#endif
3148 case '=': 2669 case '=':
3149 case '>': 2670 case '>':
3150 PrivMode ((ch == '='), PrivMode_aplKP); 2671 set_privmode (PrivMode_aplKP, ch == '=');
3151 break; 2672 break;
3152 2673
3153 case C1_40: 2674 case C1_40:
3154 cmd_getc (); 2675 cmd_getc ();
3155 break; 2676 break;
… …
3194 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2715 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3195 case C1_SCI: /* ESC Z */ 2716 case C1_SCI: /* ESC Z */
3196 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2717 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3197 break; /* steal obsolete ESC [ c */ 2718 break; /* steal obsolete ESC [ c */
3198 2719
3199 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2720 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
3200 case C1_CSI: /* ESC [ */ 2721 case C1_CSI: /* ESC [ */
3201 process_csi_seq (); 2722 process_csi_seq ();
3202 break; 2723 break;
3203 2724
3204 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2725 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
3205 case C1_OSC: /* ESC ] */ 2726 case C1_OSC: /* ESC ] */
3206 process_osc_seq (); 2727 process_osc_seq ();
3207 break; 2728 break;
3208 2729
3209 /* 8.3.106: RESET TO INITIAL STATE */ 2730 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
3210 case 'c': 2731 case 'c':
3211 mbstate.reset (); 2732 mbstate.reset ();
3212 scr_poweron (); 2733 scr_poweron ();
3213 scrollbar_show (1); 2734 scrollBar.show (1);
3214 break; 2735 break;
3215 2736
3216 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2737 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
3217 case 'n': 2738 case 'n':
3218 scr_charset_choose (2); 2739 scr_charset_choose (2);
… …
3263rxvt_term::process_csi_seq () 2784rxvt_term::process_csi_seq ()
3264{ 2785{
3265 unicode_t ch, priv, i; 2786 unicode_t ch, priv, i;
3266 unsigned int nargs, p; 2787 unsigned int nargs, p;
3267 int n, ndef; 2788 int n, ndef;
3268 int arg[ESC_ARGS]; 2789 int arg[ESC_ARGS] = { };
3269 2790
3270 for (nargs = ESC_ARGS; nargs > 0;) 2791 nargs = 0;
3271 arg[--nargs] = 0;
3272 2792
3273 priv = 0; 2793 priv = 0;
3274 ch = cmd_getc (); 2794 ch = cmd_getc ();
3275 if (ch >= '<' && ch <= '?') 2795 if ((ch >= '<' && ch <= '?') || ch == '!')
2796 {
3276 { /* '<' '=' '>' '?' */ 2797 /* '<' '=' '>' '?' '!' */
3277 priv = ch; 2798 priv = ch;
3278 ch = cmd_getc (); 2799 ch = cmd_getc ();
3279 } 2800 }
3280 2801
3281 /* read any numerical arguments */ 2802 /* read any numerical arguments */
… …
3310 ndef = get_byte_array_bit (csi_defaults, i); 2831 ndef = get_byte_array_bit (csi_defaults, i);
3311 for (p = 0; p < nargs; p++) 2832 for (p = 0; p < nargs; p++)
3312 if (arg[p] == -1) 2833 if (arg[p] == -1)
3313 arg[p] = ndef; 2834 arg[p] = ndef;
3314 2835
3315#ifdef DEBUG_CMD
3316 fprintf (stderr, "CSI ");
3317 for (p = 0; p < nargs; p++)
3318 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3319 fprintf (stderr, "%c\n", ch);
3320#endif
3321
3322 /* 2836 /*
3323 * private mode handling 2837 * private mode handling
3324 */ 2838 */
3325 if (priv) 2839 if (priv)
3326 { 2840 {
3327 switch (priv) 2841 switch (priv)
3328 { 2842 {
3329 case '>': 2843 case '>':
3330 if (ch == CSI_DA) /* secondary device attributes */ 2844 if (ch == CSI_DA) /* secondary device attributes */
3331 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 2845 {
2846 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2847 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2848 //
2849 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2850 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2851 // versions.
2852 //
2853 tt_printf ("\033[>%d;95;0c", 'U');
2854 }
3332 break; 2855 break;
2856
3333 case '?': 2857 case '?':
3334 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2858 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3335 process_terminal_mode (ch, priv, nargs, arg); 2859 process_terminal_mode (ch, priv, nargs, arg);
3336 break; 2860 break;
2861
2862 case '!':
2863 if (ch == CSI_70)
2864 {
2865 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2866 scr_soft_reset ();
2867
2868 static const int pm_h[] = { 7, 25 };
2869 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 };
2870
2871 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h);
2872 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l);
3337 } 2873 }
2874 break;
2875 }
2876
3338 return; 2877 return;
3339 } 2878 }
3340 2879
3341 switch (ch) 2880 switch (ch)
3342 { 2881 {
… …
3462 break; 3001 break;
3463 case 6: /* CPR requested */ 3002 case 6: /* CPR requested */
3464 scr_report_position (); 3003 scr_report_position ();
3465 break; 3004 break;
3466 case 7: /* unofficial extension */ 3005 case 7: /* unofficial extension */
3467 if (OPTION (Opt_insecure)) 3006 if (option (Opt_insecure))
3468 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3007 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3469 break; 3008 break;
3470 case 8: /* unofficial extension */ 3009 case 8: /* unofficial extension */
3471 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3010 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3472 break; 3011 break;
… …
3539 break; 3078 break;
3540 case CSI_75: 3079 case CSI_75:
3541 scr_cursor (RESTORE); 3080 scr_cursor (RESTORE);
3542 break; 3081 break;
3543 3082
3544#if ENABLE_FRILLS 3083#if !ENABLE_MINIMAL
3545 case CSI_74: 3084 case CSI_74:
3546 process_window_ops (arg, nargs); 3085 process_window_ops (arg, nargs);
3547 break; 3086 break;
3548#endif 3087#endif
3549 3088
… …
3556 break; 3095 break;
3557 } 3096 }
3558} 3097}
3559/*}}} */ 3098/*}}} */
3560 3099
3561#if ENABLE_FRILLS 3100#if !ENABLE_MINIMAL
3562/* ARGSUSED */ 3101/* ARGSUSED */
3563void 3102void
3564rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3103rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3565{ 3104{
3566 int x, y; 3105 int x, y;
3567 XWindowAttributes wattr; 3106 XWindowAttributes wattr;
3568 Window wdummy; 3107 Window wdummy;
3569 dDisp; 3108
3109 dLocal (Display *, dpy);
3570 3110
3571 if (nargs == 0) 3111 if (nargs == 0)
3572 return; 3112 return;
3573 3113
3574 switch (args[0]) 3114 switch (args[0])
3575 { 3115 {
3576 /* 3116 /*
3577 * commands 3117 * commands
3578 */ 3118 */
3579 case 1: /* deiconify window */ 3119 case 1: /* deiconify window */
3580 XMapWindow (disp, parent[0]); 3120 XMapWindow (dpy, parent[0]);
3581 break; 3121 break;
3582 case 2: /* iconify window */ 3122 case 2: /* iconify window */
3583 XIconifyWindow (disp, parent[0], display->screen); 3123 XIconifyWindow (dpy, parent[0], display->screen);
3584 break; 3124 break;
3585 case 3: /* set position (pixels) */ 3125 case 3: /* set position (pixels) */
3586 XMoveWindow (disp, parent[0], args[1], args[2]); 3126 XMoveWindow (dpy, parent[0], args[1], args[2]);
3587 break; 3127 break;
3588 case 4: /* set size (pixels) */ 3128 case 4: /* set size (pixels) */
3589 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3129 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3590 break; 3130 break;
3591 case 5: /* raise window */ 3131 case 5: /* raise window */
3592 XRaiseWindow (disp, parent[0]); 3132 XRaiseWindow (dpy, parent[0]);
3593 break; 3133 break;
3594 case 6: /* lower window */ 3134 case 6: /* lower window */
3595 XLowerWindow (disp, parent[0]); 3135 XLowerWindow (dpy, parent[0]);
3596 break; 3136 break;
3597 case 7: /* refresh window */ 3137 case 7: /* refresh window */
3598 scr_touch (true); 3138 scr_touch (true);
3599 break; 3139 break;
3600 case 8: /* set size (chars) */ 3140 case 8: /* set size (chars) */
… …
3607 if (args[0] >= 24) /* set height (chars) */ 3147 if (args[0] >= 24) /* set height (chars) */
3608 set_widthheight ((unsigned int)width, 3148 set_widthheight ((unsigned int)width,
3609 (unsigned int) (args[1] * fheight)); 3149 (unsigned int) (args[1] * fheight));
3610 break; 3150 break;
3611 3151
3612
3613 /* 3152 /*
3614 * reports - some output format copied from XTerm 3153 * reports - some output format copied from XTerm
3615 */ 3154 */
3616 case 11: /* report window state */ 3155 case 11: /* report window state */
3617 XGetWindowAttributes (disp, parent[0], &wattr); 3156 XGetWindowAttributes (dpy, parent[0], &wattr);
3618 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3157 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3619 break; 3158 break;
3620 case 13: /* report window position */ 3159 case 13: /* report window position */
3621 XGetWindowAttributes (disp, parent[0], &wattr); 3160 XGetWindowAttributes (dpy, parent[0], &wattr);
3622 XTranslateCoordinates (disp, parent[0], wattr.root, 3161 XTranslateCoordinates (dpy, parent[0], wattr.root,
3623 -wattr.border_width, -wattr.border_width, 3162 -wattr.border_width, -wattr.border_width,
3624 &x, &y, &wdummy); 3163 &x, &y, &wdummy);
3625 tt_printf ("\033[3;%d;%dt", x, y); 3164 tt_printf ("\033[3;%d;%dt", x, y);
3626 break; 3165 break;
3627 case 14: /* report window size (pixels) */ 3166 case 14: /* report window size (pixels) */
3628 XGetWindowAttributes (disp, parent[0], &wattr); 3167 XGetWindowAttributes (dpy, parent[0], &wattr);
3629 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3168 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3630 break; 3169 break;
3631 case 18: /* report text area size (chars) */ 3170 case 18: /* report text area size (chars) */
3632 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3171 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3633 break; 3172 break;
… …
3635 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3174 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3636 break; 3175 break;
3637 case 20: /* report icon label */ 3176 case 20: /* report icon label */
3638 { 3177 {
3639 char *s; 3178 char *s;
3640 XGetIconName (disp, parent[0], &s); 3179 XGetIconName (dpy, parent[0], &s);
3641 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3180 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3642 XFree (s); 3181 XFree (s);
3643 } 3182 }
3644 break; 3183 break;
3645 case 21: /* report window title */ 3184 case 21: /* report window title */
3646 { 3185 {
3647 char *s; 3186 char *s;
3648 XFetchName (disp, parent[0], &s); 3187 XFetchName (dpy, parent[0], &s);
3649 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3188 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3650 XFree (s); 3189 XFree (s);
3651 } 3190 }
3652 break; 3191 break;
3653 } 3192 }
3654} 3193}
… …
3681 seen_esc = true; 3220 seen_esc = true;
3682 continue; 3221 continue;
3683 } 3222 }
3684 else if (ch == C0_BEL || ch == CHAR_ST) 3223 else if (ch == C0_BEL || ch == CHAR_ST)
3685 break; 3224 break;
3225 else if (ch == C0_SYN)
3226 ch = cmd_get8 ();
3686 else if (ch < 0x20) 3227 else if (ch < 0x20)
3687 return NULL; /* other control character - exit */ 3228 return NULL; /* other control character - exit */
3688 3229
3689 seen_esc = false; 3230 seen_esc = false;
3690 3231
3691 if (n >= STRING_MAX - 1) 3232 if (n >= STRING_MAX - 1)
3692 // stop at some sane length 3233 // stop at some sane length
3693 return NULL; 3234 return NULL;
3694 3235
3695 if (ch == C0_SYN)
3696 string[n++] = cmd_get8 ();
3697 else
3698 string[n++] = ch; 3236 string[n++] = ch;
3699 } 3237 }
3700 3238
3701 string[n++] = '\0'; 3239 string[n++] = '\0';
3702 3240
3703 ends_how = (ch == 0x5c ? C0_ESC : ch); 3241 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3710 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3248 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3711 */ 3249 */
3712void 3250void
3713rxvt_term::process_dcs_seq () 3251rxvt_term::process_dcs_seq ()
3714{ 3252{
3715 char *s;
3716 unicode_t eh;
3717
3718 /* 3253 /*
3719 * Not handled yet 3254 * Not handled yet
3720 */ 3255 */
3256
3257 unicode_t eh;
3721 s = get_to_st (eh); 3258 char *s = get_to_st (eh);
3722 if (s) 3259 if (s)
3723 free (s); 3260 free (s);
3724 3261
3725 return; 3262 return;
3726} 3263}
… …
3730 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3267 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3731 */ 3268 */
3732void 3269void
3733rxvt_term::process_osc_seq () 3270rxvt_term::process_osc_seq ()
3734{ 3271{
3735 unicode_t ch, eh;
3736 int arg; 3272 int arg;
3737 3273
3738 ch = cmd_getc (); 3274 unicode_t ch = cmd_getc ();
3739 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3275 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3740 arg = arg * 10 + (ch - '0'); 3276 arg = arg * 10 + (ch - '0');
3741 3277
3742 if (ch == ';') 3278 if (ch == ';')
3743 { 3279 {
3280 unicode_t eh;
3744 char *s = get_to_st (eh); 3281 char *s = get_to_st (eh);
3745 3282
3746 if (s) 3283 if (s)
3747 { 3284 {
3748 process_xterm_seq (arg, s, eh); 3285 process_xterm_seq (arg, s, eh);
… …
3754void 3291void
3755rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3292rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3756{ 3293{
3757 if (str[0] == '?' && !str[1]) 3294 if (str[0] == '?' && !str[1])
3758 { 3295 {
3759 unsigned short r, g, b; 3296 rgba c;
3760 pix_colors_focused[color].get (display, r, g, b); 3297 pix_colors_focused[color].get (c);
3298
3299#if XFT
3300 if (c.a != rgba::MAX_CC)
3301 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3302 else
3303#endif
3761 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3304 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3762 } 3305 }
3763 else 3306 else
3764 set_window_color (color, str); 3307 set_window_color (color, str);
3765} 3308}
3766 3309
3767/* 3310/*
3768 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3311 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3769 */ 3312 */
3770void 3313void
3771rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3314rxvt_term::process_xterm_seq (int op, char *str, char resp)
3772{ 3315{
3773 int color; 3316 int color;
3774 char *buf, *name; 3317 char *buf, *name;
3775 bool query = str[0] == '?' && !str[1]; 3318 bool query = str[0] == '?' && !str[1];
3776 int saveop = op; 3319 int saveop = op;
3777 dDisp; 3320
3321 dLocal (Display *, dpy);
3778 3322
3779 assert (str != NULL); 3323 assert (str != NULL);
3324
3325 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3326 return;
3327
3780 switch (op) 3328 switch (op)
3781 { 3329 {
3782 case XTerm_name: 3330 case XTerm_name:
3783 set_title (str); 3331 set_title (str);
3784 /* FALLTHROUGH */ 3332 /* FALLTHROUGH */
… …
3798 unsigned long bytes_after; 3346 unsigned long bytes_after;
3799 unsigned char *value = 0; 3347 unsigned char *value = 0;
3800 const char *str = ""; 3348 const char *str = "";
3801 3349
3802 if (prop 3350 if (prop
3803 && XGetWindowProperty (disp, parent[0], 3351 && XGetWindowProperty (dpy, parent[0],
3804 prop, 0, 1<<16, 0, AnyPropertyType, 3352 prop, 0, 1<<16, 0, AnyPropertyType,
3805 &actual_type, &actual_format, 3353 &actual_type, &actual_format,
3806 &nitems, &bytes_after, &value) == Success 3354 &nitems, &bytes_after, &value) == Success
3807 && actual_type != None 3355 && actual_type != None
3808 && actual_format == 8) 3356 && actual_format == 8)
3809 str = (const char *)(value); 3357 str = (const char *)(value);
3810 3358
3811 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3359 tt_printf ("\033]%d;%s%c", op, str, resp);
3812 3360
3813 XFree (value); 3361 XFree (value);
3814 } 3362 }
3815 else 3363 else
3816 { 3364 {
3817 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3365 char *eq = strchr (str, '=');
3818 3366
3819 if (eq) 3367 if (eq)
3820 { 3368 {
3821 *eq = 0; 3369 *eq = 0;
3822 set_utf8_property (display->atom (str), eq + 1); 3370 set_utf8_property (display->atom (str), eq + 1);
3823 } 3371 }
3824 else 3372 else
3825 XDeleteProperty (disp, parent[0], 3373 XDeleteProperty (dpy, parent[0],
3826 display->atom (str)); 3374 display->atom (str));
3827 } 3375 }
3828 break; 3376 break;
3829 3377
3830 case XTerm_Color: 3378 case XTerm_Color:
… …
3840 break; 3388 break;
3841 3389
3842 if ((buf = strchr (name, ';')) != NULL) 3390 if ((buf = strchr (name, ';')) != NULL)
3843 *buf++ = '\0'; 3391 *buf++ = '\0';
3844 3392
3845 if (name[0] == '?' && !name[1]) 3393 process_color_seq (op, color, name, resp);
3394 }
3395 break;
3396 case Rxvt_restoreFG:
3397 case XTerm_Color00:
3398 process_color_seq (op, Color_fg, str, resp);
3399 break;
3400 case Rxvt_restoreBG:
3401 case XTerm_Color01:
3402 process_color_seq (op, Color_bg, str, resp);
3403 break;
3404#ifndef NO_CURSORCOLOR
3405 case XTerm_Color_cursor:
3406 process_color_seq (op, Color_cursor, str, resp);
3407 break;
3408#endif
3409 case XTerm_Color_pointer_fg:
3410 process_color_seq (op, Color_pointer_fg, str, resp);
3411 break;
3412 case XTerm_Color_pointer_bg:
3413 process_color_seq (op, Color_pointer_bg, str, resp);
3414 break;
3415#ifdef OPTION_HC
3416 case XTerm_Color_HC:
3417 process_color_seq (op, Color_HC, str, resp);
3418 break;
3419 case XTerm_Color_HTC:
3420 process_color_seq (op, Color_HTC, str, resp);
3421 break;
3422#endif
3423#ifndef NO_BOLD_UNDERLINE_REVERSE
3424 case URxvt_Color_BD:
3425 process_color_seq (op, Color_BD, str, resp);
3426 break;
3427 case URxvt_Color_UL:
3428 process_color_seq (op, Color_UL, str, resp);
3429 break;
3430 case URxvt_Color_IT:
3431 process_color_seq (op, Color_IT, str, resp);
3432 break;
3433#endif
3434 case URxvt_Color_border:
3435 process_color_seq (op, Color_border, str, resp);
3436 break;
3437#if ENABLE_TRANSPARENCY
3438 case URxvt_Color_tint:
3439 process_color_seq (op, Color_tint, str, resp);
3440 {
3441 bool changed = false;
3442
3443 if (ISSET_PIXCOLOR (Color_tint))
3444 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3445 else
3446 changed = bgPixmap.unset_tint ();
3447
3448 if (changed)
3449 update_background ();
3450 }
3451
3452 break;
3453#endif
3454
3455#if BG_IMAGE_FROM_FILE
3456 case Rxvt_Pixmap:
3457 if (!strcmp (str, "?"))
3458 {
3459 char str[256];
3460
3461 sprintf (str, "[%dx%d+%d+%d]",
3462 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3463 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3464 process_xterm_seq (XTerm_title, str, CHAR_ST);
3465 }
3466 else
3467 {
3468 int changed = 0;
3469
3470 if (*str != ';')
3846 { 3471 {
3847 unsigned short r, g, b; 3472 if (bgPixmap.set_file (str)) /* change pixmap */
3848 pix_colors_focused[color].get (display, r, g, b); 3473 {
3849 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3474 changed++;
3475 str = strchr (str, ';');
3476 if (str == NULL)
3477 bgPixmap.set_defaultGeometry ();
3478 else
3479 bgPixmap.set_geometry (str+1);
3480 }
3850 } 3481 }
3851 else 3482 else
3852 set_window_color (color, name); 3483 {
3484 str++;
3485 if (bgPixmap.set_geometry (str, true))
3486 changed++;
3487 }
3488
3489 if (changed)
3490 {
3491 if (bgPixmap.window_position_sensitive ())
3492 {
3493 int x, y;
3494 get_window_origin (x, y);
3495 bgPixmap.set_position (x, y);
3496 }
3497 update_background ();
3498 }
3853 } 3499 }
3854 break; 3500 break;
3855 case XTerm_Color00:
3856 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3857 break;
3858 case XTerm_Color01:
3859 process_color_seq (XTerm_Color01, Color_bg, str, resp);
3860 break;
3861#ifndef NO_CURSORCOLOR
3862 case XTerm_Color_cursor:
3863 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3864 break;
3865#endif 3501#endif
3866 case XTerm_Color_pointer_fg:
3867 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);
3868 break;
3869 case XTerm_Color_pointer_bg:
3870 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3871 break;
3872#ifndef NO_BOLD_UNDERLINE_REVERSE
3873 case XTerm_Color_RV:
3874 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3875 break;
3876 case Rxvt_Color_BD:
3877 case URxvt_Color_BD:
3878 process_color_seq (op, Color_BD, str, resp);
3879 break;
3880 case Rxvt_Color_UL:
3881 case URxvt_Color_UL:
3882 process_color_seq (op, Color_UL, str, resp);
3883 break;
3884 case URxvt_Color_IT:
3885 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3886 break;
3887#endif
3888#if TRANSPARENT && TINTING
3889 case URxvt_Color_tint:
3890 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3891 check_our_parents ();
3892 if (am_transparent)
3893 want_full_refresh = want_refresh = 1;
3894 break;
3895#endif
3896
3897 case Rxvt_Pixmap:
3898 {
3899 if (*str != ';')
3900 {
3901#if XPM_BACKGROUND
3902 scale_pixmap (""); /* reset to default scaling */
3903 set_bgPixmap (str); /* change pixmap */
3904 scr_touch (true);
3905#endif
3906 }
3907
3908 int changed = 0;
3909
3910 while ((str = strchr (str, ';')) != NULL)
3911 {
3912 str++;
3913#if XPM_BACKGROUND
3914 changed += scale_pixmap (str);
3915#endif
3916 }
3917
3918 if (changed)
3919 {
3920#ifdef XPM_BACKGROUND
3921 resize_pixmap ();
3922 scr_touch (true);
3923#endif
3924 }
3925 }
3926 break;
3927
3928 case Rxvt_restoreFG:
3929 set_window_color (Color_fg, str);
3930 break;
3931 case Rxvt_restoreBG:
3932 set_window_color (Color_bg, str);
3933 break;
3934 3502
3935 case XTerm_logfile: 3503 case XTerm_logfile:
3936 // TODO, when secure mode? 3504 // TODO, when secure mode?
3937 break; 3505 break;
3938 3506
… …
3956 case URxvt_italicFont: 3524 case URxvt_italicFont:
3957 case URxvt_boldItalicFont: 3525 case URxvt_boldItalicFont:
3958#endif 3526#endif
3959 if (query) 3527 if (query)
3960 tt_printf ("\33]%d;%-.250s%c", saveop, 3528 tt_printf ("\33]%d;%-.250s%c", saveop,
3961 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3529 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3962 ? fontset[op - URxvt_font]->fontdesc : "", 3530 ? fontset[op - URxvt_font]->fontdesc : "",
3963 resp); 3531 resp);
3964 else 3532 else
3965 { 3533 {
3966 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3534 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3969 allocated.push_back ((void *)res); 3537 allocated.push_back ((void *)res);
3970 set_fonts (); 3538 set_fonts ();
3971 } 3539 }
3972 break; 3540 break;
3973 3541
3974#if ENABLE_FRILLS 3542 case URxvt_version:
3543 if (query)
3544 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3545 op,
3546 rs[Rs_name], VERSION[0], VERSION[2],
3547 resp);
3548 break;
3549
3550#if !ENABLE_MINIMAL
3975 case URxvt_locale: 3551 case URxvt_locale:
3976 if (query) 3552 if (query)
3977 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3553 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3978 else 3554 else
3979 { 3555 {
3980 set_locale (str); 3556 set_locale (str);
3981 pty->set_utf8_mode (enc_utf8); 3557 pty->set_utf8_mode (enc_utf8);
3982 init_xlocale (); 3558 init_xlocale ();
… …
3997 break; 3573 break;
3998#endif 3574#endif
3999 3575
4000#if ENABLE_PERL 3576#if ENABLE_PERL
4001 case URxvt_perl: 3577 case URxvt_perl:
4002 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 3578 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
4003 ; // no responses yet
4004 break; 3579 break;
4005#endif 3580#endif
4006 } 3581 }
4007} 3582}
4008/*----------------------------------------------------------------------*/ 3583/*----------------------------------------------------------------------*/
… …
4031 { 3606 {
4032 if (mode == 'r') 3607 if (mode == 'r')
4033 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3608 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
4034 else 3609 else
4035 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3610 state = (mode == 't') ? ! (priv_modes & bit) : mode;
4036 PrivMode (state, bit); 3611
3612 set_privmode (bit, state);
4037 } 3613 }
4038 3614
4039 return state; 3615 return state;
4040} 3616}
4041 3617
… …
4045{ 3621{
4046 unsigned int i, j; 3622 unsigned int i, j;
4047 int state; 3623 int state;
4048 3624
4049 static const struct 3625 static const struct
4050 { 3626 {
4051 const int argval; 3627 const int argval;
4052 const unsigned long bit; 3628 const unsigned long bit;
4053 }
4054
4055 argtopriv[] = { 3629 } argtopriv[] = {
4056 { 1, PrivMode_aplCUR }, 3630 { 1, PrivMode_aplCUR }, // DECCKM
4057 { 2, PrivMode_vt52 }, 3631 { 2, PrivMode_vt52 },
4058 { 3, PrivMode_132 }, 3632 { 3, PrivMode_132 }, // DECCOLM
4059 { 4, PrivMode_smoothScroll }, 3633 { 4, PrivMode_smoothScroll }, // DECSCLM
4060 { 5, PrivMode_rVideo }, 3634 { 5, PrivMode_rVideo }, // DECSCNM
4061 { 6, PrivMode_relOrigin }, 3635 { 6, PrivMode_relOrigin }, // DECOM
4062 { 7, PrivMode_Autowrap }, 3636 { 7, PrivMode_Autowrap }, // DECAWM
4063 // 8, bi-directional support mode 3637 // 8, auto-repeat keys // DECARM
4064 { 9, PrivMode_MouseX10 }, 3638 { 9, PrivMode_MouseX10 },
4065 // 18, 19 printing-related 3639 // 18 end FF to printer after print screen
3640 // 19 Print screen prints full screen/scroll region
4066 { 25, PrivMode_VisibleCursor }, 3641 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
4067#ifdef scrollBar_esc 3642#ifdef scrollBar_esc
4068 { scrollBar_esc, PrivMode_scrollBar }, 3643 { scrollBar_esc, PrivMode_scrollBar },
4069#endif 3644#endif
4070 { 35, PrivMode_ShiftKeys }, // rxvt extension 3645 { 35, PrivMode_ShiftKeys }, // rxvt extension
3646 // 38, tektronix mode // DECTEK
4071 { 40, PrivMode_132OK }, 3647 { 40, PrivMode_132OK },
4072 // 41 xterm more fixes NYI 3648 // 41 xterm more fixes NYI
4073 // 45 margin bell NYI 3649 // 45 margin bell NYI
4074 // 46 start logging 3650 // 46 start logging
4075 { 47, PrivMode_Screen }, 3651 { 47, PrivMode_Screen },
4076 { 66, PrivMode_aplKP }, 3652 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
4077#ifndef NO_BACKSPACE_KEY 3653#ifndef NO_BACKSPACE_KEY
4078 { 67, PrivMode_BackSpace }, 3654 { 67, PrivMode_BackSpace }, // DECBKM
4079#endif 3655#endif
4080 { 1000, PrivMode_MouseX11 }, 3656 { 1000, PrivMode_MouseX11 },
4081 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3657 { 1002, PrivMode_MouseBtnEvent },
4082 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3658 { 1003, PrivMode_MouseAnyEvent },
4083 // 1003 Use All Motion Mouse Tracking. NYI, TODO
4084 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3659 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4085 { 1011, PrivMode_Keypress }, // rxvt extension 3660 { 1011, PrivMode_Keypress }, // rxvt extension
4086 // 1035 enable modifiers for alt, numlock NYI 3661 // 1035 enable modifiers for alt, numlock NYI
4087 // 1036 send ESC for meta keys NYI 3662 // 1036 send ESC for meta keys NYI
4088 // 1037 send DEL for keypad delete NYI 3663 // 1037 send DEL for keypad delete NYI
4089 { 1047, PrivMode_Screen }, 3664 { 1047, PrivMode_Screen },
4090 // 1048 save and restore cursor 3665 // 1048 save and restore cursor
4091 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3666 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
4092 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3667 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3668 { 2004, PrivMode_BracketPaste },
4093 }; 3669 };
4094 3670
4095 if (nargs == 0) 3671 if (nargs == 0)
4096 return; 3672 return;
4097 3673
… …
4122 3698
4123 scr_touch (true); 3699 scr_touch (true);
4124 break; 3700 break;
4125#endif 3701#endif
4126 case 1048: /* alternative cursor save */ 3702 case 1048: /* alternative cursor save */
4127 case 1049:
4128 if (OPTION (Opt_secondaryScreen)) 3703 if (option (Opt_secondaryScreen))
4129 if (mode == 0) 3704 if (mode == 0)
4130 scr_cursor (RESTORE); 3705 scr_cursor (RESTORE);
4131 else if (mode == 1) 3706 else if (mode == 1)
4132 scr_cursor (SAVE); 3707 scr_cursor (SAVE);
4133 break; 3708 break;
… …
4141 case 2: /* VT52 mode */ 3716 case 2: /* VT52 mode */
4142 /* oddball mode. should be set regardless of set/reset 3717 /* oddball mode. should be set regardless of set/reset
4143 * parameter. Return from VT52 mode with an ESC < from 3718 * parameter. Return from VT52 mode with an ESC < from
4144 * within VT52 mode 3719 * within VT52 mode
4145 */ 3720 */
4146 PrivMode (1, PrivMode_vt52); 3721 set_privmode (PrivMode_vt52, 1);
4147 break; 3722 break;
4148 case 3: /* 80/132 */ 3723 case 3: /* 80/132 */
4149 if (priv_modes & PrivMode_132OK) 3724 if (priv_modes & PrivMode_132OK)
4150 set_widthheight (((state ? 132 : 80) * fwidth), height); 3725 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
4151 break; 3726 break;
4152 case 4: /* smooth scrolling */ 3727 case 4: /* smooth scrolling */
4153 set_option (Opt_jumpScroll, !state); 3728 set_option (Opt_jumpScroll, !state);
4154 break; 3729 break;
4155 case 5: /* reverse video */ 3730 case 5: /* reverse video */
… …
4162 scr_autowrap (state); 3737 scr_autowrap (state);
4163 break; 3738 break;
4164 /* case 8: - auto repeat, can't do on a per window basis */ 3739 /* case 8: - auto repeat, can't do on a per window basis */
4165 case 9: /* X10 mouse reporting */ 3740 case 9: /* X10 mouse reporting */
4166 if (state) /* orthogonal */ 3741 if (state) /* orthogonal */
4167 priv_modes &= ~PrivMode_MouseX11; 3742 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4168 break; 3743 break;
4169#ifdef scrollBar_esc 3744#ifdef scrollBar_esc
4170 case scrollBar_esc: 3745 case scrollBar_esc:
4171 if (scrollbar_mapping (state)) 3746 if (scrollBar.map (state))
4172 { 3747 {
4173 resize_all_windows (0, 0, 0); 3748 resize_all_windows (0, 0, 0);
4174 scr_touch (true); 3749 scr_touch (true);
4175 } 3750 }
4176 break; 3751 break;
… …
4185 break; 3760 break;
4186 /* case 66: - application key pad */ 3761 /* case 66: - application key pad */
4187 /* case 67: - backspace key */ 3762 /* case 67: - backspace key */
4188 case 1000: /* X11 mouse reporting */ 3763 case 1000: /* X11 mouse reporting */
4189 if (state) /* orthogonal */ 3764 if (state) /* orthogonal */
4190 priv_modes &= ~PrivMode_MouseX10; 3765 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4191 break; 3766 break;
4192#if 0
4193 case 1001: 3767 case 1002:
4194 break; /* X11 mouse highlighting */ 3768 case 1003:
4195#endif 3769 if (state)
3770 {
3771 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3772 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3773 vt_emask_mouse = PointerMotionMask;
3774 }
3775 else
3776 vt_emask_mouse = NoEventMask;
3777
3778 vt_select_input ();
3779 break;
4196 case 1010: /* scroll to bottom on TTY output inhibit */ 3780 case 1010: /* scroll to bottom on TTY output inhibit */
4197 set_option (Opt_scrollTtyOutput, !state); 3781 set_option (Opt_scrollTtyOutput, !state);
4198 break; 3782 break;
4199 case 1011: /* scroll to bottom on key press */ 3783 case 1011: /* scroll to bottom on key press */
4200 set_option (Opt_scrollTtyKeypress, state); 3784 set_option (Opt_scrollTtyKeypress, state);
4201 break; 3785 break;
4202 case 1047: /* secondary screen w/ clearing last */ 3786 case 1047: /* secondary screen w/ clearing last */
4203 if (OPTION (Opt_secondaryScreen)) 3787 if (option (Opt_secondaryScreen))
4204 if (current_screen != PRIMARY) 3788 if (!state)
4205 scr_erase_screen (2); 3789 scr_erase_screen (2);
3790
4206 scr_change_screen (state); 3791 scr_change_screen (state);
4207 break; 3792 break;
4208 case 1049: /* secondary screen w/ clearing first */ 3793 case 1049: /* secondary screen w/ clearing first */
3794 if (option (Opt_secondaryScreen))
3795 if (state)
3796 scr_cursor (SAVE);
3797
4209 scr_change_screen (state); 3798 scr_change_screen (state);
3799
4210 if (OPTION (Opt_secondaryScreen)) 3800 if (option (Opt_secondaryScreen))
4211 if (current_screen != PRIMARY) 3801 if (state)
4212 scr_erase_screen (2); 3802 scr_erase_screen (2);
3803 else
3804 scr_cursor (RESTORE);
4213 break; 3805 break;
4214 default: 3806 default:
4215 break; 3807 break;
4216 } 3808 }
4217 } 3809 }
… …
4343 scr_color (Color_bg, Color_bg); 3935 scr_color (Color_bg, Color_bg);
4344 break; 3936 break;
4345 3937
4346 //case 50: // not variable spacing 3938 //case 50: // not variable spacing
4347 3939
4348#if ENABLE_FRILLS 3940#if !ENABLE_MINIMAL
4349 case 90: 3941 case 90:
4350 case 91: /* set bright fg color */ 3942 case 91: /* set bright fg color */
4351 case 92: 3943 case 92:
4352 case 93: 3944 case 93:
4353 case 94: 3945 case 94:
… …
4377rxvt_term::process_graphics () 3969rxvt_term::process_graphics ()
4378{ 3970{
4379 unicode_t ch, cmd = cmd_getc (); 3971 unicode_t ch, cmd = cmd_getc ();
4380 3972
4381 if (cmd == 'Q') 3973 if (cmd == 'Q')
3974 {
4382 { /* query graphics */ 3975 /* query graphics */
4383 tt_printf ("\033G0\012"); /* no graphics */ 3976 tt_printf ("\033G0\012"); /* no graphics */
4384 return; 3977 return;
4385 } 3978 }
4386 /* swallow other graphics sequences until terminating ':' */ 3979 /* swallow other graphics sequences until terminating ':' */
4387 do 3980 do
… …
4437 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4030 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4438 4031
4439 memcpy (v_buffer + v_buflen, data, len); 4032 memcpy (v_buffer + v_buflen, data, len);
4440 v_buflen += len; 4033 v_buflen += len;
4441 4034
4442 pty_ev.set (EVENT_READ | EVENT_WRITE); 4035 pty_ev.set (ev::READ | ev::WRITE);
4443} 4036}
4444 4037
4445void rxvt_term::pty_write () 4038void rxvt_term::pty_write ()
4446{ 4039{
4447 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4040 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4452 4045
4453 if (v_buflen == 0) 4046 if (v_buflen == 0)
4454 { 4047 {
4455 free (v_buffer); 4048 free (v_buffer);
4456 v_buffer = 0; 4049 v_buffer = 0;
4457 v_buflen = 0;
4458 4050
4459 pty_ev.set (EVENT_READ); 4051 pty_ev.set (ev::READ);
4460 return; 4052 return;
4461 } 4053 }
4462 4054
4463 memmove (v_buffer, v_buffer + written, v_buflen); 4055 memmove (v_buffer, v_buffer + written, v_buflen);
4464 } 4056 }
4465 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4057 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4466 pty_ev.set (EVENT_READ); 4058 pty_ev.set (ev::READ);
4467} 4059}
4468 4060
4469/*----------------------- end-of-file (C source) -----------------------*/ 4061/*----------------------- end-of-file (C source) -----------------------*/
4470 4062

Diff Legend

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