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.276 by root, Fri Jan 20 11:02:46 2006 UTC vs.
Revision 1.456 by sf-exg, Fri Oct 22 16:49:26 2010 UTC

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

Diff Legend

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