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

Diff Legend

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