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.295 by root, Tue Jan 31 00:25:16 2006 UTC vs.
Revision 1.484 by sf-exg, Fri Apr 29 10:10:20 2011 UTC

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

Diff Legend

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