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.282 by root, Tue Jan 24 18:57:33 2006 UTC vs.
Revision 1.479 by root, Fri Feb 25 07:07:41 2011 UTC

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

Diff Legend

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