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.280 by root, Mon Jan 23 23:33:58 2006 UTC vs.
Revision 1.448 by sf-exg, Sat Apr 17 23:00:45 2010 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: command.C 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
31 * 32 *
32 * This program is free software; you can redistribute it and/or modify 33 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 34 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 36 * (at your option) any later version.
… …
49#include "rxvt.h" 50#include "rxvt.h"
50#include "rxvtperl.h" 51#include "rxvtperl.h"
51#include "version.h" 52#include "version.h"
52#include "command.h" 53#include "command.h"
53 54
54#if HAVE_SCHED_YIELD
55#undef HAVE_SCHED_YIELD // disabled for the time being
56//# include <sched.h>
57#endif
58
59#ifdef KEYSYM_RESOURCE 55#ifdef KEYSYM_RESOURCE
60# include "keyboard.h" 56# include "keyboard.h"
61#endif 57#endif
62 58
63#include <csignal> 59#include <csignal>
60
61#if LINUX_YIELD_HACK
62# include <ctime>
63#endif
64 64
65/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
66 66
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
68 68
… …
96 XK_Shift_L, 0x21e7, 96 XK_Shift_L, 0x21e7,
97 XK_Shift_R, 0x21e7, 97 XK_Shift_R, 0x21e7,
98 98
99 XK_Shift_Lock, 0x21eb, 99 XK_Shift_Lock, 0x21eb,
100 XK_ISO_Lock, 0x21eb, 100 XK_ISO_Lock, 0x21eb,
101 XK_ISO_Lock, 0x21eb,
102 XK_Caps_Lock, 0x21ec, 101 XK_Caps_Lock, 0x21ec,
103 XK_Num_Lock, 0x21ed, 102 XK_Num_Lock, 0x21ed,
104 XK_ISO_Level3_Shift, 0x21ee, 103 XK_ISO_Level3_Shift, 0x21ee,
105 XK_ISO_Level3_Lock, 0x21ef, 104 XK_ISO_Level3_Lock, 0x21ef,
106 XK_ISO_Group_Lock, 0x21f0, 105 XK_ISO_Group_Lock, 0x21f0,
… …
163 162
164void 163void
165rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y) 164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
166{ 165{
167 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
168 rxvt_font *f = (*fs)[fs->find_font (ch)];
169 wchar_t *chr, *alloc, ch2, *fname; 167 wchar_t *chr, *alloc, ch2, **fname;
170 int len; 168 int len;
171
172 fname = rxvt_utf8towcs (f->name);
173 169
174# if ENABLE_COMBINING 170# if ENABLE_COMBINING
175 if (IS_COMPOSE (ch)) 171 if (IS_COMPOSE (ch))
176 { 172 {
177 len = rxvt_composite.expand (ch, 0); 173 len = rxvt_composite.expand (ch, 0);
… …
198 r & RS_Blink ? " blink" : "", 194 r & RS_Blink ? " blink" : "",
199 r & RS_RVid ? " rvid" : "", 195 r & RS_RVid ? " rvid" : "",
200 r & RS_Uline ? " uline" : "", 196 r & RS_Uline ? " uline" : "",
201 r & RS_Careful ? " careful" : ""); 197 r & RS_Careful ? " careful" : "");
202 198
199 int width = 0;
200 fname = rxvt_temp_buf<wchar_t *> (len);
201 for (int i = 0; i < len; i++)
202 {
203 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])];
204 fname[i] = rxvt_utf8towcs (f->name);
203 int width = wcswidth (fname, wcslen (fname)); 205 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
206 }
204 207
205 max_it (width, 8+5); // for char + hey 208 max_it (width, 8+5); // for char + hex
206 max_it (width, strlen (attr)); 209 max_it (width, strlen (attr));
207 210
208 if (y >= 0) 211 if (y >= 0)
209 { 212 {
210 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 213 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
211 x = 0; 214 x = 0;
212 } 215 }
213 216
214 scr_overlay_new (x, y, width, len + 2); 217 scr_overlay_new (x, y, width, len * 2 + 1);
215 218
216 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 219 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
217 220
218 for (int y = 0; y < len; y++) 221 for (int y = 0; y < len; y++)
219 { 222 {
… …
222 ch = *chr++; 225 ch = *chr++;
223 226
224 sprintf (buf, "%8x", ch); 227 sprintf (buf, "%8x", ch);
225 scr_overlay_set (0, y, buf); 228 scr_overlay_set (0, y, buf);
226 scr_overlay_set (9, y, '='); 229 scr_overlay_set (9, y, '=');
227# if !UNICODE3 230# if !UNICODE_3
228 if (ch >= 0x10000) 231 if (ch >= 0x10000)
229 ch = 0xfffd; 232 ch = 0xfffd;
230# endif 233# endif
231 scr_overlay_set (11, y, ch, r); 234 scr_overlay_set (11, y, ch, r);
235
236 if (WCWIDTH (ch) >= 2)
232 scr_overlay_set (12, y, NOCHAR, r); 237 scr_overlay_set (12, y, NOCHAR, r);
233 } 238 }
234 239
240// {
241// char buf[4+4+3+1];
242// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
243// scr_overlay_set (0, 0, buf);
244// }
235 scr_overlay_set (0, len , attr); 245 scr_overlay_set (0, len , attr);
246 for (int i = 0; i < len; i++)
247 {
236 scr_overlay_set (0, len + 1, fname); 248 scr_overlay_set (0, len + 1 + i, fname[i]);
237
238 free (fname); 249 free (fname[i]);
250 }
239 251
240# if ENABLE_COMBINING 252# if ENABLE_COMBINING
241 if (alloc) 253 if (alloc)
242 delete [] alloc; 254 delete [] alloc;
243# endif 255# endif
… …
273 } 285 }
274 286
275 iso14755buf = 0; 287 iso14755buf = 0;
276} 288}
277 289
278int 290static int
279rxvt_term::hex_keyval (XKeyEvent &ev) 291hex_keyval (XKeyEvent &ev)
280{ 292{
281 // check wether this event corresponds to a hex digit 293 // check whether this event corresponds to a hex digit
282 // if the modifiers had not been pressed. 294 // if the modifiers had not been pressed.
283 for (int index = 0; index < 8; index++) 295 for (int index = 0; index < 8; index++)
284 { 296 {
285 KeySym k = XLookupKeysym (&ev, index); 297 KeySym k = XLookupKeysym (&ev, index);
286 298
… …
292 304
293 return -1; 305 return -1;
294} 306}
295#endif 307#endif
296 308
297/*{{{ Convert the keypress event into a string */ 309static inline KeySym
310translate_keypad (KeySym keysym, bool kp)
311{
312#ifdef XK_KP_Home
313 static const KeySym keypadtrans[] = {
314 XK_KP_7, // XK_KP_Home
315 XK_KP_4, // XK_KP_Left
316 XK_KP_8, // XK_KP_Up
317 XK_KP_6, // XK_KP_Right
318 XK_KP_2, // XK_KP_Down
319# ifndef UNSHIFTED_SCROLLKEYS
320 XK_KP_9, // XK_KP_Prior
321 XK_KP_3, // XK_KP_Next
322# else
323 XK_Prior,
324 XK_Next,
325# endif
326 XK_KP_1, // XK_KP_End
327 XK_KP_5, // XK_KP_Begin
328 };
329
330 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
331 {
332 unsigned int index = keysym - XK_KP_Home;
333 keysym = kp ? keypadtrans[index] : XK_Home + index;
334 }
335 else if (keysym == XK_KP_Insert)
336 keysym = kp ? XK_KP_0 : XK_Insert;
337# ifndef NO_DELETE_KEY
338 else if (keysym == XK_KP_Delete)
339 keysym = kp ? XK_KP_Decimal : XK_Delete;
340# endif
341#endif
342 return keysym;
343}
344
345static inline int
346map_function_key (KeySym keysym)
347{
348 int param = 0;
349
350 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
351 {
352 param = 11 + keysym - XK_F1;
353 if (keysym >= XK_F17)
354 param += 4;
355 else if (keysym >= XK_F15)
356 param += 3;
357 else if (keysym >= XK_F11)
358 param += 2;
359 else if (keysym >= XK_F6)
360 param += 1;
361 }
362 else
363 switch (keysym)
364 {
365 case XK_Find:
366 param = 1;
367 break;
368 case XK_Insert:
369 param = 2;
370 break;
371#ifdef DXK_Remove
372 case DXK_Remove:
373#endif
374 case XK_Execute:
375 param = 3;
376 break;
377 case XK_Select:
378 param = 4;
379 break;
380#ifndef UNSHIFTED_SCROLLKEYS
381 case XK_Prior:
382 param = 5;
383 break;
384 case XK_Next:
385 param = 6;
386 break;
387 case XK_Home:
388 param = 7;
389 break;
390 case XK_End:
391 param = 8;
392 break;
393#endif
394 case XK_Help:
395 param = 28;
396 break;
397 case XK_Menu:
398 param = 29;
399 break;
400 }
401 return param;
402}
403
298void 404void
299rxvt_term::lookup_key (XKeyEvent &ev) 405rxvt_term::key_press (XKeyEvent &ev)
300{ 406{
301 int ctrl, meta, shft, len; 407 int ctrl, meta, shft, len;
302 unsigned int newlen;
303 KeySym keysym; 408 KeySym keysym;
304#ifdef DEBUG_CMD
305 static int debug_key = 1; /* accessible by a debugger only */
306#endif
307 int valid_keysym; 409 int valid_keysym;
308 char kbuf[KBUFSZ]; 410 char kbuf[KBUFSZ];
411
412#if ISO_14755
413 if (iso14755buf & ISO_14755_52)
414 return;
415#endif
309 416
310 /* 417 /*
311 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 418 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
312 * escape sequence to toggle the Keypad. 419 * escape sequence to toggle the Keypad.
313 * 420 *
314 * Always permit `shift' to override the current setting 421 * Always permit `shift' to override the current setting
315 */ 422 */
316 shft = ev.state & ShiftMask; 423 shft = ev.state & ShiftMask;
317 ctrl = ev.state & ControlMask; 424 ctrl = ev.state & ControlMask;
318 meta = ev.state & ModMetaMask; 425 meta = ev.state & ModMetaMask;
319
320 if (numlock_state || (ev.state & ModNumLockMask))
321 {
322 numlock_state = (ev.state & ModNumLockMask);
323 PrivMode ((!numlock_state), PrivMode_aplKP);
324 }
325 426
326 kbuf[0] = 0; 427 kbuf[0] = 0;
327 428
328#ifdef USE_XIM 429#ifdef USE_XIM
329 if (Input_Context) 430 if (Input_Context)
… …
404#ifdef PAGING_CONTEXT_LINES 505#ifdef PAGING_CONTEXT_LINES
405 lnsppg = nrow - PAGING_CONTEXT_LINES; 506 lnsppg = nrow - PAGING_CONTEXT_LINES;
406#else 507#else
407 lnsppg = nrow * 4 / 5; 508 lnsppg = nrow * 4 / 5;
408#endif 509#endif
510 max_it (lnsppg, 1);
511
409 if (keysym == XK_Prior) 512 if (keysym == XK_Prior)
410 { 513 {
411 scr_page (UP, lnsppg); 514 scr_page (UP, lnsppg);
412 return; 515 return;
413 } 516 }
… …
478 } 581 }
479 } 582 }
480 583
481#if ENABLE_FRILLS || ISO_14755 584#if ENABLE_FRILLS || ISO_14755
482 // ISO 14755 support 585 // ISO 14755 support
483 if (shft && ctrl) 586 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
484 { 587 {
485 int hv; 588 int hv;
486 589
487 if (iso14755buf & ISO_14755_51 590 if (iso14755buf & ISO_14755_51
488 && (keysym == XK_space || keysym == XK_KP_Space 591 && (keysym == XK_space || keysym == XK_KP_Space
… …
490 { 593 {
491 commit_iso14755 (); 594 commit_iso14755 ();
492 iso14755buf = ISO_14755_51; 595 iso14755buf = ISO_14755_51;
493# if ISO_14755 596# if ISO_14755
494 iso14755_51 (0); 597 iso14755_51 (0);
598# endif
599 return;
600 }
601 else if (keysym == XK_BackSpace)
602 {
603 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
604# if ISO_14755
605 iso14755_51 (iso14755buf & ISO_14755_MASK);
495# endif 606# endif
496 return; 607 return;
497 } 608 }
498 else if ((hv = hex_keyval (ev)) >= 0) 609 else if ((hv = hex_keyval (ev)) >= 0)
499 { 610 {
… …
504# endif 615# endif
505 return; 616 return;
506 } 617 }
507 else 618 else
508 { 619 {
509# if ENABLE_OVERLAY 620# if ISO_14755
510 scr_overlay_off (); 621 scr_overlay_off ();
511# endif 622# endif
512 iso14755buf = 0; 623 iso14755buf = 0;
513 } 624 }
514 } 625 }
626 else if (option (Opt_iso14755) &&
515 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 627 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
516 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 628 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
517 if (!(iso14755buf & ISO_14755_STARTED)) 629 if (!(iso14755buf & ISO_14755_STARTED))
518 { 630 {
519 iso14755buf |= ISO_14755_STARTED; 631 iso14755buf |= ISO_14755_STARTED;
520# if ENABLE_OVERLAY 632# if ISO_14755
521 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 633 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
522 scr_overlay_set (0, 0, "ISO 14755 mode"); 634 scr_overlay_set (0, 0, "ISO 14755 mode");
523# endif 635# endif
524 } 636 }
525#endif 637#endif
526 638
527#ifdef PRINTPIPE 639#ifdef PRINTPIPE
528 if (keysym == XK_Print) 640 if (keysym == XK_Print)
529 { 641 {
530 scr_printscreen (ctrl | shft); 642 scr_printscreen (ctrl | shft);
531 return; 643 return;
532 } 644 }
533#endif 645#endif
534 646
535 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 647 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
536 { 648 {
649 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
650 unsigned int newlen = 1;
651
652 if (ev.state & ModNumLockMask)
653 kp = false;
654
655 keysym = translate_keypad (keysym, kp);
656
657 switch (keysym)
537 { 658 {
659#ifndef NO_BACKSPACE_KEY
660 case XK_BackSpace:
661 if (priv_modes & PrivMode_HaveBackSpace)
662 {
663 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
664 ^ !!ctrl) ? '\b' : '\177';
665 kbuf[1] = '\0';
666 }
667 else
668 strcpy (kbuf, rs[Rs_backspace_key]);
669 break;
670#endif
671#ifndef NO_DELETE_KEY
672 case XK_Delete:
673 strcpy (kbuf, rs[Rs_delete_key]);
674 break;
675#endif
676 case XK_Tab:
677 if (shft)
678 strcpy (kbuf, "\033[Z");
679 else
680 {
681#ifdef CTRL_TAB_MAKES_META
682 if (ctrl)
683 meta = 1;
684#endif
685#ifdef MOD4_TAB_MAKES_META
686 if (ev.state & Mod4Mask)
687 meta = 1;
688#endif
538 newlen = 1; 689 newlen = 0;
539 switch (keysym) 690 }
691 break;
692
693 case XK_Up: /* "\033[A" */
694 case XK_Down: /* "\033[B" */
695 case XK_Right: /* "\033[C" */
696 case XK_Left: /* "\033[D" */
697 strcpy (kbuf, "\033[Z");
698 kbuf[2] = "DACB"[keysym - XK_Left];
699 /* do Shift first */
700 if (shft)
701 kbuf[2] = "dacb"[keysym - XK_Left];
702 else if (ctrl)
703 {
704 kbuf[1] = 'O';
705 kbuf[2] = "dacb"[keysym - XK_Left];
706 }
707 else if (priv_modes & PrivMode_aplCUR)
708 kbuf[1] = 'O';
709 break;
710
711 case XK_KP_Enter:
712 /* allow shift to override */
713 if (kp)
714 {
715 strcpy (kbuf, "\033OM");
716 break;
717 }
718
719 /* FALLTHROUGH */
720
721 case XK_Return:
722 if (priv_modes & PrivMode_LFNL)
723 {
724 kbuf[0] = '\015';
725 kbuf[1] = '\012';
726 kbuf[2] = '\0';
727 }
728 else
729 {
730 kbuf[0] = '\015';
731 kbuf[1] = '\0';
732 }
733 break;
734
735 case XK_KP_F1: /* "\033OP" */
736 case XK_KP_F2: /* "\033OQ" */
737 case XK_KP_F3: /* "\033OR" */
738 case XK_KP_F4: /* "\033OS" */
739 strcpy (kbuf, "\033OP");
740 kbuf[2] += (keysym - XK_KP_F1);
741 break;
742
743 case XK_KP_Multiply: /* "\033Oj" : "*" */
744 case XK_KP_Add: /* "\033Ok" : "+" */
745 case XK_KP_Separator: /* "\033Ol" : "," */
746 case XK_KP_Subtract: /* "\033Om" : "-" */
747 case XK_KP_Decimal: /* "\033On" : "." */
748 case XK_KP_Divide: /* "\033Oo" : "/" */
749 case XK_KP_0: /* "\033Op" : "0" */
750 case XK_KP_1: /* "\033Oq" : "1" */
751 case XK_KP_2: /* "\033Or" : "2" */
752 case XK_KP_3: /* "\033Os" : "3" */
753 case XK_KP_4: /* "\033Ot" : "4" */
754 case XK_KP_5: /* "\033Ou" : "5" */
755 case XK_KP_6: /* "\033Ov" : "6" */
756 case XK_KP_7: /* "\033Ow" : "7" */
757 case XK_KP_8: /* "\033Ox" : "8" */
758 case XK_KP_9: /* "\033Oy" : "9" */
759 /* allow shift to override */
760 if (kp)
761 {
762 strcpy (kbuf, "\033Oj");
763 kbuf[2] += (keysym - XK_KP_Multiply);
764 }
765 else
766 {
767 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
768 kbuf[1] = '\0';
769 }
770 break;
771
772 default:
540 { 773 {
541#ifndef NO_BACKSPACE_KEY 774 int param = map_function_key (keysym);
542 case XK_BackSpace: 775 if (param > 0)
543 if (priv_modes & PrivMode_HaveBackSpace) 776 sprintf (kbuf,"\033[%d~", param);
544 {
545 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
546 ^ !!ctrl) ? '\b' : '\177';
547 kbuf[1] = '\0';
548 }
549 else 777 else
550 strcpy (kbuf, key_backspace);
551 break;
552#endif
553#ifndef NO_DELETE_KEY
554# ifdef XK_KP_Prior
555 case XK_KP_Delete:
556 /* allow shift to override */
557 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
558 {
559 strcpy (kbuf, "\033On");
560 break;
561 }
562 /* FALLTHROUGH */
563# endif
564 case XK_Delete:
565 strcpy (kbuf, key_delete);
566 break;
567#endif
568 case XK_Tab:
569 if (shft)
570 strcpy (kbuf, "\033[Z");
571 else
572 {
573#ifdef CTRL_TAB_MAKES_META
574 if (ctrl)
575 meta = 1;
576#endif
577#ifdef MOD4_TAB_MAKES_META
578 if (ev.state & Mod4Mask)
579 meta = 1;
580#endif
581 newlen = 0;
582 }
583 break;
584
585#ifdef XK_KP_Left
586 case XK_KP_Up: /* \033Ox or standard */
587 case XK_KP_Down: /* \033Or or standard */
588 case XK_KP_Right: /* \033Ov or standard */
589 case XK_KP_Left: /* \033Ot or standard */
590 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
591 {
592 strcpy (kbuf, "\033OZ");
593 kbuf[2] = "txvr"[keysym - XK_KP_Left];
594 break;
595 }
596 else
597 /* translate to std. cursor key */
598 keysym = XK_Left + (keysym - XK_KP_Left);
599 /* FALLTHROUGH */
600#endif
601 case XK_Up: /* "\033[A" */
602 case XK_Down: /* "\033[B" */
603 case XK_Right: /* "\033[C" */
604 case XK_Left: /* "\033[D" */
605 strcpy (kbuf, "\033[Z");
606 kbuf[2] = "DACB"[keysym - XK_Left];
607 /* do Shift first */
608 if (shft)
609 kbuf[2] = "dacb"[keysym - XK_Left];
610 else if (ctrl)
611 {
612 kbuf[1] = 'O';
613 kbuf[2] = "dacb"[keysym - XK_Left];
614 }
615 else if (priv_modes & PrivMode_aplCUR)
616 kbuf[1] = 'O';
617 break;
618
619#ifndef UNSHIFTED_SCROLLKEYS
620# ifdef XK_KP_Prior
621 case XK_KP_Prior:
622 /* allow shift to override */
623 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
624 {
625 strcpy (kbuf, "\033Oy");
626 break;
627 }
628 /* FALLTHROUGH */
629# endif
630 case XK_Prior:
631 strcpy (kbuf, "\033[5~");
632 break;
633# ifdef XK_KP_Next
634 case XK_KP_Next:
635 /* allow shift to override */
636 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
637 {
638 strcpy (kbuf, "\033Os");
639 break;
640 }
641 /* FALLTHROUGH */
642# endif
643 case XK_Next:
644 strcpy (kbuf, "\033[6~");
645 break;
646#endif
647 case XK_KP_Enter:
648 /* allow shift to override */
649 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
650 {
651 strcpy (kbuf, "\033OM");
652 break;
653 }
654
655 /* FALLTHROUGH */
656
657 case XK_Return:
658 if (priv_modes & PrivMode_LFNL)
659 {
660 kbuf[0] = '\015';
661 kbuf[1] = '\012';
662 kbuf[2] = '\0';
663 }
664 else
665 {
666 kbuf[0] = '\015';
667 kbuf[1] = '\0';
668 }
669 break;
670
671#ifdef XK_KP_Begin
672 case XK_KP_Begin:
673 strcpy (kbuf, "\033Ou");
674 break;
675
676#endif
677 case XK_KP_F1: /* "\033OP" */
678 case XK_KP_F2: /* "\033OQ" */
679 case XK_KP_F3: /* "\033OR" */
680 case XK_KP_F4: /* "\033OS" */
681 strcpy (kbuf, "\033OP");
682 kbuf[2] += (keysym - XK_KP_F1);
683 break;
684
685 case XK_KP_Multiply: /* "\033Oj" : "*" */
686 case XK_KP_Add: /* "\033Ok" : "+" */
687 case XK_KP_Separator: /* "\033Ol" : "," */
688 case XK_KP_Subtract: /* "\033Om" : "-" */
689 case XK_KP_Decimal: /* "\033On" : "." */
690 case XK_KP_Divide: /* "\033Oo" : "/" */
691 case XK_KP_0: /* "\033Op" : "0" */
692 case XK_KP_1: /* "\033Oq" : "1" */
693 case XK_KP_2: /* "\033Or" : "2" */
694 case XK_KP_3: /* "\033Os" : "3" */
695 case XK_KP_4: /* "\033Ot" : "4" */
696 case XK_KP_5: /* "\033Ou" : "5" */
697 case XK_KP_6: /* "\033Ov" : "6" */
698 case XK_KP_7: /* "\033Ow" : "7" */
699 case XK_KP_8: /* "\033Ox" : "8" */
700 case XK_KP_9: /* "\033Oy" : "9" */
701 /* allow shift to override */
702 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
703 {
704 strcpy (kbuf, "\033Oj");
705 kbuf[2] += (keysym - XK_KP_Multiply);
706 }
707 else
708 {
709 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
710 kbuf[1] = '\0';
711 }
712 break;
713
714 case XK_Find:
715 strcpy (kbuf, "\033[1~");
716 break;
717
718#ifdef XK_KP_End
719 case XK_KP_Insert:
720 /* allow shift to override */
721 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
722 {
723 strcpy (kbuf, "\033Op");
724 break;
725 }
726 /* FALLTHROUGH */
727#endif
728 case XK_Insert:
729 strcpy (kbuf, "\033[2~");
730 break;
731#ifdef DXK_Remove /* support for DEC remove like key */
732 case DXK_Remove:
733 /* FALLTHROUGH */
734#endif
735 case XK_Execute:
736 strcpy (kbuf, "\033[3~");
737 break;
738 case XK_Select:
739 strcpy (kbuf, "\033[4~");
740 break;
741#ifdef XK_KP_End
742 case XK_KP_End:
743 /* allow shift to override */
744 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
745 {
746 strcpy (kbuf, "\033Oq");
747 break;
748 }
749 /* FALLTHROUGH */
750#endif
751 case XK_End:
752 strcpy (kbuf, KS_END);
753 break;
754#ifdef XK_KP_Home
755 case XK_KP_Home:
756 /* allow shift to override */
757 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
758 {
759 strcpy (kbuf, "\033Ow");
760 break;
761 }
762 /* FALLTHROUGH */
763#endif
764 case XK_Home:
765 strcpy (kbuf, KS_HOME);
766 break;
767
768#define FKEY(n, fkey) \
769 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
770
771 case XK_F1: /* "\033[11~" */
772 case XK_F2: /* "\033[12~" */
773 case XK_F3: /* "\033[13~" */
774 case XK_F4: /* "\033[14~" */
775 case XK_F5: /* "\033[15~" */
776 FKEY (11, XK_F1);
777 break;
778 case XK_F6: /* "\033[17~" */
779 case XK_F7: /* "\033[18~" */
780 case XK_F8: /* "\033[19~" */
781 case XK_F9: /* "\033[20~" */
782 case XK_F10: /* "\033[21~" */
783 FKEY (17, XK_F6);
784 break;
785 case XK_F11: /* "\033[23~" */
786 case XK_F12: /* "\033[24~" */
787 case XK_F13: /* "\033[25~" */
788 case XK_F14: /* "\033[26~" */
789 FKEY (23, XK_F11);
790 break;
791 case XK_F15: /* "\033[28~" */
792 case XK_F16: /* "\033[29~" */
793 FKEY (28, XK_F15);
794 break;
795 case XK_Help: /* "\033[28~" */
796 FKEY (28, XK_Help);
797 break;
798 case XK_Menu: /* "\033[29~" */
799 FKEY (29, XK_Menu);
800 break;
801 case XK_F17: /* "\033[31~" */
802 case XK_F18: /* "\033[32~" */
803 case XK_F19: /* "\033[33~" */
804 case XK_F20: /* "\033[34~" */
805 case XK_F21: /* "\033[35~" */
806 case XK_F22: /* "\033[36~" */
807 case XK_F23: /* "\033[37~" */
808 case XK_F24: /* "\033[38~" */
809 case XK_F25: /* "\033[39~" */
810 case XK_F26: /* "\033[40~" */
811 case XK_F27: /* "\033[41~" */
812 case XK_F28: /* "\033[42~" */
813 case XK_F29: /* "\033[43~" */
814 case XK_F30: /* "\033[44~" */
815 case XK_F31: /* "\033[45~" */
816 case XK_F32: /* "\033[46~" */
817 case XK_F33: /* "\033[47~" */
818 case XK_F34: /* "\033[48~" */
819 case XK_F35: /* "\033[49~" */
820 FKEY (31, XK_F17);
821 break;
822#undef FKEY
823 default:
824 newlen = 0; 778 newlen = 0;
825 break;
826 } 779 }
827 780 break;
828 if (newlen)
829 len = strlen (kbuf);
830 } 781 }
782
783 if (newlen)
784 len = strlen (kbuf);
831 785
832 /* 786 /*
833 * Pass meta for all function keys, if 'meta' option set 787 * Pass meta for all function keys, if 'meta' option set
834 */ 788 */
835#ifdef META8_OPTION 789#ifdef META8_OPTION
… …
870 return; 824 return;
871 825
872 if (len <= 0) 826 if (len <= 0)
873 return; /* not mapped */ 827 return; /* not mapped */
874 828
875 if (OPTION (Opt_scrollTtyKeypress)) 829 if (option (Opt_scrollTtyKeypress))
876 if (view_start) 830 if (view_start)
877 { 831 {
878 view_start = 0; 832 view_start = 0;
879 want_refresh = 1; 833 want_refresh = 1;
880 } 834 }
… …
902 { 856 {
903 const char ch = C0_ESC; 857 const char ch = C0_ESC;
904 tt_write (&ch, 1); 858 tt_write (&ch, 1);
905 } 859 }
906 860
907#if defined(DEBUG_CMD)
908 /* Display keyboard buffer contents */
909 unsigned char *p;
910 int i;
911
912 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
913 for (i = 0, p = kbuf; i < len; i++, p++)
914 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
915 fprintf (stderr, "'\n");
916#endif /* DEBUG_CMD */
917 tt_write (kbuf, (unsigned int)len); 861 tt_write (kbuf, (unsigned int)len);
918} 862}
919/*}}} */ 863
864void
865rxvt_term::key_release (XKeyEvent &ev)
866{
867#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
868 KeySym keysym;
869
870 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
871#endif
872
873#if ENABLE_FRILLS || ISO_14755
874 // ISO 14755 support
875 if (iso14755buf)
876 if (iso14755buf & ISO_14755_52)
877 {
878# if ISO_14755
879 scr_overlay_off ();
880# endif
881# if ISO_14755
882 // iso14755 part 5.2 handling: release time
883 // first: controls
884 if ((ev.state & ControlMask)
885 && ((keysym >= 0x40 && keysym <= 0x5f)
886 || (keysym >= 0x61 && keysym <= 0x7f)))
887 {
888 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
889 commit_iso14755 ();
890
891 return;
892 }
893
894 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
895 if (i[0] == keysym)
896 {
897 iso14755buf = ISO_14755_51 | i[1];
898 commit_iso14755 ();
899
900 return;
901 }
902
903 scr_bell ();
904# endif
905 iso14755buf = 0;
906
907 return;
908 }
909 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
910 {
911# if ISO_14755
912 scr_overlay_off ();
913# endif
914 if (iso14755buf & ISO_14755_51)
915 commit_iso14755 ();
916#if ISO_14755
917 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
918 {
919 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
920
921 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
922 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
923 }
924# endif
925 else
926 iso14755buf = 0;
927 }
928#endif
929
930 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
931 return;
932
933#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
934 if (!(ev.state & ControlMask))
935 slip_wheel_ev.stop ();
936 else if (keysym == XK_Control_L || keysym == XK_Control_R)
937 mouse_slip_wheel_speed = 0;
938#endif
939}
920 940
921#if defined (KEYSYM_RESOURCE) 941#if defined (KEYSYM_RESOURCE)
922unsigned int 942unsigned int
923rxvt_term::cmd_write (const char *str, unsigned int count) 943rxvt_term::cmd_write (const char *str, unsigned int count)
924{ 944{
… …
954void 974void
955rxvt_term::flush () 975rxvt_term::flush ()
956{ 976{
957 flush_ev.stop (); 977 flush_ev.stop ();
958 978
959#ifdef TRANSPARENT 979#ifdef HAVE_BG_PIXMAP
960 if (want_full_refresh) 980 if (bgPixmap.check_clearChanged ())
961 { 981 {
962 want_full_refresh = 0; 982// scr_clear (true); This needs to be researched further!
963 scr_clear ();
964 scr_touch (false); 983 scr_touch (false);
965 } 984 }
966#endif 985#endif
967 986
968 if (want_refresh) 987 if (want_refresh)
… …
1004 } 1023 }
1005 while (row < end_row); 1024 while (row < end_row);
1006 } 1025 }
1007 1026
1008 scr_refresh (); 1027 scr_refresh ();
1009 scrollbar_show (1); 1028 scrollBar.show (1);
1010#ifdef USE_XIM 1029#ifdef USE_XIM
1011 IMSendSpot (); 1030 IMSendSpot ();
1012#endif 1031#endif
1013 } 1032 }
1014 1033
1015 display->flush (); 1034 display->flush ();
1016} 1035}
1017 1036
1037/* checks whether a refresh is requested and starts the refresh timer */
1018void 1038void
1019rxvt_term::check_cb (check_watcher &w) 1039rxvt_term::refresh_check ()
1040{
1041 if (want_refresh && !flush_ev.is_active ())
1042 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1043
1044 display->flush ();
1045}
1046
1047void
1048rxvt_term::flush_cb (ev::timer &w, int revents)
1020{ 1049{
1021 make_current (); 1050 make_current ();
1022 1051
1023 display->flush ();
1024
1025 if (want_refresh && !flush_ev.active)
1026 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1027}
1028
1029void
1030rxvt_term::flush_cb (time_watcher &w)
1031{
1032 make_current ();
1033
1034 refresh_limit = 1;
1035 refresh_count = 0; 1052 refresh_count = 0;
1036 flush (); 1053 flush ();
1037} 1054}
1038 1055
1039#ifdef CURSOR_BLINK 1056#ifdef CURSOR_BLINK
1040void 1057void
1041rxvt_term::cursor_blink_cb (time_watcher &w) 1058rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1042{ 1059{
1043 hidden_cursor = !hidden_cursor; 1060 hidden_cursor = !hidden_cursor;
1044 want_refresh = 1; 1061 want_refresh = 1;
1045 1062 refresh_check ();
1046 w.start (w.at + CURSOR_BLINK_INTERVAL);
1047} 1063}
1048#endif 1064#endif
1049 1065
1050#ifdef TEXT_BLINK 1066#ifdef TEXT_BLINK
1051void 1067void
1052rxvt_term::text_blink_cb (time_watcher &w) 1068rxvt_term::text_blink_cb (ev::timer &w, int revents)
1053{ 1069{
1054 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1070 if (scr_refresh_rend (RS_Blink, RS_Blink))
1055 { 1071 {
1056 hidden_text = !hidden_text; 1072 hidden_text = !hidden_text;
1057 want_refresh = 1; 1073 want_refresh = 1;
1058 w.start (w.at + TEXT_BLINK_INTERVAL); 1074 refresh_check ();
1059 } 1075 }
1076 else
1077 w.stop ();
1060} 1078}
1061#endif 1079#endif
1062 1080
1063#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1081#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1064void 1082void
1065rxvt_term::cont_scroll_cb (time_watcher &w) 1083rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1066{ 1084{
1067 if ((scrollbar_isUp() || scrollbar_isDn()) && 1085 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1068 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1086 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1069 { 1087 {
1070 want_refresh = 1; 1088 want_refresh = 1;
1071 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1089 refresh_check ();
1072 } 1090 }
1091 else
1092 w.stop ();
1073} 1093}
1074#endif 1094#endif
1075 1095
1076#ifdef SELECTION_SCROLLING 1096#ifdef SELECTION_SCROLLING
1077void 1097void
1078rxvt_term::sel_scroll_cb (time_watcher &w) 1098rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1079{ 1099{
1080 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1100 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1081 { 1101 {
1082 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1102 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1083 want_refresh = 1; 1103 want_refresh = 1;
1084 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1104 refresh_check ();
1085 } 1105 }
1106 else
1107 w.stop ();
1086} 1108}
1087#endif 1109#endif
1088 1110
1089#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1111#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1090void 1112void
1091rxvt_term::slip_wheel_cb (time_watcher &w) 1113rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1092{ 1114{
1093 if (mouse_slip_wheel_speed == 0 1115 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1094 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1095 : scr_page (UP, mouse_slip_wheel_speed))
1096 { 1116 {
1097 if (view_start == top_row || view_start == 0)
1098 mouse_slip_wheel_speed = 0;
1099
1100 want_refresh = 1; 1117 want_refresh = 1;
1101 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1118 refresh_check ();
1119 }
1120
1121 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1102 } 1122 {
1123 mouse_slip_wheel_speed = 0;
1124 w.stop ();
1125 }
1103} 1126}
1104#endif 1127#endif
1105 1128
1106#if HAVE_SCHED_YIELD 1129#if LINUX_YIELD_HACK
1107static struct event_handler 1130static struct event_handler
1108{ 1131{
1109 check_watcher cw_yield; 1132 ev::prepare yield_ev;
1110 1133
1111 void yield (check_watcher &w) 1134 void yield_cb (ev::prepare &w, int revents)
1112 { 1135 {
1113 sched_yield (); 1136 // this should really be sched_yield(), but the linux guys thought
1137 // that giving a process calling sched_yield () less cpu time than
1138 // ones with high nice levels is a useful thing to do. It surely is is
1139 // allowed by the sus... as is returning ENOSYS.
1140 // since the linux guys additionally thought that breaking the only
1141 // known workaround against their unusable sched_yield hack is cool,
1142 // we just nanosleep a bit and hope for the best.
1143
1144 struct timespec ts = { 0, 1000 };
1145 nanosleep (&ts, 0);
1146
1114 w.stop (); 1147 w.stop ();
1115 } 1148 }
1116 1149
1117 event_handler () 1150 event_handler ()
1118 : cw_yield (this, &event_handler::yield) 1151 : yield_ev (this, &event_handler::yield_cb)
1119 { 1152 {
1120 } 1153 }
1121} event_handler; 1154} event_handler;
1122#endif 1155#endif
1123 1156
… …
1143 cmdbuf_endp += r; 1176 cmdbuf_endp += r;
1144 return true; 1177 return true;
1145 } 1178 }
1146 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1179 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1147 { 1180 {
1148#if HAVE_SCHED_YIELD 1181#if LINUX_YIELD_HACK
1149 if (display->is_local) 1182 if (display->is_local)
1150 event_handler.cw_yield.start (); 1183 event_handler.yield_ev.start ();
1151#endif 1184#endif
1152 } 1185 }
1153 else 1186 else
1154 { 1187 {
1155 pty_ev.stop (); 1188 pty_ev.stop ();
1156 1189
1157 if (!OPTION (Opt_hold)) 1190 if (!option (Opt_hold))
1158 destroy (); 1191 destroy ();
1159 } 1192 }
1160 1193
1161 return false; 1194 return false;
1162} 1195}
1163 1196
1164void 1197void
1165rxvt_term::pty_cb (io_watcher &w, short revents) 1198rxvt_term::pty_cb (ev::io &w, int revents)
1166{ 1199{
1167 make_current (); 1200 make_current ();
1168 1201
1169 if (revents & EVENT_READ) 1202 if (revents & ev::READ)
1170 // loop, but don't allow a single term to monopolize us 1203 // loop, but don't allow a single term to monopolize us
1171 while (pty_fill ()) 1204 for (int i = CBUFCNT; i-- && pty_fill (); )
1172 if (cmd_parse ()) 1205 cmd_parse ();
1173 break;
1174 1206
1175 if (revents & EVENT_WRITE) 1207 if (revents & ev::WRITE)
1176 pty_write (); 1208 pty_write ();
1209
1210 refresh_check ();
1177} 1211}
1178 1212
1179void 1213void
1180rxvt_term::pointer_unblank () 1214rxvt_term::pointer_unblank ()
1181{ 1215{
1182 XDefineCursor (display->display, vt, TermWin_cursor); 1216 XDefineCursor (dpy, vt, TermWin_cursor);
1183 recolour_cursor (); 1217 recolour_cursor ();
1184 1218
1185#ifdef POINTER_BLANK 1219#ifdef POINTER_BLANK
1186 hidden_pointer = 0; 1220 hidden_pointer = 0;
1187 1221
1188 if (OPTION (Opt_pointerBlank)) 1222 if (option (Opt_pointerBlank))
1189 pointer_ev.start (NOW + pointerBlankDelay); 1223 pointer_ev.start (pointerBlankDelay);
1190#endif 1224#endif
1191} 1225}
1192 1226
1193#ifdef POINTER_BLANK 1227#ifdef POINTER_BLANK
1194void 1228void
1195rxvt_term::pointer_blank () 1229rxvt_term::pointer_blank ()
1196{ 1230{
1197 if (!OPTION (Opt_pointerBlank)) 1231 if (!option (Opt_pointerBlank))
1198 return; 1232 return;
1199 1233
1200 XDefineCursor (display->display, vt, display->blank_cursor); 1234 XDefineCursor (dpy, vt, display->blank_cursor);
1201 XFlush (display->display); 1235 XFlush (dpy);
1202 1236
1203 hidden_pointer = 1; 1237 hidden_pointer = 1;
1204} 1238}
1205 1239
1206void 1240void
1207rxvt_term::pointer_cb (time_watcher &w) 1241rxvt_term::pointer_cb (ev::timer &w, int revents)
1208{ 1242{
1209 make_current (); 1243 make_current ();
1210 1244
1211 pointer_blank (); 1245 pointer_blank ();
1212} 1246}
… …
1215void 1249void
1216rxvt_term::mouse_report (XButtonEvent &ev) 1250rxvt_term::mouse_report (XButtonEvent &ev)
1217{ 1251{
1218 int button_number, key_state = 0; 1252 int button_number, key_state = 0;
1219 int x, y; 1253 int x, y;
1254 int code = 32;
1220 1255
1221 x = ev.x; 1256 x = Pixel2Col (ev.x);
1222 y = ev.y; 1257 y = Pixel2Row (ev.y);
1223 pixel_position (&x, &y); 1258 if (ev.type == MotionNotify)
1259 {
1260 if (x == mouse_row && y == mouse_col)
1261 return;
1262 mouse_row = x;
1263 mouse_col = y;
1264 code += 32;
1265 }
1224 1266
1225 if (MEvent.button == AnyButton) 1267 if (MEvent.button == AnyButton)
1226 button_number = 3; 1268 button_number = 3;
1227 else 1269 else
1228 { 1270 {
… …
1274 x + 1, 1316 x + 1,
1275 y + 1); 1317 y + 1);
1276#endif 1318#endif
1277 1319
1278 tt_printf ("\033[M%c%c%c", 1320 tt_printf ("\033[M%c%c%c",
1279 (32 + button_number + key_state), 1321 (code + button_number + key_state),
1280 (32 + x + 1), 1322 (32 + x + 1),
1281 (32 + y + 1)); 1323 (32 + y + 1));
1282} 1324}
1283 1325
1284#ifdef USING_W11LIB
1285void
1286rxvt_W11_process_x_event (XEvent *ev)
1287{
1288 rxvt_t *r = rxvt_get_r ();
1289
1290 x_cb (*ev);
1291}
1292#endif
1293
1294/*{{{ process an X event */ 1326/*{{{ process an X event */
1295void 1327void
1296rxvt_term::x_cb (XEvent &ev) 1328rxvt_term::x_cb (XEvent &ev)
1297{ 1329{
1298 make_current (); 1330 make_current ();
1299 1331
1300 dDisp; 1332 dLocal (Display *, dpy);
1301 1333
1302 if (ev.xany.window == vt 1334 if (ev.xany.window == vt
1303 && SHOULD_INVOKE (HOOK_X_EVENT) 1335 && SHOULD_INVOKE (HOOK_X_EVENT)
1304 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1336 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1305 return; 1337 return;
… …
1310 unsigned int unused_mask; 1342 unsigned int unused_mask;
1311 1343
1312 switch (ev.type) 1344 switch (ev.type)
1313 { 1345 {
1314 case KeyPress: 1346 case KeyPress:
1315#if ISO_14755 1347 key_press (ev.xkey);
1316 if (!(iso14755buf & ISO_14755_52))
1317#endif
1318 lookup_key (ev.xkey);
1319
1320 break; 1348 break;
1321 1349
1322 case KeyRelease: 1350 case KeyRelease:
1323 { 1351 key_release (ev.xkey);
1324#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1325 KeySym keysym;
1326
1327 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1328#endif
1329
1330#if ENABLE_FRILLS || ISO_14755
1331 // ISO 14755 support
1332 if (iso14755buf)
1333 if (iso14755buf & ISO_14755_52)
1334 {
1335# if ENABLE_OVERLAY
1336 scr_overlay_off ();
1337# endif
1338# if ISO_14755
1339 // iso14755 part 5.2 handling: release time
1340 // first: controls
1341 if ((ev.xkey.state & ControlMask)
1342 && ((keysym >= 0x40 && keysym <= 0x5f)
1343 || (keysym >= 0x61 && keysym <= 0x7f)))
1344 {
1345 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1346 commit_iso14755 ();
1347 goto skip_switch;
1348 }
1349
1350 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1351 if (i[0] == keysym)
1352 {
1353 iso14755buf = ISO_14755_51 | i[1];
1354 commit_iso14755 ();
1355 goto skip_switch;
1356 }
1357
1358 scr_bell ();
1359# endif
1360 iso14755buf = 0;
1361 break;
1362 }
1363 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1364 {
1365# if ENABLE_OVERLAY
1366 scr_overlay_off ();
1367# endif
1368 if (iso14755buf & ISO_14755_51)
1369 commit_iso14755 ();
1370#if ISO_14755
1371 else if (iso14755buf & ISO_14755_STARTED)
1372 {
1373 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1374
1375 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1376 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1377 }
1378# endif
1379 else
1380 iso14755buf = 0;
1381 }
1382#endif
1383
1384 if (ev.xany.window == vt
1385 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1386 break;
1387
1388#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1389 if (!(ev.xkey.state & ControlMask))
1390 slip_wheel_ev.stop ();
1391 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1392 mouse_slip_wheel_speed = 0;
1393#endif
1394 break; 1352 break;
1395 }
1396 1353
1397 case ButtonPress: 1354 case ButtonPress:
1398 button_press (ev.xbutton); 1355 button_press (ev.xbutton);
1399 break; 1356 break;
1400 1357
… …
1415 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END))) 1372 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1416 destroy (); 1373 destroy ();
1417 } 1374 }
1418#if ENABLE_EWMH 1375#if ENABLE_EWMH
1419 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1376 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1420 XSendEvent (disp, ev.xclient.window = display->root, 1377 XSendEvent (dpy, ev.xclient.window = display->root,
1421 False, SubstructureRedirectMask | SubstructureNotifyMask, 1378 False, SubstructureRedirectMask | SubstructureNotifyMask,
1422 &ev); 1379 &ev);
1423#endif 1380#endif
1424 } 1381 }
1425 } 1382 }
… …
1431 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1388 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1432 focus_out (); 1389 focus_out ();
1433 } 1390 }
1434#endif 1391#endif
1435 } 1392 }
1436 break;
1437
1438 case MappingNotify:
1439 XRefreshKeyboardMapping (&ev.xmapping);
1440 break; 1393 break;
1441 1394
1442 /* 1395 /*
1443 * XXX: this is not the _current_ arrangement 1396 * XXX: this is not the _current_ arrangement
1444 * Here's my conclusion: 1397 * Here's my conclusion:
… …
1463 break; 1416 break;
1464 } 1417 }
1465 break; 1418 break;
1466 1419
1467 case FocusIn: 1420 case FocusIn:
1421 if (ev.xfocus.detail != NotifyInferior
1422 && ev.xfocus.detail != NotifyPointer
1423 && ev.xfocus.mode != NotifyGrab)
1468 focus_in (); 1424 focus_in ();
1469 break; 1425 break;
1470 1426
1471 case FocusOut: 1427 case FocusOut:
1428 if (ev.xfocus.detail != NotifyInferior
1429 && ev.xfocus.detail != NotifyPointer
1430 && ev.xfocus.mode != NotifyGrab)
1472 focus_out (); 1431 focus_out ();
1473 break; 1432 break;
1474 1433
1475 case ConfigureNotify: 1434 case ConfigureNotify:
1435 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1436 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1437 szHint.width, szHint.height);*/
1476 if (ev.xconfigure.window == parent[0]) 1438 if (ev.xconfigure.window == parent[0])
1477 { 1439 {
1478 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1440 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1479 ; 1441 ;
1480 1442
1481 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1443 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1482 { 1444 {
1483 seen_resize = 1; 1445 seen_resize = 1;
1484 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1446 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1485 } 1447 }
1448 else
1449 {
1450#ifdef HAVE_BG_PIXMAP
1451 if (bgPixmap.window_position_sensitive ())
1452 {
1453 if (mapped)
1454 update_background ();
1455 else
1456 bgPixmap.invalidate ();
1457 }
1458#endif
1459 }
1486 1460
1487 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1461 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 } 1462 }
1494 break; 1463 break;
1495 1464
1496 case PropertyNotify: 1465 case PropertyNotify:
1497 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1466 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
… …
1500 selection_property (ev.xproperty.window, ev.xproperty.atom); 1469 selection_property (ev.xproperty.window, ev.xproperty.atom);
1501 1470
1502 break; 1471 break;
1503 1472
1504 case SelectionClear: 1473 case SelectionClear:
1505 selection_clear (); 1474 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1506 break; 1475 break;
1507 1476
1508 case SelectionNotify: 1477 case SelectionNotify:
1509 if (selection_wait == Sel_normal) 1478 if (selection_wait == Sel_normal)
1510 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1479 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
… …
1513 case SelectionRequest: 1482 case SelectionRequest:
1514 selection_send (ev.xselectionrequest); 1483 selection_send (ev.xselectionrequest);
1515 break; 1484 break;
1516 1485
1517 case MapNotify: 1486 case MapNotify:
1487#ifdef HAVE_BG_PIXMAP
1488 /* This is needed spcifically to fix the case of no window manager or a
1489 * non-reparenting window manager. In those cases we never get first
1490 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1491 * care of multiplicity of ConfigureNotify events arriwing while WM does
1492 * reparenting.
1493 * We should not render background immidiately, as there could be several
1494 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1495 * by scheduling background redraw as soon as we can, but giving a short
1496 * bit of time for ConfigureNotifies to arrive.
1497 * We should render background PRIOR to drawing any text, but AFTER all
1498 * of ConfigureNotifys for the best results.
1499 */
1500 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1501 update_background_ev.start (0.025);
1502#endif
1518 mapped = 1; 1503 mapped = 1;
1519#ifdef TEXT_BLINK 1504#ifdef TEXT_BLINK
1520 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1505 text_blink_ev.start ();
1521#endif 1506#endif
1522 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1507 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1523 break; 1508 break;
1524 1509
1525 case UnmapNotify: 1510 case UnmapNotify:
… …
1527#ifdef TEXT_BLINK 1512#ifdef TEXT_BLINK
1528 text_blink_ev.stop (); 1513 text_blink_ev.stop ();
1529#endif 1514#endif
1530 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1515 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1531 break; 1516 break;
1532
1533#ifdef TRANSPARENT
1534 case ReparentNotify:
1535 rootwin_cb (ev);
1536 break;
1537#endif /* TRANSPARENT */
1538 1517
1539 case GraphicsExpose: 1518 case GraphicsExpose:
1540 case Expose: 1519 case Expose:
1541 if (ev.xany.window == vt) 1520 if (ev.xany.window == vt)
1542 { 1521 {
1543 do 1522 do
1523 {
1544 scr_expose (ev.xexpose.x, ev.xexpose.y, 1524 scr_expose (ev.xexpose.x, ev.xexpose.y,
1545 ev.xexpose.width, ev.xexpose.height, False); 1525 ev.xexpose.width, ev.xexpose.height, False);
1526 }
1546 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1527 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1547 1528
1548 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1529 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1549 1530
1550 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1531 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1532 {
1551 scr_expose (ev.xexpose.x, ev.xexpose.y, 1533 scr_expose (ev.xexpose.x, ev.xexpose.y,
1552 ev.xexpose.width, ev.xexpose.height, False); 1534 ev.xexpose.width, ev.xexpose.height, False);
1535 }
1553 1536
1554 want_refresh = 1; 1537 want_refresh = 1;
1555 } 1538 }
1556 else 1539 else
1557 { 1540 {
1558 XEvent unused_event; 1541 XEvent unused_event;
1559 1542
1560 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1543 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1561 ; 1544 ;
1562 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1545 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1563 ; 1546 ;
1564 1547
1565 if (isScrollbarWindow (ev.xany.window)) 1548 if (scrollBar.state && ev.xany.window == scrollBar.win)
1566 { 1549 {
1567 scrollBar.setIdle (); 1550 scrollBar.state = STATE_IDLE;
1568 scrollbar_show (0); 1551 scrollBar.show (0);
1569 } 1552 }
1570
1571#ifdef TRANSPARENT
1572 if (am_transparent && ev.xany.window == parent[0])
1573 XClearWindow (disp, ev.xany.window);
1574#endif
1575 } 1553 }
1576 break; 1554 break;
1577 1555
1578 case MotionNotify: 1556 case MotionNotify:
1579#ifdef POINTER_BLANK 1557#ifdef POINTER_BLANK
1580 if (hidden_pointer) 1558 if (hidden_pointer)
1581 pointer_unblank (); 1559 pointer_unblank ();
1582#endif 1560#endif
1561 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1562 || priv_modes & PrivMode_MouseAnyEvent)
1563 mouse_report (ev.xbutton);
1583 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1564 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1584 break; 1565 break;
1585 1566
1586 if (ev.xany.window == vt) 1567 if (ev.xany.window == vt)
1587 { 1568 {
1588 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1569 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1589 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1570 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1590 ; // nop 1571 ; // nop
1591 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1572 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1592 { 1573 {
1593 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1574 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1594 ; 1575 ;
1595 1576
1596 XQueryPointer (disp, vt, 1577 XQueryPointer (dpy, vt,
1597 &unused_root, &unused_child, 1578 &unused_root, &unused_child,
1598 &unused_root_x, &unused_root_y, 1579 &unused_root_x, &unused_root_y,
1599 &ev.xbutton.x, &ev.xbutton.y, 1580 &ev.xbutton.x, &ev.xbutton.y,
1600 &ev.xbutton.state); 1581 &ev.xbutton.state);
1601#ifdef MOUSE_THRESHOLD 1582#ifdef MOUSE_THRESHOLD
… …
1621 int dist; 1602 int dist;
1622 1603
1623 /* don't clobber the current delay if we are 1604 /* don't clobber the current delay if we are
1624 * already in the middle of scrolling. 1605 * already in the middle of scrolling.
1625 */ 1606 */
1626 if (!sel_scroll_ev.active) 1607 if (!sel_scroll_ev.is_active ())
1627 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1608 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1628 1609
1629 /* save the event params so we can highlight 1610 /* save the event params so we can highlight
1630 * the selection in the pending-scroll loop 1611 * the selection in the pending-scroll loop
1631 */ 1612 */
1632 selection_save_x = ev.xbutton.x; 1613 selection_save_x = ev.xbutton.x;
… …
1654 else 1635 else
1655 { 1636 {
1656 /* we are within the text window, so we 1637 /* we are within the text window, so we
1657 * shouldn't be scrolling 1638 * shouldn't be scrolling
1658 */ 1639 */
1659 if (sel_scroll_ev.active)
1660 sel_scroll_ev.stop(); 1640 sel_scroll_ev.stop();
1661 } 1641 }
1662#endif 1642#endif
1663#ifdef MOUSE_THRESHOLD 1643#ifdef MOUSE_THRESHOLD
1664 } 1644 }
1665#endif 1645#endif
1666 } 1646 }
1667 } 1647 }
1668 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1648 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1669 { 1649 {
1670 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1650 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1671 MotionNotify, &ev)) 1651 MotionNotify, &ev))
1672 ; 1652 ;
1673 1653
1674 XQueryPointer (disp, scrollBar.win, 1654 XQueryPointer (dpy, scrollBar.win,
1675 &unused_root, &unused_child, 1655 &unused_root, &unused_child,
1676 &unused_root_x, &unused_root_y, 1656 &unused_root_x, &unused_root_y,
1677 &ev.xbutton.x, &ev.xbutton.y, 1657 &ev.xbutton.x, &ev.xbutton.y,
1678 &unused_mask); 1658 &unused_mask);
1679 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1659 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1680 scrollbar_size ()); 1660 scrollBar.size ());
1681 want_refresh = 1; 1661 want_refresh = 1;
1682 refresh_limit = 0;
1683 scrollbar_show (1); 1662 scrollBar.show (1);
1684 } 1663 }
1685 break; 1664 break;
1686 } 1665 }
1687 1666
1688skip_switch: ;
1689
1690#if defined(CURSOR_BLINK) 1667#if defined(CURSOR_BLINK)
1691 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1668 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1692 { 1669 {
1693 if (hidden_cursor) 1670 if (hidden_cursor)
1694 { 1671 {
1695 hidden_cursor = 0; 1672 hidden_cursor = 0;
1696 want_refresh = 1; 1673 want_refresh = 1;
1697 } 1674 }
1698 1675
1699 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1676 cursor_blink_ev.again ();
1700 } 1677 }
1701#endif 1678#endif
1702 1679
1703#if defined(POINTER_BLANK) 1680#if defined(POINTER_BLANK)
1704 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1681 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1705 { 1682 {
1706 if (ev.type == MotionNotify 1683 if (ev.type == MotionNotify
1707 || ev.type == ButtonPress 1684 || ev.type == ButtonPress
1708 || ev.type == ButtonRelease) 1685 || ev.type == ButtonRelease)
1709 if (hidden_pointer) 1686 if (hidden_pointer)
… …
1711 1688
1712 if (ev.type == KeyPress && hidden_pointer == 0) 1689 if (ev.type == KeyPress && hidden_pointer == 0)
1713 pointer_blank (); 1690 pointer_blank ();
1714 } 1691 }
1715#endif 1692#endif
1693
1694 refresh_check ();
1716} 1695}
1696
1697#if ENABLE_FRILLS
1698void
1699rxvt_term::set_urgency (bool enable)
1700{
1701 if (enable == urgency_hint)
1702 return;
1703
1704 if (XWMHints *h = XGetWMHints (dpy, parent[0]))
1705 {
1706 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1707 XSetWMHints (dpy, parent[0], h);
1708 urgency_hint = enable;
1709 }
1710}
1711#endif
1717 1712
1718void 1713void
1719rxvt_term::focus_in () 1714rxvt_term::focus_in ()
1720{ 1715{
1721 if (!focus) 1716 if (!focus)
1722 { 1717 {
1723 focus = 1; 1718 focus = 1;
1724 want_refresh = 1; 1719 want_refresh = 1;
1725 1720
1726 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1727
1728#if USE_XIM 1721#if USE_XIM
1729 if (Input_Context != NULL) 1722 if (Input_Context != NULL)
1730 { 1723 {
1731 IMSetStatusPosition (); 1724 IMSetPosition ();
1732 XSetICFocus (Input_Context); 1725 XSetICFocus (Input_Context);
1733 } 1726 }
1734#endif 1727#endif
1735#if CURSOR_BLINK 1728#if CURSOR_BLINK
1736 if (OPTION (Opt_cursorBlink)) 1729 if (option (Opt_cursorBlink))
1737 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1730 cursor_blink_ev.again ();
1738#endif 1731#endif
1739#if OFF_FOCUS_FADING 1732#if OFF_FOCUS_FADING
1740 if (rs[Rs_fade]) 1733 if (rs[Rs_fade])
1741 { 1734 {
1742 pix_colors = pix_colors_focused; 1735 pix_colors = pix_colors_focused;
1743 scr_recolour (); 1736 scr_recolour ();
1744 } 1737 }
1745#endif 1738#endif
1739#if ENABLE_FRILLS
1740 if (option (Opt_urgentOnBell))
1741 set_urgency (0);
1742#endif
1743
1744 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1746 } 1745 }
1747} 1746}
1748 1747
1749void 1748void
1750rxvt_term::focus_out () 1749rxvt_term::focus_out ()
… …
1752 if (focus) 1751 if (focus)
1753 { 1752 {
1754 focus = 0; 1753 focus = 0;
1755 want_refresh = 1; 1754 want_refresh = 1;
1756 1755
1757 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1756#if ENABLE_FRILLS
1758 1757 if (option (Opt_urgentOnBell))
1758 set_urgency (0);
1759#endif
1759#if ENABLE_FRILLS || ISO_14755 1760#if ENABLE_FRILLS || ISO_14755
1760 if (iso14755buf) 1761 if (iso14755buf)
1761 { 1762 {
1762 iso14755buf = 0; 1763 iso14755buf = 0;
1763# if ENABLE_OVERLAY 1764# if ISO_14755
1764 scr_overlay_off (); 1765 scr_overlay_off ();
1765# endif 1766# endif
1766 } 1767 }
1767#endif 1768#endif
1768#if USE_XIM 1769#if USE_XIM
1769 if (Input_Context != NULL) 1770 if (Input_Context != NULL)
1770 XUnsetICFocus (Input_Context); 1771 XUnsetICFocus (Input_Context);
1771#endif 1772#endif
1772#if CURSOR_BLINK 1773#if CURSOR_BLINK
1773 if (OPTION (Opt_cursorBlink)) 1774 if (option (Opt_cursorBlink))
1774 cursor_blink_ev.stop (); 1775 cursor_blink_ev.stop ();
1776
1775 hidden_cursor = 0; 1777 hidden_cursor = 0;
1776#endif 1778#endif
1777#if OFF_FOCUS_FADING 1779#if OFF_FOCUS_FADING
1778 if (rs[Rs_fade]) 1780 if (rs[Rs_fade])
1779 { 1781 {
1780 pix_colors = pix_colors_unfocused; 1782 pix_colors = pix_colors_unfocused;
1781 scr_recolour (); 1783 scr_recolour ();
1782 } 1784 }
1783#endif 1785#endif
1786
1787 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1788 }
1789}
1790
1791void
1792rxvt_term::update_fade_color (unsigned int idx)
1793{
1794#if OFF_FOCUS_FADING
1795 if (rs[Rs_fade])
1784 } 1796 {
1797 rgba c;
1798 pix_colors [Color_fade].get (c);
1799 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1800 }
1801#endif
1785} 1802}
1786 1803
1787#if TRANSPARENT 1804#if ENABLE_TRANSPARENCY || ENABLE_PERL
1788void 1805void
1789rxvt_term::rootwin_cb (XEvent &ev) 1806rxvt_term::rootwin_cb (XEvent &ev)
1790{ 1807{
1791 make_current (); 1808 make_current ();
1792 1809
1810 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1811 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1812 return;
1813
1814# if ENABLE_TRANSPARENCY
1793 switch (ev.type) 1815 switch (ev.type)
1794 { 1816 {
1795 case PropertyNotify: 1817 case PropertyNotify:
1796 /* 1818 /*
1797 * if user used some Esetroot compatible prog to set the root bg, 1819 * if user used some Esetroot compatible prog to set the root bg,
1798 * use the property to determine the pixmap. We use it later on. 1820 * use the property to determine the pixmap. We use it later on.
1799 */ 1821 */
1800 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1822 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1801 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1823 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1802 return; 1824 {
1825 bgPixmap.set_root_pixmap ();
1826 update_background ();
1827 }
1803 1828
1804 /* FALLTHROUGH */
1805 case ReparentNotify:
1806 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1807 want_refresh = want_full_refresh = 1;
1808 break; 1829 break;
1809 } 1830 }
1831# endif
1832
1833 refresh_check ();
1810} 1834}
1811#endif 1835#endif
1812 1836
1813void 1837void
1814rxvt_term::button_press (XButtonEvent &ev) 1838rxvt_term::button_press (XButtonEvent &ev)
… …
1869 mouse_report (ev); 1893 mouse_report (ev);
1870 } 1894 }
1871#else 1895#else
1872 MEvent.button = ev.button; 1896 MEvent.button = ev.button;
1873 mouse_report (ev); 1897 mouse_report (ev);
1874#endif /* MOUSE_REPORT_DOUBLECLICK */ 1898#endif /* MOUSE_REPORT_DOUBLECLICK */
1875 1899
1876 } 1900 }
1877 else 1901 else
1878 { 1902 {
1879 if (ev.button != MEvent.button) 1903 if (ev.button != MEvent.button)
… …
1927 } 1951 }
1928 1952
1929 /* 1953 /*
1930 * Scrollbar window processing of button press 1954 * Scrollbar window processing of button press
1931 */ 1955 */
1932 if (isScrollbarWindow (ev.window)) 1956 if (scrollBar.state && ev.window == scrollBar.win)
1933 { 1957 {
1934 scrollBar.setIdle (); 1958 page_dirn direction = NO_DIR;
1959
1960 if (scrollBar.upButton (ev.y))
1961 direction = UP; /* up */
1962 else if (scrollBar.dnButton (ev.y))
1963 direction = DN; /* down */
1964
1965 scrollBar.state = STATE_IDLE;
1935 /* 1966 /*
1936 * Rxvt-style scrollbar: 1967 * Rxvt-style scrollbar:
1937 * move up if mouse is above slider 1968 * move up if mouse is above slider
1938 * move dn if mouse is below slider 1969 * move dn if mouse is below slider
1939 * 1970 *
… …
1948 /* 1979 /*
1949 * Mouse report disabled scrollbar: 1980 * Mouse report disabled scrollbar:
1950 * arrow buttons - send up/down 1981 * arrow buttons - send up/down
1951 * click on scrollbar - send pageup/down 1982 * click on scrollbar - send pageup/down
1952 */ 1983 */
1953 if ((scrollBar.style == R_SB_NEXT 1984 if (direction == UP)
1954 && scrollbarnext_upButton (ev.y))
1955 || (scrollBar.style == R_SB_RXVT
1956 && scrollbarrxvt_upButton (ev.y)))
1957 tt_printf ("\033[A"); 1985 tt_printf ("\033[A");
1958 else if ((scrollBar.style == R_SB_NEXT 1986 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"); 1987 tt_printf ("\033[B");
1963 else 1988 else
1964 switch (ev.button) 1989 switch (ev.button)
1965 { 1990 {
1966 case Button2: 1991 case Button2:
… …
1973 tt_printf ("\033[5~"); 1998 tt_printf ("\033[5~");
1974 break; 1999 break;
1975 } 2000 }
1976 } 2001 }
1977 else 2002 else
1978#endif /* NO_SCROLLBAR_REPORT */ 2003#endif /* NO_SCROLLBAR_REPORT */
1979
1980 {
1981 char upordown = 0;
1982
1983 if (scrollBar.style == R_SB_NEXT)
1984 { 2004 {
1985 if (scrollbarnext_upButton (ev.y)) 2005 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 { 2006 {
1999#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2007#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2008 if (!cont_scroll_ev.is_active ())
2000 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2009 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2001#endif 2010#endif
2002 if (scr_page (upordown < 0 ? UP : DN, 1)) 2011 if (scr_page (direction, 1))
2003 { 2012 {
2004 if (upordown < 0) 2013 if (direction == UP)
2005 scrollBar.setUp (); 2014 scrollBar.state = STATE_UP;
2006 else 2015 else
2007 scrollBar.setDn (); 2016 scrollBar.state = STATE_DOWN;
2008 } 2017 }
2009 } 2018 }
2010 else 2019 else
2011 switch (ev.button) 2020 switch (ev.button)
2012 { 2021 {
2013 case Button2: 2022 case Button2:
2014 switch (scrollbar_align) 2023 switch (scrollBar.align)
2015 { 2024 {
2016 case R_SB_ALIGN_TOP: 2025 case R_SB_ALIGN_TOP:
2017 csrO = 0; 2026 csrO = 0;
2018 break; 2027 break;
2019 case R_SB_ALIGN_CENTRE: 2028 case R_SB_ALIGN_CENTRE:
… …
2025 } 2034 }
2026 2035
2027 if (scrollBar.style == R_SB_XTERM 2036 if (scrollBar.style == R_SB_XTERM
2028 || scrollbar_above_slider (ev.y) 2037 || scrollbar_above_slider (ev.y)
2029 || scrollbar_below_slider (ev.y)) 2038 || scrollbar_below_slider (ev.y))
2030 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2039 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2031 2040
2032 scrollBar.setMotion (); 2041 scrollBar.state = STATE_MOTION;
2033 break; 2042 break;
2034 2043
2035 case Button1: 2044 case Button1:
2036 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2045 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2037 csrO = ev.y - scrollBar.top; 2046 csrO = ev.y - scrollBar.top;
2038 /* FALLTHROUGH */ 2047 /* FALLTHROUGH */
2039 2048
2040 case Button3: 2049 case Button3:
2041 if (scrollBar.style != R_SB_XTERM) 2050 if (scrollBar.style != R_SB_XTERM)
… …
2051 scr_page (DN, nrow - 1); 2060 scr_page (DN, nrow - 1);
2052# else 2061# else
2053 scr_page (DN, nrow / 4); 2062 scr_page (DN, nrow / 4);
2054# endif 2063# endif
2055 else 2064 else
2056 scrollBar.setMotion (); 2065 scrollBar.state = STATE_MOTION;
2057 } 2066 }
2058 else 2067 else
2059 { 2068 {
2060 scr_page ((ev.button == Button1 ? DN : UP), 2069 scr_page ((ev.button == Button1 ? DN : UP),
2061 (nrow 2070 (nrow
2062 * scrollbar_position (ev.y) 2071 * scrollbar_position (ev.y)
2063 / scrollbar_size ())); 2072 / scrollBar.size ()));
2064 } 2073 }
2065 2074
2066 break; 2075 break;
2067 } 2076 }
2068 } 2077 }
… …
2078 2087
2079 csrO = 0; /* reset csr Offset */ 2088 csrO = 0; /* reset csr Offset */
2080 if (!bypass_keystate) 2089 if (!bypass_keystate)
2081 reportmode = !! (priv_modes & PrivMode_mouse_report); 2090 reportmode = !! (priv_modes & PrivMode_mouse_report);
2082 2091
2083 if (scrollbar_isUpDn ()) 2092 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2084 { 2093 {
2085 scrollBar.setIdle (); 2094 scrollBar.state = STATE_IDLE;
2086 scrollbar_show (0); 2095 scrollBar.show (0);
2087 } 2096 }
2088 2097
2089#ifdef SELECTION_SCROLLING 2098#ifdef SELECTION_SCROLLING
2090 if (sel_scroll_ev.active)
2091 sel_scroll_ev.stop(); 2099 sel_scroll_ev.stop();
2092#endif 2100#endif
2093 2101
2094 if (ev.window == vt) 2102 if (ev.window == vt)
2095 { 2103 {
2096 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2104 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
… …
2120 mouse_report (ev); 2128 mouse_report (ev);
2121 } 2129 }
2122#else /* MOUSE_REPORT_DOUBLECLICK */ 2130#else /* MOUSE_REPORT_DOUBLECLICK */
2123 MEvent.button = AnyButton; 2131 MEvent.button = AnyButton;
2124 mouse_report (ev); 2132 mouse_report (ev);
2125#endif /* MOUSE_REPORT_DOUBLECLICK */ 2133#endif /* MOUSE_REPORT_DOUBLECLICK */
2126 return; 2134 return;
2127 } 2135 }
2128 2136
2129 /* 2137 /*
2130 * dumb hack to compensate for the failure of click-and-drag 2138 * dumb hack to compensate for the failure of click-and-drag
… …
2142 selection_make (ev.time); 2150 selection_make (ev.time);
2143 break; 2151 break;
2144 2152
2145 case Button2: 2153 case Button2:
2146 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2154 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2147 selection_request (ev.time, ev.state & ShiftMask ? Sel_Clipboard : Sel_Primary); 2155 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2148 break; 2156 break;
2149 2157
2150#ifdef MOUSE_WHEEL 2158#ifdef MOUSE_WHEEL
2151 case Button4: 2159 case Button4:
2152 case Button5: 2160 case Button5:
… …
2156 2164
2157 v = ev.button == Button4 ? UP : DN; 2165 v = ev.button == Button4 ? UP : DN;
2158 2166
2159 if (ev.state & ShiftMask) 2167 if (ev.state & ShiftMask)
2160 i = 1; 2168 i = 1;
2161 else if (OPTION (Opt_mouseWheelScrollPage)) 2169 else if (option (Opt_mouseWheelScrollPage))
2162 i = nrow - 1; 2170 i = nrow - 1;
2163 else 2171 else
2164 i = 5; 2172 i = 5;
2165 2173
2166# ifdef MOUSE_SLIP_WHEELING 2174# ifdef MOUSE_SLIP_WHEELING
… …
2168 { 2176 {
2169 mouse_slip_wheel_speed += v ? -1 : 1; 2177 mouse_slip_wheel_speed += v ? -1 : 1;
2170 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2178 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2171 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2179 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2172 2180
2173 if (slip_wheel_ev.at < NOW) 2181 if (!slip_wheel_ev.is_active ())
2174 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2182 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2175
2176 slip_wheel_ev.start ();
2177 } 2183 }
2178 else 2184 else
2185# endif
2179 { 2186 {
2180# endif
2181 scr_page (v, i); 2187 scr_page (v, i);
2182 scrollbar_show (1); 2188 scrollBar.show (1);
2183# ifdef MOUSE_SLIP_WHEELING
2184 } 2189 }
2185# endif
2186 } 2190 }
2187 break; 2191 break;
2188#endif 2192#endif
2189 } 2193 }
2190 } 2194 }
2191} 2195}
2192 2196
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/*}}} */ 2197/*}}} */
2670 2198
2671bool 2199void
2672rxvt_term::cmd_parse () 2200rxvt_term::cmd_parse ()
2673{ 2201{
2674 bool flag = false;
2675 wchar_t ch = NOCHAR; 2202 wchar_t ch = NOCHAR;
2676 char *seq_begin; // remember start of esc-sequence here 2203 char *seq_begin; // remember start of esc-sequence here
2677 2204
2678 for (;;) 2205 for (;;)
2679 { 2206 {
2680 if (ch == NOCHAR) 2207 if (expect_false (ch == NOCHAR))
2681 { 2208 {
2682 seq_begin = cmdbuf_ptr; 2209 seq_begin = cmdbuf_ptr;
2683 ch = next_char (); 2210 ch = next_char ();
2684 2211
2685 if (ch == NOCHAR) 2212 if (ch == NOCHAR)
2686 break; 2213 break;
2687 } 2214 }
2688 2215
2689 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2216 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2690 { 2217 {
2691 if (!seen_input) 2218 if (expect_false (!seen_input))
2692 { 2219 {
2693 seen_input = 1; 2220 seen_input = 1;
2694 // many badly-written programs (e.g. jed) contain a race condition: 2221 // many badly-written programs (e.g. jed) contain a race condition:
2695 // they first read the screensize and then install a SIGWINCH handler. 2222 // they first read the screensize and then install a SIGWINCH handler.
2696 // some window managers resize the window early, and these programs 2223 // some window managers resize the window early, and these programs
… …
2709 wchar_t *str = buf; 2236 wchar_t *str = buf;
2710 wchar_t *eol = str + min (ncol, UBUFSIZ); 2237 wchar_t *eol = str + min (ncol, UBUFSIZ);
2711 2238
2712 for (;;) 2239 for (;;)
2713 { 2240 {
2714 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2241 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2715 break; 2242 break;
2716 2243
2717 *str++ = ch; 2244 *str++ = ch;
2718 2245
2719 if (ch == C0_LF || str >= eol) 2246 if (expect_false (ch == C0_LF || str >= eol))
2720 { 2247 {
2721 if (ch == C0_LF) 2248 if (ch == C0_LF)
2722 nlines++; 2249 nlines++;
2723 2250
2724 refresh_count++; 2251 refresh_count++;
2725 2252
2726 if (!OPTION (Opt_jumpScroll) 2253 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2727 || (refresh_count >= refresh_limit * (nrow - 1)))
2728 { 2254 {
2729 refreshnow = true;
2730 refresh_count = 0; 2255 refresh_count = 0;
2256
2257 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2258 {
2259 refreshnow = true;
2731 ch = NOCHAR; 2260 ch = NOCHAR;
2732 break; 2261 break;
2262 }
2733 } 2263 }
2734 2264
2735 // scr_add_lines only works for nlines <= nrow - 1. 2265 // scr_add_lines only works for nlines <= nrow - 1.
2736 if (nlines >= nrow - 1) 2266 if (nlines >= nrow - 1)
2737 { 2267 {
… …
2765 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2295 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2766 scr_add_lines (buf, str - buf, nlines); 2296 scr_add_lines (buf, str - buf, nlines);
2767 2297
2768 /* 2298 /*
2769 * If there have been a lot of new lines, then update the screen 2299 * If there have been a lot of new lines, then update the screen
2770 * What the heck I'll cheat and only refresh less than every page-full. 2300 * What the heck we'll cheat and only refresh less than every page-full.
2771 * the number of pages between refreshes is refresh_limit, which 2301 * if skipScroll is enabled.
2772 * is incremented here because we must be doing flat-out scrolling.
2773 */ 2302 */
2774 if (refreshnow) 2303 if (refreshnow)
2775 { 2304 {
2776 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2777 refresh_limit++;
2778 else
2779 {
2780 flag = true;
2781 scr_refresh (); 2305 scr_refresh ();
2782 want_refresh = 1; 2306 want_refresh = 1;
2783 }
2784 } 2307 }
2785
2786 } 2308 }
2787 else 2309 else
2788 { 2310 {
2789 try 2311 try
2790 { 2312 {
… …
2798 } 2320 }
2799 2321
2800 ch = NOCHAR; 2322 ch = NOCHAR;
2801 } 2323 }
2802 } 2324 }
2803
2804 return flag;
2805} 2325}
2806 2326
2807// read the next character 2327// read the next character
2808wchar_t 2328wchar_t
2809rxvt_term::next_char () NOTHROW 2329rxvt_term::next_char () NOTHROW
2810{ 2330{
2811 while (cmdbuf_ptr < cmdbuf_endp) 2331 while (cmdbuf_ptr < cmdbuf_endp)
2812 { 2332 {
2813 // assume 7-bit to be ascii ALWAYS 2333 // assume 7-bit to be ascii ALWAYS
2814 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2334 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2815 return *cmdbuf_ptr++; 2335 return *cmdbuf_ptr++;
2816 2336
2817 wchar_t wc; 2337 wchar_t wc;
2818 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2338 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2819 2339
… …
2823 cmdbuf_ptr = cmdbuf_endp; 2343 cmdbuf_ptr = cmdbuf_endp;
2824 break; 2344 break;
2825 } 2345 }
2826 2346
2827 if (len == (size_t)-1) 2347 if (len == (size_t)-1)
2348 {
2349 mbstate.reset (); // reset now undefined conversion state
2828 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2350 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2351 }
2829 2352
2830 // assume wchar == unicode 2353 // assume wchar == unicode
2831 cmdbuf_ptr += len; 2354 cmdbuf_ptr += len;
2832 return wc & UNICODE_MASK; 2355 return wc & UNICODE_MASK;
2833 } 2356 }
… …
2877/*----------------------------------------------------------------------*/ 2400/*----------------------------------------------------------------------*/
2878#ifdef PRINTPIPE 2401#ifdef PRINTPIPE
2879FILE * 2402FILE *
2880rxvt_term::popen_printer () 2403rxvt_term::popen_printer ()
2881{ 2404{
2882 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2405 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2883 2406
2884 if (stream == NULL) 2407 if (stream == NULL)
2885 rxvt_warn ("can't open printer pipe, not printing.\n"); 2408 rxvt_warn ("can't open printer pipe, not printing.\n");
2886 2409
2887 return stream; 2410 return stream;
… …
2898 * simulate attached vt100 printer 2421 * simulate attached vt100 printer
2899 */ 2422 */
2900void 2423void
2901rxvt_term::process_print_pipe () 2424rxvt_term::process_print_pipe ()
2902{ 2425{
2903 int done; 2426 FILE *fd = popen_printer ();
2904 FILE *fd;
2905 2427
2906 if ((fd = popen_printer ()) == NULL) 2428 if (!fd)
2907 return; 2429 return;
2908 2430
2909 /* 2431 /*
2910 * Send all input to the printer until either ESC[4i or ESC[?4i 2432 * Send all input to the printer until either ESC[4i or ESC[?4i
2911 * is received. 2433 * is received.
2912 */ 2434 */
2913 for (done = 0; !done;) 2435 for (int done = 0; !done; )
2914 { 2436 {
2915 unsigned char buf[8]; 2437 unsigned char buf[8];
2916 unicode_t ch; 2438 unicode_t ch;
2917 unsigned int i, len; 2439 unsigned int i, len;
2918 2440
… …
2937 { 2459 {
2938 if ((buf[len++] = cmd_getc ()) == 'i') 2460 if ((buf[len++] = cmd_getc ()) == 'i')
2939 break; /* done = 1 */ 2461 break; /* done = 1 */
2940 } 2462 }
2941 } 2463 }
2942 2464
2943 for (i = 0; i < len; i++) 2465 for (i = 0; i < len; i++)
2944 if (putc (buf[i], fd) == EOF) 2466 if (putc (buf[i], fd) == EOF)
2945 { 2467 {
2946 done = 1; 2468 done = 1;
2947 break; 2469 break;
… …
2949 } 2471 }
2950 } 2472 }
2951 2473
2952 pclose_printer (fd); 2474 pclose_printer (fd);
2953} 2475}
2954#endif /* PRINTPIPE */ 2476#endif /* PRINTPIPE */
2955/*}}} */ 2477/*}}} */
2956 2478
2957/* *INDENT-OFF* */ 2479/* *INDENT-OFF* */
2958enum { 2480enum {
2959 C1_40 = 0x40, 2481 C1_40 = 0x40,
… …
3009 process_dcs_seq (); 2531 process_dcs_seq ();
3010 break; 2532 break;
3011 case 0x9b: /* CSI */ 2533 case 0x9b: /* CSI */
3012 process_csi_seq (); 2534 process_csi_seq ();
3013 break; 2535 break;
3014 case 0x9d: /* CSI */ 2536 case 0x9d: /* OSC */
3015 process_osc_seq (); 2537 process_osc_seq ();
3016 break; 2538 break;
3017#endif 2539#endif
3018 } 2540 }
3019} 2541}
… …
3063 break; 2585 break;
3064 case 'Z': /* identify the terminal type */ 2586 case 'Z': /* identify the terminal type */
3065 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2587 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
3066 break; 2588 break;
3067 case '<': /* turn off VT52 mode */ 2589 case '<': /* turn off VT52 mode */
3068 PrivMode (0, PrivMode_vt52); 2590 set_privmode (PrivMode_vt52, 0);
3069 break; 2591 break;
3070 case 'F': /* use special graphics character set */ 2592 case 'F': /* use special graphics character set */
3071 case 'G': /* use regular character set */ 2593 case 'G': /* use regular character set */
3072 /* unimplemented */ 2594 /* unimplemented */
3073 break; 2595 break;
… …
3109 scr_charset_set (2, (unsigned int)cmd_getc ()); 2631 scr_charset_set (2, (unsigned int)cmd_getc ());
3110 break; 2632 break;
3111 case '+': 2633 case '+':
3112 scr_charset_set (3, (unsigned int)cmd_getc ()); 2634 scr_charset_set (3, (unsigned int)cmd_getc ());
3113 break; 2635 break;
3114#if ENABLE_FRILLS 2636#if !ENABLE_MINIMAL
3115 case '6': 2637 case '6':
3116 scr_backindex (); 2638 scr_backindex ();
3117 break; 2639 break;
3118#endif 2640#endif
3119 case '7': 2641 case '7':
3120 scr_cursor (SAVE); 2642 scr_cursor (SAVE);
3121 break; 2643 break;
3122 case '8': 2644 case '8':
3123 scr_cursor (RESTORE); 2645 scr_cursor (RESTORE);
3124 break; 2646 break;
3125#if ENABLE_FRILLS 2647#if !ENABLE_MINIMAL
3126 case '9': 2648 case '9':
3127 scr_forwardindex (); 2649 scr_forwardindex ();
3128 break; 2650 break;
3129#endif 2651#endif
3130 case '=': 2652 case '=':
3131 case '>': 2653 case '>':
3132 PrivMode ((ch == '='), PrivMode_aplKP); 2654 set_privmode (PrivMode_aplKP, ch == '=');
3133 break; 2655 break;
3134 2656
3135 case C1_40: 2657 case C1_40:
3136 cmd_getc (); 2658 cmd_getc ();
3137 break; 2659 break;
… …
3176 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2698 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3177 case C1_SCI: /* ESC Z */ 2699 case C1_SCI: /* ESC Z */
3178 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2700 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3179 break; /* steal obsolete ESC [ c */ 2701 break; /* steal obsolete ESC [ c */
3180 2702
3181 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2703 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
3182 case C1_CSI: /* ESC [ */ 2704 case C1_CSI: /* ESC [ */
3183 process_csi_seq (); 2705 process_csi_seq ();
3184 break; 2706 break;
3185 2707
3186 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2708 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
3187 case C1_OSC: /* ESC ] */ 2709 case C1_OSC: /* ESC ] */
3188 process_osc_seq (); 2710 process_osc_seq ();
3189 break; 2711 break;
3190 2712
3191 /* 8.3.106: RESET TO INITIAL STATE */ 2713 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
3192 case 'c': 2714 case 'c':
3193 mbstate.reset (); 2715 mbstate.reset ();
3194 scr_poweron (); 2716 scr_poweron ();
3195 scrollbar_show (1); 2717 scrollBar.show (1);
3196 break; 2718 break;
3197 2719
3198 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2720 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
3199 case 'n': 2721 case 'n':
3200 scr_charset_choose (2); 2722 scr_charset_choose (2);
… …
3245rxvt_term::process_csi_seq () 2767rxvt_term::process_csi_seq ()
3246{ 2768{
3247 unicode_t ch, priv, i; 2769 unicode_t ch, priv, i;
3248 unsigned int nargs, p; 2770 unsigned int nargs, p;
3249 int n, ndef; 2771 int n, ndef;
3250 int arg[ESC_ARGS]; 2772 int arg[ESC_ARGS] = { };
3251 2773
3252 for (nargs = ESC_ARGS; nargs > 0;) 2774 nargs = 0;
3253 arg[--nargs] = 0;
3254 2775
3255 priv = 0; 2776 priv = 0;
3256 ch = cmd_getc (); 2777 ch = cmd_getc ();
3257 if (ch >= '<' && ch <= '?') 2778 if ((ch >= '<' && ch <= '?') || ch == '!')
2779 {
3258 { /* '<' '=' '>' '?' */ 2780 /* '<' '=' '>' '?' '!' */
3259 priv = ch; 2781 priv = ch;
3260 ch = cmd_getc (); 2782 ch = cmd_getc ();
3261 } 2783 }
3262 2784
3263 /* read any numerical arguments */ 2785 /* read any numerical arguments */
… …
3292 ndef = get_byte_array_bit (csi_defaults, i); 2814 ndef = get_byte_array_bit (csi_defaults, i);
3293 for (p = 0; p < nargs; p++) 2815 for (p = 0; p < nargs; p++)
3294 if (arg[p] == -1) 2816 if (arg[p] == -1)
3295 arg[p] = ndef; 2817 arg[p] = ndef;
3296 2818
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 /* 2819 /*
3305 * private mode handling 2820 * private mode handling
3306 */ 2821 */
3307 if (priv) 2822 if (priv)
3308 { 2823 {
3309 switch (priv) 2824 switch (priv)
3310 { 2825 {
3311 case '>': 2826 case '>':
3312 if (ch == CSI_DA) /* secondary device attributes */ 2827 if (ch == CSI_DA) /* secondary device attributes */
3313 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 2828 {
2829 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2830 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2831 //
2832 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2833 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2834 // versions.
2835 //
2836 tt_printf ("\033[>%d;95;0c", 'U');
2837 }
3314 break; 2838 break;
2839
3315 case '?': 2840 case '?':
3316 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2841 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3317 process_terminal_mode (ch, priv, nargs, arg); 2842 process_terminal_mode (ch, priv, nargs, arg);
3318 break; 2843 break;
2844
2845 case '!':
2846 if (ch == CSI_70)
2847 {
2848 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2849 scr_soft_reset ();
2850
2851 static const int pm_h[] = { 7, 25 };
2852 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 };
2853
2854 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h);
2855 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l);
3319 } 2856 }
2857 break;
2858 }
2859
3320 return; 2860 return;
3321 } 2861 }
3322 2862
3323 switch (ch) 2863 switch (ch)
3324 { 2864 {
… …
3444 break; 2984 break;
3445 case 6: /* CPR requested */ 2985 case 6: /* CPR requested */
3446 scr_report_position (); 2986 scr_report_position ();
3447 break; 2987 break;
3448 case 7: /* unofficial extension */ 2988 case 7: /* unofficial extension */
3449 if (OPTION (Opt_insecure)) 2989 if (option (Opt_insecure))
3450 tt_printf ("%-.250s\012", rs[Rs_display_name]); 2990 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3451 break; 2991 break;
3452 case 8: /* unofficial extension */ 2992 case 8: /* unofficial extension */
3453 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2993 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3454 break; 2994 break;
… …
3521 break; 3061 break;
3522 case CSI_75: 3062 case CSI_75:
3523 scr_cursor (RESTORE); 3063 scr_cursor (RESTORE);
3524 break; 3064 break;
3525 3065
3526#if ENABLE_FRILLS 3066#if !ENABLE_MINIMAL
3527 case CSI_74: 3067 case CSI_74:
3528 process_window_ops (arg, nargs); 3068 process_window_ops (arg, nargs);
3529 break; 3069 break;
3530#endif 3070#endif
3531 3071
… …
3538 break; 3078 break;
3539 } 3079 }
3540} 3080}
3541/*}}} */ 3081/*}}} */
3542 3082
3543#if ENABLE_FRILLS 3083#if !ENABLE_MINIMAL
3544/* ARGSUSED */ 3084/* ARGSUSED */
3545void 3085void
3546rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3086rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3547{ 3087{
3548 int x, y; 3088 int x, y;
3549 XWindowAttributes wattr; 3089 XWindowAttributes wattr;
3550 Window wdummy; 3090 Window wdummy;
3551 dDisp; 3091
3092 dLocal (Display *, dpy);
3552 3093
3553 if (nargs == 0) 3094 if (nargs == 0)
3554 return; 3095 return;
3555 3096
3556 switch (args[0]) 3097 switch (args[0])
3557 { 3098 {
3558 /* 3099 /*
3559 * commands 3100 * commands
3560 */ 3101 */
3561 case 1: /* deiconify window */ 3102 case 1: /* deiconify window */
3562 XMapWindow (disp, parent[0]); 3103 XMapWindow (dpy, parent[0]);
3563 break; 3104 break;
3564 case 2: /* iconify window */ 3105 case 2: /* iconify window */
3565 XIconifyWindow (disp, parent[0], display->screen); 3106 XIconifyWindow (dpy, parent[0], display->screen);
3566 break; 3107 break;
3567 case 3: /* set position (pixels) */ 3108 case 3: /* set position (pixels) */
3568 XMoveWindow (disp, parent[0], args[1], args[2]); 3109 XMoveWindow (dpy, parent[0], args[1], args[2]);
3569 break; 3110 break;
3570 case 4: /* set size (pixels) */ 3111 case 4: /* set size (pixels) */
3571 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3112 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3572 break; 3113 break;
3573 case 5: /* raise window */ 3114 case 5: /* raise window */
3574 XRaiseWindow (disp, parent[0]); 3115 XRaiseWindow (dpy, parent[0]);
3575 break; 3116 break;
3576 case 6: /* lower window */ 3117 case 6: /* lower window */
3577 XLowerWindow (disp, parent[0]); 3118 XLowerWindow (dpy, parent[0]);
3578 break; 3119 break;
3579 case 7: /* refresh window */ 3120 case 7: /* refresh window */
3580 scr_touch (true); 3121 scr_touch (true);
3581 break; 3122 break;
3582 case 8: /* set size (chars) */ 3123 case 8: /* set size (chars) */
… …
3589 if (args[0] >= 24) /* set height (chars) */ 3130 if (args[0] >= 24) /* set height (chars) */
3590 set_widthheight ((unsigned int)width, 3131 set_widthheight ((unsigned int)width,
3591 (unsigned int) (args[1] * fheight)); 3132 (unsigned int) (args[1] * fheight));
3592 break; 3133 break;
3593 3134
3594
3595 /* 3135 /*
3596 * reports - some output format copied from XTerm 3136 * reports - some output format copied from XTerm
3597 */ 3137 */
3598 case 11: /* report window state */ 3138 case 11: /* report window state */
3599 XGetWindowAttributes (disp, parent[0], &wattr); 3139 XGetWindowAttributes (dpy, parent[0], &wattr);
3600 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3140 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3601 break; 3141 break;
3602 case 13: /* report window position */ 3142 case 13: /* report window position */
3603 XGetWindowAttributes (disp, parent[0], &wattr); 3143 XGetWindowAttributes (dpy, parent[0], &wattr);
3604 XTranslateCoordinates (disp, parent[0], wattr.root, 3144 XTranslateCoordinates (dpy, parent[0], wattr.root,
3605 -wattr.border_width, -wattr.border_width, 3145 -wattr.border_width, -wattr.border_width,
3606 &x, &y, &wdummy); 3146 &x, &y, &wdummy);
3607 tt_printf ("\033[3;%d;%dt", x, y); 3147 tt_printf ("\033[3;%d;%dt", x, y);
3608 break; 3148 break;
3609 case 14: /* report window size (pixels) */ 3149 case 14: /* report window size (pixels) */
3610 XGetWindowAttributes (disp, parent[0], &wattr); 3150 XGetWindowAttributes (dpy, parent[0], &wattr);
3611 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3151 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3612 break; 3152 break;
3613 case 18: /* report text area size (chars) */ 3153 case 18: /* report text area size (chars) */
3614 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3154 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3615 break; 3155 break;
… …
3617 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3157 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3618 break; 3158 break;
3619 case 20: /* report icon label */ 3159 case 20: /* report icon label */
3620 { 3160 {
3621 char *s; 3161 char *s;
3622 XGetIconName (disp, parent[0], &s); 3162 XGetIconName (dpy, parent[0], &s);
3623 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3163 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3624 XFree (s); 3164 XFree (s);
3625 } 3165 }
3626 break; 3166 break;
3627 case 21: /* report window title */ 3167 case 21: /* report window title */
3628 { 3168 {
3629 char *s; 3169 char *s;
3630 XFetchName (disp, parent[0], &s); 3170 XFetchName (dpy, parent[0], &s);
3631 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3171 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3632 XFree (s); 3172 XFree (s);
3633 } 3173 }
3634 break; 3174 break;
3635 } 3175 }
3636} 3176}
… …
3663 seen_esc = true; 3203 seen_esc = true;
3664 continue; 3204 continue;
3665 } 3205 }
3666 else if (ch == C0_BEL || ch == CHAR_ST) 3206 else if (ch == C0_BEL || ch == CHAR_ST)
3667 break; 3207 break;
3208 else if (ch == C0_SYN)
3209 ch = cmd_get8 ();
3668 else if (ch < 0x20) 3210 else if (ch < 0x20)
3669 return NULL; /* other control character - exit */ 3211 return NULL; /* other control character - exit */
3670 3212
3671 seen_esc = false; 3213 seen_esc = false;
3672 3214
3673 if (n >= STRING_MAX - 1) 3215 if (n >= STRING_MAX - 1)
3674 // stop at some sane length 3216 // stop at some sane length
3675 return NULL; 3217 return NULL;
3676 3218
3677 if (ch == C0_SYN)
3678 string[n++] = cmd_get8 ();
3679 else
3680 string[n++] = ch; 3219 string[n++] = ch;
3681 } 3220 }
3682 3221
3683 string[n++] = '\0'; 3222 string[n++] = '\0';
3684 3223
3685 ends_how = (ch == 0x5c ? C0_ESC : ch); 3224 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3736void 3275void
3737rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3276rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3738{ 3277{
3739 if (str[0] == '?' && !str[1]) 3278 if (str[0] == '?' && !str[1])
3740 { 3279 {
3741 unsigned short r, g, b; 3280 rgba c;
3742 pix_colors_focused[color].get (display, r, g, b); 3281 pix_colors_focused[color].get (c);
3282
3283#if XFT
3284 if (c.a != rgba::MAX_CC)
3285 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3286 else
3287#endif
3743 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3288 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3744 } 3289 }
3745 else 3290 else
3746 set_window_color (color, str); 3291 set_window_color (color, str);
3747} 3292}
3748 3293
3749/* 3294/*
3750 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3295 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3751 */ 3296 */
3752void 3297void
3753rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3298rxvt_term::process_xterm_seq (int op, char *str, char resp)
3754{ 3299{
3755 int color; 3300 int color;
3756 char *buf, *name; 3301 char *buf, *name;
3757 bool query = str[0] == '?' && !str[1]; 3302 bool query = str[0] == '?' && !str[1];
3758 int saveop = op; 3303 int saveop = op;
3759 dDisp; 3304
3305 dLocal (Display *, dpy);
3760 3306
3761 assert (str != NULL); 3307 assert (str != NULL);
3308
3309 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3310 return;
3311
3762 switch (op) 3312 switch (op)
3763 { 3313 {
3764 case XTerm_name: 3314 case XTerm_name:
3765 set_title (str); 3315 set_title (str);
3766 /* FALLTHROUGH */ 3316 /* FALLTHROUGH */
… …
3780 unsigned long bytes_after; 3330 unsigned long bytes_after;
3781 unsigned char *value = 0; 3331 unsigned char *value = 0;
3782 const char *str = ""; 3332 const char *str = "";
3783 3333
3784 if (prop 3334 if (prop
3785 && XGetWindowProperty (disp, parent[0], 3335 && XGetWindowProperty (dpy, parent[0],
3786 prop, 0, 1<<16, 0, AnyPropertyType, 3336 prop, 0, 1<<16, 0, AnyPropertyType,
3787 &actual_type, &actual_format, 3337 &actual_type, &actual_format,
3788 &nitems, &bytes_after, &value) == Success 3338 &nitems, &bytes_after, &value) == Success
3789 && actual_type != None 3339 && actual_type != None
3790 && actual_format == 8) 3340 && actual_format == 8)
3791 str = (const char *)(value); 3341 str = (const char *)(value);
3792 3342
3793 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3343 tt_printf ("\033]%d;%s%c", op, str, resp);
3794 3344
3795 XFree (value); 3345 XFree (value);
3796 } 3346 }
3797 else 3347 else
3798 { 3348 {
3799 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3349 char *eq = strchr (str, '=');
3800 3350
3801 if (eq) 3351 if (eq)
3802 { 3352 {
3803 *eq = 0; 3353 *eq = 0;
3804 set_utf8_property (display->atom (str), eq + 1); 3354 set_utf8_property (display->atom (str), eq + 1);
3805 } 3355 }
3806 else 3356 else
3807 XDeleteProperty (disp, parent[0], 3357 XDeleteProperty (dpy, parent[0],
3808 display->atom (str)); 3358 display->atom (str));
3809 } 3359 }
3810 break; 3360 break;
3811 3361
3812 case XTerm_Color: 3362 case XTerm_Color:
… …
3822 break; 3372 break;
3823 3373
3824 if ((buf = strchr (name, ';')) != NULL) 3374 if ((buf = strchr (name, ';')) != NULL)
3825 *buf++ = '\0'; 3375 *buf++ = '\0';
3826 3376
3827 if (name[0] == '?' && !name[1]) 3377 process_color_seq (op, color, name, resp);
3828 {
3829 unsigned short r, g, b;
3830 pix_colors_focused[color].get (display, r, g, b);
3831 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3832 }
3833 else
3834 set_window_color (color, name);
3835 } 3378 }
3836 break; 3379 break;
3380 case Rxvt_restoreFG:
3837 case XTerm_Color00: 3381 case XTerm_Color00:
3838 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3382 process_color_seq (op, Color_fg, str, resp);
3839 break; 3383 break;
3384 case Rxvt_restoreBG:
3840 case XTerm_Color01: 3385 case XTerm_Color01:
3841 process_color_seq (XTerm_Color01, Color_bg, str, resp); 3386 process_color_seq (op, Color_bg, str, resp);
3842 break; 3387 break;
3843#ifndef NO_CURSORCOLOR 3388#ifndef NO_CURSORCOLOR
3844 case XTerm_Color_cursor: 3389 case XTerm_Color_cursor:
3845 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3390 process_color_seq (op, Color_cursor, str, resp);
3846 break; 3391 break;
3847#endif 3392#endif
3848 case XTerm_Color_pointer_fg: 3393 case XTerm_Color_pointer_fg:
3849 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3394 process_color_seq (op, Color_pointer_fg, str, resp);
3850 break; 3395 break;
3851 case XTerm_Color_pointer_bg: 3396 case XTerm_Color_pointer_bg:
3852 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3397 process_color_seq (op, Color_pointer_bg, str, resp);
3853 break; 3398 break;
3399#ifdef OPTION_HC
3400 case XTerm_Color_HC:
3401 process_color_seq (op, Color_HC, str, resp);
3402 break;
3403#endif
3854#ifndef NO_BOLD_UNDERLINE_REVERSE 3404#ifndef NO_BOLD_UNDERLINE_REVERSE
3855 case XTerm_Color_RV:
3856 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3857 break;
3858 case Rxvt_Color_BD: 3405 case Rxvt_Color_BD:
3859 case URxvt_Color_BD: 3406 case URxvt_Color_BD:
3860 process_color_seq (op, Color_BD, str, resp); 3407 process_color_seq (op, Color_BD, str, resp);
3861 break; 3408 break;
3862 case Rxvt_Color_UL: 3409 case Rxvt_Color_UL:
3863 case URxvt_Color_UL: 3410 case URxvt_Color_UL:
3864 process_color_seq (op, Color_UL, str, resp); 3411 process_color_seq (op, Color_UL, str, resp);
3865 break; 3412 break;
3866 case URxvt_Color_IT: 3413 case URxvt_Color_IT:
3867 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3414 process_color_seq (op, Color_IT, str, resp);
3868 break; 3415 break;
3869#endif 3416#endif
3870#if TRANSPARENT && TINTING 3417 case URxvt_Color_border:
3418 process_color_seq (op, Color_border, str, resp);
3419 break;
3420#if ENABLE_TRANSPARENCY
3871 case URxvt_Color_tint: 3421 case URxvt_Color_tint:
3872 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3422 process_color_seq (op, Color_tint, str, resp);
3873 check_our_parents (); 3423 {
3874 if (am_transparent) 3424 bool changed = false;
3875 want_full_refresh = want_refresh = 1;
3876 break;
3877#endif
3878 3425
3426 if (ISSET_PIXCOLOR (Color_tint))
3427 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3428 else
3429 changed = bgPixmap.unset_tint ();
3430
3431 if (changed)
3432 update_background ();
3433 }
3434
3435 break;
3436#endif
3437
3438#if BG_IMAGE_FROM_FILE
3879 case Rxvt_Pixmap: 3439 case Rxvt_Pixmap:
3880 { 3440 if (!strcmp (str, "?"))
3881 if (*str != ';')
3882 { 3441 {
3883#if XPM_BACKGROUND 3442 char str[256];
3884 scale_pixmap (""); /* reset to default scaling */ 3443
3885 set_bgPixmap (str); /* change pixmap */ 3444 sprintf (str, "[%dx%d+%d+%d]",
3886 scr_touch (true); 3445 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3887#endif 3446 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3447 process_xterm_seq (XTerm_title, str, CHAR_ST);
3888 } 3448 }
3889 3449 else
3450 {
3890 int changed = 0; 3451 int changed = 0;
3891 3452
3892 while ((str = strchr (str, ';')) != NULL) 3453 if (*str != ';')
3893 { 3454 {
3455 /* reset to default scaling :*/
3456 bgPixmap.unset_geometry ();
3457 if (bgPixmap.set_file (str)) /* change pixmap */
3458 changed++;
3459 str = strchr (str, ';');
3460 if (str == NULL)
3461 bgPixmap.set_defaultGeometry ();
3462 }
3463
3464 while (str)
3465 {
3894 str++; 3466 str++;
3895#if XPM_BACKGROUND 3467 if (bgPixmap.set_geometry (str))
3896 changed += scale_pixmap (str); 3468 changed++;
3897#endif 3469 str = strchr (str, ';');
3898 } 3470 }
3899 3471
3900 if (changed) 3472 if (changed)
3901 { 3473 update_background ();
3902#ifdef XPM_BACKGROUND
3903 resize_pixmap ();
3904 scr_touch (true);
3905#endif
3906 } 3474 }
3907 }
3908 break; 3475 break;
3909 3476#endif
3910 case Rxvt_restoreFG:
3911 set_window_color (Color_fg, str);
3912 break;
3913 case Rxvt_restoreBG:
3914 set_window_color (Color_bg, str);
3915 break;
3916 3477
3917 case XTerm_logfile: 3478 case XTerm_logfile:
3918 // TODO, when secure mode? 3479 // TODO, when secure mode?
3919 break; 3480 break;
3920 3481
… …
3938 case URxvt_italicFont: 3499 case URxvt_italicFont:
3939 case URxvt_boldItalicFont: 3500 case URxvt_boldItalicFont:
3940#endif 3501#endif
3941 if (query) 3502 if (query)
3942 tt_printf ("\33]%d;%-.250s%c", saveop, 3503 tt_printf ("\33]%d;%-.250s%c", saveop,
3943 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3504 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3944 ? fontset[op - URxvt_font]->fontdesc : "", 3505 ? fontset[op - URxvt_font]->fontdesc : "",
3945 resp); 3506 resp);
3946 else 3507 else
3947 { 3508 {
3948 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3509 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3951 allocated.push_back ((void *)res); 3512 allocated.push_back ((void *)res);
3952 set_fonts (); 3513 set_fonts ();
3953 } 3514 }
3954 break; 3515 break;
3955 3516
3956#if ENABLE_FRILLS 3517 case URxvt_version:
3518 if (query)
3519 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3520 op,
3521 rs[Rs_name], VERSION[0], VERSION[2],
3522 resp);
3523 break;
3524
3525#if !ENABLE_MINIMAL
3957 case URxvt_locale: 3526 case URxvt_locale:
3958 if (query) 3527 if (query)
3959 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3528 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3960 else 3529 else
3961 { 3530 {
3962 set_locale (str); 3531 set_locale (str);
3963 pty->set_utf8_mode (enc_utf8); 3532 pty->set_utf8_mode (enc_utf8);
3964 init_xlocale (); 3533 init_xlocale ();
… …
3979 break; 3548 break;
3980#endif 3549#endif
3981 3550
3982#if ENABLE_PERL 3551#if ENABLE_PERL
3983 case URxvt_perl: 3552 case URxvt_perl:
3984 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 3553 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3985 ; // no responses yet
3986 break; 3554 break;
3987#endif 3555#endif
3988 } 3556 }
3989} 3557}
3990/*----------------------------------------------------------------------*/ 3558/*----------------------------------------------------------------------*/
… …
4013 { 3581 {
4014 if (mode == 'r') 3582 if (mode == 'r')
4015 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3583 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
4016 else 3584 else
4017 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3585 state = (mode == 't') ? ! (priv_modes & bit) : mode;
4018 PrivMode (state, bit); 3586 set_privmode (bit, state);
4019 } 3587 }
4020 3588
4021 return state; 3589 return state;
4022} 3590}
4023 3591
… …
4027{ 3595{
4028 unsigned int i, j; 3596 unsigned int i, j;
4029 int state; 3597 int state;
4030 3598
4031 static const struct 3599 static const struct
4032 { 3600 {
4033 const int argval; 3601 const int argval;
4034 const unsigned long bit; 3602 const unsigned long bit;
4035 }
4036
4037 argtopriv[] = { 3603 } argtopriv[] = {
4038 { 1, PrivMode_aplCUR }, 3604 { 1, PrivMode_aplCUR }, // DECCKM
4039 { 2, PrivMode_vt52 }, 3605 { 2, PrivMode_vt52 },
4040 { 3, PrivMode_132 }, 3606 { 3, PrivMode_132 }, // DECCOLM
4041 { 4, PrivMode_smoothScroll }, 3607 { 4, PrivMode_smoothScroll }, // DECSCLM
4042 { 5, PrivMode_rVideo }, 3608 { 5, PrivMode_rVideo }, // DECSCNM
4043 { 6, PrivMode_relOrigin }, 3609 { 6, PrivMode_relOrigin }, // DECOM
4044 { 7, PrivMode_Autowrap }, 3610 { 7, PrivMode_Autowrap }, // DECAWM
4045 // 8, bi-directional support mode 3611 // 8, auto-repeat keys // DECARM
4046 { 9, PrivMode_MouseX10 }, 3612 { 9, PrivMode_MouseX10 },
4047 // 18, 19 printing-related 3613 // 18 end FF to printer after print screen
3614 // 19 Print screen prints full screen/scorll region
4048 { 25, PrivMode_VisibleCursor }, 3615 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
4049#ifdef scrollBar_esc 3616#ifdef scrollBar_esc
4050 { scrollBar_esc, PrivMode_scrollBar }, 3617 { scrollBar_esc, PrivMode_scrollBar },
4051#endif 3618#endif
4052 { 35, PrivMode_ShiftKeys }, // rxvt extension 3619 { 35, PrivMode_ShiftKeys }, // rxvt extension
3620 // 38, tektronix mode // DECTEK
4053 { 40, PrivMode_132OK }, 3621 { 40, PrivMode_132OK },
4054 // 41 xterm more fixes NYI 3622 // 41 xterm more fixes NYI
4055 // 45 margin bell NYI 3623 // 45 margin bell NYI
4056 // 46 start logging 3624 // 46 start logging
4057 { 47, PrivMode_Screen }, 3625 { 47, PrivMode_Screen },
4058 { 66, PrivMode_aplKP }, 3626 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
4059#ifndef NO_BACKSPACE_KEY 3627#ifndef NO_BACKSPACE_KEY
4060 { 67, PrivMode_BackSpace }, 3628 { 67, PrivMode_BackSpace }, // DECBKM
4061#endif 3629#endif
4062 { 1000, PrivMode_MouseX11 }, 3630 { 1000, PrivMode_MouseX11 },
4063 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3631 { 1002, PrivMode_MouseBtnEvent },
4064 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3632 { 1003, PrivMode_MouseAnyEvent },
4065 // 1003 Use All Motion Mouse Tracking. NYI, TODO
4066 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3633 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4067 { 1011, PrivMode_Keypress }, // rxvt extension 3634 { 1011, PrivMode_Keypress }, // rxvt extension
4068 // 1035 enable modifiers for alt, numlock NYI 3635 // 1035 enable modifiers for alt, numlock NYI
4069 // 1036 send ESC for meta keys NYI 3636 // 1036 send ESC for meta keys NYI
4070 // 1037 send DEL for keypad delete NYI 3637 // 1037 send DEL for keypad delete NYI
4071 { 1047, PrivMode_Screen }, 3638 { 1047, PrivMode_Screen },
4072 // 1048 save and restore cursor 3639 // 1048 save and restore cursor
4073 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3640 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
4074 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3641 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3642 { 2004, PrivMode_BracketPaste },
4075 }; 3643 };
4076 3644
4077 if (nargs == 0) 3645 if (nargs == 0)
4078 return; 3646 return;
4079 3647
… …
4104 3672
4105 scr_touch (true); 3673 scr_touch (true);
4106 break; 3674 break;
4107#endif 3675#endif
4108 case 1048: /* alternative cursor save */ 3676 case 1048: /* alternative cursor save */
4109 case 1049:
4110 if (OPTION (Opt_secondaryScreen)) 3677 if (option (Opt_secondaryScreen))
4111 if (mode == 0) 3678 if (mode == 0)
4112 scr_cursor (RESTORE); 3679 scr_cursor (RESTORE);
4113 else if (mode == 1) 3680 else if (mode == 1)
4114 scr_cursor (SAVE); 3681 scr_cursor (SAVE);
4115 break; 3682 break;
… …
4123 case 2: /* VT52 mode */ 3690 case 2: /* VT52 mode */
4124 /* oddball mode. should be set regardless of set/reset 3691 /* oddball mode. should be set regardless of set/reset
4125 * parameter. Return from VT52 mode with an ESC < from 3692 * parameter. Return from VT52 mode with an ESC < from
4126 * within VT52 mode 3693 * within VT52 mode
4127 */ 3694 */
4128 PrivMode (1, PrivMode_vt52); 3695 set_privmode (PrivMode_vt52, 1);
4129 break; 3696 break;
4130 case 3: /* 80/132 */ 3697 case 3: /* 80/132 */
4131 if (priv_modes & PrivMode_132OK) 3698 if (priv_modes & PrivMode_132OK)
4132 set_widthheight (((state ? 132 : 80) * fwidth), height); 3699 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
4133 break; 3700 break;
4134 case 4: /* smooth scrolling */ 3701 case 4: /* smooth scrolling */
4135 set_option (Opt_jumpScroll, !state); 3702 set_option (Opt_jumpScroll, !state);
4136 break; 3703 break;
4137 case 5: /* reverse video */ 3704 case 5: /* reverse video */
… …
4144 scr_autowrap (state); 3711 scr_autowrap (state);
4145 break; 3712 break;
4146 /* case 8: - auto repeat, can't do on a per window basis */ 3713 /* case 8: - auto repeat, can't do on a per window basis */
4147 case 9: /* X10 mouse reporting */ 3714 case 9: /* X10 mouse reporting */
4148 if (state) /* orthogonal */ 3715 if (state) /* orthogonal */
4149 priv_modes &= ~PrivMode_MouseX11; 3716 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4150 break; 3717 break;
4151#ifdef scrollBar_esc 3718#ifdef scrollBar_esc
4152 case scrollBar_esc: 3719 case scrollBar_esc:
4153 if (scrollbar_mapping (state)) 3720 if (scrollBar.map (state))
4154 { 3721 {
4155 resize_all_windows (0, 0, 0); 3722 resize_all_windows (0, 0, 0);
4156 scr_touch (true); 3723 scr_touch (true);
4157 } 3724 }
4158 break; 3725 break;
… …
4167 break; 3734 break;
4168 /* case 66: - application key pad */ 3735 /* case 66: - application key pad */
4169 /* case 67: - backspace key */ 3736 /* case 67: - backspace key */
4170 case 1000: /* X11 mouse reporting */ 3737 case 1000: /* X11 mouse reporting */
4171 if (state) /* orthogonal */ 3738 if (state) /* orthogonal */
4172 priv_modes &= ~PrivMode_MouseX10; 3739 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4173 break; 3740 break;
4174#if 0
4175 case 1001: 3741 case 1002:
4176 break; /* X11 mouse highlighting */ 3742 case 1003:
4177#endif 3743 if (state)
3744 {
3745 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3746 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3747 vt_emask_mouse = PointerMotionMask;
3748 }
3749 else
3750 vt_emask_mouse = NoEventMask;
3751
3752 vt_select_input ();
3753 break;
4178 case 1010: /* scroll to bottom on TTY output inhibit */ 3754 case 1010: /* scroll to bottom on TTY output inhibit */
4179 set_option (Opt_scrollTtyOutput, !state); 3755 set_option (Opt_scrollTtyOutput, !state);
4180 break; 3756 break;
4181 case 1011: /* scroll to bottom on key press */ 3757 case 1011: /* scroll to bottom on key press */
4182 set_option (Opt_scrollTtyKeypress, state); 3758 set_option (Opt_scrollTtyKeypress, state);
4183 break; 3759 break;
4184 case 1047: /* secondary screen w/ clearing last */ 3760 case 1047: /* secondary screen w/ clearing last */
4185 if (OPTION (Opt_secondaryScreen)) 3761 if (option (Opt_secondaryScreen))
4186 if (current_screen != PRIMARY) 3762 if (!state)
4187 scr_erase_screen (2); 3763 scr_erase_screen (2);
3764
4188 scr_change_screen (state); 3765 scr_change_screen (state);
4189 break; 3766 break;
4190 case 1049: /* secondary screen w/ clearing first */ 3767 case 1049: /* secondary screen w/ clearing first */
3768 if (option (Opt_secondaryScreen))
3769 if (state)
3770 scr_cursor (SAVE);
3771
4191 scr_change_screen (state); 3772 scr_change_screen (state);
3773
4192 if (OPTION (Opt_secondaryScreen)) 3774 if (option (Opt_secondaryScreen))
4193 if (current_screen != PRIMARY) 3775 if (state)
4194 scr_erase_screen (2); 3776 scr_erase_screen (2);
3777 else
3778 scr_cursor (RESTORE);
4195 break; 3779 break;
4196 default: 3780 default:
4197 break; 3781 break;
4198 } 3782 }
4199 } 3783 }
… …
4325 scr_color (Color_bg, Color_bg); 3909 scr_color (Color_bg, Color_bg);
4326 break; 3910 break;
4327 3911
4328 //case 50: // not variable spacing 3912 //case 50: // not variable spacing
4329 3913
4330#if ENABLE_FRILLS 3914#if !ENABLE_MINIMAL
4331 case 90: 3915 case 90:
4332 case 91: /* set bright fg color */ 3916 case 91: /* set bright fg color */
4333 case 92: 3917 case 92:
4334 case 93: 3918 case 93:
4335 case 94: 3919 case 94:
… …
4359rxvt_term::process_graphics () 3943rxvt_term::process_graphics ()
4360{ 3944{
4361 unicode_t ch, cmd = cmd_getc (); 3945 unicode_t ch, cmd = cmd_getc ();
4362 3946
4363 if (cmd == 'Q') 3947 if (cmd == 'Q')
3948 {
4364 { /* query graphics */ 3949 /* query graphics */
4365 tt_printf ("\033G0\012"); /* no graphics */ 3950 tt_printf ("\033G0\012"); /* no graphics */
4366 return; 3951 return;
4367 } 3952 }
4368 /* swallow other graphics sequences until terminating ':' */ 3953 /* swallow other graphics sequences until terminating ':' */
4369 do 3954 do
… …
4419 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4004 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4420 4005
4421 memcpy (v_buffer + v_buflen, data, len); 4006 memcpy (v_buffer + v_buflen, data, len);
4422 v_buflen += len; 4007 v_buflen += len;
4423 4008
4424 pty_ev.set (EVENT_READ | EVENT_WRITE); 4009 pty_ev.set (ev::READ | ev::WRITE);
4425} 4010}
4426 4011
4427void rxvt_term::pty_write () 4012void rxvt_term::pty_write ()
4428{ 4013{
4429 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4014 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4434 4019
4435 if (v_buflen == 0) 4020 if (v_buflen == 0)
4436 { 4021 {
4437 free (v_buffer); 4022 free (v_buffer);
4438 v_buffer = 0; 4023 v_buffer = 0;
4439 v_buflen = 0;
4440 4024
4441 pty_ev.set (EVENT_READ); 4025 pty_ev.set (ev::READ);
4442 return; 4026 return;
4443 } 4027 }
4444 4028
4445 memmove (v_buffer, v_buffer + written, v_buflen); 4029 memmove (v_buffer, v_buffer + written, v_buflen);
4446 } 4030 }
4447 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4031 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4448 pty_ev.set (EVENT_READ); 4032 pty_ev.set (ev::READ);
4449} 4033}
4450 4034
4451/*----------------------- end-of-file (C source) -----------------------*/ 4035/*----------------------- end-of-file (C source) -----------------------*/
4452 4036

Diff Legend

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