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.248 by root, Sun Jan 8 00:07:18 2006 UTC vs.
Revision 1.445 by sf-exg, Fri Apr 2 13:52:30 2010 UTC

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

Diff Legend

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