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

Diff Legend

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