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

Diff Legend

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