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

Diff Legend

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