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.261 by root, Fri Jan 13 15:42:50 2006 UTC vs.
Revision 1.445 by sf-exg, Fri Apr 2 13:52:30 2010 UTC

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

Diff Legend

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