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.439 by sf-exg, Wed Feb 10 16:05:42 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 (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 wether 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 {
… …
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 *
… …
318 meta = ev.state & ModMetaMask; 425 meta = ev.state & ModMetaMask;
319 426
320 if (numlock_state || (ev.state & ModNumLockMask)) 427 if (numlock_state || (ev.state & ModNumLockMask))
321 { 428 {
322 numlock_state = (ev.state & ModNumLockMask); 429 numlock_state = (ev.state & ModNumLockMask);
323 PrivMode ((!numlock_state), PrivMode_aplKP); 430 set_privmode (PrivMode_aplKP, !numlock_state);
324 } 431 }
325 432
326 kbuf[0] = 0; 433 kbuf[0] = 0;
327 434
328#ifdef USE_XIM 435#ifdef USE_XIM
… …
404#ifdef PAGING_CONTEXT_LINES 511#ifdef PAGING_CONTEXT_LINES
405 lnsppg = nrow - PAGING_CONTEXT_LINES; 512 lnsppg = nrow - PAGING_CONTEXT_LINES;
406#else 513#else
407 lnsppg = nrow * 4 / 5; 514 lnsppg = nrow * 4 / 5;
408#endif 515#endif
516 max_it (lnsppg, 1);
517
409 if (keysym == XK_Prior) 518 if (keysym == XK_Prior)
410 { 519 {
411 scr_page (UP, lnsppg); 520 scr_page (UP, lnsppg);
412 return; 521 return;
413 } 522 }
… …
461 { 570 {
462 switch (keysym) 571 switch (keysym)
463 { 572 {
464 /* normal XTerm key bindings */ 573 /* normal XTerm key bindings */
465 case XK_Insert: /* Shift+Insert = paste mouse selection */ 574 case XK_Insert: /* Shift+Insert = paste mouse selection */
466 selection_request (ev.time, Sel_Primary); 575 selection_request (ev.time);
467 return; 576 return;
468#if TODO 577#if TODO
469 /* rxvt extras */ 578 /* rxvt extras */
470 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 579 case XK_KP_Add: /* Shift+KP_Add = bigger font */
471 change_font (FONT_UP); 580 change_font (FONT_UP);
… …
478 } 587 }
479 } 588 }
480 589
481#if ENABLE_FRILLS || ISO_14755 590#if ENABLE_FRILLS || ISO_14755
482 // ISO 14755 support 591 // ISO 14755 support
483 if (shft && ctrl) 592 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
484 { 593 {
485 int hv; 594 int hv;
486 595
487 if (iso14755buf & ISO_14755_51 596 if (iso14755buf & ISO_14755_51
488 && (keysym == XK_space || keysym == XK_KP_Space 597 && (keysym == XK_space || keysym == XK_KP_Space
… …
490 { 599 {
491 commit_iso14755 (); 600 commit_iso14755 ();
492 iso14755buf = ISO_14755_51; 601 iso14755buf = ISO_14755_51;
493# if ISO_14755 602# if ISO_14755
494 iso14755_51 (0); 603 iso14755_51 (0);
604# endif
605 return;
606 }
607 else if (keysym == XK_BackSpace)
608 {
609 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
610# if ISO_14755
611 iso14755_51 (iso14755buf & ISO_14755_MASK);
495# endif 612# endif
496 return; 613 return;
497 } 614 }
498 else if ((hv = hex_keyval (ev)) >= 0) 615 else if ((hv = hex_keyval (ev)) >= 0)
499 { 616 {
… …
504# endif 621# endif
505 return; 622 return;
506 } 623 }
507 else 624 else
508 { 625 {
509# if ENABLE_OVERLAY 626# if ISO_14755
510 scr_overlay_off (); 627 scr_overlay_off ();
511# endif 628# endif
512 iso14755buf = 0; 629 iso14755buf = 0;
513 } 630 }
514 } 631 }
632 else if (option (Opt_iso14755) &&
515 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 633 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
516 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 634 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
517 if (!(iso14755buf & ISO_14755_STARTED)) 635 if (!(iso14755buf & ISO_14755_STARTED))
518 { 636 {
519 iso14755buf |= ISO_14755_STARTED; 637 iso14755buf |= ISO_14755_STARTED;
520# if ENABLE_OVERLAY 638# if ISO_14755
521 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 639 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
522 scr_overlay_set (0, 0, "ISO 14755 mode"); 640 scr_overlay_set (0, 0, "ISO 14755 mode");
523# endif 641# endif
524 } 642 }
525#endif 643#endif
526 644
527#ifdef PRINTPIPE 645#ifdef PRINTPIPE
528 if (keysym == XK_Print) 646 if (keysym == XK_Print)
529 { 647 {
530 scr_printscreen (ctrl | shft); 648 scr_printscreen (ctrl | shft);
531 return; 649 return;
532 } 650 }
533#endif 651#endif
534 652
535 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 653 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
536 { 654 {
655 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
656 unsigned int newlen = 1;
657
658 switch (translate_keypad (keysym, kp))
537 { 659 {
660#ifndef NO_BACKSPACE_KEY
661 case XK_BackSpace:
662 if (priv_modes & PrivMode_HaveBackSpace)
663 {
664 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
665 ^ !!ctrl) ? '\b' : '\177';
666 kbuf[1] = '\0';
667 }
668 else
669 strcpy (kbuf, rs[Rs_backspace_key]);
670 break;
671#endif
672#ifndef NO_DELETE_KEY
673 case XK_Delete:
674 strcpy (kbuf, rs[Rs_delete_key]);
675 break;
676#endif
677 case XK_Tab:
678 if (shft)
679 strcpy (kbuf, "\033[Z");
680 else
681 {
682#ifdef CTRL_TAB_MAKES_META
683 if (ctrl)
684 meta = 1;
685#endif
686#ifdef MOD4_TAB_MAKES_META
687 if (ev.state & Mod4Mask)
688 meta = 1;
689#endif
538 newlen = 1; 690 newlen = 0;
539 switch (keysym) 691 }
692 break;
693
694 case XK_Up: /* "\033[A" */
695 case XK_Down: /* "\033[B" */
696 case XK_Right: /* "\033[C" */
697 case XK_Left: /* "\033[D" */
698 strcpy (kbuf, "\033[Z");
699 kbuf[2] = "DACB"[keysym - XK_Left];
700 /* do Shift first */
701 if (shft)
702 kbuf[2] = "dacb"[keysym - XK_Left];
703 else if (ctrl)
704 {
705 kbuf[1] = 'O';
706 kbuf[2] = "dacb"[keysym - XK_Left];
707 }
708 else if (priv_modes & PrivMode_aplCUR)
709 kbuf[1] = 'O';
710 break;
711
712 case XK_KP_Enter:
713 /* allow shift to override */
714 if (kp)
715 {
716 strcpy (kbuf, "\033OM");
717 break;
718 }
719
720 /* FALLTHROUGH */
721
722 case XK_Return:
723 if (priv_modes & PrivMode_LFNL)
724 {
725 kbuf[0] = '\015';
726 kbuf[1] = '\012';
727 kbuf[2] = '\0';
728 }
729 else
730 {
731 kbuf[0] = '\015';
732 kbuf[1] = '\0';
733 }
734 break;
735
736 case XK_KP_F1: /* "\033OP" */
737 case XK_KP_F2: /* "\033OQ" */
738 case XK_KP_F3: /* "\033OR" */
739 case XK_KP_F4: /* "\033OS" */
740 strcpy (kbuf, "\033OP");
741 kbuf[2] += (keysym - XK_KP_F1);
742 break;
743
744 case XK_KP_Multiply: /* "\033Oj" : "*" */
745 case XK_KP_Add: /* "\033Ok" : "+" */
746 case XK_KP_Separator: /* "\033Ol" : "," */
747 case XK_KP_Subtract: /* "\033Om" : "-" */
748 case XK_KP_Decimal: /* "\033On" : "." */
749 case XK_KP_Divide: /* "\033Oo" : "/" */
750 case XK_KP_0: /* "\033Op" : "0" */
751 case XK_KP_1: /* "\033Oq" : "1" */
752 case XK_KP_2: /* "\033Or" : "2" */
753 case XK_KP_3: /* "\033Os" : "3" */
754 case XK_KP_4: /* "\033Ot" : "4" */
755 case XK_KP_5: /* "\033Ou" : "5" */
756 case XK_KP_6: /* "\033Ov" : "6" */
757 case XK_KP_7: /* "\033Ow" : "7" */
758 case XK_KP_8: /* "\033Ox" : "8" */
759 case XK_KP_9: /* "\033Oy" : "9" */
760 /* allow shift to override */
761 if (kp)
762 {
763 strcpy (kbuf, "\033Oj");
764 kbuf[2] += (keysym - XK_KP_Multiply);
765 }
766 else
767 {
768 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
769 kbuf[1] = '\0';
770 }
771 break;
772
773 default:
540 { 774 {
541#ifndef NO_BACKSPACE_KEY 775 int param = map_function_key (keysym);
542 case XK_BackSpace: 776 if (param > 0)
543 if (priv_modes & PrivMode_HaveBackSpace) 777 sprintf (kbuf,"\033[%d~", param);
544 {
545 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
546 ^ !!ctrl) ? '\b' : '\177';
547 kbuf[1] = '\0';
548 }
549 else 778 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; 779 newlen = 0;
825 break;
826 } 780 }
827 781 break;
828 if (newlen)
829 len = strlen (kbuf);
830 } 782 }
783
784 if (newlen)
785 len = strlen (kbuf);
831 786
832 /* 787 /*
833 * Pass meta for all function keys, if 'meta' option set 788 * Pass meta for all function keys, if 'meta' option set
834 */ 789 */
835#ifdef META8_OPTION 790#ifdef META8_OPTION
… …
870 return; 825 return;
871 826
872 if (len <= 0) 827 if (len <= 0)
873 return; /* not mapped */ 828 return; /* not mapped */
874 829
875 if (OPTION (Opt_scrollTtyKeypress)) 830 if (option (Opt_scrollTtyKeypress))
876 if (view_start) 831 if (view_start)
877 { 832 {
878 view_start = 0; 833 view_start = 0;
879 want_refresh = 1; 834 want_refresh = 1;
880 } 835 }
… …
902 { 857 {
903 const char ch = C0_ESC; 858 const char ch = C0_ESC;
904 tt_write (&ch, 1); 859 tt_write (&ch, 1);
905 } 860 }
906 861
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); 862 tt_write (kbuf, (unsigned int)len);
918} 863}
919/*}}} */ 864
865void
866rxvt_term::key_release (XKeyEvent &ev)
867{
868#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
869 KeySym keysym;
870
871 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
872#endif
873
874#if ENABLE_FRILLS || ISO_14755
875 // ISO 14755 support
876 if (iso14755buf)
877 if (iso14755buf & ISO_14755_52)
878 {
879# if ISO_14755
880 scr_overlay_off ();
881# endif
882# if ISO_14755
883 // iso14755 part 5.2 handling: release time
884 // first: controls
885 if ((ev.state & ControlMask)
886 && ((keysym >= 0x40 && keysym <= 0x5f)
887 || (keysym >= 0x61 && keysym <= 0x7f)))
888 {
889 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
890 commit_iso14755 ();
891
892 return;
893 }
894
895 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
896 if (i[0] == keysym)
897 {
898 iso14755buf = ISO_14755_51 | i[1];
899 commit_iso14755 ();
900
901 return;
902 }
903
904 scr_bell ();
905# endif
906 iso14755buf = 0;
907
908 return;
909 }
910 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
911 {
912# if ISO_14755
913 scr_overlay_off ();
914# endif
915 if (iso14755buf & ISO_14755_51)
916 commit_iso14755 ();
917#if ISO_14755
918 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
919 {
920 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
921
922 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
923 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
924 }
925# endif
926 else
927 iso14755buf = 0;
928 }
929#endif
930
931 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
932 return;
933
934#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
935 if (!(ev.state & ControlMask))
936 slip_wheel_ev.stop ();
937 else if (keysym == XK_Control_L || keysym == XK_Control_R)
938 mouse_slip_wheel_speed = 0;
939#endif
940}
920 941
921#if defined (KEYSYM_RESOURCE) 942#if defined (KEYSYM_RESOURCE)
922unsigned int 943unsigned int
923rxvt_term::cmd_write (const char *str, unsigned int count) 944rxvt_term::cmd_write (const char *str, unsigned int count)
924{ 945{
… …
954void 975void
955rxvt_term::flush () 976rxvt_term::flush ()
956{ 977{
957 flush_ev.stop (); 978 flush_ev.stop ();
958 979
959#ifdef TRANSPARENT 980#ifdef HAVE_BG_PIXMAP
960 if (want_full_refresh) 981 if (bgPixmap.check_clearChanged ())
961 { 982 {
962 want_full_refresh = 0; 983// scr_clear (true); This needs to be researched further!
963 scr_clear ();
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 wether 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 workaroudn 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:
1436 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1437 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1438 szHint.width, szHint.height);*/
1493 if (ev.xconfigure.window == parent[0]) 1439 if (ev.xconfigure.window == parent[0])
1494 { 1440 {
1495 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1441 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1496 ; 1442 ;
1497 1443
1498 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1444 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1499 { 1445 {
1500 seen_resize = 1; 1446 seen_resize = 1;
1501 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1447 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1502 } 1448 }
1449 else
1450 {
1451#ifdef HAVE_BG_PIXMAP
1452 if (bgPixmap.window_position_sensitive ())
1453 {
1454 if (mapped)
1455 update_background ();
1456 else
1457 bgPixmap.invalidate ();
1458 }
1459#endif
1460 }
1503 1461
1504 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1462 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 } 1463 }
1511 break; 1464 break;
1512 1465
1513 case PropertyNotify: 1466 case PropertyNotify:
1467 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1514 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1468 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1515 && ev.xproperty.state == PropertyNewValue) 1469 && ev.xproperty.state == PropertyNewValue)
1516 selection_property (ev.xproperty.window, ev.xproperty.atom); 1470 selection_property (ev.xproperty.window, ev.xproperty.atom);
1517 1471
1518 break; 1472 break;
1519 1473
1520 case SelectionClear: 1474 case SelectionClear:
1521 selection_clear (); 1475 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1522 break; 1476 break;
1523 1477
1524 case SelectionNotify: 1478 case SelectionNotify:
1525 if (selection_wait == Sel_normal) 1479 if (selection_wait == Sel_normal)
1526 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1480 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
… …
1529 case SelectionRequest: 1483 case SelectionRequest:
1530 selection_send (ev.xselectionrequest); 1484 selection_send (ev.xselectionrequest);
1531 break; 1485 break;
1532 1486
1533 case MapNotify: 1487 case MapNotify:
1488#ifdef HAVE_BG_PIXMAP
1489 /* This is needed spcifically to fix the case of no window manager or a
1490 * non-reparenting window manager. In those cases we never get first
1491 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1492 * care of multiplicity of ConfigureNotify events arriwing while WM does
1493 * reparenting.
1494 * We should not render background immidiately, as there could be several
1495 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1496 * by scheduling background redraw as soon as we can, but giving a short
1497 * bit of time for ConfigureNotifies to arrive.
1498 * We should render background PRIOR to drawing any text, but AFTER all
1499 * of ConfigureNotifys for the best results.
1500 */
1501 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1502 update_background_ev.start (0.025);
1503#endif
1534 mapped = 1; 1504 mapped = 1;
1535#ifdef TEXT_BLINK 1505#ifdef TEXT_BLINK
1536 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1506 text_blink_ev.start ();
1537#endif 1507#endif
1538 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1508 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1539 break; 1509 break;
1540 1510
1541 case UnmapNotify: 1511 case UnmapNotify:
… …
1543#ifdef TEXT_BLINK 1513#ifdef TEXT_BLINK
1544 text_blink_ev.stop (); 1514 text_blink_ev.stop ();
1545#endif 1515#endif
1546 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1516 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1547 break; 1517 break;
1548
1549#ifdef TRANSPARENT
1550 case ReparentNotify:
1551 rootwin_cb (ev);
1552 break;
1553#endif /* TRANSPARENT */
1554 1518
1555 case GraphicsExpose: 1519 case GraphicsExpose:
1556 case Expose: 1520 case Expose:
1557 if (ev.xany.window == vt) 1521 if (ev.xany.window == vt)
1558 { 1522 {
1559 do 1523 do
1524 {
1560 scr_expose (ev.xexpose.x, ev.xexpose.y, 1525 scr_expose (ev.xexpose.x, ev.xexpose.y,
1561 ev.xexpose.width, ev.xexpose.height, False); 1526 ev.xexpose.width, ev.xexpose.height, False);
1527 }
1562 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1528 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1563 1529
1564 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1530 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1565 1531
1566 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1532 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1533 {
1567 scr_expose (ev.xexpose.x, ev.xexpose.y, 1534 scr_expose (ev.xexpose.x, ev.xexpose.y,
1568 ev.xexpose.width, ev.xexpose.height, False); 1535 ev.xexpose.width, ev.xexpose.height, False);
1536 }
1569 1537
1570 want_refresh = 1; 1538 want_refresh = 1;
1571 } 1539 }
1572 else 1540 else
1573 { 1541 {
1574 XEvent unused_event; 1542 XEvent unused_event;
1575 1543
1576 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1544 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1577 ; 1545 ;
1578 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1546 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1579 ; 1547 ;
1580 1548
1581 if (isScrollbarWindow (ev.xany.window)) 1549 if (scrollBar.state && ev.xany.window == scrollBar.win)
1582 { 1550 {
1583 scrollBar.setIdle (); 1551 scrollBar.state = STATE_IDLE;
1584 scrollbar_show (0); 1552 scrollBar.show (0);
1585 } 1553 }
1586
1587#ifdef TRANSPARENT
1588 if (am_transparent && ev.xany.window == parent[0])
1589 XClearWindow (disp, ev.xany.window);
1590#endif
1591 } 1554 }
1592 break; 1555 break;
1593 1556
1594 case MotionNotify: 1557 case MotionNotify:
1595#ifdef POINTER_BLANK 1558#ifdef POINTER_BLANK
1596 if (hidden_pointer) 1559 if (hidden_pointer)
1597 pointer_unblank (); 1560 pointer_unblank ();
1598#endif 1561#endif
1562 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1563 || priv_modes & PrivMode_MouseAnyEvent)
1564 mouse_report (ev.xbutton);
1599 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1565 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1600 break; 1566 break;
1601 1567
1602 if (ev.xany.window == vt) 1568 if (ev.xany.window == vt)
1603 { 1569 {
1604 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1570 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1605 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1571 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1606 ; // nop 1572 ; // nop
1607 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1573 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1608 { 1574 {
1609 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1575 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1610 ; 1576 ;
1611 1577
1612 XQueryPointer (disp, vt, 1578 XQueryPointer (dpy, vt,
1613 &unused_root, &unused_child, 1579 &unused_root, &unused_child,
1614 &unused_root_x, &unused_root_y, 1580 &unused_root_x, &unused_root_y,
1615 &ev.xbutton.x, &ev.xbutton.y, 1581 &ev.xbutton.x, &ev.xbutton.y,
1616 &ev.xbutton.state); 1582 &ev.xbutton.state);
1617#ifdef MOUSE_THRESHOLD 1583#ifdef MOUSE_THRESHOLD
… …
1637 int dist; 1603 int dist;
1638 1604
1639 /* don't clobber the current delay if we are 1605 /* don't clobber the current delay if we are
1640 * already in the middle of scrolling. 1606 * already in the middle of scrolling.
1641 */ 1607 */
1642 if (!sel_scroll_ev.active) 1608 if (!sel_scroll_ev.is_active ())
1643 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1609 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1644 1610
1645 /* save the event params so we can highlight 1611 /* save the event params so we can highlight
1646 * the selection in the pending-scroll loop 1612 * the selection in the pending-scroll loop
1647 */ 1613 */
1648 selection_save_x = ev.xbutton.x; 1614 selection_save_x = ev.xbutton.x;
… …
1670 else 1636 else
1671 { 1637 {
1672 /* we are within the text window, so we 1638 /* we are within the text window, so we
1673 * shouldn't be scrolling 1639 * shouldn't be scrolling
1674 */ 1640 */
1675 if (sel_scroll_ev.active)
1676 sel_scroll_ev.stop(); 1641 sel_scroll_ev.stop();
1677 } 1642 }
1678#endif 1643#endif
1679#ifdef MOUSE_THRESHOLD 1644#ifdef MOUSE_THRESHOLD
1680 } 1645 }
1681#endif 1646#endif
1682 } 1647 }
1683 } 1648 }
1684 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1649 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1685 { 1650 {
1686 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1651 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1687 MotionNotify, &ev)) 1652 MotionNotify, &ev))
1688 ; 1653 ;
1689 1654
1690 XQueryPointer (disp, scrollBar.win, 1655 XQueryPointer (dpy, scrollBar.win,
1691 &unused_root, &unused_child, 1656 &unused_root, &unused_child,
1692 &unused_root_x, &unused_root_y, 1657 &unused_root_x, &unused_root_y,
1693 &ev.xbutton.x, &ev.xbutton.y, 1658 &ev.xbutton.x, &ev.xbutton.y,
1694 &unused_mask); 1659 &unused_mask);
1695 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1660 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1696 scrollbar_size ()); 1661 scrollBar.size ());
1697 want_refresh = 1; 1662 want_refresh = 1;
1698 refresh_limit = 0;
1699 scrollbar_show (1); 1663 scrollBar.show (1);
1700 } 1664 }
1701 break; 1665 break;
1702 } 1666 }
1703 1667
1704skip_switch: ;
1705
1706#if defined(CURSOR_BLINK) 1668#if defined(CURSOR_BLINK)
1707 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1669 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1708 { 1670 {
1709 if (hidden_cursor) 1671 if (hidden_cursor)
1710 { 1672 {
1711 hidden_cursor = 0; 1673 hidden_cursor = 0;
1712 want_refresh = 1; 1674 want_refresh = 1;
1713 } 1675 }
1714 1676
1715 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1677 cursor_blink_ev.again ();
1716 } 1678 }
1717#endif 1679#endif
1718 1680
1719#if defined(POINTER_BLANK) 1681#if defined(POINTER_BLANK)
1720 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1682 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1721 { 1683 {
1722 if (ev.type == MotionNotify 1684 if (ev.type == MotionNotify
1723 || ev.type == ButtonPress 1685 || ev.type == ButtonPress
1724 || ev.type == ButtonRelease) 1686 || ev.type == ButtonRelease)
1725 if (hidden_pointer) 1687 if (hidden_pointer)
… …
1727 1689
1728 if (ev.type == KeyPress && hidden_pointer == 0) 1690 if (ev.type == KeyPress && hidden_pointer == 0)
1729 pointer_blank (); 1691 pointer_blank ();
1730 } 1692 }
1731#endif 1693#endif
1694
1695 refresh_check ();
1732} 1696}
1697
1698#if ENABLE_FRILLS
1699void
1700rxvt_term::set_urgency (bool enable)
1701{
1702 if (enable == urgency_hint)
1703 return;
1704
1705 if (XWMHints *h = XGetWMHints (dpy, parent[0]))
1706 {
1707 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1708 XSetWMHints (dpy, parent[0], h);
1709 urgency_hint = enable;
1710 }
1711}
1712#endif
1733 1713
1734void 1714void
1735rxvt_term::focus_in () 1715rxvt_term::focus_in ()
1736{ 1716{
1737 if (!focus) 1717 if (!focus)
1738 { 1718 {
1739 focus = 1; 1719 focus = 1;
1740 want_refresh = 1; 1720 want_refresh = 1;
1741 1721
1742 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1743
1744#if USE_XIM 1722#if USE_XIM
1745 if (Input_Context != NULL) 1723 if (Input_Context != NULL)
1746 { 1724 {
1747 IMSetStatusPosition (); 1725 IMSetPosition ();
1748 XSetICFocus (Input_Context); 1726 XSetICFocus (Input_Context);
1749 } 1727 }
1750#endif 1728#endif
1751#if CURSOR_BLINK 1729#if CURSOR_BLINK
1752 if (OPTION (Opt_cursorBlink)) 1730 if (option (Opt_cursorBlink))
1753 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1731 cursor_blink_ev.again ();
1754#endif 1732#endif
1755#if OFF_FOCUS_FADING 1733#if OFF_FOCUS_FADING
1756 if (rs[Rs_fade]) 1734 if (rs[Rs_fade])
1757 { 1735 {
1758 pix_colors = pix_colors_focused; 1736 pix_colors = pix_colors_focused;
1759 scr_recolour (); 1737 scr_recolour ();
1760 } 1738 }
1761#endif 1739#endif
1740#if ENABLE_FRILLS
1741 if (option (Opt_urgentOnBell))
1742 set_urgency (0);
1743#endif
1744
1745 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1762 } 1746 }
1763} 1747}
1764 1748
1765void 1749void
1766rxvt_term::focus_out () 1750rxvt_term::focus_out ()
… …
1768 if (focus) 1752 if (focus)
1769 { 1753 {
1770 focus = 0; 1754 focus = 0;
1771 want_refresh = 1; 1755 want_refresh = 1;
1772 1756
1773 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1757#if ENABLE_FRILLS
1774 1758 if (option (Opt_urgentOnBell))
1759 set_urgency (0);
1760#endif
1775#if ENABLE_FRILLS || ISO_14755 1761#if ENABLE_FRILLS || ISO_14755
1776 if (iso14755buf) 1762 if (iso14755buf)
1777 { 1763 {
1778 iso14755buf = 0; 1764 iso14755buf = 0;
1779# if ENABLE_OVERLAY 1765# if ISO_14755
1780 scr_overlay_off (); 1766 scr_overlay_off ();
1781# endif 1767# endif
1782 } 1768 }
1783#endif 1769#endif
1784#if USE_XIM 1770#if USE_XIM
1785 if (Input_Context != NULL) 1771 if (Input_Context != NULL)
1786 XUnsetICFocus (Input_Context); 1772 XUnsetICFocus (Input_Context);
1787#endif 1773#endif
1788#if CURSOR_BLINK 1774#if CURSOR_BLINK
1789 if (OPTION (Opt_cursorBlink)) 1775 if (option (Opt_cursorBlink))
1790 cursor_blink_ev.stop (); 1776 cursor_blink_ev.stop ();
1777
1791 hidden_cursor = 0; 1778 hidden_cursor = 0;
1792#endif 1779#endif
1793#if OFF_FOCUS_FADING 1780#if OFF_FOCUS_FADING
1794 if (rs[Rs_fade]) 1781 if (rs[Rs_fade])
1795 { 1782 {
1796 pix_colors = pix_colors_unfocused; 1783 pix_colors = pix_colors_unfocused;
1797 scr_recolour (); 1784 scr_recolour ();
1798 } 1785 }
1799#endif 1786#endif
1787
1788 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1789 }
1790}
1791
1792void
1793rxvt_term::update_fade_color (unsigned int idx)
1794{
1795#if OFF_FOCUS_FADING
1796 if (rs[Rs_fade])
1800 } 1797 {
1798 rgba c;
1799 pix_colors [Color_fade].get (c);
1800 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1801 }
1802#endif
1801} 1803}
1802 1804
1803#if TRANSPARENT 1805#if ENABLE_TRANSPARENCY || ENABLE_PERL
1804void 1806void
1805rxvt_term::rootwin_cb (XEvent &ev) 1807rxvt_term::rootwin_cb (XEvent &ev)
1806{ 1808{
1807 make_current (); 1809 make_current ();
1808 1810
1811 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1812 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1813 return;
1814
1815# if ENABLE_TRANSPARENCY
1809 switch (ev.type) 1816 switch (ev.type)
1810 { 1817 {
1811 case PropertyNotify: 1818 case PropertyNotify:
1812 /* 1819 /*
1813 * if user used some Esetroot compatible prog to set the root bg, 1820 * 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. 1821 * use the property to determine the pixmap. We use it later on.
1815 */ 1822 */
1816 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1823 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1817 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1824 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1818 return; 1825 {
1826 bgPixmap.set_root_pixmap ();
1827 update_background ();
1828 }
1819 1829
1820 /* FALLTHROUGH */
1821 case ReparentNotify:
1822 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1823 want_refresh = want_full_refresh = 1;
1824 break; 1830 break;
1825 } 1831 }
1832# endif
1833
1834 refresh_check ();
1826} 1835}
1827#endif 1836#endif
1828 1837
1829void 1838void
1830rxvt_term::button_press (XButtonEvent &ev) 1839rxvt_term::button_press (XButtonEvent &ev)
… …
1839 /* 1848 /*
1840 * VT window processing of button press 1849 * VT window processing of button press
1841 */ 1850 */
1842 if (ev.window == vt) 1851 if (ev.window == vt)
1843 { 1852 {
1853 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1854 return;
1855
1844#if ISO_14755 1856#if ISO_14755
1845 // 5.4 1857 // 5.4
1846 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1858 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1847 { 1859 {
1848 iso14755_54 (ev.x, ev.y); 1860 iso14755_54 (ev.x, ev.y);
… …
1882 mouse_report (ev); 1894 mouse_report (ev);
1883 } 1895 }
1884#else 1896#else
1885 MEvent.button = ev.button; 1897 MEvent.button = ev.button;
1886 mouse_report (ev); 1898 mouse_report (ev);
1887#endif /* MOUSE_REPORT_DOUBLECLICK */ 1899#endif /* MOUSE_REPORT_DOUBLECLICK */
1888 1900
1889 } 1901 }
1890 else 1902 else
1891 { 1903 {
1892 if (ev.button != MEvent.button) 1904 if (ev.button != MEvent.button)
1893 MEvent.clicks = 0; 1905 MEvent.clicks = 0;
1894 1906
1895 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1896 switch (ev.button) 1907 switch (ev.button)
1897 { 1908 {
1898 case Button1: 1909 case Button1:
1899 /* allow meta + click to select rectangular areas */ 1910 /* allow meta + click to select rectangular areas */
1900 /* should be done in screen.C */ 1911 /* should be done in screen.C */
1901#if ENABLE_FRILLS 1912#if ENABLE_FRILLS
1902 selection.rect = !!(ev.state & ModMetaMask); 1913 selection.rect = !!(ev.state & ModMetaMask);
1903#else 1914#else
1904 selection.rect = false; 1915 selection.rect = false;
1905#endif 1916#endif
1906 1917
1907 /* allow shift+left click to extend selection */ 1918 /* allow shift+left click to extend selection */
1908 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report)) 1919 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1909 { 1920 {
1910 if (MEvent.button == Button1 && clickintime) 1921 if (MEvent.button == Button1 && clickintime)
1911 selection_rotate (ev.x, ev.y); 1922 selection_rotate (ev.x, ev.y);
1912 else 1923 else
1913 selection_extend (ev.x, ev.y, 1); 1924 selection_extend (ev.x, ev.y, 1);
1914 } 1925 }
1915 else 1926 else
1916 { 1927 {
1917 if (MEvent.button == Button1 && clickintime) 1928 if (MEvent.button == Button1 && clickintime)
1918 MEvent.clicks++; 1929 MEvent.clicks++;
1919 else 1930 else
1920 MEvent.clicks = 1; 1931 MEvent.clicks = 1;
1921 1932
1922 selection_click (MEvent.clicks, ev.x, ev.y); 1933 selection_click (MEvent.clicks, ev.x, ev.y);
1923 } 1934 }
1924 1935
1925 MEvent.button = Button1; 1936 MEvent.button = Button1;
1926 break; 1937 break;
1927 1938
1928 case Button3: 1939 case Button3:
1929 if (MEvent.button == Button3 && clickintime) 1940 if (MEvent.button == Button3 && clickintime)
1930 selection_rotate (ev.x, ev.y); 1941 selection_rotate (ev.x, ev.y);
1931 else 1942 else
1932 selection_extend (ev.x, ev.y, 1); 1943 selection_extend (ev.x, ev.y, 1);
1933 1944
1934 MEvent.button = Button3; 1945 MEvent.button = Button3;
1935 break; 1946 break;
1936 } 1947 }
1937 } 1948 }
1938 1949
1939 MEvent.time = ev.time; 1950 MEvent.time = ev.time;
1940 return; 1951 return;
1941 } 1952 }
1942 1953
1943 /* 1954 /*
1944 * Scrollbar window processing of button press 1955 * Scrollbar window processing of button press
1945 */ 1956 */
1946 if (isScrollbarWindow (ev.window)) 1957 if (scrollBar.state && ev.window == scrollBar.win)
1947 { 1958 {
1948 scrollBar.setIdle (); 1959 page_dirn direction = NO_DIR;
1960
1961 if (scrollBar.upButton (ev.y))
1962 direction = UP; /* up */
1963 else if (scrollBar.dnButton (ev.y))
1964 direction = DN; /* down */
1965
1966 scrollBar.state = STATE_IDLE;
1949 /* 1967 /*
1950 * Rxvt-style scrollbar: 1968 * Rxvt-style scrollbar:
1951 * move up if mouse is above slider 1969 * move up if mouse is above slider
1952 * move dn if mouse is below slider 1970 * move dn if mouse is below slider
1953 * 1971 *
… …
1962 /* 1980 /*
1963 * Mouse report disabled scrollbar: 1981 * Mouse report disabled scrollbar:
1964 * arrow buttons - send up/down 1982 * arrow buttons - send up/down
1965 * click on scrollbar - send pageup/down 1983 * click on scrollbar - send pageup/down
1966 */ 1984 */
1967 if ((scrollBar.style == R_SB_NEXT 1985 if (direction == UP)
1968 && scrollbarnext_upButton (ev.y))
1969 || (scrollBar.style == R_SB_RXVT
1970 && scrollbarrxvt_upButton (ev.y)))
1971 tt_printf ("\033[A"); 1986 tt_printf ("\033[A");
1972 else if ((scrollBar.style == R_SB_NEXT 1987 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"); 1988 tt_printf ("\033[B");
1977 else 1989 else
1978 switch (ev.button) 1990 switch (ev.button)
1979 { 1991 {
1980 case Button2: 1992 case Button2:
… …
1987 tt_printf ("\033[5~"); 1999 tt_printf ("\033[5~");
1988 break; 2000 break;
1989 } 2001 }
1990 } 2002 }
1991 else 2003 else
1992#endif /* NO_SCROLLBAR_REPORT */ 2004#endif /* NO_SCROLLBAR_REPORT */
1993
1994 {
1995 char upordown = 0;
1996
1997 if (scrollBar.style == R_SB_NEXT)
1998 { 2005 {
1999 if (scrollbarnext_upButton (ev.y)) 2006 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 { 2007 {
2013#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2008#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2009 if (!cont_scroll_ev.is_active ())
2014 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2010 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2015#endif 2011#endif
2016 if (scr_page (upordown < 0 ? UP : DN, 1)) 2012 if (scr_page (direction, 1))
2017 { 2013 {
2018 if (upordown < 0) 2014 if (direction == UP)
2019 scrollBar.setUp (); 2015 scrollBar.state = STATE_UP;
2020 else 2016 else
2021 scrollBar.setDn (); 2017 scrollBar.state = STATE_DOWN;
2022 } 2018 }
2023 } 2019 }
2024 else 2020 else
2025 switch (ev.button) 2021 switch (ev.button)
2026 { 2022 {
2027 case Button2: 2023 case Button2:
2028 switch (scrollbar_align) 2024 switch (scrollBar.align)
2029 { 2025 {
2030 case R_SB_ALIGN_TOP: 2026 case R_SB_ALIGN_TOP:
2031 csrO = 0; 2027 csrO = 0;
2032 break; 2028 break;
2033 case R_SB_ALIGN_CENTRE: 2029 case R_SB_ALIGN_CENTRE:
… …
2039 } 2035 }
2040 2036
2041 if (scrollBar.style == R_SB_XTERM 2037 if (scrollBar.style == R_SB_XTERM
2042 || scrollbar_above_slider (ev.y) 2038 || scrollbar_above_slider (ev.y)
2043 || scrollbar_below_slider (ev.y)) 2039 || scrollbar_below_slider (ev.y))
2044 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2040 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2045 2041
2046 scrollBar.setMotion (); 2042 scrollBar.state = STATE_MOTION;
2047 break; 2043 break;
2048 2044
2049 case Button1: 2045 case Button1:
2050 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2046 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2051 csrO = ev.y - scrollBar.top; 2047 csrO = ev.y - scrollBar.top;
2052 /* FALLTHROUGH */ 2048 /* FALLTHROUGH */
2053 2049
2054 case Button3: 2050 case Button3:
2055 if (scrollBar.style != R_SB_XTERM) 2051 if (scrollBar.style != R_SB_XTERM)
… …
2065 scr_page (DN, nrow - 1); 2061 scr_page (DN, nrow - 1);
2066# else 2062# else
2067 scr_page (DN, nrow / 4); 2063 scr_page (DN, nrow / 4);
2068# endif 2064# endif
2069 else 2065 else
2070 scrollBar.setMotion (); 2066 scrollBar.state = STATE_MOTION;
2071 } 2067 }
2072 else 2068 else
2073 { 2069 {
2074 scr_page ((ev.button == Button1 ? DN : UP), 2070 scr_page ((ev.button == Button1 ? DN : UP),
2075 (nrow 2071 (nrow
2076 * scrollbar_position (ev.y) 2072 * scrollbar_position (ev.y)
2077 / scrollbar_size ())); 2073 / scrollBar.size ()));
2078 } 2074 }
2079 2075
2080 break; 2076 break;
2081 } 2077 }
2082 } 2078 }
… …
2092 2088
2093 csrO = 0; /* reset csr Offset */ 2089 csrO = 0; /* reset csr Offset */
2094 if (!bypass_keystate) 2090 if (!bypass_keystate)
2095 reportmode = !! (priv_modes & PrivMode_mouse_report); 2091 reportmode = !! (priv_modes & PrivMode_mouse_report);
2096 2092
2097 if (scrollbar_isUpDn ()) 2093 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2098 { 2094 {
2099 scrollBar.setIdle (); 2095 scrollBar.state = STATE_IDLE;
2100 scrollbar_show (0); 2096 scrollBar.show (0);
2101 } 2097 }
2102 2098
2103#ifdef SELECTION_SCROLLING 2099#ifdef SELECTION_SCROLLING
2104 if (sel_scroll_ev.active)
2105 sel_scroll_ev.stop(); 2100 sel_scroll_ev.stop();
2106#endif 2101#endif
2107 2102
2108 if (ev.window == vt) 2103 if (ev.window == vt)
2109 { 2104 {
2105 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2106 return;
2107
2110#if ISO_14755 2108#if ISO_14755
2111 // 5.4 2109 // 5.4
2112 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2110 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2113 return; 2111 return;
2114#endif 2112#endif
2113
2115 if (reportmode) 2114 if (reportmode)
2116 { 2115 {
2117 /* mouse report from vt window */ 2116 /* mouse report from vt window */
2118 /* don't report release of wheel "buttons" */ 2117 /* don't report release of wheel "buttons" */
2119 if (ev.button >= 4) 2118 if (ev.button >= 4)
… …
2130 mouse_report (ev); 2129 mouse_report (ev);
2131 } 2130 }
2132#else /* MOUSE_REPORT_DOUBLECLICK */ 2131#else /* MOUSE_REPORT_DOUBLECLICK */
2133 MEvent.button = AnyButton; 2132 MEvent.button = AnyButton;
2134 mouse_report (ev); 2133 mouse_report (ev);
2135#endif /* MOUSE_REPORT_DOUBLECLICK */ 2134#endif /* MOUSE_REPORT_DOUBLECLICK */
2136 return; 2135 return;
2137 } 2136 }
2138 2137
2139 /* 2138 /*
2140 * dumb hack to compensate for the failure of click-and-drag 2139 * dumb hack to compensate for the failure of click-and-drag
… …
2143 if (priv_modes & PrivMode_mouse_report 2142 if (priv_modes & PrivMode_mouse_report
2144 && bypass_keystate 2143 && bypass_keystate
2145 && ev.button == Button1 && MEvent.clicks <= 1) 2144 && ev.button == Button1 && MEvent.clicks <= 1)
2146 selection_extend (ev.x, ev.y, 0); 2145 selection_extend (ev.x, ev.y, 0);
2147 2146
2148 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2149 return;
2150
2151 switch (ev.button) 2147 switch (ev.button)
2152 { 2148 {
2153 case Button1: 2149 case Button1:
2154 case Button3: 2150 case Button3:
2155 selection_make (ev.time); 2151 selection_make (ev.time);
2156 break; 2152 break;
2157 2153
2158 case Button2: 2154 case Button2:
2159 if (IN_RANGE_EXC (ev.x, 0, width) 2155 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? 2156 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; 2157 break;
2168 2158
2169#ifdef MOUSE_WHEEL 2159#ifdef MOUSE_WHEEL
2170 case Button4: 2160 case Button4:
2171 case Button5: 2161 case Button5:
… …
2175 2165
2176 v = ev.button == Button4 ? UP : DN; 2166 v = ev.button == Button4 ? UP : DN;
2177 2167
2178 if (ev.state & ShiftMask) 2168 if (ev.state & ShiftMask)
2179 i = 1; 2169 i = 1;
2180 else if (OPTION (Opt_mouseWheelScrollPage)) 2170 else if (option (Opt_mouseWheelScrollPage))
2181 i = nrow - 1; 2171 i = nrow - 1;
2182 else 2172 else
2183 i = 5; 2173 i = 5;
2184 2174
2185# ifdef MOUSE_SLIP_WHEELING 2175# ifdef MOUSE_SLIP_WHEELING
… …
2187 { 2177 {
2188 mouse_slip_wheel_speed += v ? -1 : 1; 2178 mouse_slip_wheel_speed += v ? -1 : 1;
2189 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2179 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2190 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2180 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2191 2181
2192 if (slip_wheel_ev.at < NOW) 2182 if (!slip_wheel_ev.is_active ())
2193 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2183 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2194
2195 slip_wheel_ev.start ();
2196 } 2184 }
2197 else 2185 else
2186# endif
2198 { 2187 {
2199# endif
2200 scr_page (v, i); 2188 scr_page (v, i);
2201 scrollbar_show (1); 2189 scrollBar.show (1);
2202# ifdef MOUSE_SLIP_WHEELING
2203 } 2190 }
2204# endif
2205 } 2191 }
2206 break; 2192 break;
2207#endif 2193#endif
2208 } 2194 }
2209 } 2195 }
2210} 2196}
2211 2197
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/*}}} */ 2198/*}}} */
2694 2199
2695bool 2200void
2696rxvt_term::cmd_parse () 2201rxvt_term::cmd_parse ()
2697{ 2202{
2698 bool flag = false;
2699 wchar_t ch = NOCHAR; 2203 wchar_t ch = NOCHAR;
2700 char *seq_begin; // remember start of esc-sequence here 2204 char *seq_begin; // remember start of esc-sequence here
2701 2205
2702 for (;;) 2206 for (;;)
2703 { 2207 {
2704 if (ch == NOCHAR) 2208 if (expect_false (ch == NOCHAR))
2705 { 2209 {
2706 seq_begin = cmdbuf_ptr; 2210 seq_begin = cmdbuf_ptr;
2707 ch = next_char (); 2211 ch = next_char ();
2708 2212
2709 if (ch == NOCHAR) 2213 if (ch == NOCHAR)
2710 break; 2214 break;
2711 } 2215 }
2712 2216
2713 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2217 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2714 { 2218 {
2715 if (!seen_input) 2219 if (expect_false (!seen_input))
2716 { 2220 {
2717 seen_input = 1; 2221 seen_input = 1;
2718 // many badly-written programs (e.g. jed) contain a race condition: 2222 // many badly-written programs (e.g. jed) contain a race condition:
2719 // they first read the screensize and then install a SIGWINCH handler. 2223 // they first read the screensize and then install a SIGWINCH handler.
2720 // some window managers resize the window early, and these programs 2224 // some window managers resize the window early, and these programs
… …
2733 wchar_t *str = buf; 2237 wchar_t *str = buf;
2734 wchar_t *eol = str + min (ncol, UBUFSIZ); 2238 wchar_t *eol = str + min (ncol, UBUFSIZ);
2735 2239
2736 for (;;) 2240 for (;;)
2737 { 2241 {
2738 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2242 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2739 break; 2243 break;
2740 2244
2741 *str++ = ch; 2245 *str++ = ch;
2742 2246
2743 if (ch == C0_LF || str >= eol) 2247 if (expect_false (ch == C0_LF || str >= eol))
2744 { 2248 {
2745 if (ch == C0_LF) 2249 if (ch == C0_LF)
2746 nlines++; 2250 nlines++;
2747 2251
2748 refresh_count++; 2252 refresh_count++;
2749 2253
2750 if (!OPTION (Opt_jumpScroll) 2254 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2751 || (refresh_count >= refresh_limit * (nrow - 1)))
2752 { 2255 {
2753 refreshnow = true;
2754 refresh_count = 0; 2256 refresh_count = 0;
2257
2258 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2259 {
2260 refreshnow = true;
2755 ch = NOCHAR; 2261 ch = NOCHAR;
2756 break; 2262 break;
2263 }
2757 } 2264 }
2758 2265
2759 // scr_add_lines only works for nlines <= nrow - 1. 2266 // scr_add_lines only works for nlines <= nrow - 1.
2760 if (nlines >= nrow - 1) 2267 if (nlines >= nrow - 1)
2761 { 2268 {
… …
2789 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2296 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2790 scr_add_lines (buf, str - buf, nlines); 2297 scr_add_lines (buf, str - buf, nlines);
2791 2298
2792 /* 2299 /*
2793 * If there have been a lot of new lines, then update the screen 2300 * 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. 2301 * 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 2302 * if skipScroll is enabled.
2796 * is incremented here because we must be doing flat-out scrolling.
2797 */ 2303 */
2798 if (refreshnow) 2304 if (refreshnow)
2799 { 2305 {
2800 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2801 refresh_limit++;
2802 else
2803 {
2804 flag = true;
2805 scr_refresh (); 2306 scr_refresh ();
2806 want_refresh = 1; 2307 want_refresh = 1;
2807 }
2808 } 2308 }
2809
2810 } 2309 }
2811 else 2310 else
2812 { 2311 {
2813 try 2312 try
2814 { 2313 {
… …
2822 } 2321 }
2823 2322
2824 ch = NOCHAR; 2323 ch = NOCHAR;
2825 } 2324 }
2826 } 2325 }
2827
2828 return flag;
2829} 2326}
2830 2327
2831// read the next character 2328// read the next character
2832wchar_t 2329wchar_t
2833rxvt_term::next_char () NOTHROW 2330rxvt_term::next_char () NOTHROW
2834{ 2331{
2835 while (cmdbuf_ptr < cmdbuf_endp) 2332 while (cmdbuf_ptr < cmdbuf_endp)
2836 { 2333 {
2837 // assume 7-bit to be ascii ALWAYS 2334 // assume 7-bit to be ascii ALWAYS
2838 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2335 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2839 return *cmdbuf_ptr++; 2336 return *cmdbuf_ptr++;
2840 2337
2841 wchar_t wc; 2338 wchar_t wc;
2842 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2339 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2843 2340
… …
2847 cmdbuf_ptr = cmdbuf_endp; 2344 cmdbuf_ptr = cmdbuf_endp;
2848 break; 2345 break;
2849 } 2346 }
2850 2347
2851 if (len == (size_t)-1) 2348 if (len == (size_t)-1)
2349 {
2350 mbstate.reset (); // reset now undefined conversion state
2852 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2351 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2352 }
2853 2353
2854 // assume wchar == unicode 2354 // assume wchar == unicode
2855 cmdbuf_ptr += len; 2355 cmdbuf_ptr += len;
2856 return wc & UNICODE_MASK; 2356 return wc & UNICODE_MASK;
2857 } 2357 }
… …
2901/*----------------------------------------------------------------------*/ 2401/*----------------------------------------------------------------------*/
2902#ifdef PRINTPIPE 2402#ifdef PRINTPIPE
2903FILE * 2403FILE *
2904rxvt_term::popen_printer () 2404rxvt_term::popen_printer ()
2905{ 2405{
2906 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2406 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2907 2407
2908 if (stream == NULL) 2408 if (stream == NULL)
2909 rxvt_warn ("can't open printer pipe, not printing.\n"); 2409 rxvt_warn ("can't open printer pipe, not printing.\n");
2910 2410
2911 return stream; 2411 return stream;
… …
2922 * simulate attached vt100 printer 2422 * simulate attached vt100 printer
2923 */ 2423 */
2924void 2424void
2925rxvt_term::process_print_pipe () 2425rxvt_term::process_print_pipe ()
2926{ 2426{
2927 int done; 2427 FILE *fd = popen_printer ();
2928 FILE *fd;
2929 2428
2930 if ((fd = popen_printer ()) == NULL) 2429 if (!fd)
2931 return; 2430 return;
2932 2431
2933 /* 2432 /*
2934 * Send all input to the printer until either ESC[4i or ESC[?4i 2433 * Send all input to the printer until either ESC[4i or ESC[?4i
2935 * is received. 2434 * is received.
2936 */ 2435 */
2937 for (done = 0; !done;) 2436 for (int done = 0; !done; )
2938 { 2437 {
2939 unsigned char buf[8]; 2438 unsigned char buf[8];
2940 unicode_t ch; 2439 unicode_t ch;
2941 unsigned int i, len; 2440 unsigned int i, len;
2942 2441
… …
2961 { 2460 {
2962 if ((buf[len++] = cmd_getc ()) == 'i') 2461 if ((buf[len++] = cmd_getc ()) == 'i')
2963 break; /* done = 1 */ 2462 break; /* done = 1 */
2964 } 2463 }
2965 } 2464 }
2966 2465
2967 for (i = 0; i < len; i++) 2466 for (i = 0; i < len; i++)
2968 if (putc (buf[i], fd) == EOF) 2467 if (putc (buf[i], fd) == EOF)
2969 { 2468 {
2970 done = 1; 2469 done = 1;
2971 break; 2470 break;
… …
2973 } 2472 }
2974 } 2473 }
2975 2474
2976 pclose_printer (fd); 2475 pclose_printer (fd);
2977} 2476}
2978#endif /* PRINTPIPE */ 2477#endif /* PRINTPIPE */
2979/*}}} */ 2478/*}}} */
2980 2479
2981/* *INDENT-OFF* */ 2480/* *INDENT-OFF* */
2982enum { 2481enum {
2983 C1_40 = 0x40, 2482 C1_40 = 0x40,
… …
3033 process_dcs_seq (); 2532 process_dcs_seq ();
3034 break; 2533 break;
3035 case 0x9b: /* CSI */ 2534 case 0x9b: /* CSI */
3036 process_csi_seq (); 2535 process_csi_seq ();
3037 break; 2536 break;
3038 case 0x9d: /* CSI */ 2537 case 0x9d: /* OSC */
3039 process_osc_seq (); 2538 process_osc_seq ();
3040 break; 2539 break;
3041#endif 2540#endif
3042 } 2541 }
3043} 2542}
… …
3087 break; 2586 break;
3088 case 'Z': /* identify the terminal type */ 2587 case 'Z': /* identify the terminal type */
3089 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2588 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
3090 break; 2589 break;
3091 case '<': /* turn off VT52 mode */ 2590 case '<': /* turn off VT52 mode */
3092 PrivMode (0, PrivMode_vt52); 2591 set_privmode (PrivMode_vt52, 0);
3093 break; 2592 break;
3094 case 'F': /* use special graphics character set */ 2593 case 'F': /* use special graphics character set */
3095 case 'G': /* use regular character set */ 2594 case 'G': /* use regular character set */
3096 /* unimplemented */ 2595 /* unimplemented */
3097 break; 2596 break;
… …
3133 scr_charset_set (2, (unsigned int)cmd_getc ()); 2632 scr_charset_set (2, (unsigned int)cmd_getc ());
3134 break; 2633 break;
3135 case '+': 2634 case '+':
3136 scr_charset_set (3, (unsigned int)cmd_getc ()); 2635 scr_charset_set (3, (unsigned int)cmd_getc ());
3137 break; 2636 break;
3138#if ENABLE_FRILLS 2637#if !ENABLE_MINIMAL
3139 case '6': 2638 case '6':
3140 scr_backindex (); 2639 scr_backindex ();
3141 break; 2640 break;
3142#endif 2641#endif
3143 case '7': 2642 case '7':
3144 scr_cursor (SAVE); 2643 scr_cursor (SAVE);
3145 break; 2644 break;
3146 case '8': 2645 case '8':
3147 scr_cursor (RESTORE); 2646 scr_cursor (RESTORE);
3148 break; 2647 break;
3149#if ENABLE_FRILLS 2648#if !ENABLE_MINIMAL
3150 case '9': 2649 case '9':
3151 scr_forwardindex (); 2650 scr_forwardindex ();
3152 break; 2651 break;
3153#endif 2652#endif
3154 case '=': 2653 case '=':
3155 case '>': 2654 case '>':
3156 PrivMode ((ch == '='), PrivMode_aplKP); 2655 set_privmode (PrivMode_aplKP, ch == '=');
3157 break; 2656 break;
3158 2657
3159 case C1_40: 2658 case C1_40:
3160 cmd_getc (); 2659 cmd_getc ();
3161 break; 2660 break;
… …
3200 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2699 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3201 case C1_SCI: /* ESC Z */ 2700 case C1_SCI: /* ESC Z */
3202 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2701 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3203 break; /* steal obsolete ESC [ c */ 2702 break; /* steal obsolete ESC [ c */
3204 2703
3205 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2704 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
3206 case C1_CSI: /* ESC [ */ 2705 case C1_CSI: /* ESC [ */
3207 process_csi_seq (); 2706 process_csi_seq ();
3208 break; 2707 break;
3209 2708
3210 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2709 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
3211 case C1_OSC: /* ESC ] */ 2710 case C1_OSC: /* ESC ] */
3212 process_osc_seq (); 2711 process_osc_seq ();
3213 break; 2712 break;
3214 2713
3215 /* 8.3.106: RESET TO INITIAL STATE */ 2714 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
3216 case 'c': 2715 case 'c':
3217 mbstate.reset (); 2716 mbstate.reset ();
3218 scr_poweron (); 2717 scr_poweron ();
3219 scrollbar_show (1); 2718 scrollBar.show (1);
3220 break; 2719 break;
3221 2720
3222 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2721 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
3223 case 'n': 2722 case 'n':
3224 scr_charset_choose (2); 2723 scr_charset_choose (2);
… …
3269rxvt_term::process_csi_seq () 2768rxvt_term::process_csi_seq ()
3270{ 2769{
3271 unicode_t ch, priv, i; 2770 unicode_t ch, priv, i;
3272 unsigned int nargs, p; 2771 unsigned int nargs, p;
3273 int n, ndef; 2772 int n, ndef;
3274 int arg[ESC_ARGS]; 2773 int arg[ESC_ARGS] = { };
3275 2774
3276 for (nargs = ESC_ARGS; nargs > 0;) 2775 nargs = 0;
3277 arg[--nargs] = 0;
3278 2776
3279 priv = 0; 2777 priv = 0;
3280 ch = cmd_getc (); 2778 ch = cmd_getc ();
3281 if (ch >= '<' && ch <= '?') 2779 if ((ch >= '<' && ch <= '?') || ch == '!')
2780 {
3282 { /* '<' '=' '>' '?' */ 2781 /* '<' '=' '>' '?' '!' */
3283 priv = ch; 2782 priv = ch;
3284 ch = cmd_getc (); 2783 ch = cmd_getc ();
3285 } 2784 }
3286 2785
3287 /* read any numerical arguments */ 2786 /* read any numerical arguments */
… …
3316 ndef = get_byte_array_bit (csi_defaults, i); 2815 ndef = get_byte_array_bit (csi_defaults, i);
3317 for (p = 0; p < nargs; p++) 2816 for (p = 0; p < nargs; p++)
3318 if (arg[p] == -1) 2817 if (arg[p] == -1)
3319 arg[p] = ndef; 2818 arg[p] = ndef;
3320 2819
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 /* 2820 /*
3329 * private mode handling 2821 * private mode handling
3330 */ 2822 */
3331 if (priv) 2823 if (priv)
3332 { 2824 {
3333 switch (priv) 2825 switch (priv)
3334 { 2826 {
3335 case '>': 2827 case '>':
3336 if (ch == CSI_DA) /* secondary device attributes */ 2828 if (ch == CSI_DA) /* secondary device attributes */
3337 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 2829 {
2830 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2831 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2832 //
2833 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2834 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2835 // versions.
2836 //
2837 tt_printf ("\033[>%d;95;0c", 'U');
2838 }
3338 break; 2839 break;
2840
3339 case '?': 2841 case '?':
3340 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2842 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3341 process_terminal_mode (ch, priv, nargs, arg); 2843 process_terminal_mode (ch, priv, nargs, arg);
3342 break; 2844 break;
2845
2846 case '!':
2847 if (ch == CSI_70)
2848 {
2849 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2850 scr_soft_reset ();
2851
2852 static const int pm_h[] = { 7, 25 };
2853 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 };
2854
2855 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h);
2856 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l);
3343 } 2857 }
2858 break;
2859 }
2860
3344 return; 2861 return;
3345 } 2862 }
3346 2863
3347 switch (ch) 2864 switch (ch)
3348 { 2865 {
… …
3468 break; 2985 break;
3469 case 6: /* CPR requested */ 2986 case 6: /* CPR requested */
3470 scr_report_position (); 2987 scr_report_position ();
3471 break; 2988 break;
3472 case 7: /* unofficial extension */ 2989 case 7: /* unofficial extension */
3473 if (OPTION (Opt_insecure)) 2990 if (option (Opt_insecure))
3474 tt_printf ("%-.250s\012", rs[Rs_display_name]); 2991 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3475 break; 2992 break;
3476 case 8: /* unofficial extension */ 2993 case 8: /* unofficial extension */
3477 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2994 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3478 break; 2995 break;
… …
3545 break; 3062 break;
3546 case CSI_75: 3063 case CSI_75:
3547 scr_cursor (RESTORE); 3064 scr_cursor (RESTORE);
3548 break; 3065 break;
3549 3066
3550#if ENABLE_FRILLS 3067#if !ENABLE_MINIMAL
3551 case CSI_74: 3068 case CSI_74:
3552 process_window_ops (arg, nargs); 3069 process_window_ops (arg, nargs);
3553 break; 3070 break;
3554#endif 3071#endif
3555 3072
… …
3562 break; 3079 break;
3563 } 3080 }
3564} 3081}
3565/*}}} */ 3082/*}}} */
3566 3083
3567#if ENABLE_FRILLS 3084#if !ENABLE_MINIMAL
3568/* ARGSUSED */ 3085/* ARGSUSED */
3569void 3086void
3570rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3087rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3571{ 3088{
3572 int x, y; 3089 int x, y;
3573 XWindowAttributes wattr; 3090 XWindowAttributes wattr;
3574 Window wdummy; 3091 Window wdummy;
3575 dDisp; 3092
3093 dLocal (Display *, dpy);
3576 3094
3577 if (nargs == 0) 3095 if (nargs == 0)
3578 return; 3096 return;
3579 3097
3580 switch (args[0]) 3098 switch (args[0])
3581 { 3099 {
3582 /* 3100 /*
3583 * commands 3101 * commands
3584 */ 3102 */
3585 case 1: /* deiconify window */ 3103 case 1: /* deiconify window */
3586 XMapWindow (disp, parent[0]); 3104 XMapWindow (dpy, parent[0]);
3587 break; 3105 break;
3588 case 2: /* iconify window */ 3106 case 2: /* iconify window */
3589 XIconifyWindow (disp, parent[0], display->screen); 3107 XIconifyWindow (dpy, parent[0], display->screen);
3590 break; 3108 break;
3591 case 3: /* set position (pixels) */ 3109 case 3: /* set position (pixels) */
3592 XMoveWindow (disp, parent[0], args[1], args[2]); 3110 XMoveWindow (dpy, parent[0], args[1], args[2]);
3593 break; 3111 break;
3594 case 4: /* set size (pixels) */ 3112 case 4: /* set size (pixels) */
3595 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3113 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3596 break; 3114 break;
3597 case 5: /* raise window */ 3115 case 5: /* raise window */
3598 XRaiseWindow (disp, parent[0]); 3116 XRaiseWindow (dpy, parent[0]);
3599 break; 3117 break;
3600 case 6: /* lower window */ 3118 case 6: /* lower window */
3601 XLowerWindow (disp, parent[0]); 3119 XLowerWindow (dpy, parent[0]);
3602 break; 3120 break;
3603 case 7: /* refresh window */ 3121 case 7: /* refresh window */
3604 scr_touch (true); 3122 scr_touch (true);
3605 break; 3123 break;
3606 case 8: /* set size (chars) */ 3124 case 8: /* set size (chars) */
… …
3613 if (args[0] >= 24) /* set height (chars) */ 3131 if (args[0] >= 24) /* set height (chars) */
3614 set_widthheight ((unsigned int)width, 3132 set_widthheight ((unsigned int)width,
3615 (unsigned int) (args[1] * fheight)); 3133 (unsigned int) (args[1] * fheight));
3616 break; 3134 break;
3617 3135
3618
3619 /* 3136 /*
3620 * reports - some output format copied from XTerm 3137 * reports - some output format copied from XTerm
3621 */ 3138 */
3622 case 11: /* report window state */ 3139 case 11: /* report window state */
3623 XGetWindowAttributes (disp, parent[0], &wattr); 3140 XGetWindowAttributes (dpy, parent[0], &wattr);
3624 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3141 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3625 break; 3142 break;
3626 case 13: /* report window position */ 3143 case 13: /* report window position */
3627 XGetWindowAttributes (disp, parent[0], &wattr); 3144 XGetWindowAttributes (dpy, parent[0], &wattr);
3628 XTranslateCoordinates (disp, parent[0], wattr.root, 3145 XTranslateCoordinates (dpy, parent[0], wattr.root,
3629 -wattr.border_width, -wattr.border_width, 3146 -wattr.border_width, -wattr.border_width,
3630 &x, &y, &wdummy); 3147 &x, &y, &wdummy);
3631 tt_printf ("\033[3;%d;%dt", x, y); 3148 tt_printf ("\033[3;%d;%dt", x, y);
3632 break; 3149 break;
3633 case 14: /* report window size (pixels) */ 3150 case 14: /* report window size (pixels) */
3634 XGetWindowAttributes (disp, parent[0], &wattr); 3151 XGetWindowAttributes (dpy, parent[0], &wattr);
3635 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3152 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3636 break; 3153 break;
3637 case 18: /* report text area size (chars) */ 3154 case 18: /* report text area size (chars) */
3638 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3155 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3639 break; 3156 break;
… …
3641 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3158 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3642 break; 3159 break;
3643 case 20: /* report icon label */ 3160 case 20: /* report icon label */
3644 { 3161 {
3645 char *s; 3162 char *s;
3646 XGetIconName (disp, parent[0], &s); 3163 XGetIconName (dpy, parent[0], &s);
3647 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3164 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3648 XFree (s); 3165 XFree (s);
3649 } 3166 }
3650 break; 3167 break;
3651 case 21: /* report window title */ 3168 case 21: /* report window title */
3652 { 3169 {
3653 char *s; 3170 char *s;
3654 XFetchName (disp, parent[0], &s); 3171 XFetchName (dpy, parent[0], &s);
3655 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3172 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3656 XFree (s); 3173 XFree (s);
3657 } 3174 }
3658 break; 3175 break;
3659 } 3176 }
3660} 3177}
… …
3687 seen_esc = true; 3204 seen_esc = true;
3688 continue; 3205 continue;
3689 } 3206 }
3690 else if (ch == C0_BEL || ch == CHAR_ST) 3207 else if (ch == C0_BEL || ch == CHAR_ST)
3691 break; 3208 break;
3209 else if (ch == C0_SYN)
3210 ch = cmd_get8 ();
3692 else if (ch < 0x20) 3211 else if (ch < 0x20)
3693 return NULL; /* other control character - exit */ 3212 return NULL; /* other control character - exit */
3694 3213
3695 seen_esc = false; 3214 seen_esc = false;
3696 3215
3697 if (n >= STRING_MAX - 1) 3216 if (n >= STRING_MAX - 1)
3698 // stop at some sane length 3217 // stop at some sane length
3699 return NULL; 3218 return NULL;
3700 3219
3701 if (ch == C0_SYN)
3702 string[n++] = cmd_get8 ();
3703 else
3704 string[n++] = ch; 3220 string[n++] = ch;
3705 } 3221 }
3706 3222
3707 string[n++] = '\0'; 3223 string[n++] = '\0';
3708 3224
3709 ends_how = (ch == 0x5c ? C0_ESC : ch); 3225 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3760void 3276void
3761rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3277rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3762{ 3278{
3763 if (str[0] == '?' && !str[1]) 3279 if (str[0] == '?' && !str[1])
3764 { 3280 {
3765 unsigned short r, g, b; 3281 rgba c;
3766 pix_colors_focused[color].get (display, r, g, b); 3282 pix_colors_focused[color].get (c);
3283
3284#if XFT
3285 if (c.a != rgba::MAX_CC)
3286 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3287 else
3288#endif
3767 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3289 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3768 } 3290 }
3769 else 3291 else
3770 set_window_color (color, str); 3292 set_window_color (color, str);
3771} 3293}
3772 3294
3773/* 3295/*
3774 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3296 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3775 */ 3297 */
3776void 3298void
3777rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3299rxvt_term::process_xterm_seq (int op, char *str, char resp)
3778{ 3300{
3779 int color; 3301 int color;
3780 char *buf, *name; 3302 char *buf, *name;
3781 bool query = str[0] == '?' && !str[1]; 3303 bool query = str[0] == '?' && !str[1];
3782 int saveop = op; 3304 int saveop = op;
3783 dDisp; 3305
3306 dLocal (Display *, dpy);
3784 3307
3785 assert (str != NULL); 3308 assert (str != NULL);
3309
3310 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3311 return;
3312
3786 switch (op) 3313 switch (op)
3787 { 3314 {
3788 case XTerm_name: 3315 case XTerm_name:
3789 set_title (str); 3316 set_title (str);
3790 /* FALLTHROUGH */ 3317 /* FALLTHROUGH */
… …
3804 unsigned long bytes_after; 3331 unsigned long bytes_after;
3805 unsigned char *value = 0; 3332 unsigned char *value = 0;
3806 const char *str = ""; 3333 const char *str = "";
3807 3334
3808 if (prop 3335 if (prop
3809 && XGetWindowProperty (disp, parent[0], 3336 && XGetWindowProperty (dpy, parent[0],
3810 prop, 0, 1<<16, 0, AnyPropertyType, 3337 prop, 0, 1<<16, 0, AnyPropertyType,
3811 &actual_type, &actual_format, 3338 &actual_type, &actual_format,
3812 &nitems, &bytes_after, &value) == Success 3339 &nitems, &bytes_after, &value) == Success
3813 && actual_type != None 3340 && actual_type != None
3814 && actual_format == 8) 3341 && actual_format == 8)
3815 str = (const char *)(value); 3342 str = (const char *)(value);
3816 3343
3817 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3344 tt_printf ("\033]%d;%s%c", op, str, resp);
3818 3345
3819 XFree (value); 3346 XFree (value);
3820 } 3347 }
3821 else 3348 else
3822 { 3349 {
3823 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3350 char *eq = strchr (str, '=');
3824 3351
3825 if (eq) 3352 if (eq)
3826 { 3353 {
3827 *eq = 0; 3354 *eq = 0;
3828 set_utf8_property (display->atom (str), eq + 1); 3355 set_utf8_property (display->atom (str), eq + 1);
3829 } 3356 }
3830 else 3357 else
3831 XDeleteProperty (disp, parent[0], 3358 XDeleteProperty (dpy, parent[0],
3832 display->atom (str)); 3359 display->atom (str));
3833 } 3360 }
3834 break; 3361 break;
3835 3362
3836 case XTerm_Color: 3363 case XTerm_Color:
… …
3846 break; 3373 break;
3847 3374
3848 if ((buf = strchr (name, ';')) != NULL) 3375 if ((buf = strchr (name, ';')) != NULL)
3849 *buf++ = '\0'; 3376 *buf++ = '\0';
3850 3377
3851 if (name[0] == '?' && !name[1]) 3378 process_color_seq (op, color, name, resp);
3852 {
3853 unsigned short r, g, b;
3854 pix_colors_focused[color].get (display, r, g, b);
3855 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3856 }
3857 else
3858 set_window_color (color, name);
3859 } 3379 }
3860 break; 3380 break;
3381 case Rxvt_restoreFG:
3861 case XTerm_Color00: 3382 case XTerm_Color00:
3862 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3383 process_color_seq (op, Color_fg, str, resp);
3863 break; 3384 break;
3385 case Rxvt_restoreBG:
3864 case XTerm_Color01: 3386 case XTerm_Color01:
3865 process_color_seq (XTerm_Color01, Color_bg, str, resp); 3387 process_color_seq (op, Color_bg, str, resp);
3866 break; 3388 break;
3867#ifndef NO_CURSORCOLOR 3389#ifndef NO_CURSORCOLOR
3868 case XTerm_Color_cursor: 3390 case XTerm_Color_cursor:
3869 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3391 process_color_seq (op, Color_cursor, str, resp);
3870 break; 3392 break;
3871#endif 3393#endif
3872 case XTerm_Color_pointer_fg: 3394 case XTerm_Color_pointer_fg:
3873 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3395 process_color_seq (op, Color_pointer_fg, str, resp);
3874 break; 3396 break;
3875 case XTerm_Color_pointer_bg: 3397 case XTerm_Color_pointer_bg:
3876 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3398 process_color_seq (op, Color_pointer_bg, str, resp);
3877 break; 3399 break;
3878#ifndef NO_BOLD_UNDERLINE_REVERSE 3400#ifndef NO_BOLD_UNDERLINE_REVERSE
3879 case XTerm_Color_RV: 3401 case XTerm_Color_RV:
3880 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3402 process_color_seq (op, Color_RV, str, resp);
3881 break; 3403 break;
3882 case Rxvt_Color_BD: 3404 case Rxvt_Color_BD:
3883 case URxvt_Color_BD: 3405 case URxvt_Color_BD:
3884 process_color_seq (op, Color_BD, str, resp); 3406 process_color_seq (op, Color_BD, str, resp);
3885 break; 3407 break;
3886 case Rxvt_Color_UL: 3408 case Rxvt_Color_UL:
3887 case URxvt_Color_UL: 3409 case URxvt_Color_UL:
3888 process_color_seq (op, Color_UL, str, resp); 3410 process_color_seq (op, Color_UL, str, resp);
3889 break; 3411 break;
3890 case URxvt_Color_IT: 3412 case URxvt_Color_IT:
3891 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3413 process_color_seq (op, Color_IT, str, resp);
3892 break; 3414 break;
3893#endif 3415#endif
3894#if TRANSPARENT && TINTING 3416 case URxvt_Color_border:
3417 process_color_seq (op, Color_border, str, resp);
3418 break;
3419#if ENABLE_TRANSPARENCY
3895 case URxvt_Color_tint: 3420 case URxvt_Color_tint:
3896 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3421 process_color_seq (op, Color_tint, str, resp);
3897 check_our_parents (); 3422 {
3898 if (am_transparent) 3423 bool changed = false;
3899 want_full_refresh = want_refresh = 1;
3900 break;
3901#endif
3902 3424
3425 if (ISSET_PIXCOLOR (Color_tint))
3426 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3427 else
3428 changed = bgPixmap.unset_tint ();
3429
3430 if (changed)
3431 update_background ();
3432 }
3433
3434 break;
3435#endif
3436
3437#if BG_IMAGE_FROM_FILE
3903 case Rxvt_Pixmap: 3438 case Rxvt_Pixmap:
3904 { 3439 if (!strcmp (str, "?"))
3905 if (*str != ';')
3906 { 3440 {
3907#if XPM_BACKGROUND 3441 char str[256];
3908 scale_pixmap (""); /* reset to default scaling */ 3442
3909 set_bgPixmap (str); /* change pixmap */ 3443 sprintf (str, "[%dx%d+%d+%d]",
3910 scr_touch (true); 3444 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3911#endif 3445 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3446 process_xterm_seq (XTerm_title, str, CHAR_ST);
3912 } 3447 }
3913 3448 else
3449 {
3914 int changed = 0; 3450 int changed = 0;
3915 3451
3916 while ((str = strchr (str, ';')) != NULL) 3452 if (*str != ';')
3917 { 3453 {
3454 /* reset to default scaling :*/
3455 bgPixmap.unset_geometry ();
3456 if (bgPixmap.set_file (str)) /* change pixmap */
3457 changed++;
3458 str = strchr (str, ';');
3459 if (str == NULL)
3460 bgPixmap.set_defaultGeometry ();
3461 }
3462
3463 while (str)
3464 {
3918 str++; 3465 str++;
3919#if XPM_BACKGROUND 3466 if (bgPixmap.set_geometry (str))
3920 changed += scale_pixmap (str); 3467 changed++;
3921#endif 3468 str = strchr (str, ';');
3922 } 3469 }
3923 3470
3924 if (changed) 3471 if (changed)
3925 { 3472 update_background ();
3926#ifdef XPM_BACKGROUND
3927 resize_pixmap ();
3928 scr_touch (true);
3929#endif
3930 } 3473 }
3931 }
3932 break; 3474 break;
3933 3475#endif
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 3476
3941 case XTerm_logfile: 3477 case XTerm_logfile:
3942 // TODO, when secure mode? 3478 // TODO, when secure mode?
3943 break; 3479 break;
3944 3480
… …
3962 case URxvt_italicFont: 3498 case URxvt_italicFont:
3963 case URxvt_boldItalicFont: 3499 case URxvt_boldItalicFont:
3964#endif 3500#endif
3965 if (query) 3501 if (query)
3966 tt_printf ("\33]%d;%-.250s%c", saveop, 3502 tt_printf ("\33]%d;%-.250s%c", saveop,
3967 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3503 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3968 ? fontset[op - URxvt_font]->fontdesc : "", 3504 ? fontset[op - URxvt_font]->fontdesc : "",
3969 resp); 3505 resp);
3970 else 3506 else
3971 { 3507 {
3972 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3508 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3975 allocated.push_back ((void *)res); 3511 allocated.push_back ((void *)res);
3976 set_fonts (); 3512 set_fonts ();
3977 } 3513 }
3978 break; 3514 break;
3979 3515
3980#if ENABLE_FRILLS 3516 case URxvt_version:
3517 if (query)
3518 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3519 op,
3520 rs[Rs_name], VERSION[0], VERSION[2],
3521 resp);
3522 break;
3523
3524#if !ENABLE_MINIMAL
3981 case URxvt_locale: 3525 case URxvt_locale:
3982 if (query) 3526 if (query)
3983 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3527 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3984 else 3528 else
3985 { 3529 {
3986 set_locale (str); 3530 set_locale (str);
3987 pty->set_utf8_mode (enc_utf8); 3531 pty->set_utf8_mode (enc_utf8);
3988 init_xlocale (); 3532 init_xlocale ();
… …
4003 break; 3547 break;
4004#endif 3548#endif
4005 3549
4006#if ENABLE_PERL 3550#if ENABLE_PERL
4007 case URxvt_perl: 3551 case URxvt_perl:
4008 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 3552 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
4009 ; // no responses yet
4010 break; 3553 break;
4011#endif 3554#endif
4012 } 3555 }
4013} 3556}
4014/*----------------------------------------------------------------------*/ 3557/*----------------------------------------------------------------------*/
… …
4037 { 3580 {
4038 if (mode == 'r') 3581 if (mode == 'r')
4039 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3582 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
4040 else 3583 else
4041 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3584 state = (mode == 't') ? ! (priv_modes & bit) : mode;
4042 PrivMode (state, bit); 3585 set_privmode (bit, state);
4043 } 3586 }
4044 3587
4045 return state; 3588 return state;
4046} 3589}
4047 3590
… …
4051{ 3594{
4052 unsigned int i, j; 3595 unsigned int i, j;
4053 int state; 3596 int state;
4054 3597
4055 static const struct 3598 static const struct
4056 { 3599 {
4057 const int argval; 3600 const int argval;
4058 const unsigned long bit; 3601 const unsigned long bit;
4059 }
4060
4061 argtopriv[] = { 3602 } argtopriv[] = {
4062 { 1, PrivMode_aplCUR }, 3603 { 1, PrivMode_aplCUR }, // DECCKM
4063 { 2, PrivMode_vt52 }, 3604 { 2, PrivMode_vt52 },
4064 { 3, PrivMode_132 }, 3605 { 3, PrivMode_132 }, // DECCOLM
4065 { 4, PrivMode_smoothScroll }, 3606 { 4, PrivMode_smoothScroll }, // DECSCLM
4066 { 5, PrivMode_rVideo }, 3607 { 5, PrivMode_rVideo }, // DECSCNM
4067 { 6, PrivMode_relOrigin }, 3608 { 6, PrivMode_relOrigin }, // DECOM
4068 { 7, PrivMode_Autowrap }, 3609 { 7, PrivMode_Autowrap }, // DECAWM
4069 // 8, bi-directional support mode 3610 // 8, auto-repeat keys // DECARM
4070 { 9, PrivMode_MouseX10 }, 3611 { 9, PrivMode_MouseX10 },
4071 // 18, 19 printing-related 3612 // 18 end FF to printer after print screen
3613 // 19 Print screen prints full screen/scorll region
4072 { 25, PrivMode_VisibleCursor }, 3614 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
4073#ifdef scrollBar_esc 3615#ifdef scrollBar_esc
4074 { scrollBar_esc, PrivMode_scrollBar }, 3616 { scrollBar_esc, PrivMode_scrollBar },
4075#endif 3617#endif
4076 { 35, PrivMode_ShiftKeys }, // rxvt extension 3618 { 35, PrivMode_ShiftKeys }, // rxvt extension
3619 // 38, tektronix mode // DECTEK
4077 { 40, PrivMode_132OK }, 3620 { 40, PrivMode_132OK },
4078 // 41 xterm more fixes NYI 3621 // 41 xterm more fixes NYI
4079 // 45 margin bell NYI 3622 // 45 margin bell NYI
4080 // 46 start logging 3623 // 46 start logging
4081 { 47, PrivMode_Screen }, 3624 { 47, PrivMode_Screen },
4082 { 66, PrivMode_aplKP }, 3625 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
4083#ifndef NO_BACKSPACE_KEY 3626#ifndef NO_BACKSPACE_KEY
4084 { 67, PrivMode_BackSpace }, 3627 { 67, PrivMode_BackSpace }, // DECBKM
4085#endif 3628#endif
4086 { 1000, PrivMode_MouseX11 }, 3629 { 1000, PrivMode_MouseX11 },
4087 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3630 { 1002, PrivMode_MouseBtnEvent },
4088 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3631 { 1003, PrivMode_MouseAnyEvent },
4089 // 1003 Use All Motion Mouse Tracking. NYI, TODO
4090 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3632 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4091 { 1011, PrivMode_Keypress }, // rxvt extension 3633 { 1011, PrivMode_Keypress }, // rxvt extension
4092 // 1035 enable modifiers for alt, numlock NYI 3634 // 1035 enable modifiers for alt, numlock NYI
4093 // 1036 send ESC for meta keys NYI 3635 // 1036 send ESC for meta keys NYI
4094 // 1037 send DEL for keypad delete NYI 3636 // 1037 send DEL for keypad delete NYI
4095 { 1047, PrivMode_Screen }, 3637 { 1047, PrivMode_Screen },
4096 // 1048 save and restore cursor 3638 // 1048 save and restore cursor
4097 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3639 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
4098 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3640 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3641 { 2004, PrivMode_BracketPaste },
4099 }; 3642 };
4100 3643
4101 if (nargs == 0) 3644 if (nargs == 0)
4102 return; 3645 return;
4103 3646
… …
4128 3671
4129 scr_touch (true); 3672 scr_touch (true);
4130 break; 3673 break;
4131#endif 3674#endif
4132 case 1048: /* alternative cursor save */ 3675 case 1048: /* alternative cursor save */
4133 case 1049:
4134 if (OPTION (Opt_secondaryScreen)) 3676 if (option (Opt_secondaryScreen))
4135 if (mode == 0) 3677 if (mode == 0)
4136 scr_cursor (RESTORE); 3678 scr_cursor (RESTORE);
4137 else if (mode == 1) 3679 else if (mode == 1)
4138 scr_cursor (SAVE); 3680 scr_cursor (SAVE);
4139 break; 3681 break;
… …
4147 case 2: /* VT52 mode */ 3689 case 2: /* VT52 mode */
4148 /* oddball mode. should be set regardless of set/reset 3690 /* oddball mode. should be set regardless of set/reset
4149 * parameter. Return from VT52 mode with an ESC < from 3691 * parameter. Return from VT52 mode with an ESC < from
4150 * within VT52 mode 3692 * within VT52 mode
4151 */ 3693 */
4152 PrivMode (1, PrivMode_vt52); 3694 set_privmode (PrivMode_vt52, 1);
4153 break; 3695 break;
4154 case 3: /* 80/132 */ 3696 case 3: /* 80/132 */
4155 if (priv_modes & PrivMode_132OK) 3697 if (priv_modes & PrivMode_132OK)
4156 set_widthheight (((state ? 132 : 80) * fwidth), height); 3698 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
4157 break; 3699 break;
4158 case 4: /* smooth scrolling */ 3700 case 4: /* smooth scrolling */
4159 set_option (Opt_jumpScroll, !state); 3701 set_option (Opt_jumpScroll, !state);
4160 break; 3702 break;
4161 case 5: /* reverse video */ 3703 case 5: /* reverse video */
… …
4168 scr_autowrap (state); 3710 scr_autowrap (state);
4169 break; 3711 break;
4170 /* case 8: - auto repeat, can't do on a per window basis */ 3712 /* case 8: - auto repeat, can't do on a per window basis */
4171 case 9: /* X10 mouse reporting */ 3713 case 9: /* X10 mouse reporting */
4172 if (state) /* orthogonal */ 3714 if (state) /* orthogonal */
4173 priv_modes &= ~PrivMode_MouseX11; 3715 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4174 break; 3716 break;
4175#ifdef scrollBar_esc 3717#ifdef scrollBar_esc
4176 case scrollBar_esc: 3718 case scrollBar_esc:
4177 if (scrollbar_mapping (state)) 3719 if (scrollBar.map (state))
4178 { 3720 {
4179 resize_all_windows (0, 0, 0); 3721 resize_all_windows (0, 0, 0);
4180 scr_touch (true); 3722 scr_touch (true);
4181 } 3723 }
4182 break; 3724 break;
… …
4191 break; 3733 break;
4192 /* case 66: - application key pad */ 3734 /* case 66: - application key pad */
4193 /* case 67: - backspace key */ 3735 /* case 67: - backspace key */
4194 case 1000: /* X11 mouse reporting */ 3736 case 1000: /* X11 mouse reporting */
4195 if (state) /* orthogonal */ 3737 if (state) /* orthogonal */
4196 priv_modes &= ~PrivMode_MouseX10; 3738 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4197 break; 3739 break;
4198#if 0
4199 case 1001: 3740 case 1002:
4200 break; /* X11 mouse highlighting */ 3741 case 1003:
4201#endif 3742 if (state)
3743 {
3744 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3745 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3746 vt_emask_mouse = PointerMotionMask;
3747 }
3748 else
3749 vt_emask_mouse = NoEventMask;
3750
3751 vt_select_input ();
3752 break;
4202 case 1010: /* scroll to bottom on TTY output inhibit */ 3753 case 1010: /* scroll to bottom on TTY output inhibit */
4203 set_option (Opt_scrollTtyOutput, !state); 3754 set_option (Opt_scrollTtyOutput, !state);
4204 break; 3755 break;
4205 case 1011: /* scroll to bottom on key press */ 3756 case 1011: /* scroll to bottom on key press */
4206 set_option (Opt_scrollTtyKeypress, state); 3757 set_option (Opt_scrollTtyKeypress, state);
4207 break; 3758 break;
4208 case 1047: /* secondary screen w/ clearing last */ 3759 case 1047: /* secondary screen w/ clearing last */
4209 if (OPTION (Opt_secondaryScreen)) 3760 if (option (Opt_secondaryScreen))
4210 if (current_screen != PRIMARY) 3761 if (!state)
4211 scr_erase_screen (2); 3762 scr_erase_screen (2);
3763
4212 scr_change_screen (state); 3764 scr_change_screen (state);
4213 break; 3765 break;
4214 case 1049: /* secondary screen w/ clearing first */ 3766 case 1049: /* secondary screen w/ clearing first */
3767 if (option (Opt_secondaryScreen))
3768 if (state)
3769 scr_cursor (SAVE);
3770
4215 scr_change_screen (state); 3771 scr_change_screen (state);
3772
4216 if (OPTION (Opt_secondaryScreen)) 3773 if (option (Opt_secondaryScreen))
4217 if (current_screen != PRIMARY) 3774 if (state)
4218 scr_erase_screen (2); 3775 scr_erase_screen (2);
3776 else
3777 scr_cursor (RESTORE);
4219 break; 3778 break;
4220 default: 3779 default:
4221 break; 3780 break;
4222 } 3781 }
4223 } 3782 }
… …
4349 scr_color (Color_bg, Color_bg); 3908 scr_color (Color_bg, Color_bg);
4350 break; 3909 break;
4351 3910
4352 //case 50: // not variable spacing 3911 //case 50: // not variable spacing
4353 3912
4354#if ENABLE_FRILLS 3913#if !ENABLE_MINIMAL
4355 case 90: 3914 case 90:
4356 case 91: /* set bright fg color */ 3915 case 91: /* set bright fg color */
4357 case 92: 3916 case 92:
4358 case 93: 3917 case 93:
4359 case 94: 3918 case 94:
… …
4383rxvt_term::process_graphics () 3942rxvt_term::process_graphics ()
4384{ 3943{
4385 unicode_t ch, cmd = cmd_getc (); 3944 unicode_t ch, cmd = cmd_getc ();
4386 3945
4387 if (cmd == 'Q') 3946 if (cmd == 'Q')
3947 {
4388 { /* query graphics */ 3948 /* query graphics */
4389 tt_printf ("\033G0\012"); /* no graphics */ 3949 tt_printf ("\033G0\012"); /* no graphics */
4390 return; 3950 return;
4391 } 3951 }
4392 /* swallow other graphics sequences until terminating ':' */ 3952 /* swallow other graphics sequences until terminating ':' */
4393 do 3953 do
… …
4443 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4003 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4444 4004
4445 memcpy (v_buffer + v_buflen, data, len); 4005 memcpy (v_buffer + v_buflen, data, len);
4446 v_buflen += len; 4006 v_buflen += len;
4447 4007
4448 pty_ev.set (EVENT_READ | EVENT_WRITE); 4008 pty_ev.set (ev::READ | ev::WRITE);
4449} 4009}
4450 4010
4451void rxvt_term::pty_write () 4011void rxvt_term::pty_write ()
4452{ 4012{
4453 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4013 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4458 4018
4459 if (v_buflen == 0) 4019 if (v_buflen == 0)
4460 { 4020 {
4461 free (v_buffer); 4021 free (v_buffer);
4462 v_buffer = 0; 4022 v_buffer = 0;
4463 v_buflen = 0;
4464 4023
4465 pty_ev.set (EVENT_READ); 4024 pty_ev.set (ev::READ);
4466 return; 4025 return;
4467 } 4026 }
4468 4027
4469 memmove (v_buffer, v_buffer + written, v_buflen); 4028 memmove (v_buffer, v_buffer + written, v_buflen);
4470 } 4029 }
4471 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4030 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4472 pty_ev.set (EVENT_READ); 4031 pty_ev.set (ev::READ);
4473} 4032}
4474 4033
4475/*----------------------- end-of-file (C source) -----------------------*/ 4034/*----------------------- end-of-file (C source) -----------------------*/
4476 4035

Diff Legend

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