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

Diff Legend

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