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.255 by root, Wed Jan 11 03:13:26 2006 UTC vs.
Revision 1.442 by sf-exg, Wed Mar 31 09:37:20 2010 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: command.C 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
31 * 32 *
32 * This program is free software; you can redistribute it and/or modify 33 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 34 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 36 * (at your option) any later version.
… …
49#include "rxvt.h" 50#include "rxvt.h"
50#include "rxvtperl.h" 51#include "rxvtperl.h"
51#include "version.h" 52#include "version.h"
52#include "command.h" 53#include "command.h"
53 54
54#if HAVE_SCHED_YIELD
55#undef HAVE_SCHED_YIELD // disabled for the time being
56//# include <sched.h>
57#endif
58
59#ifdef KEYSYM_RESOURCE 55#ifdef KEYSYM_RESOURCE
60# include "keyboard.h" 56# include "keyboard.h"
61#endif 57#endif
62 58
63#include <csignal> 59#include <csignal>
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,
… …
147 || !IN_RANGE_EXC (y, 0, nrow)) 143 || !IN_RANGE_EXC (y, 0, nrow))
148 return; 144 return;
149 145
150 for (;;) 146 for (;;)
151 { 147 {
152 const line_t &l = ROW(y - view_start); 148 const line_t &l = ROW(y + view_start);
153 149
154 text_t t = l.t[x]; 150 text_t t = l.t[x];
155 151
156 if (t != NOCHAR || !x) 152 if (t != NOCHAR || !x)
157 { 153 {
… …
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 (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 *
… …
321 meta = ev.state & ModMetaMask; 425 meta = ev.state & ModMetaMask;
322 426
323 if (numlock_state || (ev.state & ModNumLockMask)) 427 if (numlock_state || (ev.state & ModNumLockMask))
324 { 428 {
325 numlock_state = (ev.state & ModNumLockMask); 429 numlock_state = (ev.state & ModNumLockMask);
326 PrivMode ((!numlock_state), PrivMode_aplKP); 430 set_privmode (PrivMode_aplKP, !numlock_state);
327 } 431 }
328 432
329 kbuf[0] = 0; 433 kbuf[0] = 0;
330 434
331#ifdef USE_XIM 435#ifdef USE_XIM
… …
407#ifdef PAGING_CONTEXT_LINES 511#ifdef PAGING_CONTEXT_LINES
408 lnsppg = nrow - PAGING_CONTEXT_LINES; 512 lnsppg = nrow - PAGING_CONTEXT_LINES;
409#else 513#else
410 lnsppg = nrow * 4 / 5; 514 lnsppg = nrow * 4 / 5;
411#endif 515#endif
516 max_it (lnsppg, 1);
517
412 if (keysym == XK_Prior) 518 if (keysym == XK_Prior)
413 { 519 {
414 scr_page (UP, lnsppg); 520 scr_page (UP, lnsppg);
415 return; 521 return;
416 } 522 }
… …
443 scr_move_to (0, 1); 549 scr_move_to (0, 1);
444 return; 550 return;
445 } 551 }
446 else if (keysym == XK_End) 552 else if (keysym == XK_End)
447 { 553 {
448 scr_move_to (1, 0); 554 scr_move_to (1, 1);
449 return; 555 return;
450 } 556 }
451 } 557 }
452#endif 558#endif
453 } 559 }
… …
464 { 570 {
465 switch (keysym) 571 switch (keysym)
466 { 572 {
467 /* normal XTerm key bindings */ 573 /* normal XTerm key bindings */
468 case XK_Insert: /* Shift+Insert = paste mouse selection */ 574 case XK_Insert: /* Shift+Insert = paste mouse selection */
469 selection_request (ev.time, 0, 0); 575 selection_request (ev.time);
470 return; 576 return;
471#if TODO 577#if TODO
472 /* rxvt extras */ 578 /* rxvt extras */
473 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 579 case XK_KP_Add: /* Shift+KP_Add = bigger font */
474 change_font (FONT_UP); 580 change_font (FONT_UP);
… …
481 } 587 }
482 } 588 }
483 589
484#if ENABLE_FRILLS || ISO_14755 590#if ENABLE_FRILLS || ISO_14755
485 // ISO 14755 support 591 // ISO 14755 support
486 if (shft && ctrl) 592 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
487 { 593 {
488 int hv; 594 int hv;
489 595
490 if (iso14755buf & ISO_14755_51 596 if (iso14755buf & ISO_14755_51
491 && (keysym == XK_space || keysym == XK_KP_Space 597 && (keysym == XK_space || keysym == XK_KP_Space
… …
493 { 599 {
494 commit_iso14755 (); 600 commit_iso14755 ();
495 iso14755buf = ISO_14755_51; 601 iso14755buf = ISO_14755_51;
496# if ISO_14755 602# if ISO_14755
497 iso14755_51 (0); 603 iso14755_51 (0);
604# endif
605 return;
606 }
607 else if (keysym == XK_BackSpace)
608 {
609 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
610# if ISO_14755
611 iso14755_51 (iso14755buf & ISO_14755_MASK);
498# endif 612# endif
499 return; 613 return;
500 } 614 }
501 else if ((hv = hex_keyval (ev)) >= 0) 615 else if ((hv = hex_keyval (ev)) >= 0)
502 { 616 {
… …
507# endif 621# endif
508 return; 622 return;
509 } 623 }
510 else 624 else
511 { 625 {
512# if ENABLE_OVERLAY 626# if ISO_14755
513 scr_overlay_off (); 627 scr_overlay_off ();
514# endif 628# endif
515 iso14755buf = 0; 629 iso14755buf = 0;
516 } 630 }
517 } 631 }
632 else if (option (Opt_iso14755) &&
518 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 633 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
519 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 634 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
520 if (!(iso14755buf & ISO_14755_STARTED)) 635 if (!(iso14755buf & ISO_14755_STARTED))
521 { 636 {
522 iso14755buf |= ISO_14755_STARTED; 637 iso14755buf |= ISO_14755_STARTED;
523# if ENABLE_OVERLAY 638# if ISO_14755
524 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 639 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
525 scr_overlay_set (0, 0, "ISO 14755 mode"); 640 scr_overlay_set (0, 0, "ISO 14755 mode");
526# endif 641# endif
527 } 642 }
528#endif 643#endif
529 644
530#ifdef PRINTPIPE 645#ifdef PRINTPIPE
531 if (keysym == XK_Print) 646 if (keysym == XK_Print)
532 { 647 {
533 scr_printscreen (ctrl | shft); 648 scr_printscreen (ctrl | shft);
534 return; 649 return;
535 } 650 }
536#endif 651#endif
537 652
538 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 653 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
539 { 654 {
655 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
656 unsigned int newlen = 1;
657
658 switch (translate_keypad (keysym, kp))
540 { 659 {
660#ifndef NO_BACKSPACE_KEY
661 case XK_BackSpace:
662 if (priv_modes & PrivMode_HaveBackSpace)
663 {
664 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
665 ^ !!ctrl) ? '\b' : '\177';
666 kbuf[1] = '\0';
667 }
668 else
669 strcpy (kbuf, rs[Rs_backspace_key]);
670 break;
671#endif
672#ifndef NO_DELETE_KEY
673 case XK_Delete:
674 strcpy (kbuf, rs[Rs_delete_key]);
675 break;
676#endif
677 case XK_Tab:
678 if (shft)
679 strcpy (kbuf, "\033[Z");
680 else
681 {
682#ifdef CTRL_TAB_MAKES_META
683 if (ctrl)
684 meta = 1;
685#endif
686#ifdef MOD4_TAB_MAKES_META
687 if (ev.state & Mod4Mask)
688 meta = 1;
689#endif
541 newlen = 1; 690 newlen = 0;
542 switch (keysym) 691 }
692 break;
693
694 case XK_Up: /* "\033[A" */
695 case XK_Down: /* "\033[B" */
696 case XK_Right: /* "\033[C" */
697 case XK_Left: /* "\033[D" */
698 strcpy (kbuf, "\033[Z");
699 kbuf[2] = "DACB"[keysym - XK_Left];
700 /* do Shift first */
701 if (shft)
702 kbuf[2] = "dacb"[keysym - XK_Left];
703 else if (ctrl)
704 {
705 kbuf[1] = 'O';
706 kbuf[2] = "dacb"[keysym - XK_Left];
707 }
708 else if (priv_modes & PrivMode_aplCUR)
709 kbuf[1] = 'O';
710 break;
711
712 case XK_KP_Enter:
713 /* allow shift to override */
714 if (kp)
715 {
716 strcpy (kbuf, "\033OM");
717 break;
718 }
719
720 /* FALLTHROUGH */
721
722 case XK_Return:
723 if (priv_modes & PrivMode_LFNL)
724 {
725 kbuf[0] = '\015';
726 kbuf[1] = '\012';
727 kbuf[2] = '\0';
728 }
729 else
730 {
731 kbuf[0] = '\015';
732 kbuf[1] = '\0';
733 }
734 break;
735
736 case XK_KP_F1: /* "\033OP" */
737 case XK_KP_F2: /* "\033OQ" */
738 case XK_KP_F3: /* "\033OR" */
739 case XK_KP_F4: /* "\033OS" */
740 strcpy (kbuf, "\033OP");
741 kbuf[2] += (keysym - XK_KP_F1);
742 break;
743
744 case XK_KP_Multiply: /* "\033Oj" : "*" */
745 case XK_KP_Add: /* "\033Ok" : "+" */
746 case XK_KP_Separator: /* "\033Ol" : "," */
747 case XK_KP_Subtract: /* "\033Om" : "-" */
748 case XK_KP_Decimal: /* "\033On" : "." */
749 case XK_KP_Divide: /* "\033Oo" : "/" */
750 case XK_KP_0: /* "\033Op" : "0" */
751 case XK_KP_1: /* "\033Oq" : "1" */
752 case XK_KP_2: /* "\033Or" : "2" */
753 case XK_KP_3: /* "\033Os" : "3" */
754 case XK_KP_4: /* "\033Ot" : "4" */
755 case XK_KP_5: /* "\033Ou" : "5" */
756 case XK_KP_6: /* "\033Ov" : "6" */
757 case XK_KP_7: /* "\033Ow" : "7" */
758 case XK_KP_8: /* "\033Ox" : "8" */
759 case XK_KP_9: /* "\033Oy" : "9" */
760 /* allow shift to override */
761 if (kp)
762 {
763 strcpy (kbuf, "\033Oj");
764 kbuf[2] += (keysym - XK_KP_Multiply);
765 }
766 else
767 {
768 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
769 kbuf[1] = '\0';
770 }
771 break;
772
773 default:
543 { 774 {
544#ifndef NO_BACKSPACE_KEY 775 int param = map_function_key (keysym);
545 case XK_BackSpace: 776 if (param > 0)
546 if (priv_modes & PrivMode_HaveBackSpace) 777 sprintf (kbuf,"\033[%d~", param);
547 {
548 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
549 ^ !!ctrl) ? '\b' : '\177';
550 kbuf[1] = '\0';
551 }
552 else 778 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; 779 newlen = 0;
828 break;
829 } 780 }
830 781 break;
831 if (newlen)
832 len = strlen (kbuf);
833 } 782 }
783
784 if (newlen)
785 len = strlen (kbuf);
834 786
835 /* 787 /*
836 * Pass meta for all function keys, if 'meta' option set 788 * Pass meta for all function keys, if 'meta' option set
837 */ 789 */
838#ifdef META8_OPTION 790#ifdef META8_OPTION
… …
873 return; 825 return;
874 826
875 if (len <= 0) 827 if (len <= 0)
876 return; /* not mapped */ 828 return; /* not mapped */
877 829
878 if (OPTION (Opt_scrollTtyKeypress)) 830 if (option (Opt_scrollTtyKeypress))
879 if (view_start) 831 if (view_start)
880 { 832 {
881 view_start = 0; 833 view_start = 0;
882 want_refresh = 1; 834 want_refresh = 1;
883 } 835 }
… …
905 { 857 {
906 const char ch = C0_ESC; 858 const char ch = C0_ESC;
907 tt_write (&ch, 1); 859 tt_write (&ch, 1);
908 } 860 }
909 861
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); 862 tt_write (kbuf, (unsigned int)len);
921} 863}
922/*}}} */
923 864
865void
866rxvt_term::key_release (XKeyEvent &ev)
867{
868#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
869 KeySym keysym;
870
871 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
872#endif
873
874#if ENABLE_FRILLS || ISO_14755
875 // ISO 14755 support
876 if (iso14755buf)
877 if (iso14755buf & ISO_14755_52)
878 {
879# if ISO_14755
880 scr_overlay_off ();
881# endif
882# if ISO_14755
883 // iso14755 part 5.2 handling: release time
884 // first: controls
885 if ((ev.state & ControlMask)
886 && ((keysym >= 0x40 && keysym <= 0x5f)
887 || (keysym >= 0x61 && keysym <= 0x7f)))
888 {
889 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
890 commit_iso14755 ();
891
892 return;
893 }
894
895 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
896 if (i[0] == keysym)
897 {
898 iso14755buf = ISO_14755_51 | i[1];
899 commit_iso14755 ();
900
901 return;
902 }
903
904 scr_bell ();
905# endif
906 iso14755buf = 0;
907
908 return;
909 }
910 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
911 {
912# if ISO_14755
913 scr_overlay_off ();
914# endif
915 if (iso14755buf & ISO_14755_51)
916 commit_iso14755 ();
917#if ISO_14755
918 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
919 {
920 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
921
922 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
923 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
924 }
925# endif
926 else
927 iso14755buf = 0;
928 }
929#endif
930
931 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
932 return;
933
934#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
935 if (!(ev.state & ControlMask))
936 slip_wheel_ev.stop ();
937 else if (keysym == XK_Control_L || keysym == XK_Control_R)
938 mouse_slip_wheel_speed = 0;
939#endif
940}
941
924#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 942#if defined (KEYSYM_RESOURCE)
925/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
926/* attempt to `write' count to the input buffer */
927unsigned int 943unsigned int
928rxvt_term::cmd_write (const char *str, unsigned int count) 944rxvt_term::cmd_write (const char *str, unsigned int count)
929{ 945{
930 unsigned int n, s; 946 unsigned int n, s;
931 947
… …
959void 975void
960rxvt_term::flush () 976rxvt_term::flush ()
961{ 977{
962 flush_ev.stop (); 978 flush_ev.stop ();
963 979
964#ifdef TRANSPARENT 980#ifdef HAVE_BG_PIXMAP
965 if (want_full_refresh) 981 if (bgPixmap.check_clearChanged ())
966 { 982 {
967 want_full_refresh = 0; 983// scr_clear (true); This needs to be researched further!
968 scr_clear ();
969 scr_touch (false); 984 scr_touch (false);
970 } 985 }
971#endif 986#endif
972 987
973 if (want_refresh) 988 if (want_refresh)
974 { 989 {
975 if (SHOULD_INVOKE (HOOK_LINE_UPDATE)) 990 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
976 { 991 {
977 int row = -view_start; 992 int row = view_start;
978 int end_row = row + nrow; 993 int end_row = row + nrow;
979 994
980 while (row > -nsaved && ROW (row - 1).is_longer ()) 995 while (row > top_row && ROW (row - 1).is_longer ())
981 --row; 996 --row;
982 997
983 do 998 do
984 { 999 {
985 int start_row = row; 1000 int start_row = row;
… …
1008 while (l->is_longer () && row < end_row); 1023 while (l->is_longer () && row < end_row);
1009 } 1024 }
1010 while (row < end_row); 1025 while (row < end_row);
1011 } 1026 }
1012 1027
1013 scr_refresh (refresh_type); 1028 scr_refresh ();
1014 scrollbar_show (1); 1029 scrollBar.show (1);
1015#ifdef USE_XIM 1030#ifdef USE_XIM
1016 IMSendSpot (); 1031 IMSendSpot ();
1017#endif 1032#endif
1018 } 1033 }
1019 1034
1020 display->flush (); 1035 display->flush ();
1021} 1036}
1022 1037
1038/* checks wether a refresh is requested and starts the refresh timer */
1023void 1039void
1024rxvt_term::check_cb (check_watcher &w) 1040rxvt_term::refresh_check ()
1025{ 1041{
1026 SET_R (this); 1042 if (want_refresh && !flush_ev.is_active ())
1027 SET_LOCALE (locale); 1043 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1028 1044
1029 display->flush (); 1045 display->flush ();
1030
1031 if (want_refresh && !flush_ev.active)
1032 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1033} 1046}
1034 1047
1035void 1048void
1036rxvt_term::flush_cb (time_watcher &w) 1049rxvt_term::flush_cb (ev::timer &w, int revents)
1037{ 1050{
1038 SET_R (this); 1051 make_current ();
1039 SET_LOCALE (locale);
1040 1052
1041 refresh_limit = 1;
1042 refresh_count = 0; 1053 refresh_count = 0;
1043 flush (); 1054 flush ();
1044} 1055}
1045 1056
1046#ifdef CURSOR_BLINK 1057#ifdef CURSOR_BLINK
1047void 1058void
1048rxvt_term::cursor_blink_cb (time_watcher &w) 1059rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1049{ 1060{
1050 hidden_cursor = !hidden_cursor; 1061 hidden_cursor = !hidden_cursor;
1051 want_refresh = 1; 1062 want_refresh = 1;
1052 1063 refresh_check ();
1053 w.start (w.at + BLINK_INTERVAL);
1054} 1064}
1055#endif 1065#endif
1056 1066
1057#ifdef TEXT_BLINK 1067#ifdef TEXT_BLINK
1058void 1068void
1059rxvt_term::text_blink_cb (time_watcher &w) 1069rxvt_term::text_blink_cb (ev::timer &w, int revents)
1060{ 1070{
1061 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1071 if (scr_refresh_rend (RS_Blink, RS_Blink))
1062 { 1072 {
1063 hidden_text = !hidden_text; 1073 hidden_text = !hidden_text;
1064 want_refresh = 1; 1074 want_refresh = 1;
1065 w.start (w.at + TEXT_BLINK_INTERVAL); 1075 refresh_check ();
1066 } 1076 }
1077 else
1078 w.stop ();
1067} 1079}
1068#endif 1080#endif
1069 1081
1070#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1082#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1071void 1083void
1072rxvt_term::cont_scroll_cb (time_watcher &w) 1084rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1073{ 1085{
1074 if ((scrollbar_isUp() || scrollbar_isDn()) && 1086 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1075 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1087 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1076 { 1088 {
1077 refresh_type |= SMOOTH_REFRESH;
1078 want_refresh = 1; 1089 want_refresh = 1;
1079 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1090 refresh_check ();
1080 } 1091 }
1092 else
1093 w.stop ();
1081} 1094}
1082#endif 1095#endif
1083 1096
1084#ifdef SELECTION_SCROLLING 1097#ifdef SELECTION_SCROLLING
1085void 1098void
1086rxvt_term::sel_scroll_cb (time_watcher &w) 1099rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1087{ 1100{
1088 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1101 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1089 { 1102 {
1090 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1103 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1091 refresh_type |= SMOOTH_REFRESH;
1092 want_refresh = 1; 1104 want_refresh = 1;
1093 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1105 refresh_check ();
1094 } 1106 }
1107 else
1108 w.stop ();
1095} 1109}
1096#endif 1110#endif
1097 1111
1098#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1112#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1099void 1113void
1100rxvt_term::slip_wheel_cb (time_watcher &w) 1114rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1101{ 1115{
1102 if (mouse_slip_wheel_speed == 0 1116 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1103 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1104 : scr_page (UP, mouse_slip_wheel_speed))
1105 { 1117 {
1106 if (view_start == nsaved ||
1107 view_start == 0)
1108 mouse_slip_wheel_speed = 0;
1109
1110 refresh_type |= SMOOTH_REFRESH;
1111 want_refresh = 1; 1118 want_refresh = 1;
1112 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1119 refresh_check ();
1120 }
1121
1122 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1113 } 1123 {
1124 mouse_slip_wheel_speed = 0;
1125 w.stop ();
1126 }
1114} 1127}
1115#endif 1128#endif
1116 1129
1117#if HAVE_SCHED_YIELD 1130#if LINUX_YIELD_HACK
1118static struct event_handler 1131static struct event_handler
1119{ 1132{
1120 check_watcher cw_yield; 1133 ev::prepare yield_ev;
1121 1134
1122 void yield (check_watcher &w) 1135 void yield_cb (ev::prepare &w, int revents)
1123 { 1136 {
1124 sched_yield (); 1137 // this should really be sched_yield(), but the linux guys thought
1138 // that giving a process calling sched_yield () less cpu time than
1139 // ones with high nice levels is a useful thing to do. It surely is is
1140 // allowed by the sus... as is returning ENOSYS.
1141 // since the linux guys additionally thought that breaking the only
1142 // known workaround against their unusable sched_yield hack is cool,
1143 // we just nanosleep a bit and hope for the best.
1144
1145 struct timespec ts = { 0, 1000 };
1146 nanosleep (&ts, 0);
1147
1125 w.stop (); 1148 w.stop ();
1126 } 1149 }
1127 1150
1128 event_handler () 1151 event_handler ()
1129 : cw_yield (this, &event_handler::yield) 1152 : yield_ev (this, &event_handler::yield_cb)
1130 { 1153 {
1131 } 1154 }
1132} event_handler; 1155} event_handler;
1133#endif 1156#endif
1134 1157
… …
1145 1168
1146 memmove (cmdbuf_base, cmdbuf_ptr, n); 1169 memmove (cmdbuf_base, cmdbuf_ptr, n);
1147 cmdbuf_ptr = cmdbuf_base; 1170 cmdbuf_ptr = cmdbuf_base;
1148 cmdbuf_endp = cmdbuf_ptr + n; 1171 cmdbuf_endp = cmdbuf_ptr + n;
1149 1172
1150 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1173 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1151 1174
1152 if (r > 0) 1175 if (r > 0)
1153 { 1176 {
1154 cmdbuf_endp += r; 1177 cmdbuf_endp += r;
1155 return true; 1178 return true;
1156 } 1179 }
1157 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1180 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1158 { 1181 {
1159#if HAVE_SCHED_YIELD 1182#if LINUX_YIELD_HACK
1160 if (display->is_local) 1183 if (display->is_local)
1161 event_handler.cw_yield.start (); 1184 event_handler.yield_ev.start ();
1162#endif 1185#endif
1163 } 1186 }
1164 else 1187 else
1165 { 1188 {
1166 pty_ev.stop (); 1189 pty_ev.stop ();
1167 1190
1168 if (!OPTION (Opt_hold)) 1191 if (!option (Opt_hold))
1169 destroy (); 1192 destroy ();
1170 } 1193 }
1171 1194
1172 return false; 1195 return false;
1173} 1196}
1174 1197
1175void 1198void
1176rxvt_term::pty_cb (io_watcher &w, short revents) 1199rxvt_term::pty_cb (ev::io &w, int revents)
1177{ 1200{
1178 SET_R (this); 1201 make_current ();
1179 SET_LOCALE (locale);
1180 1202
1181 if (revents & EVENT_READ) 1203 if (revents & ev::READ)
1182 // loop, but don't allow a single term to monopolize us 1204 // loop, but don't allow a single term to monopolize us
1183 while (pty_fill ()) 1205 for (int i = CBUFCNT; i-- && pty_fill (); )
1184 if (cmd_parse ()) 1206 cmd_parse ();
1185 break;
1186 1207
1187 if (revents & EVENT_WRITE) 1208 if (revents & ev::WRITE)
1188 pty_write (); 1209 pty_write ();
1210
1211 refresh_check ();
1189} 1212}
1190 1213
1191void 1214void
1192rxvt_term::pointer_unblank () 1215rxvt_term::pointer_unblank ()
1193{ 1216{
1194 XDefineCursor (display->display, vt, TermWin_cursor); 1217 XDefineCursor (dpy, vt, TermWin_cursor);
1195 recolour_cursor (); 1218 recolour_cursor ();
1196 1219
1197#ifdef POINTER_BLANK 1220#ifdef POINTER_BLANK
1198 hidden_pointer = 0; 1221 hidden_pointer = 0;
1199 1222
1200 if (OPTION (Opt_pointerBlank)) 1223 if (option (Opt_pointerBlank))
1201 pointer_ev.start (NOW + pointerBlankDelay); 1224 pointer_ev.start (pointerBlankDelay);
1202#endif 1225#endif
1203} 1226}
1204 1227
1205#ifdef POINTER_BLANK 1228#ifdef POINTER_BLANK
1206void 1229void
1207rxvt_term::pointer_blank () 1230rxvt_term::pointer_blank ()
1208{ 1231{
1209 if (!OPTION (Opt_pointerBlank)) 1232 if (!option (Opt_pointerBlank))
1210 return; 1233 return;
1211 1234
1212 XDefineCursor (display->display, vt, display->blank_cursor); 1235 XDefineCursor (dpy, vt, display->blank_cursor);
1213 XFlush (display->display); 1236 XFlush (dpy);
1214 1237
1215 hidden_pointer = 1; 1238 hidden_pointer = 1;
1216} 1239}
1217 1240
1218void 1241void
1219rxvt_term::pointer_cb (time_watcher &w) 1242rxvt_term::pointer_cb (ev::timer &w, int revents)
1220{ 1243{
1221 SET_R (this); 1244 make_current ();
1222 SET_LOCALE (locale);
1223 1245
1224 pointer_blank (); 1246 pointer_blank ();
1225} 1247}
1226#endif 1248#endif
1227 1249
1228void 1250void
1229rxvt_term::mouse_report (XButtonEvent &ev) 1251rxvt_term::mouse_report (XButtonEvent &ev)
1230{ 1252{
1231 int button_number, key_state = 0; 1253 int button_number, key_state = 0;
1232 int x, y; 1254 int x, y;
1255 int code = 32;
1233 1256
1234 x = ev.x; 1257 x = Pixel2Col (ev.x);
1235 y = ev.y; 1258 y = Pixel2Row (ev.y);
1236 pixel_position (&x, &y); 1259 if (ev.type == MotionNotify)
1260 {
1261 if (x == mouse_row && y == mouse_col)
1262 return;
1263 mouse_row = x;
1264 mouse_col = y;
1265 code += 32;
1266 }
1237 1267
1238 if (MEvent.button == AnyButton) 1268 if (MEvent.button == AnyButton)
1239 button_number = 3; 1269 button_number = 3;
1240 else 1270 else
1241 { 1271 {
… …
1287 x + 1, 1317 x + 1,
1288 y + 1); 1318 y + 1);
1289#endif 1319#endif
1290 1320
1291 tt_printf ("\033[M%c%c%c", 1321 tt_printf ("\033[M%c%c%c",
1292 (32 + button_number + key_state), 1322 (code + button_number + key_state),
1293 (32 + x + 1), 1323 (32 + x + 1),
1294 (32 + y + 1)); 1324 (32 + y + 1));
1295} 1325}
1296 1326
1297#ifdef USING_W11LIB
1298void
1299rxvt_W11_process_x_event (XEvent *ev)
1300{
1301 rxvt_t *r = rxvt_get_r ();
1302
1303 x_cb (*ev);
1304}
1305#endif
1306
1307/*{{{ process an X event */ 1327/*{{{ process an X event */
1308void 1328void
1309rxvt_term::x_cb (XEvent &ev) 1329rxvt_term::x_cb (XEvent &ev)
1310{ 1330{
1311 dDisp; 1331 make_current ();
1312 1332
1313 SET_R (this); 1333 dLocal (Display *, dpy);
1314 SET_LOCALE (locale);
1315 1334
1335 if (ev.xany.window == vt
1336 && SHOULD_INVOKE (HOOK_X_EVENT)
1337 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1338 return;
1339
1340 // for XQueryPointer
1316 Window unused_root, unused_child; 1341 Window unused_root, unused_child;
1317 int unused_root_x, unused_root_y; 1342 int unused_root_x, unused_root_y;
1318 unsigned int unused_mask; 1343 unsigned int unused_mask;
1319 1344
1320 switch (ev.type) 1345 switch (ev.type)
1321 { 1346 {
1322 case KeyPress: 1347 case KeyPress:
1323#if ISO_14755 1348 key_press (ev.xkey);
1324 if (!(iso14755buf & ISO_14755_52))
1325#endif
1326 lookup_key (ev.xkey);
1327
1328 break; 1349 break;
1329 1350
1330 case KeyRelease: 1351 case KeyRelease:
1331 { 1352 key_release (ev.xkey);
1332#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1333 KeySym keysym;
1334
1335 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1336#endif
1337
1338#if ENABLE_FRILLS || ISO_14755
1339 // ISO 14755 support
1340 if (iso14755buf)
1341 if (iso14755buf & ISO_14755_52)
1342 {
1343# if ENABLE_OVERLAY
1344 scr_overlay_off ();
1345# endif
1346# if ISO_14755
1347 // iso14755 part 5.2 handling: release time
1348 // first: controls
1349 if ((ev.xkey.state & ControlMask)
1350 && ((keysym >= 0x40 && keysym <= 0x5f)
1351 || (keysym >= 0x61 && keysym <= 0x7f)))
1352 {
1353 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1354 commit_iso14755 ();
1355 goto skip_switch;
1356 }
1357
1358 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1359 if (i[0] == keysym)
1360 {
1361 iso14755buf = ISO_14755_51 | i[1];
1362 commit_iso14755 ();
1363 goto skip_switch;
1364 }
1365
1366 scr_bell ();
1367# endif
1368 iso14755buf = 0;
1369 break;
1370 }
1371 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1372 {
1373# if ENABLE_OVERLAY
1374 scr_overlay_off ();
1375# endif
1376 if (iso14755buf & ISO_14755_51)
1377 commit_iso14755 ();
1378#if ISO_14755
1379 else if (iso14755buf & ISO_14755_STARTED)
1380 {
1381 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1382
1383 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1384 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1385 }
1386# endif
1387 else
1388 iso14755buf = 0;
1389 }
1390#endif
1391
1392 if (ev.xany.window == vt
1393 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1394 break;
1395
1396#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1397 if (!(ev.xkey.state & ControlMask))
1398 slip_wheel_ev.stop ();
1399 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1400 mouse_slip_wheel_speed = 0;
1401#endif
1402 break; 1353 break;
1403 }
1404 1354
1405 case ButtonPress: 1355 case ButtonPress:
1406 button_press (ev.xbutton); 1356 button_press (ev.xbutton);
1407 break; 1357 break;
1408 1358
… …
1410 button_release (ev.xbutton); 1360 button_release (ev.xbutton);
1411 break; 1361 break;
1412 1362
1413 case ClientMessage: 1363 case ClientMessage:
1414 if (ev.xclient.format == 32 1364 if (ev.xclient.format == 32
1415 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1365 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1416 { 1366 {
1367 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1368 {
1369 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1370 {
1417 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1371 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1372 {
1373 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1418 destroy (); 1374 destroy ();
1375 }
1419#if ENABLE_EWMH 1376#if ENABLE_EWMH
1420 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1377 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1421 XSendEvent (disp, ev.xclient.window = display->root, 1378 XSendEvent (dpy, ev.xclient.window = display->root,
1422 False, SubstructureRedirectMask | SubstructureNotifyMask, 1379 False, SubstructureRedirectMask | SubstructureNotifyMask,
1423 &ev); 1380 &ev);
1381#endif
1382 }
1383 }
1384#if ENABLE_XEMBED
1385 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1386 {
1387 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1388 focus_in ();
1389 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1390 focus_out ();
1391 }
1424#endif 1392#endif
1425 } 1393 }
1426#if ENABLE_XEMBED
1427 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1428 {
1429 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1430 focus_in ();
1431 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1432 focus_out ();
1433 }
1434#endif
1435#ifdef OFFIX_DND
1436 /* OffiX Dnd (drag 'n' drop) protocol */
1437 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1438 && (ev.xclient.data.l[0] == DndFile
1439 || ev.xclient.data.l[0] == DndDir
1440 || ev.xclient.data.l[0] == DndLink))
1441 {
1442 /* Get Dnd data */
1443 Atom ActualType;
1444 int ActualFormat;
1445 unsigned char *data;
1446 unsigned long Size, RemainingBytes;
1447
1448 XGetWindowProperty (disp, display->root,
1449 xa[XA_DNDSELECTION],
1450 0L, 1000000L,
1451 False, AnyPropertyType,
1452 &ActualType, &ActualFormat,
1453 &Size, &RemainingBytes,
1454 &data);
1455 set_string_property (XA_CUT_BUFFER0, data);
1456 XFree (data);
1457 selection_paste (display->root, XA_CUT_BUFFER0, true);
1458 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1459 }
1460#endif /* OFFIX_DND */
1461 break;
1462
1463 case MappingNotify:
1464 XRefreshKeyboardMapping (&ev.xmapping);
1465 break; 1394 break;
1466 1395
1467 /* 1396 /*
1468 * XXX: this is not the _current_ arrangement 1397 * XXX: this is not the _current_ arrangement
1469 * Here's my conclusion: 1398 * Here's my conclusion:
… …
1488 break; 1417 break;
1489 } 1418 }
1490 break; 1419 break;
1491 1420
1492 case FocusIn: 1421 case FocusIn:
1422 if (ev.xfocus.detail != NotifyInferior
1423 && ev.xfocus.detail != NotifyPointer
1424 && ev.xfocus.mode != NotifyGrab)
1493 focus_in (); 1425 focus_in ();
1494 break; 1426 break;
1495 1427
1496 case FocusOut: 1428 case FocusOut:
1429 if (ev.xfocus.detail != NotifyInferior
1430 && ev.xfocus.detail != NotifyPointer
1431 && ev.xfocus.mode != NotifyGrab)
1497 focus_out (); 1432 focus_out ();
1498 break; 1433 break;
1499 1434
1500 case ConfigureNotify: 1435 case ConfigureNotify:
1436 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1437 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1438 szHint.width, szHint.height);*/
1501 if (ev.xconfigure.window == parent[0]) 1439 if (ev.xconfigure.window == parent[0])
1502 { 1440 {
1503 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1441 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1504 ; 1442 ;
1505 1443
1506 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1444 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1507 { 1445 {
1508 seen_resize = 1; 1446 seen_resize = 1;
1509 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1447 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1510 } 1448 }
1511 1449 else
1512#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1450 {
1513 if (OPTION (Opt_transparent)) 1451#ifdef HAVE_BG_PIXMAP
1514 check_our_parents (); 1452 if (bgPixmap.window_position_sensitive ())
1453 {
1454 if (mapped)
1455 update_background ();
1456 else
1457 bgPixmap.invalidate ();
1458 }
1515#endif 1459#endif
1460 }
1461
1462 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1516 } 1463 }
1517 break; 1464 break;
1518 1465
1519 case PropertyNotify: 1466 case PropertyNotify:
1467 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1520 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1468 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1521 && ev.xproperty.state == PropertyNewValue) 1469 && ev.xproperty.state == PropertyNewValue)
1522 selection_property (ev.xproperty.window, ev.xproperty.atom); 1470 selection_property (ev.xproperty.window, ev.xproperty.atom);
1523 1471
1524 break; 1472 break;
1525 1473
1526 case SelectionClear: 1474 case SelectionClear:
1527 selection_clear (); 1475 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1528 break; 1476 break;
1529 1477
1530 case SelectionNotify: 1478 case SelectionNotify:
1531 if (selection_wait == Sel_normal) 1479 if (selection_wait == Sel_normal)
1532 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1480 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
… …
1535 case SelectionRequest: 1483 case SelectionRequest:
1536 selection_send (ev.xselectionrequest); 1484 selection_send (ev.xselectionrequest);
1537 break; 1485 break;
1538 1486
1539 case MapNotify: 1487 case MapNotify:
1488#ifdef HAVE_BG_PIXMAP
1489 /* This is needed spcifically to fix the case of no window manager or a
1490 * non-reparenting window manager. In those cases we never get first
1491 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1492 * care of multiplicity of ConfigureNotify events arriwing while WM does
1493 * reparenting.
1494 * We should not render background immidiately, as there could be several
1495 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1496 * by scheduling background redraw as soon as we can, but giving a short
1497 * bit of time for ConfigureNotifies to arrive.
1498 * We should render background PRIOR to drawing any text, but AFTER all
1499 * of ConfigureNotifys for the best results.
1500 */
1501 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1502 update_background_ev.start (0.025);
1503#endif
1540 mapped = 1; 1504 mapped = 1;
1541#ifdef TEXT_BLINK 1505#ifdef TEXT_BLINK
1542 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1506 text_blink_ev.start ();
1543#endif 1507#endif
1544 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1508 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1545 break; 1509 break;
1546 1510
1547 case UnmapNotify: 1511 case UnmapNotify:
… …
1549#ifdef TEXT_BLINK 1513#ifdef TEXT_BLINK
1550 text_blink_ev.stop (); 1514 text_blink_ev.stop ();
1551#endif 1515#endif
1552 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1516 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1553 break; 1517 break;
1554
1555#ifdef TRANSPARENT
1556 case ReparentNotify:
1557 rootwin_cb (ev);
1558 break;
1559#endif /* TRANSPARENT */
1560 1518
1561 case GraphicsExpose: 1519 case GraphicsExpose:
1562 case Expose: 1520 case Expose:
1563 if (ev.xany.window == vt) 1521 if (ev.xany.window == vt)
1564 { 1522 {
1565 do 1523 do
1524 {
1566 scr_expose (ev.xexpose.x, ev.xexpose.y, 1525 scr_expose (ev.xexpose.x, ev.xexpose.y,
1567 ev.xexpose.width, ev.xexpose.height, False); 1526 ev.xexpose.width, ev.xexpose.height, False);
1527 }
1568 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1528 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1569 1529
1570 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1530 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1571 1531
1572 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1532 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1533 {
1573 scr_expose (ev.xexpose.x, ev.xexpose.y, 1534 scr_expose (ev.xexpose.x, ev.xexpose.y,
1574 ev.xexpose.width, ev.xexpose.height, False); 1535 ev.xexpose.width, ev.xexpose.height, False);
1536 }
1575 1537
1576 want_refresh = 1; 1538 want_refresh = 1;
1577 } 1539 }
1578 else 1540 else
1579 { 1541 {
1580 XEvent unused_event; 1542 XEvent unused_event;
1581 1543
1582 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1544 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1583 ; 1545 ;
1584 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1546 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1585 ; 1547 ;
1586 1548
1587 if (isScrollbarWindow (ev.xany.window)) 1549 if (scrollBar.state && ev.xany.window == scrollBar.win)
1588 { 1550 {
1589 scrollBar.setIdle (); 1551 scrollBar.state = STATE_IDLE;
1590 scrollbar_show (0); 1552 scrollBar.show (0);
1591 } 1553 }
1592#ifdef MENUBAR
1593 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1594 menubar_expose ();
1595#endif
1596
1597#ifdef TRANSPARENT
1598 if (am_transparent && ev.xany.window == parent[0])
1599 XClearWindow (disp, ev.xany.window);
1600#endif
1601 } 1554 }
1602 break; 1555 break;
1603 1556
1604 case MotionNotify: 1557 case MotionNotify:
1605#ifdef POINTER_BLANK 1558#ifdef POINTER_BLANK
1606 if (hidden_pointer) 1559 if (hidden_pointer)
1607 pointer_unblank (); 1560 pointer_unblank ();
1608#endif 1561#endif
1609#if MENUBAR 1562 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1610 if (isMenuBarWindow (ev.xany.window)) 1563 || priv_modes & PrivMode_MouseAnyEvent)
1611 {
1612 menubar_control (ev.xbutton); 1564 mouse_report (ev.xbutton);
1613 break;
1614 }
1615#endif
1616 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1565 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1617 break; 1566 break;
1618 1567
1619 if (ev.xany.window == vt) 1568 if (ev.xany.window == vt)
1620 { 1569 {
1570 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1621 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1571 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1622 ; // nop 1572 ; // nop
1623 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1573 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1624 { 1574 {
1625 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1575 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1626 ; 1576 ;
1627 1577
1628 XQueryPointer (disp, vt, 1578 XQueryPointer (dpy, vt,
1629 &unused_root, &unused_child, 1579 &unused_root, &unused_child,
1630 &unused_root_x, &unused_root_y, 1580 &unused_root_x, &unused_root_y,
1631 &ev.xbutton.x, &ev.xbutton.y, 1581 &ev.xbutton.x, &ev.xbutton.y,
1632 &ev.xbutton.state); 1582 &ev.xbutton.state);
1633#ifdef MOUSE_THRESHOLD 1583#ifdef MOUSE_THRESHOLD
… …
1653 int dist; 1603 int dist;
1654 1604
1655 /* don't clobber the current delay if we are 1605 /* don't clobber the current delay if we are
1656 * already in the middle of scrolling. 1606 * already in the middle of scrolling.
1657 */ 1607 */
1658 if (!sel_scroll_ev.active) 1608 if (!sel_scroll_ev.is_active ())
1659 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1609 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1660 1610
1661 /* save the event params so we can highlight 1611 /* save the event params so we can highlight
1662 * the selection in the pending-scroll loop 1612 * the selection in the pending-scroll loop
1663 */ 1613 */
1664 selection_save_x = ev.xbutton.x; 1614 selection_save_x = ev.xbutton.x;
… …
1686 else 1636 else
1687 { 1637 {
1688 /* we are within the text window, so we 1638 /* we are within the text window, so we
1689 * shouldn't be scrolling 1639 * shouldn't be scrolling
1690 */ 1640 */
1691 if (sel_scroll_ev.active)
1692 sel_scroll_ev.stop(); 1641 sel_scroll_ev.stop();
1693 } 1642 }
1694#endif 1643#endif
1695#ifdef MOUSE_THRESHOLD 1644#ifdef MOUSE_THRESHOLD
1696 } 1645 }
1697#endif 1646#endif
1698 } 1647 }
1699 } 1648 }
1700 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1649 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1701 { 1650 {
1702 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1651 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1703 MotionNotify, &ev)) 1652 MotionNotify, &ev))
1704 ; 1653 ;
1705 1654
1706 XQueryPointer (disp, scrollBar.win, 1655 XQueryPointer (dpy, scrollBar.win,
1707 &unused_root, &unused_child, 1656 &unused_root, &unused_child,
1708 &unused_root_x, &unused_root_y, 1657 &unused_root_x, &unused_root_y,
1709 &ev.xbutton.x, &ev.xbutton.y, 1658 &ev.xbutton.x, &ev.xbutton.y,
1710 &unused_mask); 1659 &unused_mask);
1711 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1660 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1712 scrollbar_size ()); 1661 scrollBar.size ());
1713 want_refresh = 1; 1662 want_refresh = 1;
1714 refresh_limit = 0;
1715 scrollbar_show (1); 1663 scrollBar.show (1);
1716 } 1664 }
1717 break; 1665 break;
1718 } 1666 }
1719 1667
1720skip_switch: ;
1721
1722#if defined(CURSOR_BLINK) 1668#if defined(CURSOR_BLINK)
1723 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1669 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1724 { 1670 {
1725 if (hidden_cursor) 1671 if (hidden_cursor)
1726 { 1672 {
1727 hidden_cursor = 0; 1673 hidden_cursor = 0;
1728 want_refresh = 1; 1674 want_refresh = 1;
1729 } 1675 }
1730 1676
1731 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1677 cursor_blink_ev.again ();
1732 } 1678 }
1733#endif 1679#endif
1734 1680
1735#if defined(POINTER_BLANK) 1681#if defined(POINTER_BLANK)
1736 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1682 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1737 { 1683 {
1738 if (ev.type == MotionNotify 1684 if (ev.type == MotionNotify
1739 || ev.type == ButtonPress 1685 || ev.type == ButtonPress
1740 || ev.type == ButtonRelease) 1686 || ev.type == ButtonRelease)
1741 if (hidden_pointer) 1687 if (hidden_pointer)
… …
1743 1689
1744 if (ev.type == KeyPress && hidden_pointer == 0) 1690 if (ev.type == KeyPress && hidden_pointer == 0)
1745 pointer_blank (); 1691 pointer_blank ();
1746 } 1692 }
1747#endif 1693#endif
1694
1695 refresh_check ();
1748} 1696}
1697
1698#if ENABLE_FRILLS
1699void
1700rxvt_term::set_urgency (bool enable)
1701{
1702 if (enable == urgency_hint)
1703 return;
1704
1705 if (XWMHints *h = XGetWMHints (dpy, parent[0]))
1706 {
1707 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1708 XSetWMHints (dpy, parent[0], h);
1709 urgency_hint = enable;
1710 }
1711}
1712#endif
1749 1713
1750void 1714void
1751rxvt_term::focus_in () 1715rxvt_term::focus_in ()
1752{ 1716{
1753 if (!focus) 1717 if (!focus)
1754 { 1718 {
1755 focus = 1; 1719 focus = 1;
1756 want_refresh = 1; 1720 want_refresh = 1;
1757 1721
1758 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1759
1760#if USE_XIM 1722#if USE_XIM
1761 if (Input_Context != NULL) 1723 if (Input_Context != NULL)
1762 { 1724 {
1763 IMSetStatusPosition (); 1725 IMSetPosition ();
1764 XSetICFocus (Input_Context); 1726 XSetICFocus (Input_Context);
1765 } 1727 }
1766#endif 1728#endif
1767#if CURSOR_BLINK 1729#if CURSOR_BLINK
1768 if (OPTION (Opt_cursorBlink)) 1730 if (option (Opt_cursorBlink))
1769 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1731 cursor_blink_ev.again ();
1770#endif 1732#endif
1771#if OFF_FOCUS_FADING 1733#if OFF_FOCUS_FADING
1772 if (rs[Rs_fade]) 1734 if (rs[Rs_fade])
1773 { 1735 {
1774 pix_colors = pix_colors_focused; 1736 pix_colors = pix_colors_focused;
1775 scr_recolour (); 1737 scr_recolour ();
1776 } 1738 }
1777#endif 1739#endif
1740#if ENABLE_FRILLS
1741 if (option (Opt_urgentOnBell))
1742 set_urgency (0);
1743#endif
1744
1745 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1778 } 1746 }
1779} 1747}
1780 1748
1781void 1749void
1782rxvt_term::focus_out () 1750rxvt_term::focus_out ()
… …
1784 if (focus) 1752 if (focus)
1785 { 1753 {
1786 focus = 0; 1754 focus = 0;
1787 want_refresh = 1; 1755 want_refresh = 1;
1788 1756
1789 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1757#if ENABLE_FRILLS
1790 1758 if (option (Opt_urgentOnBell))
1759 set_urgency (0);
1760#endif
1791#if ENABLE_FRILLS || ISO_14755 1761#if ENABLE_FRILLS || ISO_14755
1792 if (iso14755buf) 1762 if (iso14755buf)
1793 { 1763 {
1794 iso14755buf = 0; 1764 iso14755buf = 0;
1795# if ENABLE_OVERLAY 1765# if ISO_14755
1796 scr_overlay_off (); 1766 scr_overlay_off ();
1797# endif 1767# endif
1798 } 1768 }
1799#endif 1769#endif
1800#if USE_XIM 1770#if USE_XIM
1801 if (Input_Context != NULL) 1771 if (Input_Context != NULL)
1802 XUnsetICFocus (Input_Context); 1772 XUnsetICFocus (Input_Context);
1803#endif 1773#endif
1804#if CURSOR_BLINK 1774#if CURSOR_BLINK
1805 if (OPTION (Opt_cursorBlink)) 1775 if (option (Opt_cursorBlink))
1806 cursor_blink_ev.stop (); 1776 cursor_blink_ev.stop ();
1777
1807 hidden_cursor = 0; 1778 hidden_cursor = 0;
1808#endif 1779#endif
1809#if OFF_FOCUS_FADING 1780#if OFF_FOCUS_FADING
1810 if (rs[Rs_fade]) 1781 if (rs[Rs_fade])
1811 { 1782 {
1812 pix_colors = pix_colors_unfocused; 1783 pix_colors = pix_colors_unfocused;
1813 scr_recolour (); 1784 scr_recolour ();
1814 } 1785 }
1815#endif 1786#endif
1787
1788 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1789 }
1790}
1791
1792void
1793rxvt_term::update_fade_color (unsigned int idx)
1794{
1795#if OFF_FOCUS_FADING
1796 if (rs[Rs_fade])
1816 } 1797 {
1798 rgba c;
1799 pix_colors [Color_fade].get (c);
1800 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1801 }
1802#endif
1817} 1803}
1818 1804
1819#if TRANSPARENT 1805#if ENABLE_TRANSPARENCY || ENABLE_PERL
1820void 1806void
1821rxvt_term::rootwin_cb (XEvent &ev) 1807rxvt_term::rootwin_cb (XEvent &ev)
1822{ 1808{
1823 SET_R (this); 1809 make_current ();
1824 SET_LOCALE (locale);
1825 1810
1811 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1812 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1813 return;
1814
1815# if ENABLE_TRANSPARENCY
1826 switch (ev.type) 1816 switch (ev.type)
1827 { 1817 {
1828 case PropertyNotify: 1818 case PropertyNotify:
1829 /* 1819 /*
1830 * if user used some Esetroot compatible prog to set the root bg, 1820 * if user used some Esetroot compatible prog to set the root bg,
1831 * use the property to determine the pixmap. We use it later on. 1821 * use the property to determine the pixmap. We use it later on.
1832 */ 1822 */
1833 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1823 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1834 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1824 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1835 return; 1825 {
1826 bgPixmap.set_root_pixmap ();
1827 update_background ();
1828 }
1836 1829
1837 /* FALLTHROUGH */
1838 case ReparentNotify:
1839 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1840 want_refresh = want_full_refresh = 1;
1841 break; 1830 break;
1842 } 1831 }
1832# endif
1833
1834 refresh_check ();
1843} 1835}
1844#endif 1836#endif
1845 1837
1846void 1838void
1847rxvt_term::button_press (XButtonEvent &ev) 1839rxvt_term::button_press (XButtonEvent &ev)
… …
1856 /* 1848 /*
1857 * VT window processing of button press 1849 * VT window processing of button press
1858 */ 1850 */
1859 if (ev.window == vt) 1851 if (ev.window == vt)
1860 { 1852 {
1853 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1854 return;
1855
1861#if ISO_14755 1856#if ISO_14755
1862 // 5.4 1857 // 5.4
1863 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1858 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1864 { 1859 {
1865 iso14755_54 (ev.x, ev.y); 1860 iso14755_54 (ev.x, ev.y);
… …
1899 mouse_report (ev); 1894 mouse_report (ev);
1900 } 1895 }
1901#else 1896#else
1902 MEvent.button = ev.button; 1897 MEvent.button = ev.button;
1903 mouse_report (ev); 1898 mouse_report (ev);
1904#endif /* MOUSE_REPORT_DOUBLECLICK */ 1899#endif /* MOUSE_REPORT_DOUBLECLICK */
1905 1900
1906 } 1901 }
1907 else 1902 else
1908 { 1903 {
1909 if (ev.button != MEvent.button) 1904 if (ev.button != MEvent.button)
1910 MEvent.clicks = 0; 1905 MEvent.clicks = 0;
1911 1906
1912 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1913 switch (ev.button) 1907 switch (ev.button)
1914 { 1908 {
1915 case Button1: 1909 case Button1:
1916 /* allow meta + click to select rectangular areas */ 1910 /* allow meta + click to select rectangular areas */
1917 /* should be done in screen.C */ 1911 /* should be done in screen.C */
1918#if ENABLE_FRILLS 1912#if ENABLE_FRILLS
1919 selection.rect = !!(ev.state & ModMetaMask); 1913 selection.rect = !!(ev.state & ModMetaMask);
1920#else 1914#else
1921 selection.rect = false; 1915 selection.rect = false;
1922#endif 1916#endif
1923 1917
1924 /* allow shift+left click to extend selection */ 1918 /* allow shift+left click to extend selection */
1925 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1919 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1926 { 1920 {
1927 if (MEvent.button == Button1 && clickintime) 1921 if (MEvent.button == Button1 && clickintime)
1928 selection_rotate (ev.x, ev.y); 1922 selection_rotate (ev.x, ev.y);
1929 else 1923 else
1930 selection_extend (ev.x, ev.y, 1); 1924 selection_extend (ev.x, ev.y, 1);
1931 } 1925 }
1932 else 1926 else
1933 { 1927 {
1934 if (MEvent.button == Button1 && clickintime) 1928 if (MEvent.button == Button1 && clickintime)
1935 MEvent.clicks++; 1929 MEvent.clicks++;
1936 else 1930 else
1937 MEvent.clicks = 1; 1931 MEvent.clicks = 1;
1938 1932
1939 selection_click (MEvent.clicks, ev.x, ev.y); 1933 selection_click (MEvent.clicks, ev.x, ev.y);
1940 } 1934 }
1941 1935
1942 MEvent.button = Button1; 1936 MEvent.button = Button1;
1943 break; 1937 break;
1944 1938
1945 case Button3: 1939 case Button3:
1946 if (MEvent.button == Button3 && clickintime) 1940 if (MEvent.button == Button3 && clickintime)
1947 selection_rotate (ev.x, ev.y); 1941 selection_rotate (ev.x, ev.y);
1948 else 1942 else
1949 selection_extend (ev.x, ev.y, 1); 1943 selection_extend (ev.x, ev.y, 1);
1950 1944
1951 MEvent.button = Button3; 1945 MEvent.button = Button3;
1952 break; 1946 break;
1953 } 1947 }
1954 } 1948 }
1955 1949
1956 MEvent.time = ev.time; 1950 MEvent.time = ev.time;
1957 return; 1951 return;
1958 } 1952 }
1959 1953
1960 /* 1954 /*
1961 * Scrollbar window processing of button press 1955 * Scrollbar window processing of button press
1962 */ 1956 */
1963 if (isScrollbarWindow (ev.window)) 1957 if (scrollBar.state && ev.window == scrollBar.win)
1964 { 1958 {
1965 scrollBar.setIdle (); 1959 page_dirn direction = NO_DIR;
1960
1961 if (scrollBar.upButton (ev.y))
1962 direction = UP; /* up */
1963 else if (scrollBar.dnButton (ev.y))
1964 direction = DN; /* down */
1965
1966 scrollBar.state = STATE_IDLE;
1966 /* 1967 /*
1967 * Rxvt-style scrollbar: 1968 * Rxvt-style scrollbar:
1968 * move up if mouse is above slider 1969 * move up if mouse is above slider
1969 * move dn if mouse is below slider 1970 * move dn if mouse is below slider
1970 * 1971 *
… …
1979 /* 1980 /*
1980 * Mouse report disabled scrollbar: 1981 * Mouse report disabled scrollbar:
1981 * arrow buttons - send up/down 1982 * arrow buttons - send up/down
1982 * click on scrollbar - send pageup/down 1983 * click on scrollbar - send pageup/down
1983 */ 1984 */
1984 if ((scrollBar.style == R_SB_NEXT 1985 if (direction == UP)
1985 && scrollbarnext_upButton (ev.y))
1986 || (scrollBar.style == R_SB_RXVT
1987 && scrollbarrxvt_upButton (ev.y)))
1988 tt_printf ("\033[A"); 1986 tt_printf ("\033[A");
1989 else if ((scrollBar.style == R_SB_NEXT 1987 else if (direction == DN)
1990 && scrollbarnext_dnButton (ev.y))
1991 || (scrollBar.style == R_SB_RXVT
1992 && scrollbarrxvt_dnButton (ev.y)))
1993 tt_printf ("\033[B"); 1988 tt_printf ("\033[B");
1994 else 1989 else
1995 switch (ev.button) 1990 switch (ev.button)
1996 { 1991 {
1997 case Button2: 1992 case Button2:
… …
2004 tt_printf ("\033[5~"); 1999 tt_printf ("\033[5~");
2005 break; 2000 break;
2006 } 2001 }
2007 } 2002 }
2008 else 2003 else
2009#endif /* NO_SCROLLBAR_REPORT */ 2004#endif /* NO_SCROLLBAR_REPORT */
2010
2011 {
2012 char upordown = 0;
2013
2014 if (scrollBar.style == R_SB_NEXT)
2015 { 2005 {
2016 if (scrollbarnext_upButton (ev.y)) 2006 if (direction != NO_DIR)
2017 upordown = -1; /* up */
2018 else if (scrollbarnext_dnButton (ev.y))
2019 upordown = 1; /* down */
2020 }
2021 else if (scrollBar.style == R_SB_RXVT)
2022 {
2023 if (scrollbarrxvt_upButton (ev.y))
2024 upordown = -1; /* up */
2025 else if (scrollbarrxvt_dnButton (ev.y))
2026 upordown = 1; /* down */
2027 }
2028 if (upordown)
2029 { 2007 {
2030#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2008#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2009 if (!cont_scroll_ev.is_active ())
2031 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2010 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2032#endif 2011#endif
2033 if (scr_page (upordown < 0 ? UP : DN, 1)) 2012 if (scr_page (direction, 1))
2034 { 2013 {
2035 if (upordown < 0) 2014 if (direction == UP)
2036 scrollBar.setUp (); 2015 scrollBar.state = STATE_UP;
2037 else 2016 else
2038 scrollBar.setDn (); 2017 scrollBar.state = STATE_DOWN;
2039 } 2018 }
2040 } 2019 }
2041 else 2020 else
2042 switch (ev.button) 2021 switch (ev.button)
2043 { 2022 {
2044 case Button2: 2023 case Button2:
2045 switch (scrollbar_align) 2024 switch (scrollBar.align)
2046 { 2025 {
2047 case R_SB_ALIGN_TOP: 2026 case R_SB_ALIGN_TOP:
2048 csrO = 0; 2027 csrO = 0;
2049 break; 2028 break;
2050 case R_SB_ALIGN_CENTRE: 2029 case R_SB_ALIGN_CENTRE:
… …
2056 } 2035 }
2057 2036
2058 if (scrollBar.style == R_SB_XTERM 2037 if (scrollBar.style == R_SB_XTERM
2059 || scrollbar_above_slider (ev.y) 2038 || scrollbar_above_slider (ev.y)
2060 || scrollbar_below_slider (ev.y)) 2039 || scrollbar_below_slider (ev.y))
2061 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2040 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2062 2041
2063 scrollBar.setMotion (); 2042 scrollBar.state = STATE_MOTION;
2064 break; 2043 break;
2065 2044
2066 case Button1: 2045 case Button1:
2067 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2046 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2068 csrO = ev.y - scrollBar.top; 2047 csrO = ev.y - scrollBar.top;
2069 /* FALLTHROUGH */ 2048 /* FALLTHROUGH */
2070 2049
2071 case Button3: 2050 case Button3:
2072 if (scrollBar.style != R_SB_XTERM) 2051 if (scrollBar.style != R_SB_XTERM)
… …
2082 scr_page (DN, nrow - 1); 2061 scr_page (DN, nrow - 1);
2083# else 2062# else
2084 scr_page (DN, nrow / 4); 2063 scr_page (DN, nrow / 4);
2085# endif 2064# endif
2086 else 2065 else
2087 scrollBar.setMotion (); 2066 scrollBar.state = STATE_MOTION;
2088 } 2067 }
2089 else 2068 else
2090 { 2069 {
2091 scr_page ((ev.button == Button1 ? DN : UP), 2070 scr_page ((ev.button == Button1 ? DN : UP),
2092 (nrow 2071 (nrow
2093 * scrollbar_position (ev.y) 2072 * scrollbar_position (ev.y)
2094 / scrollbar_size ())); 2073 / scrollBar.size ()));
2095 } 2074 }
2096 2075
2097 break; 2076 break;
2098 } 2077 }
2099 } 2078 }
2100 2079
2101 return; 2080 return;
2102 } 2081 }
2103
2104#if MENUBAR
2105 /*
2106 * Menubar window processing of button press
2107 */
2108 if (isMenuBarWindow (ev.window))
2109 menubar_control (ev);
2110#endif
2111} 2082}
2112 2083
2113void 2084void
2114rxvt_term::button_release (XButtonEvent &ev) 2085rxvt_term::button_release (XButtonEvent &ev)
2115{ 2086{
… …
2117 2088
2118 csrO = 0; /* reset csr Offset */ 2089 csrO = 0; /* reset csr Offset */
2119 if (!bypass_keystate) 2090 if (!bypass_keystate)
2120 reportmode = !! (priv_modes & PrivMode_mouse_report); 2091 reportmode = !! (priv_modes & PrivMode_mouse_report);
2121 2092
2122 if (scrollbar_isUpDn ()) 2093 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2123 { 2094 {
2124 scrollBar.setIdle (); 2095 scrollBar.state = STATE_IDLE;
2125 scrollbar_show (0); 2096 scrollBar.show (0);
2126#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2127 refresh_type &= ~SMOOTH_REFRESH;
2128#endif
2129 } 2097 }
2130 2098
2131#ifdef SELECTION_SCROLLING 2099#ifdef SELECTION_SCROLLING
2132 if (sel_scroll_ev.active)
2133 sel_scroll_ev.stop(); 2100 sel_scroll_ev.stop();
2134#endif 2101#endif
2135 2102
2136 if (ev.window == vt) 2103 if (ev.window == vt)
2137 { 2104 {
2105 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2106 return;
2107
2138#if ISO_14755 2108#if ISO_14755
2139 // 5.4 2109 // 5.4
2140 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2110 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2141 return; 2111 return;
2142#endif 2112#endif
2113
2143 if (reportmode) 2114 if (reportmode)
2144 { 2115 {
2145 /* mouse report from vt window */ 2116 /* mouse report from vt window */
2146 /* don't report release of wheel "buttons" */ 2117 /* don't report release of wheel "buttons" */
2147 if (ev.button >= 4) 2118 if (ev.button >= 4)
… …
2158 mouse_report (ev); 2129 mouse_report (ev);
2159 } 2130 }
2160#else /* MOUSE_REPORT_DOUBLECLICK */ 2131#else /* MOUSE_REPORT_DOUBLECLICK */
2161 MEvent.button = AnyButton; 2132 MEvent.button = AnyButton;
2162 mouse_report (ev); 2133 mouse_report (ev);
2163#endif /* MOUSE_REPORT_DOUBLECLICK */ 2134#endif /* MOUSE_REPORT_DOUBLECLICK */
2164 return; 2135 return;
2165 } 2136 }
2166 2137
2167 /* 2138 /*
2168 * dumb hack to compensate for the failure of click-and-drag 2139 * dumb hack to compensate for the failure of click-and-drag
… …
2171 if (priv_modes & PrivMode_mouse_report 2142 if (priv_modes & PrivMode_mouse_report
2172 && bypass_keystate 2143 && bypass_keystate
2173 && ev.button == Button1 && MEvent.clicks <= 1) 2144 && ev.button == Button1 && MEvent.clicks <= 1)
2174 selection_extend (ev.x, ev.y, 0); 2145 selection_extend (ev.x, ev.y, 0);
2175 2146
2176 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2177 return;
2178
2179 switch (ev.button) 2147 switch (ev.button)
2180 { 2148 {
2181 case Button1: 2149 case Button1:
2182 case Button3: 2150 case Button3:
2183 selection_make (ev.time); 2151 selection_make (ev.time);
2184 break; 2152 break;
2153
2185 case Button2: 2154 case Button2:
2186 selection_request (ev.time, ev.x, ev.y); 2155 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2156 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2187 break; 2157 break;
2158
2188#ifdef MOUSE_WHEEL 2159#ifdef MOUSE_WHEEL
2189 case Button4: 2160 case Button4:
2190 case Button5: 2161 case Button5:
2191 { 2162 {
2192 int i; 2163 int i;
… …
2194 2165
2195 v = ev.button == Button4 ? UP : DN; 2166 v = ev.button == Button4 ? UP : DN;
2196 2167
2197 if (ev.state & ShiftMask) 2168 if (ev.state & ShiftMask)
2198 i = 1; 2169 i = 1;
2199 else if (OPTION (Opt_mouseWheelScrollPage)) 2170 else if (option (Opt_mouseWheelScrollPage))
2200 i = nrow - 1; 2171 i = nrow - 1;
2201 else 2172 else
2202 i = 5; 2173 i = 5;
2203 2174
2204# ifdef MOUSE_SLIP_WHEELING 2175# ifdef MOUSE_SLIP_WHEELING
… …
2206 { 2177 {
2207 mouse_slip_wheel_speed += v ? -1 : 1; 2178 mouse_slip_wheel_speed += v ? -1 : 1;
2208 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2179 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2209 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2180 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2210 2181
2211 if (slip_wheel_ev.at < NOW) 2182 if (!slip_wheel_ev.is_active ())
2212 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2183 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2213
2214 slip_wheel_ev.start ();
2215 } 2184 }
2216 else 2185 else
2186# endif
2217 { 2187 {
2218# endif
2219 scr_page (v, i); 2188 scr_page (v, i);
2220 scrollbar_show (1); 2189 scrollBar.show (1);
2221# ifdef MOUSE_SLIP_WHEELING
2222 } 2190 }
2223# endif
2224 } 2191 }
2225 break; 2192 break;
2226#endif 2193#endif
2227 } 2194 }
2228 } 2195 }
2229#ifdef MENUBAR
2230 else if (isMenuBarWindow (ev.window))
2231 menubar_control (ev);
2232#endif
2233} 2196}
2234
2235#ifdef TRANSPARENT
2236#if TINTING
2237/* taken from aterm-0.4.2 */
2238
2239typedef uint32_t RUINT32T;
2240
2241void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2242{
2243 int sh_r, sh_g, sh_b;
2244 RUINT32T mask_r, mask_g, mask_b;
2245 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2246 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2247 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2248 int i;
2249
2250 Visual *visual = display->visual;
2251
2252 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2253
2254 /* for convenience */
2255 mask_r = visual->red_mask;
2256 mask_g = visual->green_mask;
2257 mask_b = visual->blue_mask;
2258
2259 /* boring lookup table pre-initialization */
2260 switch (srcImage->bits_per_pixel) {
2261 case 15:
2262 if ((mask_r != 0x7c00) ||
2263 (mask_g != 0x03e0) ||
2264 (mask_b != 0x001f))
2265 return;
2266 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2267 lookup_r = lookup;
2268 lookup_g = lookup+32;
2269 lookup_b = lookup+32+32;
2270 sh_r = 10;
2271 sh_g = 5;
2272 sh_b = 0;
2273 break;
2274 case 16:
2275 if ((mask_r != 0xf800) ||
2276 (mask_g != 0x07e0) ||
2277 (mask_b != 0x001f))
2278 return;
2279 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2280 lookup_r = lookup;
2281 lookup_g = lookup+32;
2282 lookup_b = lookup+32+64;
2283 sh_r = 11;
2284 sh_g = 5;
2285 sh_b = 0;
2286 break;
2287 case 24:
2288 if ((mask_r != 0xff0000) ||
2289 (mask_g != 0x00ff00) ||
2290 (mask_b != 0x0000ff))
2291 return;
2292 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2293 lookup_r = lookup;
2294 lookup_g = lookup+256;
2295 lookup_b = lookup+256+256;
2296 sh_r = 16;
2297 sh_g = 8;
2298 sh_b = 0;
2299 break;
2300 case 32:
2301 if ((mask_r != 0xff0000) ||
2302 (mask_g != 0x00ff00) ||
2303 (mask_b != 0x0000ff))
2304 return;
2305 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2306 lookup_r = lookup;
2307 lookup_g = lookup+256;
2308 lookup_b = lookup+256+256;
2309 sh_r = 16;
2310 sh_g = 8;
2311 sh_b = 0;
2312 break;
2313 default:
2314 return; /* we do not support this color depth */
2315 }
2316
2317 /* prepare limits for color transformation (each channel is handled separately) */
2318 if (shade < 0) {
2319 shade = -shade;
2320 if (shade < 0) shade = 0;
2321 if (shade > 100) shade = 100;
2322
2323 lower_lim_r = 65535-rm;
2324 lower_lim_g = 65535-gm;
2325 lower_lim_b = 65535-bm;
2326
2327 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2328 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2329 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2330
2331 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2332 } else {
2333 if (shade < 0) shade = 0;
2334 if (shade > 100) shade = 100;
2335
2336 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2337
2338 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2339 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2340 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2341 }
2342
2343 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2344 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2345 {
2346 unsigned int tmp;
2347
2348 tmp = lower_lim_r;
2349 lower_lim_r = lower_lim_b;
2350 lower_lim_b = tmp;
2351
2352 tmp = upper_lim_r;
2353 upper_lim_r = upper_lim_b;
2354 upper_lim_b = tmp;
2355 }
2356
2357 /* fill our lookup tables */
2358 for (i = 0; i <= mask_r>>sh_r; i++)
2359 {
2360 RUINT32T tmp;
2361 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2362 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2363 lookup_r[i] = (tmp/65535)<<sh_r;
2364 }
2365 for (i = 0; i <= mask_g>>sh_g; i++)
2366 {
2367 RUINT32T tmp;
2368 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2369 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2370 lookup_g[i] = (tmp/65535)<<sh_g;
2371 }
2372 for (i = 0; i <= mask_b>>sh_b; i++)
2373 {
2374 RUINT32T tmp;
2375 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2376 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2377 lookup_b[i] = (tmp/65535)<<sh_b;
2378 }
2379
2380 /* apply table to input image (replacing colors by newly calculated ones) */
2381 switch (srcImage->bits_per_pixel)
2382 {
2383 case 15:
2384 {
2385 unsigned short *p1, *pf, *p, *pl;
2386 p1 = (unsigned short *) srcImage->data;
2387 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2388 while (p1 < pf)
2389 {
2390 p = p1;
2391 pl = p1 + srcImage->width;
2392 for (; p < pl; p++)
2393 {
2394 *p = lookup_r[(*p & 0x7c00)>>10] |
2395 lookup_g[(*p & 0x03e0)>> 5] |
2396 lookup_b[(*p & 0x001f)];
2397 }
2398 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2399 }
2400 break;
2401 }
2402 case 16:
2403 {
2404 unsigned short *p1, *pf, *p, *pl;
2405 p1 = (unsigned short *) srcImage->data;
2406 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2407 while (p1 < pf)
2408 {
2409 p = p1;
2410 pl = p1 + srcImage->width;
2411 for (; p < pl; p++)
2412 {
2413 *p = lookup_r[(*p & 0xf800)>>11] |
2414 lookup_g[(*p & 0x07e0)>> 5] |
2415 lookup_b[(*p & 0x001f)];
2416 }
2417 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2418 }
2419 break;
2420 }
2421 case 24:
2422 {
2423 unsigned char *p1, *pf, *p, *pl;
2424 p1 = (unsigned char *) srcImage->data;
2425 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2426 while (p1 < pf)
2427 {
2428 p = p1;
2429 pl = p1 + srcImage->width * 3;
2430 for (; p < pl; p += 3)
2431 {
2432 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2433 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2434 p[2] = lookup_r[(p[2] & 0x0000ff)];
2435 }
2436 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2437 }
2438 break;
2439 }
2440 case 32:
2441 {
2442 RUINT32T *p1, *pf, *p, *pl;
2443 p1 = (RUINT32T *) srcImage->data;
2444 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2445
2446 while (p1 < pf)
2447 {
2448 p = p1;
2449 pl = p1 + srcImage->width;
2450 for (; p < pl; p++)
2451 {
2452 *p = lookup_r[(*p & 0xff0000)>>16] |
2453 lookup_g[(*p & 0x00ff00)>> 8] |
2454 lookup_b[(*p & 0x0000ff)] |
2455 (*p & ~0xffffff);
2456 }
2457 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2458 }
2459 break;
2460 }
2461 }
2462
2463 free (lookup);
2464}
2465#endif
2466
2467/*
2468 * Check our parents are still who we think they are.
2469 * Do transparency updates if required
2470 */
2471int
2472rxvt_term::check_our_parents ()
2473{
2474 int i, pchanged, aformat, have_pixmap, rootdepth;
2475 unsigned long nitems, bytes_after;
2476 Atom atype;
2477 unsigned char *prop = NULL;
2478 Window root, oldp, *list;
2479 Pixmap rootpixmap = None;
2480 XWindowAttributes wattr, wrootattr;
2481 dDisp;
2482
2483 pchanged = 0;
2484
2485 if (!OPTION (Opt_transparent))
2486 return pchanged; /* Don't try any more */
2487
2488 XGetWindowAttributes (disp, display->root, &wrootattr);
2489 rootdepth = wrootattr.depth;
2490
2491 XGetWindowAttributes (disp, parent[0], &wattr);
2492
2493 if (rootdepth != wattr.depth)
2494 {
2495 if (am_transparent)
2496 {
2497 pchanged = 1;
2498 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2499 am_transparent = am_pixmap_trans = 0;
2500 }
2501
2502 return pchanged; /* Don't try any more */
2503 }
2504
2505 /* Get all X ops out of the queue so that our information is up-to-date. */
2506 XSync (disp, False);
2507
2508 /*
2509 * Make the frame window set by the window manager have
2510 * the root background. Some window managers put multiple nested frame
2511 * windows for each client, so we have to take care about that.
2512 */
2513 i = (xa[XA_XROOTPMAP_ID]
2514 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2515 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2516 &nitems, &bytes_after, &prop) == Success);
2517
2518 if (!i || prop == NULL)
2519 i = (xa[XA_ESETROOT_PMAP_ID]
2520 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2521 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2522 &nitems, &bytes_after, &prop) == Success);
2523
2524 if (!i || prop == NULL
2525#if TINTING
2526 || !rs[Rs_color + Color_tint]
2527#endif
2528 )
2529 have_pixmap = 0;
2530 else
2531 {
2532 have_pixmap = 1;
2533 rootpixmap = *(Pixmap *)prop;
2534 XFree (prop);
2535 }
2536
2537 if (have_pixmap)
2538 {
2539 /*
2540 * Copy display->root pixmap transparency
2541 */
2542 int sx, sy, nx, ny;
2543 unsigned int nw, nh;
2544 Window cr;
2545 XImage *image;
2546 GC gc;
2547 XGCValues gcvalue;
2548
2549 XTranslateCoordinates (disp, parent[0], display->root,
2550 0, 0, &sx, &sy, &cr);
2551 nw = (unsigned int)szHint.width;
2552 nh = (unsigned int)szHint.height;
2553 nx = ny = 0;
2554
2555 if (sx < 0)
2556 {
2557 nw += sx;
2558 nx = -sx;
2559 sx = 0;
2560 }
2561
2562 if (sy < 0)
2563 {
2564 nh += sy;
2565 ny = -sy;
2566 sy = 0;
2567 }
2568
2569 min_it (nw, (unsigned int) (wrootattr.width - sx));
2570 min_it (nh, (unsigned int) (wrootattr.height - sy));
2571
2572 XSync (disp, False);
2573 allowedxerror = -1;
2574 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2575
2576 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2577 /* XXX: may need a delay here? */
2578 allowedxerror = 0;
2579
2580 if (image == NULL)
2581 {
2582 if (am_transparent && am_pixmap_trans)
2583 {
2584 pchanged = 1;
2585 if (pixmap != None)
2586 {
2587 XFreePixmap (disp, pixmap);
2588 pixmap = None;
2589 }
2590 }
2591
2592 am_pixmap_trans = 0;
2593 }
2594 else
2595 {
2596 if (pixmap != None)
2597 XFreePixmap (disp, pixmap);
2598
2599#if TINTING
2600 if (ISSET_PIXCOLOR (Color_tint))
2601 {
2602 unsigned short rm, gm, bm;
2603 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2604
2605 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2606
2607 ShadeXImage (display, image, shade, rm, gm, bm);
2608 }
2609#endif
2610
2611 pixmap = XCreatePixmap (disp, vt,
2612 szHint.width, szHint.height, image->depth);
2613 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2614 XPutImage (disp, pixmap, gc, image, 0, 0,
2615 nx, ny, image->width, image->height);
2616 XFreeGC (disp, gc);
2617 XDestroyImage (image);
2618 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2619 XClearWindow (disp, parent[0]);
2620
2621 if (!am_transparent || !am_pixmap_trans)
2622 pchanged = 1;
2623
2624 am_transparent = am_pixmap_trans = 1;
2625 }
2626 }
2627
2628 if (am_pixmap_trans)
2629 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2630 else
2631 {
2632 unsigned int n;
2633 /*
2634 * InheritPixmap transparency
2635 */
2636 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2637 {
2638 oldp = parent[i];
2639 XQueryTree (disp, parent[i - 1], &root,
2640 &parent[i], &list, &n);
2641 XFree (list);
2642
2643 if (parent[i] == display->root)
2644 {
2645 if (oldp != None)
2646 pchanged = 1;
2647
2648 break;
2649 }
2650
2651 if (oldp != parent[i])
2652 pchanged = 1;
2653 }
2654
2655 n = 0;
2656
2657 if (pchanged)
2658 {
2659 for (; n < (unsigned int)i; n++)
2660 {
2661 XGetWindowAttributes (disp, parent[n], &wattr);
2662 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2663 {
2664 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2665 break;
2666 }
2667 }
2668 }
2669
2670 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2671 {
2672 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2673 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2674 am_transparent = 0;
2675 /* XXX: also turn off Opt_transparent? */
2676 }
2677 else
2678 {
2679#if WAIT_FOR_WM
2680 /* wait (an arbitrary period) for the WM to do its thing
2681 * needed for fvwm2.2.2 (and before?) */
2682 sleep (1);
2683#endif
2684 for (n = 0; n < (unsigned int)i; n++)
2685 {
2686 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2687 XClearWindow (disp, parent[n]);
2688 }
2689
2690 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2691 am_transparent = 1;
2692 }
2693
2694 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2695 parent[i] = None;
2696 }
2697
2698 if (scrollBar.win)
2699 {
2700 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2701 scrollBar.setIdle ();
2702 scrollbar_show (0);
2703 }
2704
2705 if (am_transparent)
2706 {
2707 want_refresh = want_full_refresh = 1;
2708 if (am_pixmap_trans)
2709 flush ();
2710 }
2711
2712 return pchanged;
2713}
2714#endif
2715 2197
2716/*}}} */ 2198/*}}} */
2717 2199
2718bool 2200void
2719rxvt_term::cmd_parse () 2201rxvt_term::cmd_parse ()
2720{ 2202{
2721 bool flag = false;
2722 wchar_t ch = NOCHAR; 2203 wchar_t ch = NOCHAR;
2723 char *seq_begin; // remember start of esc-sequence here 2204 char *seq_begin; // remember start of esc-sequence here
2724 2205
2725 for (;;) 2206 for (;;)
2726 { 2207 {
2727 if (ch == NOCHAR) 2208 if (expect_false (ch == NOCHAR))
2728 { 2209 {
2729 seq_begin = cmdbuf_ptr; 2210 seq_begin = cmdbuf_ptr;
2730 ch = next_char (); 2211 ch = next_char ();
2731 2212
2732 if (ch == NOCHAR) 2213 if (ch == NOCHAR)
2733 break; 2214 break;
2734 } 2215 }
2735 2216
2736 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2217 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2737 { 2218 {
2738 if (!seen_input) 2219 if (expect_false (!seen_input))
2739 { 2220 {
2740 seen_input = 1; 2221 seen_input = 1;
2741 // many badly-written programs (e.g. jed) contain a race condition: 2222 // many badly-written programs (e.g. jed) contain a race condition:
2742 // they first read the screensize and then install a SIGWINCH handler. 2223 // they first read the screensize and then install a SIGWINCH handler.
2743 // some window managers resize the window early, and these programs 2224 // some window managers resize the window early, and these programs
… …
2756 wchar_t *str = buf; 2237 wchar_t *str = buf;
2757 wchar_t *eol = str + min (ncol, UBUFSIZ); 2238 wchar_t *eol = str + min (ncol, UBUFSIZ);
2758 2239
2759 for (;;) 2240 for (;;)
2760 { 2241 {
2761 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2242 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2762 break; 2243 break;
2763 2244
2764 *str++ = ch; 2245 *str++ = ch;
2765 2246
2766 if (ch == C0_LF || str >= eol) 2247 if (expect_false (ch == C0_LF || str >= eol))
2767 { 2248 {
2768 if (ch == C0_LF) 2249 if (ch == C0_LF)
2769 nlines++; 2250 nlines++;
2770 2251
2771 refresh_count++; 2252 refresh_count++;
2772 2253
2773 if (!OPTION (Opt_jumpScroll) 2254 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2774 || (refresh_count >= refresh_limit * (nrow - 1)))
2775 { 2255 {
2776 refreshnow = true;
2777 refresh_count = 0; 2256 refresh_count = 0;
2257
2258 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2259 {
2260 refreshnow = true;
2778 ch = NOCHAR; 2261 ch = NOCHAR;
2779 break; 2262 break;
2263 }
2780 } 2264 }
2781 2265
2782 // scr_add_lines only works for nlines <= nrow - 1. 2266 // scr_add_lines only works for nlines <= nrow - 1.
2783 if (nlines >= nrow - 1) 2267 if (nlines >= nrow - 1)
2784 { 2268 {
2269 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2785 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) 2270 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2786 scr_add_lines (buf, str - buf, nlines); 2271 scr_add_lines (buf, str - buf, nlines);
2787 2272
2788 nlines = 0; 2273 nlines = 0;
2789 str = buf; 2274 str = buf;
2790 eol = str + min (ncol, UBUFSIZ); 2275 eol = str + min (ncol, UBUFSIZ);
… …
2805 2290
2806 seq_begin = cmdbuf_ptr; 2291 seq_begin = cmdbuf_ptr;
2807 ch = next_char (); 2292 ch = next_char ();
2808 } 2293 }
2809 2294
2295 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2810 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) 2296 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2811 scr_add_lines (buf, str - buf, nlines); 2297 scr_add_lines (buf, str - buf, nlines);
2812 2298
2813 /* 2299 /*
2814 * If there have been a lot of new lines, then update the screen 2300 * If there have been a lot of new lines, then update the screen
2815 * What the heck I'll cheat and only refresh less than every page-full. 2301 * What the heck we'll cheat and only refresh less than every page-full.
2816 * the number of pages between refreshes is refresh_limit, which 2302 * if skipScroll is enabled.
2817 * is incremented here because we must be doing flat-out scrolling.
2818 */ 2303 */
2819 if (refreshnow) 2304 if (refreshnow)
2820 { 2305 {
2821 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2822 refresh_limit++;
2823 else
2824 {
2825 flag = true;
2826 scr_refresh (refresh_type); 2306 scr_refresh ();
2827 want_refresh = 1; 2307 want_refresh = 1;
2828 }
2829 } 2308 }
2830
2831 } 2309 }
2832 else 2310 else
2833 { 2311 {
2834 try 2312 try
2835 { 2313 {
… …
2843 } 2321 }
2844 2322
2845 ch = NOCHAR; 2323 ch = NOCHAR;
2846 } 2324 }
2847 } 2325 }
2848
2849 return flag;
2850} 2326}
2851 2327
2852// read the next character 2328// read the next character
2853wchar_t 2329wchar_t
2854rxvt_term::next_char () 2330rxvt_term::next_char () NOTHROW
2855{ 2331{
2856 while (cmdbuf_ptr < cmdbuf_endp) 2332 while (cmdbuf_ptr < cmdbuf_endp)
2857 { 2333 {
2858 // assume 7-bit to be ascii ALWAYS 2334 // assume 7-bit to be ascii ALWAYS
2859 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2335 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2860 return *cmdbuf_ptr++; 2336 return *cmdbuf_ptr++;
2861 2337
2862 wchar_t wc; 2338 wchar_t wc;
2863 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2339 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2864 2340
… …
2868 cmdbuf_ptr = cmdbuf_endp; 2344 cmdbuf_ptr = cmdbuf_endp;
2869 break; 2345 break;
2870 } 2346 }
2871 2347
2872 if (len == (size_t)-1) 2348 if (len == (size_t)-1)
2349 {
2350 mbstate.reset (); // reset now undefined conversion state
2873 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2351 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2352 }
2874 2353
2875 // assume wchar == unicode 2354 // assume wchar == unicode
2876 cmdbuf_ptr += len; 2355 cmdbuf_ptr += len;
2877 return wc & UNICODE_MASK; 2356 return wc & UNICODE_MASK;
2878 } 2357 }
… …
2880 return NOCHAR; 2359 return NOCHAR;
2881} 2360}
2882 2361
2883// read the next octet 2362// read the next octet
2884uint32_t 2363uint32_t
2885rxvt_term::next_octet () 2364rxvt_term::next_octet () NOTHROW
2886{ 2365{
2887 return cmdbuf_ptr < cmdbuf_endp 2366 return cmdbuf_ptr < cmdbuf_endp
2888 ? (unsigned char)*cmdbuf_ptr++ 2367 ? (unsigned char)*cmdbuf_ptr++
2889 : NOCHAR; 2368 : NOCHAR;
2890} 2369}
2370
2371static class out_of_input out_of_input;
2891 2372
2892/* rxvt_cmd_getc () - Return next input character */ 2373/* rxvt_cmd_getc () - Return next input character */
2893/* 2374/*
2894 * Return the next input character after first passing any keyboard input 2375 * Return the next input character after first passing any keyboard input
2895 * to the command. 2376 * to the command.
2896 */ 2377 */
2897wchar_t 2378wchar_t
2898rxvt_term::cmd_getc () 2379rxvt_term::cmd_getc () THROW ((class out_of_input))
2899{ 2380{
2900 wchar_t c = next_char (); 2381 wchar_t c = next_char ();
2901 2382
2902 if (c == NOCHAR) 2383 if (c == NOCHAR)
2903 throw out_of_input; 2384 throw out_of_input;
2904 2385
2905 return c; 2386 return c;
2906} 2387}
2907 2388
2908uint32_t 2389uint32_t
2909rxvt_term::cmd_get8 () 2390rxvt_term::cmd_get8 () THROW ((class out_of_input))
2910{ 2391{
2911 uint32_t c = next_octet (); 2392 uint32_t c = next_octet ();
2912 2393
2913 if (c == NOCHAR) 2394 if (c == NOCHAR)
2914 throw out_of_input; 2395 throw out_of_input;
… …
2920/*----------------------------------------------------------------------*/ 2401/*----------------------------------------------------------------------*/
2921#ifdef PRINTPIPE 2402#ifdef PRINTPIPE
2922FILE * 2403FILE *
2923rxvt_term::popen_printer () 2404rxvt_term::popen_printer ()
2924{ 2405{
2925 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2406 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2926 2407
2927 if (stream == NULL) 2408 if (stream == NULL)
2928 rxvt_warn ("can't open printer pipe, not printing.\n"); 2409 rxvt_warn ("can't open printer pipe, not printing.\n");
2929 2410
2930 return stream; 2411 return stream;
… …
2941 * simulate attached vt100 printer 2422 * simulate attached vt100 printer
2942 */ 2423 */
2943void 2424void
2944rxvt_term::process_print_pipe () 2425rxvt_term::process_print_pipe ()
2945{ 2426{
2946 int done; 2427 FILE *fd = popen_printer ();
2947 FILE *fd;
2948 2428
2949 if ((fd = popen_printer ()) == NULL) 2429 if (!fd)
2950 return; 2430 return;
2951 2431
2952 /* 2432 /*
2953 * Send all input to the printer until either ESC[4i or ESC[?4i 2433 * Send all input to the printer until either ESC[4i or ESC[?4i
2954 * is received. 2434 * is received.
2955 */ 2435 */
2956 for (done = 0; !done;) 2436 for (int done = 0; !done; )
2957 { 2437 {
2958 unsigned char buf[8]; 2438 unsigned char buf[8];
2959 unicode_t ch; 2439 unicode_t ch;
2960 unsigned int i, len; 2440 unsigned int i, len;
2961 2441
… …
2980 { 2460 {
2981 if ((buf[len++] = cmd_getc ()) == 'i') 2461 if ((buf[len++] = cmd_getc ()) == 'i')
2982 break; /* done = 1 */ 2462 break; /* done = 1 */
2983 } 2463 }
2984 } 2464 }
2985 2465
2986 for (i = 0; i < len; i++) 2466 for (i = 0; i < len; i++)
2987 if (putc (buf[i], fd) == EOF) 2467 if (putc (buf[i], fd) == EOF)
2988 { 2468 {
2989 done = 1; 2469 done = 1;
2990 break; 2470 break;
… …
2992 } 2472 }
2993 } 2473 }
2994 2474
2995 pclose_printer (fd); 2475 pclose_printer (fd);
2996} 2476}
2997#endif /* PRINTPIPE */ 2477#endif /* PRINTPIPE */
2998/*}}} */ 2478/*}}} */
2999 2479
3000/* *INDENT-OFF* */ 2480/* *INDENT-OFF* */
3001enum { 2481enum {
3002 C1_40 = 0x40, 2482 C1_40 = 0x40,
… …
3052 process_dcs_seq (); 2532 process_dcs_seq ();
3053 break; 2533 break;
3054 case 0x9b: /* CSI */ 2534 case 0x9b: /* CSI */
3055 process_csi_seq (); 2535 process_csi_seq ();
3056 break; 2536 break;
3057 case 0x9d: /* CSI */ 2537 case 0x9d: /* OSC */
3058 process_osc_seq (); 2538 process_osc_seq ();
3059 break; 2539 break;
3060#endif 2540#endif
3061 } 2541 }
3062} 2542}
… …
3106 break; 2586 break;
3107 case 'Z': /* identify the terminal type */ 2587 case 'Z': /* identify the terminal type */
3108 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2588 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
3109 break; 2589 break;
3110 case '<': /* turn off VT52 mode */ 2590 case '<': /* turn off VT52 mode */
3111 PrivMode (0, PrivMode_vt52); 2591 set_privmode (PrivMode_vt52, 0);
3112 break; 2592 break;
3113 case 'F': /* use special graphics character set */ 2593 case 'F': /* use special graphics character set */
3114 case 'G': /* use regular character set */ 2594 case 'G': /* use regular character set */
3115 /* unimplemented */ 2595 /* unimplemented */
3116 break; 2596 break;
… …
3152 scr_charset_set (2, (unsigned int)cmd_getc ()); 2632 scr_charset_set (2, (unsigned int)cmd_getc ());
3153 break; 2633 break;
3154 case '+': 2634 case '+':
3155 scr_charset_set (3, (unsigned int)cmd_getc ()); 2635 scr_charset_set (3, (unsigned int)cmd_getc ());
3156 break; 2636 break;
3157#if ENABLE_FRILLS 2637#if !ENABLE_MINIMAL
3158 case '6': 2638 case '6':
3159 scr_backindex (); 2639 scr_backindex ();
3160 break; 2640 break;
3161#endif 2641#endif
3162 case '7': 2642 case '7':
3163 scr_cursor (SAVE); 2643 scr_cursor (SAVE);
3164 break; 2644 break;
3165 case '8': 2645 case '8':
3166 scr_cursor (RESTORE); 2646 scr_cursor (RESTORE);
3167 break; 2647 break;
3168#if ENABLE_FRILLS 2648#if !ENABLE_MINIMAL
3169 case '9': 2649 case '9':
3170 scr_forwardindex (); 2650 scr_forwardindex ();
3171 break; 2651 break;
3172#endif 2652#endif
3173 case '=': 2653 case '=':
3174 case '>': 2654 case '>':
3175 PrivMode ((ch == '='), PrivMode_aplKP); 2655 set_privmode (PrivMode_aplKP, ch == '=');
3176 break; 2656 break;
3177 2657
3178 case C1_40: 2658 case C1_40:
3179 cmd_getc (); 2659 cmd_getc ();
3180 break; 2660 break;
… …
3219 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2699 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3220 case C1_SCI: /* ESC Z */ 2700 case C1_SCI: /* ESC Z */
3221 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2701 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3222 break; /* steal obsolete ESC [ c */ 2702 break; /* steal obsolete ESC [ c */
3223 2703
3224 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2704 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
3225 case C1_CSI: /* ESC [ */ 2705 case C1_CSI: /* ESC [ */
3226 process_csi_seq (); 2706 process_csi_seq ();
3227 break; 2707 break;
3228 2708
3229 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2709 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
3230 case C1_OSC: /* ESC ] */ 2710 case C1_OSC: /* ESC ] */
3231 process_osc_seq (); 2711 process_osc_seq ();
3232 break; 2712 break;
3233 2713
3234 /* 8.3.106: RESET TO INITIAL STATE */ 2714 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
3235 case 'c': 2715 case 'c':
3236 mbstate.reset (); 2716 mbstate.reset ();
3237 scr_poweron (); 2717 scr_poweron ();
3238 scrollbar_show (1); 2718 scrollBar.show (1);
3239 break; 2719 break;
3240 2720
3241 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2721 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
3242 case 'n': 2722 case 'n':
3243 scr_charset_choose (2); 2723 scr_charset_choose (2);
… …
3288rxvt_term::process_csi_seq () 2768rxvt_term::process_csi_seq ()
3289{ 2769{
3290 unicode_t ch, priv, i; 2770 unicode_t ch, priv, i;
3291 unsigned int nargs, p; 2771 unsigned int nargs, p;
3292 int n, ndef; 2772 int n, ndef;
3293 int arg[ESC_ARGS]; 2773 int arg[ESC_ARGS] = { };
3294 2774
3295 for (nargs = ESC_ARGS; nargs > 0;) 2775 nargs = 0;
3296 arg[--nargs] = 0;
3297 2776
3298 priv = 0; 2777 priv = 0;
3299 ch = cmd_getc (); 2778 ch = cmd_getc ();
3300 if (ch >= '<' && ch <= '?') 2779 if ((ch >= '<' && ch <= '?') || ch == '!')
2780 {
3301 { /* '<' '=' '>' '?' */ 2781 /* '<' '=' '>' '?' '!' */
3302 priv = ch; 2782 priv = ch;
3303 ch = cmd_getc (); 2783 ch = cmd_getc ();
3304 } 2784 }
3305 2785
3306 /* read any numerical arguments */ 2786 /* read any numerical arguments */
… …
3335 ndef = get_byte_array_bit (csi_defaults, i); 2815 ndef = get_byte_array_bit (csi_defaults, i);
3336 for (p = 0; p < nargs; p++) 2816 for (p = 0; p < nargs; p++)
3337 if (arg[p] == -1) 2817 if (arg[p] == -1)
3338 arg[p] = ndef; 2818 arg[p] = ndef;
3339 2819
3340#ifdef DEBUG_CMD
3341 fprintf (stderr, "CSI ");
3342 for (p = 0; p < nargs; p++)
3343 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3344 fprintf (stderr, "%c\n", ch);
3345#endif
3346
3347 /* 2820 /*
3348 * private mode handling 2821 * private mode handling
3349 */ 2822 */
3350 if (priv) 2823 if (priv)
3351 { 2824 {
3352 switch (priv) 2825 switch (priv)
3353 { 2826 {
3354 case '>': 2827 case '>':
3355 if (ch == CSI_DA) /* secondary device attributes */ 2828 if (ch == CSI_DA) /* secondary device attributes */
3356 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 2829 {
2830 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2831 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2832 //
2833 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2834 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2835 // versions.
2836 //
2837 tt_printf ("\033[>%d;95;0c", 'U');
2838 }
3357 break; 2839 break;
2840
3358 case '?': 2841 case '?':
3359 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2842 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3360 process_terminal_mode (ch, priv, nargs, arg); 2843 process_terminal_mode (ch, priv, nargs, arg);
3361 break; 2844 break;
2845
2846 case '!':
2847 if (ch == CSI_70)
2848 {
2849 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2850 scr_soft_reset ();
2851
2852 static const int pm_h[] = { 7, 25 };
2853 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 };
2854
2855 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h);
2856 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l);
3362 } 2857 }
2858 break;
2859 }
2860
3363 return; 2861 return;
3364 } 2862 }
3365 2863
3366 switch (ch) 2864 switch (ch)
3367 { 2865 {
… …
3487 break; 2985 break;
3488 case 6: /* CPR requested */ 2986 case 6: /* CPR requested */
3489 scr_report_position (); 2987 scr_report_position ();
3490 break; 2988 break;
3491 case 7: /* unofficial extension */ 2989 case 7: /* unofficial extension */
3492 if (OPTION (Opt_insecure)) 2990 if (option (Opt_insecure))
3493 tt_printf ("%-.250s\012", rs[Rs_display_name]); 2991 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3494 break; 2992 break;
3495 case 8: /* unofficial extension */ 2993 case 8: /* unofficial extension */
3496 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2994 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3497 break; 2995 break;
… …
3564 break; 3062 break;
3565 case CSI_75: 3063 case CSI_75:
3566 scr_cursor (RESTORE); 3064 scr_cursor (RESTORE);
3567 break; 3065 break;
3568 3066
3569#if ENABLE_FRILLS 3067#if !ENABLE_MINIMAL
3570 case CSI_74: 3068 case CSI_74:
3571 process_window_ops (arg, nargs); 3069 process_window_ops (arg, nargs);
3572 break; 3070 break;
3573#endif 3071#endif
3574 3072
… …
3581 break; 3079 break;
3582 } 3080 }
3583} 3081}
3584/*}}} */ 3082/*}}} */
3585 3083
3586#if ENABLE_FRILLS 3084#if !ENABLE_MINIMAL
3587/* ARGSUSED */ 3085/* ARGSUSED */
3588void 3086void
3589rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3087rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3590{ 3088{
3591 int x, y; 3089 int x, y;
3592 XWindowAttributes wattr; 3090 XWindowAttributes wattr;
3593 Window wdummy; 3091 Window wdummy;
3594 dDisp; 3092
3093 dLocal (Display *, dpy);
3595 3094
3596 if (nargs == 0) 3095 if (nargs == 0)
3597 return; 3096 return;
3598 3097
3599 switch (args[0]) 3098 switch (args[0])
3600 { 3099 {
3601 /* 3100 /*
3602 * commands 3101 * commands
3603 */ 3102 */
3604 case 1: /* deiconify window */ 3103 case 1: /* deiconify window */
3605 XMapWindow (disp, parent[0]); 3104 XMapWindow (dpy, parent[0]);
3606 break; 3105 break;
3607 case 2: /* iconify window */ 3106 case 2: /* iconify window */
3608 XIconifyWindow (disp, parent[0], display->screen); 3107 XIconifyWindow (dpy, parent[0], display->screen);
3609 break; 3108 break;
3610 case 3: /* set position (pixels) */ 3109 case 3: /* set position (pixels) */
3611 XMoveWindow (disp, parent[0], args[1], args[2]); 3110 XMoveWindow (dpy, parent[0], args[1], args[2]);
3612 break; 3111 break;
3613 case 4: /* set size (pixels) */ 3112 case 4: /* set size (pixels) */
3614 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3113 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3615 break; 3114 break;
3616 case 5: /* raise window */ 3115 case 5: /* raise window */
3617 XRaiseWindow (disp, parent[0]); 3116 XRaiseWindow (dpy, parent[0]);
3618 break; 3117 break;
3619 case 6: /* lower window */ 3118 case 6: /* lower window */
3620 XLowerWindow (disp, parent[0]); 3119 XLowerWindow (dpy, parent[0]);
3621 break; 3120 break;
3622 case 7: /* refresh window */ 3121 case 7: /* refresh window */
3623 scr_touch (true); 3122 scr_touch (true);
3624 break; 3123 break;
3625 case 8: /* set size (chars) */ 3124 case 8: /* set size (chars) */
… …
3632 if (args[0] >= 24) /* set height (chars) */ 3131 if (args[0] >= 24) /* set height (chars) */
3633 set_widthheight ((unsigned int)width, 3132 set_widthheight ((unsigned int)width,
3634 (unsigned int) (args[1] * fheight)); 3133 (unsigned int) (args[1] * fheight));
3635 break; 3134 break;
3636 3135
3637
3638 /* 3136 /*
3639 * reports - some output format copied from XTerm 3137 * reports - some output format copied from XTerm
3640 */ 3138 */
3641 case 11: /* report window state */ 3139 case 11: /* report window state */
3642 XGetWindowAttributes (disp, parent[0], &wattr); 3140 XGetWindowAttributes (dpy, parent[0], &wattr);
3643 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3141 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3644 break; 3142 break;
3645 case 13: /* report window position */ 3143 case 13: /* report window position */
3646 XGetWindowAttributes (disp, parent[0], &wattr); 3144 XGetWindowAttributes (dpy, parent[0], &wattr);
3647 XTranslateCoordinates (disp, parent[0], wattr.root, 3145 XTranslateCoordinates (dpy, parent[0], wattr.root,
3648 -wattr.border_width, -wattr.border_width, 3146 -wattr.border_width, -wattr.border_width,
3649 &x, &y, &wdummy); 3147 &x, &y, &wdummy);
3650 tt_printf ("\033[3;%d;%dt", x, y); 3148 tt_printf ("\033[3;%d;%dt", x, y);
3651 break; 3149 break;
3652 case 14: /* report window size (pixels) */ 3150 case 14: /* report window size (pixels) */
3653 XGetWindowAttributes (disp, parent[0], &wattr); 3151 XGetWindowAttributes (dpy, parent[0], &wattr);
3654 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3152 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3655 break; 3153 break;
3656 case 18: /* report text area size (chars) */ 3154 case 18: /* report text area size (chars) */
3657 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3155 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3658 break; 3156 break;
… …
3660 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3158 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3661 break; 3159 break;
3662 case 20: /* report icon label */ 3160 case 20: /* report icon label */
3663 { 3161 {
3664 char *s; 3162 char *s;
3665 XGetIconName (disp, parent[0], &s); 3163 XGetIconName (dpy, parent[0], &s);
3666 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3164 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3667 XFree (s); 3165 XFree (s);
3668 } 3166 }
3669 break; 3167 break;
3670 case 21: /* report window title */ 3168 case 21: /* report window title */
3671 { 3169 {
3672 char *s; 3170 char *s;
3673 XFetchName (disp, parent[0], &s); 3171 XFetchName (dpy, parent[0], &s);
3674 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3172 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3675 XFree (s); 3173 XFree (s);
3676 } 3174 }
3677 break; 3175 break;
3678 } 3176 }
3679} 3177}
… …
3706 seen_esc = true; 3204 seen_esc = true;
3707 continue; 3205 continue;
3708 } 3206 }
3709 else if (ch == C0_BEL || ch == CHAR_ST) 3207 else if (ch == C0_BEL || ch == CHAR_ST)
3710 break; 3208 break;
3209 else if (ch == C0_SYN)
3210 ch = cmd_get8 ();
3711 else if (ch < 0x20) 3211 else if (ch < 0x20)
3712 return NULL; /* other control character - exit */ 3212 return NULL; /* other control character - exit */
3713 3213
3714 seen_esc = false; 3214 seen_esc = false;
3715 3215
3716 if (n >= STRING_MAX - 1) 3216 if (n >= STRING_MAX - 1)
3717 // stop at some sane length 3217 // stop at some sane length
3718 return NULL; 3218 return NULL;
3719 3219
3720 if (ch == C0_SYN)
3721 string[n++] = cmd_get8 ();
3722 else
3723 string[n++] = ch; 3220 string[n++] = ch;
3724 } 3221 }
3725 3222
3726 string[n++] = '\0'; 3223 string[n++] = '\0';
3727 3224
3728 ends_how = (ch == 0x5c ? C0_ESC : ch); 3225 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3779void 3276void
3780rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3277rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3781{ 3278{
3782 if (str[0] == '?' && !str[1]) 3279 if (str[0] == '?' && !str[1])
3783 { 3280 {
3784 unsigned short r, g, b; 3281 rgba c;
3785 pix_colors_focused[color].get (display, r, g, b); 3282 pix_colors_focused[color].get (c);
3283
3284#if XFT
3285 if (c.a != rgba::MAX_CC)
3286 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3287 else
3288#endif
3786 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3289 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3787 } 3290 }
3788 else 3291 else
3789 set_window_color (color, str); 3292 set_window_color (color, str);
3790} 3293}
3791 3294
3792/* 3295/*
3793 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3296 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3794 */ 3297 */
3795void 3298void
3796rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3299rxvt_term::process_xterm_seq (int op, char *str, char resp)
3797{ 3300{
3798 int changed = 0;
3799 int color; 3301 int color;
3800 char *buf, *name; 3302 char *buf, *name;
3801 bool query = str[0] == '?' && !str[1]; 3303 bool query = str[0] == '?' && !str[1];
3802 int saveop = op; 3304 int saveop = op;
3803 dDisp; 3305
3306 dLocal (Display *, dpy);
3804 3307
3805 assert (str != NULL); 3308 assert (str != NULL);
3309
3310 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3311 return;
3312
3806 switch (op) 3313 switch (op)
3807 { 3314 {
3808 case XTerm_name: 3315 case XTerm_name:
3809 set_title (str); 3316 set_title (str);
3810 /* FALLTHROUGH */ 3317 /* FALLTHROUGH */
… …
3824 unsigned long bytes_after; 3331 unsigned long bytes_after;
3825 unsigned char *value = 0; 3332 unsigned char *value = 0;
3826 const char *str = ""; 3333 const char *str = "";
3827 3334
3828 if (prop 3335 if (prop
3829 && XGetWindowProperty (disp, parent[0], 3336 && XGetWindowProperty (dpy, parent[0],
3830 prop, 0, 1<<16, 0, AnyPropertyType, 3337 prop, 0, 1<<16, 0, AnyPropertyType,
3831 &actual_type, &actual_format, 3338 &actual_type, &actual_format,
3832 &nitems, &bytes_after, &value) == Success 3339 &nitems, &bytes_after, &value) == Success
3833 && actual_type != None 3340 && actual_type != None
3834 && actual_format == 8) 3341 && actual_format == 8)
3835 str = (const char *)(value); 3342 str = (const char *)(value);
3836 3343
3837 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3344 tt_printf ("\033]%d;%s%c", op, str, resp);
3838 3345
3839 XFree (value); 3346 XFree (value);
3840 } 3347 }
3841 else 3348 else
3842 { 3349 {
3843 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3350 char *eq = strchr (str, '=');
3844 3351
3845 if (eq) 3352 if (eq)
3846 { 3353 {
3847 *eq = 0; 3354 *eq = 0;
3848 set_utf8_property (display->atom (str), eq + 1); 3355 set_utf8_property (display->atom (str), eq + 1);
3849 } 3356 }
3850 else 3357 else
3851 XDeleteProperty (disp, parent[0], 3358 XDeleteProperty (dpy, parent[0],
3852 display->atom (str)); 3359 display->atom (str));
3853 } 3360 }
3854 break; 3361 break;
3855 3362
3856 case XTerm_Color: 3363 case XTerm_Color:
… …
3858 { 3365 {
3859 if ((name = strchr (buf, ';')) == NULL) 3366 if ((name = strchr (buf, ';')) == NULL)
3860 break; 3367 break;
3861 3368
3862 *name++ = '\0'; 3369 *name++ = '\0';
3863 color = atoi (buf); 3370 color = atoi (buf) + minCOLOR;
3864 3371
3865 if (color < 0 || color >= TOTAL_COLORS) 3372 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3866 break; 3373 break;
3867 3374
3868 if ((buf = strchr (name, ';')) != NULL) 3375 if ((buf = strchr (name, ';')) != NULL)
3869 *buf++ = '\0'; 3376 *buf++ = '\0';
3870 3377
3871 if (name[0] == '?' && !name[1]) 3378 process_color_seq (op, color, name, resp);
3872 {
3873 unsigned short r, g, b;
3874 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3875 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3876 }
3877 else
3878 set_window_color (color + minCOLOR, name);
3879 } 3379 }
3880 break; 3380 break;
3381 case Rxvt_restoreFG:
3881 case XTerm_Color00: 3382 case XTerm_Color00:
3882 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3383 process_color_seq (op, Color_fg, str, resp);
3883 break; 3384 break;
3385 case Rxvt_restoreBG:
3884 case XTerm_Color01: 3386 case XTerm_Color01:
3885 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3387 process_color_seq (op, Color_bg, str, resp);
3886 break; 3388 break;
3887#ifndef NO_CURSORCOLOR 3389#ifndef NO_CURSORCOLOR
3888 case XTerm_Color_cursor: 3390 case XTerm_Color_cursor:
3889 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3391 process_color_seq (op, Color_cursor, str, resp);
3890 break; 3392 break;
3891#endif 3393#endif
3892 case XTerm_Color_pointer_fg: 3394 case XTerm_Color_pointer_fg:
3893 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3395 process_color_seq (op, Color_pointer_fg, str, resp);
3894 break; 3396 break;
3895 case XTerm_Color_pointer_bg: 3397 case XTerm_Color_pointer_bg:
3896 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3398 process_color_seq (op, Color_pointer_bg, str, resp);
3897 break; 3399 break;
3898#ifndef NO_BOLD_UNDERLINE_REVERSE 3400#ifndef NO_BOLD_UNDERLINE_REVERSE
3899 case XTerm_Color_BD:
3900 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3901 break;
3902 case XTerm_Color_UL:
3903 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3904 break;
3905 case XTerm_Color_RV: 3401 case XTerm_Color_RV:
3906 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3402 process_color_seq (op, Color_RV, str, resp);
3403 break;
3404 case Rxvt_Color_BD:
3405 case URxvt_Color_BD:
3406 process_color_seq (op, Color_BD, str, resp);
3407 break;
3408 case Rxvt_Color_UL:
3409 case URxvt_Color_UL:
3410 process_color_seq (op, Color_UL, str, resp);
3907 break; 3411 break;
3908 case URxvt_Color_IT: 3412 case URxvt_Color_IT:
3909 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3413 process_color_seq (op, Color_IT, str, resp);
3910 break; 3414 break;
3911#endif 3415#endif
3912#if TRANSPARENT && TINTING 3416 case URxvt_Color_border:
3417 process_color_seq (op, Color_border, str, resp);
3418 break;
3419#if ENABLE_TRANSPARENCY
3913 case URxvt_Color_tint: 3420 case URxvt_Color_tint:
3914 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3421 process_color_seq (op, Color_tint, str, resp);
3915 check_our_parents (); 3422 {
3916 if (am_transparent) 3423 bool changed = false;
3917 want_full_refresh = want_refresh = 1;
3918 break;
3919#endif
3920 3424
3425 if (ISSET_PIXCOLOR (Color_tint))
3426 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3427 else
3428 changed = bgPixmap.unset_tint ();
3429
3430 if (changed)
3431 update_background ();
3432 }
3433
3434 break;
3435#endif
3436
3437#if BG_IMAGE_FROM_FILE
3921 case XTerm_Pixmap: 3438 case Rxvt_Pixmap:
3922 if (*str != ';') 3439 if (!strcmp (str, "?"))
3923 { 3440 {
3924#if XPM_BACKGROUND 3441 char str[256];
3925 scale_pixmap (""); /* reset to default scaling */ 3442
3926 set_bgPixmap (str); /* change pixmap */ 3443 sprintf (str, "[%dx%d+%d+%d]",
3927#endif 3444 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3928 scr_touch (true); 3445 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3446 process_xterm_seq (XTerm_title, str, CHAR_ST);
3929 } 3447 }
3930 while ((str = strchr (str, ';')) != NULL) 3448 else
3931 { 3449 {
3450 int changed = 0;
3451
3452 if (*str != ';')
3453 {
3454 /* reset to default scaling :*/
3455 bgPixmap.unset_geometry ();
3456 if (bgPixmap.set_file (str)) /* change pixmap */
3457 changed++;
3458 str = strchr (str, ';');
3459 if (str == NULL)
3460 bgPixmap.set_defaultGeometry ();
3461 }
3462
3463 while (str)
3464 {
3932 str++; 3465 str++;
3933#if XPM_BACKGROUND 3466 if (bgPixmap.set_geometry (str))
3934 changed += scale_pixmap (str); 3467 changed++;
3935#endif 3468 str = strchr (str, ';');
3469 }
3470
3471 if (changed)
3472 update_background ();
3936 } 3473 }
3937
3938 if (changed)
3939 {
3940#ifdef XPM_BACKGROUND
3941 resize_pixmap ();
3942#endif
3943 scr_touch (true);
3944 }
3945 break; 3474 break;
3946 3475#endif
3947 case XTerm_restoreFG:
3948 set_window_color (Color_fg, str);
3949 break;
3950 case XTerm_restoreBG:
3951 set_window_color (Color_bg, str);
3952 break;
3953 3476
3954 case XTerm_logfile: 3477 case XTerm_logfile:
3955 // TODO, when secure mode? 3478 // TODO, when secure mode?
3956 break; 3479 break;
3957 3480
3958#ifdef MENUBAR
3959 case URxvt_Menu:
3960 if (OPTION (Opt_insecure))
3961 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3962 break;
3963#endif
3964#if 0 3481#if 0
3965 case XTerm_dumpscreen: /* no error notices */ 3482 case Rxvt_dumpscreen: /* no error notices */
3966 { 3483 {
3967 int fd; 3484 int fd;
3968 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3485 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3969 { 3486 {
3970 scr_dump (fd); 3487 scr_dump (fd);
… …
3981 case URxvt_italicFont: 3498 case URxvt_italicFont:
3982 case URxvt_boldItalicFont: 3499 case URxvt_boldItalicFont:
3983#endif 3500#endif
3984 if (query) 3501 if (query)
3985 tt_printf ("\33]%d;%-.250s%c", saveop, 3502 tt_printf ("\33]%d;%-.250s%c", saveop,
3986 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3503 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3987 ? fontset[op - URxvt_font]->fontdesc : "", 3504 ? fontset[op - URxvt_font]->fontdesc : "",
3988 resp); 3505 resp);
3989 else 3506 else
3990 { 3507 {
3991 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3508 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3994 allocated.push_back ((void *)res); 3511 allocated.push_back ((void *)res);
3995 set_fonts (); 3512 set_fonts ();
3996 } 3513 }
3997 break; 3514 break;
3998 3515
3999#if ENABLE_FRILLS 3516 case URxvt_version:
3517 if (query)
3518 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3519 op,
3520 rs[Rs_name], VERSION[0], VERSION[2],
3521 resp);
3522 break;
3523
3524#if !ENABLE_MINIMAL
4000 case URxvt_locale: 3525 case URxvt_locale:
4001 if (query) 3526 if (query)
4002 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3527 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
4003 else 3528 else
4004 { 3529 {
4005 set_locale (str); 3530 set_locale (str);
4006 pty.set_utf8_mode (enc_utf8); 3531 pty->set_utf8_mode (enc_utf8);
4007 init_xlocale (); 3532 init_xlocale ();
4008 } 3533 }
4009 break; 3534 break;
4010 3535
4011 case URxvt_view_up: 3536 case URxvt_view_up:
… …
4022 break; 3547 break;
4023#endif 3548#endif
4024 3549
4025#if ENABLE_PERL 3550#if ENABLE_PERL
4026 case URxvt_perl: 3551 case URxvt_perl:
4027 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 3552 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
4028 ; // no responses yet
4029 break; 3553 break;
4030#endif 3554#endif
4031 } 3555 }
4032} 3556}
4033/*----------------------------------------------------------------------*/ 3557/*----------------------------------------------------------------------*/
… …
4056 { 3580 {
4057 if (mode == 'r') 3581 if (mode == 'r')
4058 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3582 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
4059 else 3583 else
4060 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3584 state = (mode == 't') ? ! (priv_modes & bit) : mode;
4061 PrivMode (state, bit); 3585 set_privmode (bit, state);
4062 } 3586 }
4063 3587
4064 return state; 3588 return state;
4065} 3589}
4066 3590
4067/* we're not using priv _yet_ */ 3591/* we're not using priv _yet_ */
4068void 3592void
4069rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3593rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4070{ 3594{
4071 unsigned int i, j; 3595 unsigned int i, j;
4072 int state; 3596 int state;
4073 3597
4074 static const struct 3598 static const struct
4075 { 3599 {
4076 const int argval; 3600 const int argval;
4077 const unsigned long bit; 3601 const unsigned long bit;
4078 }
4079
4080 argtopriv[] = { 3602 } argtopriv[] = {
4081 { 1, PrivMode_aplCUR }, 3603 { 1, PrivMode_aplCUR }, // DECCKM
4082 { 2, PrivMode_vt52 }, 3604 { 2, PrivMode_vt52 },
4083 { 3, PrivMode_132 }, 3605 { 3, PrivMode_132 }, // DECCOLM
4084 { 4, PrivMode_smoothScroll }, 3606 { 4, PrivMode_smoothScroll }, // DECSCLM
4085 { 5, PrivMode_rVideo }, 3607 { 5, PrivMode_rVideo }, // DECSCNM
4086 { 6, PrivMode_relOrigin }, 3608 { 6, PrivMode_relOrigin }, // DECOM
4087 { 7, PrivMode_Autowrap }, 3609 { 7, PrivMode_Autowrap }, // DECAWM
4088 // 8, bi-directional support mode 3610 // 8, auto-repeat keys // DECARM
4089 { 9, PrivMode_MouseX10 }, 3611 { 9, PrivMode_MouseX10 },
4090#ifdef menuBar_esc 3612 // 18 end FF to printer after print screen
4091 { menuBar_esc, PrivMode_menuBar }, 3613 // 19 Print screen prints full screen/scorll region
4092#endif
4093 // 18, 19 printing-related
4094 { 25, PrivMode_VisibleCursor }, 3614 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
4095#ifdef scrollBar_esc 3615#ifdef scrollBar_esc
4096 { scrollBar_esc, PrivMode_scrollBar }, 3616 { scrollBar_esc, PrivMode_scrollBar },
4097#endif 3617#endif
4098 { 35, PrivMode_ShiftKeys }, // rxvt extension 3618 { 35, PrivMode_ShiftKeys }, // rxvt extension
3619 // 38, tektronix mode // DECTEK
4099 { 40, PrivMode_132OK }, 3620 { 40, PrivMode_132OK },
4100 // 41 xterm more fixes NYI 3621 // 41 xterm more fixes NYI
4101 // 45 margin bell NYI 3622 // 45 margin bell NYI
4102 // 46 start logging 3623 // 46 start logging
4103 { 47, PrivMode_Screen }, 3624 { 47, PrivMode_Screen },
4104 { 66, PrivMode_aplKP }, 3625 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
4105#ifndef NO_BACKSPACE_KEY 3626#ifndef NO_BACKSPACE_KEY
4106 { 67, PrivMode_BackSpace }, 3627 { 67, PrivMode_BackSpace }, // DECBKM
4107#endif 3628#endif
4108 { 1000, PrivMode_MouseX11 }, 3629 { 1000, PrivMode_MouseX11 },
4109 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3630 { 1002, PrivMode_MouseBtnEvent },
4110 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3631 { 1003, PrivMode_MouseAnyEvent },
4111 // 1003 Use All Motion Mouse Tracking. NYI, TODO
4112 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3632 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4113 { 1011, PrivMode_Keypress }, // rxvt extension 3633 { 1011, PrivMode_Keypress }, // rxvt extension
4114 // 1035 enable modifiers for alt, numlock NYI 3634 // 1035 enable modifiers for alt, numlock NYI
4115 // 1036 send ESC for meta keys NYI 3635 // 1036 send ESC for meta keys NYI
4116 // 1037 send DEL for keypad delete NYI 3636 // 1037 send DEL for keypad delete NYI
4117 { 1047, PrivMode_Screen }, 3637 { 1047, PrivMode_Screen },
4118 // 1048 save and restore cursor 3638 // 1048 save and restore cursor
4119 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3639 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
4120 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3640 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3641 { 2004, PrivMode_BracketPaste },
4121 }; 3642 };
4122 3643
4123 if (nargs == 0) 3644 if (nargs == 0)
4124 return; 3645 return;
4125 3646
… …
4150 3671
4151 scr_touch (true); 3672 scr_touch (true);
4152 break; 3673 break;
4153#endif 3674#endif
4154 case 1048: /* alternative cursor save */ 3675 case 1048: /* alternative cursor save */
4155 case 1049:
4156 if (OPTION (Opt_secondaryScreen)) 3676 if (option (Opt_secondaryScreen))
4157 if (mode == 0) 3677 if (mode == 0)
4158 scr_cursor (RESTORE); 3678 scr_cursor (RESTORE);
4159 else if (mode == 1) 3679 else if (mode == 1)
4160 scr_cursor (SAVE); 3680 scr_cursor (SAVE);
4161 break; 3681 break;
… …
4169 case 2: /* VT52 mode */ 3689 case 2: /* VT52 mode */
4170 /* oddball mode. should be set regardless of set/reset 3690 /* oddball mode. should be set regardless of set/reset
4171 * parameter. Return from VT52 mode with an ESC < from 3691 * parameter. Return from VT52 mode with an ESC < from
4172 * within VT52 mode 3692 * within VT52 mode
4173 */ 3693 */
4174 PrivMode (1, PrivMode_vt52); 3694 set_privmode (PrivMode_vt52, 1);
4175 break; 3695 break;
4176 case 3: /* 80/132 */ 3696 case 3: /* 80/132 */
4177 if (priv_modes & PrivMode_132OK) 3697 if (priv_modes & PrivMode_132OK)
4178 set_widthheight (((state ? 132 : 80) * fwidth), height); 3698 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
4179 break; 3699 break;
4180 case 4: /* smooth scrolling */ 3700 case 4: /* smooth scrolling */
4181 set_option (Opt_jumpScroll, !state); 3701 set_option (Opt_jumpScroll, !state);
4182 break; 3702 break;
4183 case 5: /* reverse video */ 3703 case 5: /* reverse video */
… …
4190 scr_autowrap (state); 3710 scr_autowrap (state);
4191 break; 3711 break;
4192 /* case 8: - auto repeat, can't do on a per window basis */ 3712 /* case 8: - auto repeat, can't do on a per window basis */
4193 case 9: /* X10 mouse reporting */ 3713 case 9: /* X10 mouse reporting */
4194 if (state) /* orthogonal */ 3714 if (state) /* orthogonal */
4195 priv_modes &= ~PrivMode_MouseX11; 3715 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4196 break; 3716 break;
4197#ifdef menuBar_esc
4198 case menuBar_esc:
4199#ifdef MENUBAR
4200 map_menuBar (state);
4201#endif
4202 break;
4203#endif
4204#ifdef scrollBar_esc 3717#ifdef scrollBar_esc
4205 case scrollBar_esc: 3718 case scrollBar_esc:
4206 if (scrollbar_mapping (state)) 3719 if (scrollBar.map (state))
4207 { 3720 {
4208 resize_all_windows (0, 0, 0); 3721 resize_all_windows (0, 0, 0);
4209 scr_touch (true); 3722 scr_touch (true);
4210 } 3723 }
4211 break; 3724 break;
… …
4220 break; 3733 break;
4221 /* case 66: - application key pad */ 3734 /* case 66: - application key pad */
4222 /* case 67: - backspace key */ 3735 /* case 67: - backspace key */
4223 case 1000: /* X11 mouse reporting */ 3736 case 1000: /* X11 mouse reporting */
4224 if (state) /* orthogonal */ 3737 if (state) /* orthogonal */
4225 priv_modes &= ~PrivMode_MouseX10; 3738 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4226 break; 3739 break;
4227#if 0
4228 case 1001: 3740 case 1002:
4229 break; /* X11 mouse highlighting */ 3741 case 1003:
4230#endif 3742 if (state)
3743 {
3744 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3745 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3746 vt_emask_mouse = PointerMotionMask;
3747 }
3748 else
3749 vt_emask_mouse = NoEventMask;
3750
3751 vt_select_input ();
3752 break;
4231 case 1010: /* scroll to bottom on TTY output inhibit */ 3753 case 1010: /* scroll to bottom on TTY output inhibit */
4232 set_option (Opt_scrollTtyOutput, !state); 3754 set_option (Opt_scrollTtyOutput, !state);
4233 break; 3755 break;
4234 case 1011: /* scroll to bottom on key press */ 3756 case 1011: /* scroll to bottom on key press */
4235 set_option (Opt_scrollTtyKeypress, state); 3757 set_option (Opt_scrollTtyKeypress, state);
4236 break; 3758 break;
4237 case 1047: /* secondary screen w/ clearing last */ 3759 case 1047: /* secondary screen w/ clearing last */
4238 if (OPTION (Opt_secondaryScreen)) 3760 if (option (Opt_secondaryScreen))
4239 if (current_screen != PRIMARY) 3761 if (!state)
4240 scr_erase_screen (2); 3762 scr_erase_screen (2);
3763
4241 scr_change_screen (state); 3764 scr_change_screen (state);
4242 break; 3765 break;
4243 case 1049: /* secondary screen w/ clearing first */ 3766 case 1049: /* secondary screen w/ clearing first */
3767 if (option (Opt_secondaryScreen))
3768 if (state)
3769 scr_cursor (SAVE);
3770
4244 scr_change_screen (state); 3771 scr_change_screen (state);
3772
4245 if (OPTION (Opt_secondaryScreen)) 3773 if (option (Opt_secondaryScreen))
4246 if (current_screen != PRIMARY) 3774 if (state)
4247 scr_erase_screen (2); 3775 scr_erase_screen (2);
3776 else
3777 scr_cursor (RESTORE);
4248 break; 3778 break;
4249 default: 3779 default:
4250 break; 3780 break;
4251 } 3781 }
4252 } 3782 }
… …
4378 scr_color (Color_bg, Color_bg); 3908 scr_color (Color_bg, Color_bg);
4379 break; 3909 break;
4380 3910
4381 //case 50: // not variable spacing 3911 //case 50: // not variable spacing
4382 3912
4383#if ENABLE_FRILLS 3913#if !ENABLE_MINIMAL
4384 case 90: 3914 case 90:
4385 case 91: /* set bright fg color */ 3915 case 91: /* set bright fg color */
4386 case 92: 3916 case 92:
4387 case 93: 3917 case 93:
4388 case 94: 3918 case 94:
… …
4412rxvt_term::process_graphics () 3942rxvt_term::process_graphics ()
4413{ 3943{
4414 unicode_t ch, cmd = cmd_getc (); 3944 unicode_t ch, cmd = cmd_getc ();
4415 3945
4416 if (cmd == 'Q') 3946 if (cmd == 'Q')
3947 {
4417 { /* query graphics */ 3948 /* query graphics */
4418 tt_printf ("\033G0\012"); /* no graphics */ 3949 tt_printf ("\033G0\012"); /* no graphics */
4419 return; 3950 return;
4420 } 3951 }
4421 /* swallow other graphics sequences until terminating ':' */ 3952 /* swallow other graphics sequences until terminating ':' */
4422 do 3953 do
… …
4453rxvt_term::tt_write (const char *data, unsigned int len) 3984rxvt_term::tt_write (const char *data, unsigned int len)
4454{ 3985{
4455 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 3986 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4456 return; 3987 return;
4457 3988
4458 if (pty.pty < 0) 3989 if (pty->pty < 0)
4459 return; 3990 return;
4460 3991
4461 if (v_buflen == 0) 3992 if (v_buflen == 0)
4462 { 3993 {
4463 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 3994 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4464 3995
4465 if ((unsigned int)written == len) 3996 if ((unsigned int)written == len)
4466 return; 3997 return;
4467 3998
4468 data += written; 3999 data += written;
… …
4472 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4003 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4473 4004
4474 memcpy (v_buffer + v_buflen, data, len); 4005 memcpy (v_buffer + v_buflen, data, len);
4475 v_buflen += len; 4006 v_buflen += len;
4476 4007
4477 pty_ev.set (EVENT_READ | EVENT_WRITE); 4008 pty_ev.set (ev::READ | ev::WRITE);
4478} 4009}
4479 4010
4480void rxvt_term::pty_write () 4011void rxvt_term::pty_write ()
4481{ 4012{
4482 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4013 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4483 4014
4484 if (written > 0) 4015 if (written > 0)
4485 { 4016 {
4486 v_buflen -= written; 4017 v_buflen -= written;
4487 4018
4488 if (v_buflen == 0) 4019 if (v_buflen == 0)
4489 { 4020 {
4490 free (v_buffer); 4021 free (v_buffer);
4491 v_buffer = 0; 4022 v_buffer = 0;
4492 v_buflen = 0;
4493 4023
4494 pty_ev.set (EVENT_READ); 4024 pty_ev.set (ev::READ);
4495 return; 4025 return;
4496 } 4026 }
4497 4027
4498 memmove (v_buffer, v_buffer + written, v_buflen); 4028 memmove (v_buffer, v_buffer + written, v_buflen);
4499 } 4029 }
4500 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4030 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4501 pty_ev.set (EVENT_READ); 4031 pty_ev.set (ev::READ);
4502} 4032}
4503 4033
4504/*----------------------- end-of-file (C source) -----------------------*/ 4034/*----------------------- end-of-file (C source) -----------------------*/
4505 4035

Diff Legend

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