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

Diff Legend

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