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.262 by root, Sun Jan 15 06:02:40 2006 UTC vs.
Revision 1.451 by root, Sun May 23 00:37:19 2010 UTC

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

Diff Legend

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