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.278 by root, Fri Jan 20 18:50:49 2006 UTC vs.
Revision 1.489 by sf-exg, Sat Jul 9 13:40:13 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 im_send_spot ();
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 (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1492 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1498 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1499 && ev.xproperty.state == PropertyNewValue)
1500 selection_property (ev.xproperty.window, ev.xproperty.atom);
1501
1502 break; 1493 break;
1503 1494
1504 case SelectionClear: 1495 case SelectionClear:
1505 selection_clear (); 1496 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1506 break;
1507
1508 case SelectionNotify:
1509 if (selection_wait == Sel_normal)
1510 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1511 break; 1497 break;
1512 1498
1513 case SelectionRequest: 1499 case SelectionRequest:
1514 selection_send (ev.xselectionrequest); 1500 selection_send (ev.xselectionrequest);
1515 break; 1501 break;
1516 1502
1517 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
1518 mapped = 1; 1520 mapped = 1;
1519#ifdef TEXT_BLINK 1521#ifdef TEXT_BLINK
1520 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1522 text_blink_ev.start ();
1521#endif 1523#endif
1522 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1524 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1523 break; 1525 break;
1524 1526
1525 case UnmapNotify: 1527 case UnmapNotify:
… …
1527#ifdef TEXT_BLINK 1529#ifdef TEXT_BLINK
1528 text_blink_ev.stop (); 1530 text_blink_ev.stop ();
1529#endif 1531#endif
1530 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1532 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1531 break; 1533 break;
1532
1533#ifdef TRANSPARENT
1534 case ReparentNotify:
1535 rootwin_cb (ev);
1536 break;
1537#endif /* TRANSPARENT */
1538 1534
1539 case GraphicsExpose: 1535 case GraphicsExpose:
1540 case Expose: 1536 case Expose:
1541 if (ev.xany.window == vt) 1537 if (ev.xany.window == vt)
1542 { 1538 {
1543 do 1539 do
1540 {
1544 scr_expose (ev.xexpose.x, ev.xexpose.y, 1541 scr_expose (ev.xexpose.x, ev.xexpose.y,
1545 ev.xexpose.width, ev.xexpose.height, False); 1542 ev.xexpose.width, ev.xexpose.height, false);
1543 }
1546 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1544 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1547 1545
1548 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1546 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1549 1547
1550 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1548 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1549 {
1551 scr_expose (ev.xexpose.x, ev.xexpose.y, 1550 scr_expose (ev.xexpose.x, ev.xexpose.y,
1552 ev.xexpose.width, ev.xexpose.height, False); 1551 ev.xexpose.width, ev.xexpose.height, false);
1552 }
1553 1553
1554 want_refresh = 1; 1554 want_refresh = 1;
1555 } 1555 }
1556 else 1556 else
1557 { 1557 {
1558 XEvent unused_event; 1558 XEvent unused_event;
1559 1559
1560 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1560 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1561 ; 1561 ;
1562 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1562 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1563 ; 1563 ;
1564 1564
1565 if (isScrollbarWindow (ev.xany.window)) 1565 if (scrollBar.state && ev.xany.window == scrollBar.win)
1566 { 1566 {
1567 scrollBar.setIdle (); 1567 scrollBar.state = STATE_IDLE;
1568 scrollbar_show (0); 1568 scrollBar.show (0);
1569 } 1569 }
1570
1571#ifdef TRANSPARENT
1572 if (am_transparent && ev.xany.window == parent[0])
1573 XClearWindow (disp, ev.xany.window);
1574#endif
1575 } 1570 }
1576 break; 1571 break;
1577 1572
1578 case MotionNotify: 1573 case MotionNotify:
1579#ifdef POINTER_BLANK 1574#ifdef POINTER_BLANK
1580 if (hidden_pointer) 1575 if (hidden_pointer)
1581 pointer_unblank (); 1576 pointer_unblank ();
1582#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);
1583 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1581 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1584 break; 1582 break;
1585 1583
1586 if (ev.xany.window == vt) 1584 if (ev.xany.window == vt)
1587 { 1585 {
1588 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1586 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1589 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1587 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1590 ; // nop 1588 ; // nop
1591 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1589 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1592 { 1590 {
1593 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1591 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1594 ; 1592 ;
1595 1593
1596 XQueryPointer (disp, vt, 1594 XQueryPointer (dpy, vt,
1597 &unused_root, &unused_child, 1595 &unused_root, &unused_child,
1598 &unused_root_x, &unused_root_y, 1596 &unused_root_x, &unused_root_y,
1599 &ev.xbutton.x, &ev.xbutton.y, 1597 &ev.xbutton.x, &ev.xbutton.y,
1600 &ev.xbutton.state); 1598 &ev.xbutton.state);
1601#ifdef MOUSE_THRESHOLD 1599#ifdef MOUSE_THRESHOLD
… …
1621 int dist; 1619 int dist;
1622 1620
1623 /* don't clobber the current delay if we are 1621 /* don't clobber the current delay if we are
1624 * already in the middle of scrolling. 1622 * already in the middle of scrolling.
1625 */ 1623 */
1626 if (!sel_scroll_ev.active) 1624 if (!sel_scroll_ev.is_active ())
1627 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1625 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1628 1626
1629 /* save the event params so we can highlight 1627 /* save the event params so we can highlight
1630 * the selection in the pending-scroll loop 1628 * the selection in the pending-scroll loop
1631 */ 1629 */
1632 selection_save_x = ev.xbutton.x; 1630 selection_save_x = ev.xbutton.x;
… …
1654 else 1652 else
1655 { 1653 {
1656 /* we are within the text window, so we 1654 /* we are within the text window, so we
1657 * shouldn't be scrolling 1655 * shouldn't be scrolling
1658 */ 1656 */
1659 if (sel_scroll_ev.active)
1660 sel_scroll_ev.stop(); 1657 sel_scroll_ev.stop();
1661 } 1658 }
1662#endif 1659#endif
1663#ifdef MOUSE_THRESHOLD 1660#ifdef MOUSE_THRESHOLD
1664 } 1661 }
1665#endif 1662#endif
1666 } 1663 }
1667 } 1664 }
1668 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1665 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1669 { 1666 {
1670 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1667 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1671 MotionNotify, &ev)) 1668 MotionNotify, &ev))
1672 ; 1669 ;
1673 1670
1674 XQueryPointer (disp, scrollBar.win, 1671 XQueryPointer (dpy, scrollBar.win,
1675 &unused_root, &unused_child, 1672 &unused_root, &unused_child,
1676 &unused_root_x, &unused_root_y, 1673 &unused_root_x, &unused_root_y,
1677 &ev.xbutton.x, &ev.xbutton.y, 1674 &ev.xbutton.x, &ev.xbutton.y,
1678 &unused_mask); 1675 &unused_mask);
1679 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1676 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1680 scrollbar_size ()); 1677 scrollBar.size ());
1681 want_refresh = 1; 1678 want_refresh = 1;
1682 refresh_limit = 0;
1683 scrollbar_show (1); 1679 scrollBar.show (1);
1684 } 1680 }
1685 break; 1681 break;
1686 } 1682 }
1687 1683
1688skip_switch: ;
1689
1690#if defined(CURSOR_BLINK) 1684#if defined(CURSOR_BLINK)
1691 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1685 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1692 { 1686 {
1693 if (hidden_cursor) 1687 if (hidden_cursor)
1694 { 1688 {
1695 hidden_cursor = 0; 1689 hidden_cursor = 0;
1696 want_refresh = 1; 1690 want_refresh = 1;
1697 } 1691 }
1698 1692
1699 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1693 cursor_blink_ev.again ();
1700 } 1694 }
1701#endif 1695#endif
1702 1696
1703#if defined(POINTER_BLANK) 1697#if defined(POINTER_BLANK)
1704 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1698 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1705 { 1699 {
1706 if (ev.type == MotionNotify 1700 if (ev.type == MotionNotify
1707 || ev.type == ButtonPress 1701 || ev.type == ButtonPress
1708 || ev.type == ButtonRelease) 1702 || ev.type == ButtonRelease)
1709 if (hidden_pointer) 1703 if (hidden_pointer)
… …
1711 1705
1712 if (ev.type == KeyPress && hidden_pointer == 0) 1706 if (ev.type == KeyPress && hidden_pointer == 0)
1713 pointer_blank (); 1707 pointer_blank ();
1714 } 1708 }
1715#endif 1709#endif
1710
1711 refresh_check ();
1716} 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
1717 1729
1718void 1730void
1719rxvt_term::focus_in () 1731rxvt_term::focus_in ()
1720{ 1732{
1721 if (!focus) 1733 if (!focus)
1722 { 1734 {
1723 focus = 1; 1735 focus = 1;
1724 want_refresh = 1; 1736 want_refresh = 1;
1725 1737
1726 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1727
1728#if USE_XIM 1738#if USE_XIM
1729 if (Input_Context != NULL) 1739 if (Input_Context != NULL)
1730 { 1740 {
1731 IMSetStatusPosition (); 1741 im_set_position ();
1732 XSetICFocus (Input_Context); 1742 XSetICFocus (Input_Context);
1733 } 1743 }
1734#endif 1744#endif
1735#if CURSOR_BLINK 1745#if CURSOR_BLINK
1736 if (OPTION (Opt_cursorBlink)) 1746 if (option (Opt_cursorBlink))
1737 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1747 cursor_blink_ev.again ();
1738#endif 1748#endif
1739#if OFF_FOCUS_FADING 1749#if OFF_FOCUS_FADING
1740 if (rs[Rs_fade]) 1750 if (rs[Rs_fade])
1741 { 1751 {
1742 pix_colors = pix_colors_focused; 1752 pix_colors = pix_colors_focused;
1743 scr_recolour (); 1753 scr_recolour ();
1744 } 1754 }
1745#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));
1746 } 1762 }
1747} 1763}
1748 1764
1749void 1765void
1750rxvt_term::focus_out () 1766rxvt_term::focus_out ()
… …
1752 if (focus) 1768 if (focus)
1753 { 1769 {
1754 focus = 0; 1770 focus = 0;
1755 want_refresh = 1; 1771 want_refresh = 1;
1756 1772
1757 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1773#if ENABLE_FRILLS
1758 1774 if (option (Opt_urgentOnBell))
1775 set_urgency (0);
1776#endif
1759#if ENABLE_FRILLS || ISO_14755 1777#if ENABLE_FRILLS || ISO_14755
1760 if (iso14755buf) 1778 if (iso14755buf)
1761 { 1779 {
1762 iso14755buf = 0; 1780 iso14755buf = 0;
1763# if ENABLE_OVERLAY 1781# if ISO_14755
1764 scr_overlay_off (); 1782 scr_overlay_off ();
1765# endif 1783# endif
1766 } 1784 }
1767#endif 1785#endif
1768#if USE_XIM 1786#if USE_XIM
1769 if (Input_Context != NULL) 1787 if (Input_Context != NULL)
1770 XUnsetICFocus (Input_Context); 1788 XUnsetICFocus (Input_Context);
1771#endif 1789#endif
1772#if CURSOR_BLINK 1790#if CURSOR_BLINK
1773 if (OPTION (Opt_cursorBlink)) 1791 if (option (Opt_cursorBlink))
1774 cursor_blink_ev.stop (); 1792 cursor_blink_ev.stop ();
1793
1775 hidden_cursor = 0; 1794 hidden_cursor = 0;
1776#endif 1795#endif
1777#if OFF_FOCUS_FADING 1796#if OFF_FOCUS_FADING
1778 if (rs[Rs_fade]) 1797 if (rs[Rs_fade])
1779 { 1798 {
1780 pix_colors = pix_colors_unfocused; 1799 pix_colors = pix_colors_unfocused;
1781 scr_recolour (); 1800 scr_recolour ();
1782 } 1801 }
1783#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])
1784 } 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
1785} 1819}
1786 1820
1787#if TRANSPARENT 1821#if ENABLE_TRANSPARENCY || ENABLE_PERL
1788void 1822void
1789rxvt_term::rootwin_cb (XEvent &ev) 1823rxvt_term::rootwin_cb (XEvent &ev)
1790{ 1824{
1791 make_current (); 1825 make_current ();
1792 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
1793 switch (ev.type) 1832 switch (ev.type)
1794 { 1833 {
1795 case PropertyNotify: 1834 case PropertyNotify:
1796 /* 1835 /*
1797 * 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,
1798 * 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.
1799 */ 1838 */
1800 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1839 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1801 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1840 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1802 return; 1841 {
1842 bg_set_root_pixmap ();
1843 update_background ();
1844 }
1803 1845
1804 /* FALLTHROUGH */
1805 case ReparentNotify:
1806 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1807 want_refresh = want_full_refresh = 1;
1808 break; 1846 break;
1809 } 1847 }
1848# endif
1849
1850 refresh_check ();
1810} 1851}
1811#endif 1852#endif
1812 1853
1813void 1854void
1814rxvt_term::button_press (XButtonEvent &ev) 1855rxvt_term::button_press (XButtonEvent &ev)
… …
1823 /* 1864 /*
1824 * VT window processing of button press 1865 * VT window processing of button press
1825 */ 1866 */
1826 if (ev.window == vt) 1867 if (ev.window == vt)
1827 { 1868 {
1869 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1870 return;
1871
1828#if ISO_14755 1872#if ISO_14755
1829 // 5.4 1873 // 5.4
1830 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1874 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1831 { 1875 {
1832 iso14755_54 (ev.x, ev.y); 1876 iso14755_54 (ev.x, ev.y);
… …
1842 /* save the xbutton state (for ButtonRelease) */ 1886 /* save the xbutton state (for ButtonRelease) */
1843 MEvent.state = ev.state; 1887 MEvent.state = ev.state;
1844#ifdef MOUSE_REPORT_DOUBLECLICK 1888#ifdef MOUSE_REPORT_DOUBLECLICK
1845 if (ev.button == MEvent.button && clickintime) 1889 if (ev.button == MEvent.button && clickintime)
1846 { 1890 {
1847 /* same button, within alloted time */ 1891 /* same button, within allowed time */
1848 MEvent.clicks++; 1892 MEvent.clicks++;
1849 1893
1850 if (MEvent.clicks > 1) 1894 if (MEvent.clicks > 1)
1851 { 1895 {
1852 /* only report double clicks */ 1896 /* only report double clicks */
… …
1866 mouse_report (ev); 1910 mouse_report (ev);
1867 } 1911 }
1868#else 1912#else
1869 MEvent.button = ev.button; 1913 MEvent.button = ev.button;
1870 mouse_report (ev); 1914 mouse_report (ev);
1871#endif /* MOUSE_REPORT_DOUBLECLICK */ 1915#endif /* MOUSE_REPORT_DOUBLECLICK */
1872 1916
1873 } 1917 }
1874 else 1918 else
1875 { 1919 {
1876 if (ev.button != MEvent.button) 1920 if (ev.button != MEvent.button)
1877 MEvent.clicks = 0; 1921 MEvent.clicks = 0;
1878 1922
1879 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1880 switch (ev.button) 1923 switch (ev.button)
1881 { 1924 {
1882 case Button1: 1925 case Button1:
1883 /* allow meta + click to select rectangular areas */ 1926 /* allow meta + click to select rectangular areas */
1884 /* should be done in screen.C */ 1927 /* should be done in screen.C */
1885#if ENABLE_FRILLS 1928#if ENABLE_FRILLS
1886 selection.rect = !!(ev.state & ModMetaMask); 1929 selection.rect = !!(ev.state & ModMetaMask);
1887#else 1930#else
1888 selection.rect = false; 1931 selection.rect = false;
1889#endif 1932#endif
1890 1933
1891 /* allow shift+left click to extend selection */ 1934 /* allow shift+left click to extend selection */
1892 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report)) 1935 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1893 { 1936 {
1894 if (MEvent.button == Button1 && clickintime) 1937 if (MEvent.button == Button1 && clickintime)
1895 selection_rotate (ev.x, ev.y); 1938 selection_rotate (ev.x, ev.y);
1896 else 1939 else
1897 selection_extend (ev.x, ev.y, 1); 1940 selection_extend (ev.x, ev.y, 1);
1898 } 1941 }
1899 else 1942 else
1900 { 1943 {
1901 if (MEvent.button == Button1 && clickintime) 1944 if (MEvent.button == Button1 && clickintime)
1902 MEvent.clicks++; 1945 MEvent.clicks++;
1903 else 1946 else
1904 MEvent.clicks = 1; 1947 MEvent.clicks = 1;
1905 1948
1906 selection_click (MEvent.clicks, ev.x, ev.y); 1949 selection_click (MEvent.clicks, ev.x, ev.y);
1907 } 1950 }
1908 1951
1909 MEvent.button = Button1; 1952 MEvent.button = Button1;
1910 break; 1953 break;
1911 1954
1912 case Button3: 1955 case Button3:
1913 if (MEvent.button == Button3 && clickintime) 1956 if (MEvent.button == Button3 && clickintime)
1914 selection_rotate (ev.x, ev.y); 1957 selection_rotate (ev.x, ev.y);
1915 else 1958 else
1916 selection_extend (ev.x, ev.y, 1); 1959 selection_extend (ev.x, ev.y, 1);
1917 1960
1918 MEvent.button = Button3; 1961 MEvent.button = Button3;
1919 break; 1962 break;
1920 } 1963 }
1921 } 1964 }
1922 1965
1923 MEvent.time = ev.time; 1966 MEvent.time = ev.time;
1924 return; 1967 return;
1925 } 1968 }
1926 1969
1927 /* 1970 /*
1928 * Scrollbar window processing of button press 1971 * Scrollbar window processing of button press
1929 */ 1972 */
1930 if (isScrollbarWindow (ev.window)) 1973 if (scrollBar.state && ev.window == scrollBar.win)
1931 { 1974 {
1932 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;
1933 /* 1983 /*
1934 * Rxvt-style scrollbar: 1984 * Rxvt-style scrollbar:
1935 * move up if mouse is above slider 1985 * move up if mouse is above slider
1936 * move dn if mouse is below slider 1986 * move dn if mouse is below slider
1937 * 1987 *
… …
1946 /* 1996 /*
1947 * Mouse report disabled scrollbar: 1997 * Mouse report disabled scrollbar:
1948 * arrow buttons - send up/down 1998 * arrow buttons - send up/down
1949 * click on scrollbar - send pageup/down 1999 * click on scrollbar - send pageup/down
1950 */ 2000 */
1951 if ((scrollBar.style == R_SB_NEXT 2001 if (direction == UP)
1952 && scrollbarnext_upButton (ev.y))
1953 || (scrollBar.style == R_SB_RXVT
1954 && scrollbarrxvt_upButton (ev.y)))
1955 tt_printf ("\033[A"); 2002 tt_printf ("\033[A");
1956 else if ((scrollBar.style == R_SB_NEXT 2003 else if (direction == DN)
1957 && scrollbarnext_dnButton (ev.y))
1958 || (scrollBar.style == R_SB_RXVT
1959 && scrollbarrxvt_dnButton (ev.y)))
1960 tt_printf ("\033[B"); 2004 tt_printf ("\033[B");
1961 else 2005 else
1962 switch (ev.button) 2006 switch (ev.button)
1963 { 2007 {
1964 case Button2: 2008 case Button2:
… …
1971 tt_printf ("\033[5~"); 2015 tt_printf ("\033[5~");
1972 break; 2016 break;
1973 } 2017 }
1974 } 2018 }
1975 else 2019 else
1976#endif /* NO_SCROLLBAR_REPORT */ 2020#endif /* NO_SCROLLBAR_REPORT */
1977
1978 {
1979 char upordown = 0;
1980
1981 if (scrollBar.style == R_SB_NEXT)
1982 { 2021 {
1983 if (scrollbarnext_upButton (ev.y)) 2022 if (direction != NO_DIR)
1984 upordown = -1; /* up */
1985 else if (scrollbarnext_dnButton (ev.y))
1986 upordown = 1; /* down */
1987 }
1988 else if (scrollBar.style == R_SB_RXVT)
1989 {
1990 if (scrollbarrxvt_upButton (ev.y))
1991 upordown = -1; /* up */
1992 else if (scrollbarrxvt_dnButton (ev.y))
1993 upordown = 1; /* down */
1994 }
1995 if (upordown)
1996 { 2023 {
1997#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2024#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2025 if (!cont_scroll_ev.is_active ())
1998 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2026 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1999#endif 2027#endif
2000 if (scr_page (upordown < 0 ? UP : DN, 1)) 2028 if (scr_page (direction, 1))
2001 { 2029 {
2002 if (upordown < 0) 2030 if (direction == UP)
2003 scrollBar.setUp (); 2031 scrollBar.state = STATE_UP;
2004 else 2032 else
2005 scrollBar.setDn (); 2033 scrollBar.state = STATE_DOWN;
2006 } 2034 }
2007 } 2035 }
2008 else 2036 else
2009 switch (ev.button) 2037 switch (ev.button)
2010 { 2038 {
2011 case Button2: 2039 case Button2:
2012 switch (scrollbar_align) 2040 switch (scrollBar.align)
2013 { 2041 {
2014 case R_SB_ALIGN_TOP: 2042 case R_SB_ALIGN_TOP:
2015 csrO = 0; 2043 csrO = 0;
2016 break; 2044 break;
2017 case R_SB_ALIGN_CENTRE: 2045 case R_SB_ALIGN_CENTRE:
… …
2023 } 2051 }
2024 2052
2025 if (scrollBar.style == R_SB_XTERM 2053 if (scrollBar.style == R_SB_XTERM
2026 || scrollbar_above_slider (ev.y) 2054 || scrollbar_above_slider (ev.y)
2027 || scrollbar_below_slider (ev.y)) 2055 || scrollbar_below_slider (ev.y))
2028 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2056 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2029 2057
2030 scrollBar.setMotion (); 2058 scrollBar.state = STATE_MOTION;
2031 break; 2059 break;
2032 2060
2033 case Button1: 2061 case Button1:
2034 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2062 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2035 csrO = ev.y - scrollBar.top; 2063 csrO = ev.y - scrollBar.top;
2036 /* FALLTHROUGH */ 2064 /* FALLTHROUGH */
2037 2065
2038 case Button3: 2066 case Button3:
2039 if (scrollBar.style != R_SB_XTERM) 2067 if (scrollBar.style != R_SB_XTERM)
… …
2049 scr_page (DN, nrow - 1); 2077 scr_page (DN, nrow - 1);
2050# else 2078# else
2051 scr_page (DN, nrow / 4); 2079 scr_page (DN, nrow / 4);
2052# endif 2080# endif
2053 else 2081 else
2054 scrollBar.setMotion (); 2082 scrollBar.state = STATE_MOTION;
2055 } 2083 }
2056 else 2084 else
2057 { 2085 {
2058 scr_page ((ev.button == Button1 ? DN : UP), 2086 scr_page ((ev.button == Button1 ? DN : UP),
2059 (nrow 2087 (nrow
2060 * scrollbar_position (ev.y) 2088 * scrollbar_position (ev.y)
2061 / scrollbar_size ())); 2089 / scrollBar.size ()));
2062 } 2090 }
2063 2091
2064 break; 2092 break;
2065 } 2093 }
2066 } 2094 }
… …
2076 2104
2077 csrO = 0; /* reset csr Offset */ 2105 csrO = 0; /* reset csr Offset */
2078 if (!bypass_keystate) 2106 if (!bypass_keystate)
2079 reportmode = !! (priv_modes & PrivMode_mouse_report); 2107 reportmode = !! (priv_modes & PrivMode_mouse_report);
2080 2108
2081 if (scrollbar_isUpDn ()) 2109 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2082 { 2110 {
2083 scrollBar.setIdle (); 2111 scrollBar.state = STATE_IDLE;
2084 scrollbar_show (0); 2112 scrollBar.show (0);
2085 } 2113 }
2086 2114
2087#ifdef SELECTION_SCROLLING 2115#ifdef SELECTION_SCROLLING
2088 if (sel_scroll_ev.active)
2089 sel_scroll_ev.stop(); 2116 sel_scroll_ev.stop();
2090#endif 2117#endif
2091 2118
2092 if (ev.window == vt) 2119 if (ev.window == vt)
2093 { 2120 {
2121 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2122 return;
2123
2094#if ISO_14755 2124#if ISO_14755
2095 // 5.4 2125 // 5.4
2096 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2126 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2097 return; 2127 return;
2098#endif 2128#endif
2129
2099 if (reportmode) 2130 if (reportmode)
2100 { 2131 {
2101 /* mouse report from vt window */ 2132 /* mouse report from vt window */
2102 /* don't report release of wheel "buttons" */ 2133 /* don't report release of wheel "buttons" */
2103 if (ev.button >= 4) 2134 if (ev.button >= 4)
… …
2114 mouse_report (ev); 2145 mouse_report (ev);
2115 } 2146 }
2116#else /* MOUSE_REPORT_DOUBLECLICK */ 2147#else /* MOUSE_REPORT_DOUBLECLICK */
2117 MEvent.button = AnyButton; 2148 MEvent.button = AnyButton;
2118 mouse_report (ev); 2149 mouse_report (ev);
2119#endif /* MOUSE_REPORT_DOUBLECLICK */ 2150#endif /* MOUSE_REPORT_DOUBLECLICK */
2120 return; 2151 return;
2121 } 2152 }
2122 2153
2123 /* 2154 /*
2124 * dumb hack to compensate for the failure of click-and-drag 2155 * dumb hack to compensate for the failure of click-and-drag
… …
2127 if (priv_modes & PrivMode_mouse_report 2158 if (priv_modes & PrivMode_mouse_report
2128 && bypass_keystate 2159 && bypass_keystate
2129 && ev.button == Button1 && MEvent.clicks <= 1) 2160 && ev.button == Button1 && MEvent.clicks <= 1)
2130 selection_extend (ev.x, ev.y, 0); 2161 selection_extend (ev.x, ev.y, 0);
2131 2162
2132 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2133 return;
2134
2135 switch (ev.button) 2163 switch (ev.button)
2136 { 2164 {
2137 case Button1: 2165 case Button1:
2138 case Button3: 2166 case Button3:
2139 selection_make (ev.time); 2167 selection_make (ev.time);
2140 break; 2168 break;
2141 2169
2142 case Button2: 2170 case Button2:
2143 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?
2144 selection_request (ev.time, ev.state & ShiftMask ? Sel_Clipboard : Sel_Primary); 2172 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2145 break; 2173 break;
2146 2174
2147#ifdef MOUSE_WHEEL 2175#ifdef MOUSE_WHEEL
2148 case Button4: 2176 case Button4:
2149 case Button5: 2177 case Button5:
… …
2153 2181
2154 v = ev.button == Button4 ? UP : DN; 2182 v = ev.button == Button4 ? UP : DN;
2155 2183
2156 if (ev.state & ShiftMask) 2184 if (ev.state & ShiftMask)
2157 i = 1; 2185 i = 1;
2158 else if (OPTION (Opt_mouseWheelScrollPage)) 2186 else if (option (Opt_mouseWheelScrollPage))
2159 i = nrow - 1; 2187 i = nrow - 1;
2160 else 2188 else
2161 i = 5; 2189 i = 5;
2162 2190
2163# ifdef MOUSE_SLIP_WHEELING 2191# ifdef MOUSE_SLIP_WHEELING
… …
2165 { 2193 {
2166 mouse_slip_wheel_speed += v ? -1 : 1; 2194 mouse_slip_wheel_speed += v ? -1 : 1;
2167 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2195 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2168 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2196 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2169 2197
2170 if (slip_wheel_ev.at < NOW) 2198 if (!slip_wheel_ev.is_active ())
2171 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2199 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2172
2173 slip_wheel_ev.start ();
2174 } 2200 }
2175 else 2201 else
2202# endif
2176 { 2203 {
2177# endif
2178 scr_page (v, i); 2204 scr_page (v, i);
2179 scrollbar_show (1); 2205 scrollBar.show (1);
2180# ifdef MOUSE_SLIP_WHEELING
2181 } 2206 }
2182# endif
2183 } 2207 }
2184 break; 2208 break;
2185#endif 2209#endif
2186 } 2210 }
2187 } 2211 }
2188} 2212}
2189 2213
2190#ifdef TRANSPARENT
2191#if TINTING
2192/* taken from aterm-0.4.2 */
2193
2194typedef uint32_t RUINT32T;
2195
2196void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2197{
2198 int sh_r, sh_g, sh_b;
2199 RUINT32T mask_r, mask_g, mask_b;
2200 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2201 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2202 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2203 int i;
2204
2205 Visual *visual = display->visual;
2206
2207 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2208
2209 /* for convenience */
2210 mask_r = visual->red_mask;
2211 mask_g = visual->green_mask;
2212 mask_b = visual->blue_mask;
2213
2214 /* boring lookup table pre-initialization */
2215 switch (srcImage->bits_per_pixel) {
2216 case 15:
2217 if ((mask_r != 0x7c00) ||
2218 (mask_g != 0x03e0) ||
2219 (mask_b != 0x001f))
2220 return;
2221 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2222 lookup_r = lookup;
2223 lookup_g = lookup+32;
2224 lookup_b = lookup+32+32;
2225 sh_r = 10;
2226 sh_g = 5;
2227 sh_b = 0;
2228 break;
2229 case 16:
2230 if ((mask_r != 0xf800) ||
2231 (mask_g != 0x07e0) ||
2232 (mask_b != 0x001f))
2233 return;
2234 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2235 lookup_r = lookup;
2236 lookup_g = lookup+32;
2237 lookup_b = lookup+32+64;
2238 sh_r = 11;
2239 sh_g = 5;
2240 sh_b = 0;
2241 break;
2242 case 24:
2243 if ((mask_r != 0xff0000) ||
2244 (mask_g != 0x00ff00) ||
2245 (mask_b != 0x0000ff))
2246 return;
2247 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2248 lookup_r = lookup;
2249 lookup_g = lookup+256;
2250 lookup_b = lookup+256+256;
2251 sh_r = 16;
2252 sh_g = 8;
2253 sh_b = 0;
2254 break;
2255 case 32:
2256 if ((mask_r != 0xff0000) ||
2257 (mask_g != 0x00ff00) ||
2258 (mask_b != 0x0000ff))
2259 return;
2260 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2261 lookup_r = lookup;
2262 lookup_g = lookup+256;
2263 lookup_b = lookup+256+256;
2264 sh_r = 16;
2265 sh_g = 8;
2266 sh_b = 0;
2267 break;
2268 default:
2269 return; /* we do not support this color depth */
2270 }
2271
2272 /* prepare limits for color transformation (each channel is handled separately) */
2273 if (shade < 0) {
2274 shade = -shade;
2275 if (shade < 0) shade = 0;
2276 if (shade > 100) shade = 100;
2277
2278 lower_lim_r = 65535-rm;
2279 lower_lim_g = 65535-gm;
2280 lower_lim_b = 65535-bm;
2281
2282 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2283 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2284 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2285
2286 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2287 } else {
2288 if (shade < 0) shade = 0;
2289 if (shade > 100) shade = 100;
2290
2291 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2292
2293 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2294 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2295 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2296 }
2297
2298 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2299 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2300 {
2301 unsigned int tmp;
2302
2303 tmp = lower_lim_r;
2304 lower_lim_r = lower_lim_b;
2305 lower_lim_b = tmp;
2306
2307 tmp = upper_lim_r;
2308 upper_lim_r = upper_lim_b;
2309 upper_lim_b = tmp;
2310 }
2311
2312 /* fill our lookup tables */
2313 for (i = 0; i <= mask_r>>sh_r; i++)
2314 {
2315 RUINT32T tmp;
2316 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2317 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2318 lookup_r[i] = (tmp/65535)<<sh_r;
2319 }
2320 for (i = 0; i <= mask_g>>sh_g; i++)
2321 {
2322 RUINT32T tmp;
2323 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2324 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2325 lookup_g[i] = (tmp/65535)<<sh_g;
2326 }
2327 for (i = 0; i <= mask_b>>sh_b; i++)
2328 {
2329 RUINT32T tmp;
2330 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2331 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2332 lookup_b[i] = (tmp/65535)<<sh_b;
2333 }
2334
2335 /* apply table to input image (replacing colors by newly calculated ones) */
2336 switch (srcImage->bits_per_pixel)
2337 {
2338 case 15:
2339 {
2340 unsigned short *p1, *pf, *p, *pl;
2341 p1 = (unsigned short *) srcImage->data;
2342 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2343 while (p1 < pf)
2344 {
2345 p = p1;
2346 pl = p1 + srcImage->width;
2347 for (; p < pl; p++)
2348 {
2349 *p = lookup_r[(*p & 0x7c00)>>10] |
2350 lookup_g[(*p & 0x03e0)>> 5] |
2351 lookup_b[(*p & 0x001f)];
2352 }
2353 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2354 }
2355 break;
2356 }
2357 case 16:
2358 {
2359 unsigned short *p1, *pf, *p, *pl;
2360 p1 = (unsigned short *) srcImage->data;
2361 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2362 while (p1 < pf)
2363 {
2364 p = p1;
2365 pl = p1 + srcImage->width;
2366 for (; p < pl; p++)
2367 {
2368 *p = lookup_r[(*p & 0xf800)>>11] |
2369 lookup_g[(*p & 0x07e0)>> 5] |
2370 lookup_b[(*p & 0x001f)];
2371 }
2372 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2373 }
2374 break;
2375 }
2376 case 24:
2377 {
2378 unsigned char *p1, *pf, *p, *pl;
2379 p1 = (unsigned char *) srcImage->data;
2380 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2381 while (p1 < pf)
2382 {
2383 p = p1;
2384 pl = p1 + srcImage->width * 3;
2385 for (; p < pl; p += 3)
2386 {
2387 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2388 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2389 p[2] = lookup_r[(p[2] & 0x0000ff)];
2390 }
2391 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2392 }
2393 break;
2394 }
2395 case 32:
2396 {
2397 RUINT32T *p1, *pf, *p, *pl;
2398 p1 = (RUINT32T *) srcImage->data;
2399 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2400
2401 while (p1 < pf)
2402 {
2403 p = p1;
2404 pl = p1 + srcImage->width;
2405 for (; p < pl; p++)
2406 {
2407 *p = lookup_r[(*p & 0xff0000)>>16] |
2408 lookup_g[(*p & 0x00ff00)>> 8] |
2409 lookup_b[(*p & 0x0000ff)] |
2410 (*p & ~0xffffff);
2411 }
2412 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2413 }
2414 break;
2415 }
2416 }
2417
2418 free (lookup);
2419}
2420#endif
2421
2422/*
2423 * Check our parents are still who we think they are.
2424 * Do transparency updates if required
2425 */
2426int
2427rxvt_term::check_our_parents ()
2428{
2429 int i, pchanged, aformat, have_pixmap, rootdepth;
2430 unsigned long nitems, bytes_after;
2431 Atom atype;
2432 unsigned char *prop = NULL;
2433 Window root, oldp, *list;
2434 Pixmap rootpixmap = None;
2435 XWindowAttributes wattr, wrootattr;
2436 dDisp;
2437
2438 pchanged = 0;
2439
2440 if (!OPTION (Opt_transparent))
2441 return pchanged; /* Don't try any more */
2442
2443 XGetWindowAttributes (disp, display->root, &wrootattr);
2444 rootdepth = wrootattr.depth;
2445
2446 XGetWindowAttributes (disp, parent[0], &wattr);
2447
2448 if (rootdepth != wattr.depth)
2449 {
2450 if (am_transparent)
2451 {
2452 pchanged = 1;
2453 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2454 am_transparent = am_pixmap_trans = 0;
2455 }
2456
2457 return pchanged; /* Don't try any more */
2458 }
2459
2460 /* Get all X ops out of the queue so that our information is up-to-date. */
2461 XSync (disp, False);
2462
2463 /*
2464 * Make the frame window set by the window manager have
2465 * the root background. Some window managers put multiple nested frame
2466 * windows for each client, so we have to take care about that.
2467 */
2468 i = (xa[XA_XROOTPMAP_ID]
2469 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2470 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2471 &nitems, &bytes_after, &prop) == Success);
2472
2473 if (!i || prop == NULL)
2474 i = (xa[XA_ESETROOT_PMAP_ID]
2475 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2476 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2477 &nitems, &bytes_after, &prop) == Success);
2478
2479 if (!i || prop == NULL
2480#if TINTING
2481 || !rs[Rs_color + Color_tint]
2482#endif
2483 )
2484 have_pixmap = 0;
2485 else
2486 {
2487 have_pixmap = 1;
2488 rootpixmap = *(Pixmap *)prop;
2489 XFree (prop);
2490 }
2491
2492 if (have_pixmap)
2493 {
2494 /*
2495 * Copy display->root pixmap transparency
2496 */
2497 int sx, sy, nx, ny;
2498 unsigned int nw, nh;
2499 Window cr;
2500 XImage *image;
2501 GC gc;
2502 XGCValues gcvalue;
2503
2504 XTranslateCoordinates (disp, parent[0], display->root,
2505 0, 0, &sx, &sy, &cr);
2506 nw = (unsigned int)szHint.width;
2507 nh = (unsigned int)szHint.height;
2508 nx = ny = 0;
2509
2510 if (sx < 0)
2511 {
2512 nw += sx;
2513 nx = -sx;
2514 sx = 0;
2515 }
2516
2517 if (sy < 0)
2518 {
2519 nh += sy;
2520 ny = -sy;
2521 sy = 0;
2522 }
2523
2524 min_it (nw, (unsigned int) (wrootattr.width - sx));
2525 min_it (nh, (unsigned int) (wrootattr.height - sy));
2526
2527 XSync (disp, False);
2528 allowedxerror = -1;
2529 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2530
2531 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2532 /* XXX: may need a delay here? */
2533 allowedxerror = 0;
2534
2535 if (image == NULL)
2536 {
2537 if (am_transparent && am_pixmap_trans)
2538 {
2539 pchanged = 1;
2540 if (pixmap != None)
2541 {
2542 XFreePixmap (disp, pixmap);
2543 pixmap = None;
2544 }
2545 }
2546
2547 am_pixmap_trans = 0;
2548 }
2549 else
2550 {
2551 if (pixmap != None)
2552 XFreePixmap (disp, pixmap);
2553
2554#if TINTING
2555 if (ISSET_PIXCOLOR (Color_tint))
2556 {
2557 unsigned short rm, gm, bm;
2558 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2559
2560 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2561
2562 ShadeXImage (display, image, shade, rm, gm, bm);
2563 }
2564#endif
2565
2566 pixmap = XCreatePixmap (disp, vt,
2567 szHint.width, szHint.height, image->depth);
2568 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2569 XPutImage (disp, pixmap, gc, image, 0, 0,
2570 nx, ny, image->width, image->height);
2571 XFreeGC (disp, gc);
2572 XDestroyImage (image);
2573 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2574 XClearWindow (disp, parent[0]);
2575
2576 if (!am_transparent || !am_pixmap_trans)
2577 pchanged = 1;
2578
2579 am_transparent = am_pixmap_trans = 1;
2580 }
2581 }
2582
2583 if (am_pixmap_trans)
2584 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2585 else
2586 {
2587 unsigned int n;
2588 /*
2589 * InheritPixmap transparency
2590 */
2591 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2592 {
2593 oldp = parent[i];
2594 XQueryTree (disp, parent[i - 1], &root,
2595 &parent[i], &list, &n);
2596 XFree (list);
2597
2598 if (parent[i] == display->root)
2599 {
2600 if (oldp != None)
2601 pchanged = 1;
2602
2603 break;
2604 }
2605
2606 if (oldp != parent[i])
2607 pchanged = 1;
2608 }
2609
2610 n = 0;
2611
2612 if (pchanged)
2613 {
2614 for (; n < (unsigned int)i; n++)
2615 {
2616 XGetWindowAttributes (disp, parent[n], &wattr);
2617 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2618 {
2619 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2620 break;
2621 }
2622 }
2623 }
2624
2625 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2626 {
2627 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2628 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2629 am_transparent = 0;
2630 /* XXX: also turn off Opt_transparent? */
2631 }
2632 else
2633 {
2634#if WAIT_FOR_WM
2635 /* wait (an arbitrary period) for the WM to do its thing
2636 * needed for fvwm2.2.2 (and before?) */
2637 sleep (1);
2638#endif
2639 for (n = 0; n < (unsigned int)i; n++)
2640 {
2641 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2642 XClearWindow (disp, parent[n]);
2643 }
2644
2645 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2646 am_transparent = 1;
2647 }
2648
2649 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2650 parent[i] = None;
2651 }
2652
2653 if (scrollBar.win)
2654 {
2655 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2656 scrollBar.setIdle ();
2657 scrollbar_show (0);
2658 }
2659
2660 if (am_transparent)
2661 {
2662 want_refresh = want_full_refresh = 1;
2663 if (am_pixmap_trans)
2664 flush ();
2665 }
2666
2667 return pchanged;
2668}
2669#endif
2670
2671/*}}} */ 2214/*}}} */
2672 2215
2673bool 2216void
2674rxvt_term::cmd_parse () 2217rxvt_term::cmd_parse ()
2675{ 2218{
2676 bool flag = false;
2677 wchar_t ch = NOCHAR; 2219 wchar_t ch = NOCHAR;
2678 char *seq_begin; // remember start of esc-sequence here 2220 char *seq_begin; // remember start of esc-sequence here
2679 2221
2680 for (;;) 2222 for (;;)
2681 { 2223 {
2682 if (ch == NOCHAR) 2224 if (ecb_unlikely (ch == NOCHAR))
2683 { 2225 {
2684 seq_begin = cmdbuf_ptr; 2226 seq_begin = cmdbuf_ptr;
2685 ch = next_char (); 2227 ch = next_char ();
2686 2228
2687 if (ch == NOCHAR) 2229 if (ch == NOCHAR)
2688 break; 2230 break;
2689 } 2231 }
2690 2232
2691 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2233 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2692 { 2234 {
2693 if (!seen_input) 2235 if (ecb_unlikely (!seen_input))
2694 { 2236 {
2695 seen_input = 1; 2237 seen_input = 1;
2696 // many badly-written programs (e.g. jed) contain a race condition: 2238 // many badly-written programs (e.g. jed) contain a race condition:
2697 // they first read the screensize and then install a SIGWINCH handler. 2239 // they first read the screensize and then install a SIGWINCH handler.
2698 // some window managers resize the window early, and these programs 2240 // some window managers resize the window early, and these programs
… …
2711 wchar_t *str = buf; 2253 wchar_t *str = buf;
2712 wchar_t *eol = str + min (ncol, UBUFSIZ); 2254 wchar_t *eol = str + min (ncol, UBUFSIZ);
2713 2255
2714 for (;;) 2256 for (;;)
2715 { 2257 {
2716 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2258 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2717 break; 2259 break;
2718 2260
2719 *str++ = ch; 2261 *str++ = ch;
2720 2262
2721 if (ch == C0_LF || str >= eol) 2263 if (ecb_unlikely (ch == C0_LF || str >= eol))
2722 { 2264 {
2723 if (ch == C0_LF) 2265 if (ch == C0_LF)
2724 nlines++; 2266 nlines++;
2725 2267
2726 refresh_count++; 2268 refresh_count++;
2727 2269
2728 if (!OPTION (Opt_jumpScroll) 2270 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2729 || (refresh_count >= refresh_limit * (nrow - 1)))
2730 { 2271 {
2731 refreshnow = true;
2732 refresh_count = 0; 2272 refresh_count = 0;
2273
2274 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2275 {
2276 refreshnow = true;
2733 ch = NOCHAR; 2277 ch = NOCHAR;
2734 break; 2278 break;
2279 }
2735 } 2280 }
2736 2281
2737 // scr_add_lines only works for nlines <= nrow - 1. 2282 // scr_add_lines only works for nlines <= nrow - 1.
2738 if (nlines >= nrow - 1) 2283 if (nlines >= nrow - 1)
2739 { 2284 {
… …
2767 && 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))))
2768 scr_add_lines (buf, str - buf, nlines); 2313 scr_add_lines (buf, str - buf, nlines);
2769 2314
2770 /* 2315 /*
2771 * 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
2772 * 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.
2773 * the number of pages between refreshes is refresh_limit, which 2318 * if skipScroll is enabled.
2774 * is incremented here because we must be doing flat-out scrolling.
2775 */ 2319 */
2776 if (refreshnow) 2320 if (refreshnow)
2777 { 2321 {
2778 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2779 refresh_limit++;
2780 else
2781 {
2782 flag = true;
2783 scr_refresh (); 2322 scr_refresh ();
2784 want_refresh = 1; 2323 want_refresh = 1;
2785 }
2786 } 2324 }
2787
2788 } 2325 }
2789 else 2326 else
2790 { 2327 {
2791 try 2328 try
2792 { 2329 {
… …
2800 } 2337 }
2801 2338
2802 ch = NOCHAR; 2339 ch = NOCHAR;
2803 } 2340 }
2804 } 2341 }
2805
2806 return flag;
2807} 2342}
2808 2343
2809// read the next character 2344// read the next character
2810wchar_t 2345wchar_t
2811rxvt_term::next_char () NOTHROW 2346rxvt_term::next_char () NOTHROW
2812{ 2347{
2813 while (cmdbuf_ptr < cmdbuf_endp) 2348 while (cmdbuf_ptr < cmdbuf_endp)
2814 { 2349 {
2815 // assume 7-bit to be ascii ALWAYS 2350 // assume 7-bit to be ascii ALWAYS
2816 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2351 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2817 return *cmdbuf_ptr++; 2352 return *cmdbuf_ptr++;
2818 2353
2819 wchar_t wc; 2354 wchar_t wc;
2820 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);
2821 2356
… …
2825 cmdbuf_ptr = cmdbuf_endp; 2360 cmdbuf_ptr = cmdbuf_endp;
2826 break; 2361 break;
2827 } 2362 }
2828 2363
2829 if (len == (size_t)-1) 2364 if (len == (size_t)-1)
2365 {
2366 mbstate.reset (); // reset now undefined conversion state
2830 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 }
2831 2369
2832 // assume wchar == unicode 2370 // assume wchar == unicode
2833 cmdbuf_ptr += len; 2371 cmdbuf_ptr += len;
2834 return wc & UNICODE_MASK; 2372 return wc & UNICODE_MASK;
2835 } 2373 }
… …
2846 : NOCHAR; 2384 : NOCHAR;
2847} 2385}
2848 2386
2849static class out_of_input out_of_input; 2387static class out_of_input out_of_input;
2850 2388
2851/* rxvt_cmd_getc () - Return next input character */
2852/*
2853 * Return the next input character after first passing any keyboard input
2854 * to the command.
2855 */
2856wchar_t 2389wchar_t
2857rxvt_term::cmd_getc () THROW ((class out_of_input)) 2390rxvt_term::cmd_getc () THROW ((class out_of_input))
2858{ 2391{
2859 wchar_t c = next_char (); 2392 wchar_t c = next_char ();
2860 2393
… …
2879/*----------------------------------------------------------------------*/ 2412/*----------------------------------------------------------------------*/
2880#ifdef PRINTPIPE 2413#ifdef PRINTPIPE
2881FILE * 2414FILE *
2882rxvt_term::popen_printer () 2415rxvt_term::popen_printer ()
2883{ 2416{
2884 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2417 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2885 2418
2886 if (stream == NULL) 2419 if (stream == NULL)
2887 rxvt_warn ("can't open printer pipe, not printing.\n"); 2420 rxvt_warn ("can't open printer pipe, not printing.\n");
2888 2421
2889 return stream; 2422 return stream;
… …
2900 * simulate attached vt100 printer 2433 * simulate attached vt100 printer
2901 */ 2434 */
2902void 2435void
2903rxvt_term::process_print_pipe () 2436rxvt_term::process_print_pipe ()
2904{ 2437{
2905 int done; 2438 FILE *fd = popen_printer ();
2906 FILE *fd;
2907 2439
2908 if ((fd = popen_printer ()) == NULL) 2440 if (!fd)
2909 return; 2441 return;
2910 2442
2911 /* 2443 /*
2912 * 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
2913 * is received. 2445 * is received.
2914 */ 2446 */
2915 for (done = 0; !done;) 2447 for (int done = 0; !done; )
2916 { 2448 {
2917 unsigned char buf[8]; 2449 unsigned char buf[8];
2918 unicode_t ch; 2450 unicode_t ch;
2919 unsigned int i, len; 2451 unsigned int i, len;
2920 2452
… …
2939 { 2471 {
2940 if ((buf[len++] = cmd_getc ()) == 'i') 2472 if ((buf[len++] = cmd_getc ()) == 'i')
2941 break; /* done = 1 */ 2473 break; /* done = 1 */
2942 } 2474 }
2943 } 2475 }
2944 2476
2945 for (i = 0; i < len; i++) 2477 for (i = 0; i < len; i++)
2946 if (putc (buf[i], fd) == EOF) 2478 if (putc (buf[i], fd) == EOF)
2947 { 2479 {
2948 done = 1; 2480 done = 1;
2949 break; 2481 break;
… …
2951 } 2483 }
2952 } 2484 }
2953 2485
2954 pclose_printer (fd); 2486 pclose_printer (fd);
2955} 2487}
2956#endif /* PRINTPIPE */ 2488#endif /* PRINTPIPE */
2957/*}}} */ 2489/*}}} */
2958 2490
2959/* *INDENT-OFF* */
2960enum { 2491enum {
2961 C1_40 = 0x40, 2492 C1_40 = 0x40,
2962 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,
2963 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,
2964 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,
2965 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,
2966}; 2497};
2967/* *INDENT-ON* */
2968 2498
2969/*{{{ process non-printing single characters */ 2499/*{{{ process non-printing single characters */
2970void 2500void
2971rxvt_term::process_nonprinting (unicode_t ch) 2501rxvt_term::process_nonprinting (unicode_t ch)
2972{ 2502{
… …
3011 process_dcs_seq (); 2541 process_dcs_seq ();
3012 break; 2542 break;
3013 case 0x9b: /* CSI */ 2543 case 0x9b: /* CSI */
3014 process_csi_seq (); 2544 process_csi_seq ();
3015 break; 2545 break;
3016 case 0x9d: /* CSI */ 2546 case 0x9d: /* OSC */
3017 process_osc_seq (); 2547 process_osc_seq ();
3018 break; 2548 break;
3019#endif 2549#endif
3020 } 2550 }
3021} 2551}
… …
3065 break; 2595 break;
3066 case 'Z': /* identify the terminal type */ 2596 case 'Z': /* identify the terminal type */
3067 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2597 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
3068 break; 2598 break;
3069 case '<': /* turn off VT52 mode */ 2599 case '<': /* turn off VT52 mode */
3070 PrivMode (0, PrivMode_vt52); 2600 set_privmode (PrivMode_vt52, 0);
3071 break; 2601 break;
3072 case 'F': /* use special graphics character set */ 2602 case 'F': /* use special graphics character set */
3073 case 'G': /* use regular character set */ 2603 case 'G': /* use regular character set */
3074 /* unimplemented */ 2604 /* unimplemented */
3075 break; 2605 break;
… …
3094 return; 2624 return;
3095 } 2625 }
3096 2626
3097 switch (ch) 2627 switch (ch)
3098 { 2628 {
3099 /* case 1: do_tek_mode (); break; */
3100 case '#': 2629 case '#':
3101 if (cmd_getc () == '8') 2630 if (cmd_getc () == '8')
3102 scr_E (); 2631 scr_E ();
3103 break; 2632 break;
3104 case '(': 2633 case '(':
… …
3111 scr_charset_set (2, (unsigned int)cmd_getc ()); 2640 scr_charset_set (2, (unsigned int)cmd_getc ());
3112 break; 2641 break;
3113 case '+': 2642 case '+':
3114 scr_charset_set (3, (unsigned int)cmd_getc ()); 2643 scr_charset_set (3, (unsigned int)cmd_getc ());
3115 break; 2644 break;
3116#if ENABLE_FRILLS 2645#if !ENABLE_MINIMAL
3117 case '6': 2646 case '6':
3118 scr_backindex (); 2647 scr_backindex ();
3119 break; 2648 break;
3120#endif 2649#endif
3121 case '7': 2650 case '7':
3122 scr_cursor (SAVE); 2651 scr_cursor (SAVE);
3123 break; 2652 break;
3124 case '8': 2653 case '8':
3125 scr_cursor (RESTORE); 2654 scr_cursor (RESTORE);
3126 break; 2655 break;
3127#if ENABLE_FRILLS 2656#if !ENABLE_MINIMAL
3128 case '9': 2657 case '9':
3129 scr_forwardindex (); 2658 scr_forwardindex ();
3130 break; 2659 break;
3131#endif 2660#endif
3132 case '=': 2661 case '=':
3133 case '>': 2662 case '>':
3134 PrivMode ((ch == '='), PrivMode_aplKP); 2663 set_privmode (PrivMode_aplKP, ch == '=');
3135 break; 2664 break;
3136 2665
3137 case C1_40: 2666 case C1_40:
3138 cmd_getc (); 2667 cmd_getc ();
3139 break; 2668 break;
… …
3143 2672
3144 /* 8.3.87: NEXT LINE */ 2673 /* 8.3.87: NEXT LINE */
3145 case C1_NEL: /* ESC E */ 2674 case C1_NEL: /* ESC E */
3146 { 2675 {
3147 wchar_t nlcr[] = { C0_LF, C0_CR }; 2676 wchar_t nlcr[] = { C0_LF, C0_CR };
3148 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2677 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
3149 } 2678 }
3150 break; 2679 break;
3151 2680
3152 /* kidnapped escape sequence: Should be 8.3.48 */ 2681 /* kidnapped escape sequence: Should be 8.3.48 */
3153 case C1_ESA: /* ESC G */ 2682 case C1_ESA: /* ESC G */
3154 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 */
3155 break; 2686 break;
3156 2687
3157 /* 8.3.63: CHARACTER TABULATION SET */ 2688 /* 8.3.63: CHARACTER TABULATION SET */
3158 case C1_HTS: /* ESC H */ 2689 case C1_HTS: /* ESC H */
3159 scr_set_tab (1); 2690 scr_set_tab (1);
… …
3163 case C1_RI: /* ESC M */ 2694 case C1_RI: /* ESC M */
3164 scr_index (DN); 2695 scr_index (DN);
3165 break; 2696 break;
3166 2697
3167 /* 8.3.142: SINGLE-SHIFT TWO */ 2698 /* 8.3.142: SINGLE-SHIFT TWO */
3168 /*case C1_SS2: scr_single_shift (2); break; */ 2699 /* case C1_SS2: break; */
3169 2700
3170 /* 8.3.143: SINGLE-SHIFT THREE */ 2701 /* 8.3.143: SINGLE-SHIFT THREE */
3171 /*case C1_SS3: scr_single_shift (3); break; */ 2702 /* case C1_SS3: break; */
3172 2703
3173 /* 8.3.27: DEVICE CONTROL STRING */ 2704 /* 8.3.27: DEVICE CONTROL STRING */
3174 case C1_DCS: /* ESC P */ 2705 case C1_DCS: /* ESC P */
3175 process_dcs_seq (); 2706 process_dcs_seq ();
3176 break; 2707 break;
… …
3178 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2709 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3179 case C1_SCI: /* ESC Z */ 2710 case C1_SCI: /* ESC Z */
3180 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2711 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3181 break; /* steal obsolete ESC [ c */ 2712 break; /* steal obsolete ESC [ c */
3182 2713
3183 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2714 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
3184 case C1_CSI: /* ESC [ */ 2715 case C1_CSI: /* ESC [ */
3185 process_csi_seq (); 2716 process_csi_seq ();
3186 break; 2717 break;
3187 2718
3188 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2719 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
3189 case C1_OSC: /* ESC ] */ 2720 case C1_OSC: /* ESC ] */
3190 process_osc_seq (); 2721 process_osc_seq ();
3191 break; 2722 break;
3192 2723
3193 /* 8.3.106: RESET TO INITIAL STATE */ 2724 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
3194 case 'c': 2725 case 'c':
3195 mbstate.reset (); 2726 mbstate.reset ();
3196 scr_poweron (); 2727 scr_poweron ();
3197 scrollbar_show (1); 2728 scrollBar.show (1);
3198 break; 2729 break;
3199 2730
3200 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2731 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
3201 case 'n': 2732 case 'n':
3202 scr_charset_choose (2); 2733 scr_charset_choose (2);
… …
3209 } 2740 }
3210} 2741}
3211/*}}} */ 2742/*}}} */
3212 2743
3213/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2744/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
3214/* *INDENT-OFF* */
3215enum { 2745enum {
3216 CSI_ICH = 0x40, 2746 CSI_ICH = 0x40,
3217 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,
3218 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 ,
3219 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,
… …
3222 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,
3223 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 ,
3224 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
3225}; 2755};
3226 2756
3227#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2757#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
3228 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2758 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
3229 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2759 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
3230#define get_byte_array_bit(array, bit) \ 2760#define get_byte_array_bit(array, bit) \
3231 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2761 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
3232 2762
3233const unsigned char csi_defaults[] = 2763static const unsigned char csi_defaults[] =
3234 { 2764 {
3235 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, */
3236 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, */
3237 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, */
3238 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, [, \, ], ^, _, */
3239 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, */
3240 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, */
3241 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, */
3242 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, {, |, }, ~, */
3243 }; 2773 };
3244/* *INDENT-ON* */
3245 2774
3246void 2775void
3247rxvt_term::process_csi_seq () 2776rxvt_term::process_csi_seq ()
3248{ 2777{
3249 unicode_t ch, priv, i; 2778 unicode_t ch, priv, i;
3250 unsigned int nargs, p; 2779 unsigned int nargs, p;
3251 int n, ndef; 2780 int n, ndef;
3252 int arg[ESC_ARGS]; 2781 int arg[ESC_ARGS] = { };
3253 2782
3254 for (nargs = ESC_ARGS; nargs > 0;) 2783 nargs = 0;
3255 arg[--nargs] = 0;
3256 2784
3257 priv = 0; 2785 priv = 0;
3258 ch = cmd_getc (); 2786 ch = cmd_getc ();
3259 if (ch >= '<' && ch <= '?') 2787 if ((ch >= '<' && ch <= '?') || ch == '!')
2788 {
3260 { /* '<' '=' '>' '?' */ 2789 /* '<' '=' '>' '?' '!' */
3261 priv = ch; 2790 priv = ch;
3262 ch = cmd_getc (); 2791 ch = cmd_getc ();
3263 } 2792 }
3264 2793
3265 /* read any numerical arguments */ 2794 /* read any numerical arguments */
… …
3294 ndef = get_byte_array_bit (csi_defaults, i); 2823 ndef = get_byte_array_bit (csi_defaults, i);
3295 for (p = 0; p < nargs; p++) 2824 for (p = 0; p < nargs; p++)
3296 if (arg[p] == -1) 2825 if (arg[p] == -1)
3297 arg[p] = ndef; 2826 arg[p] = ndef;
3298 2827
3299#ifdef DEBUG_CMD
3300 fprintf (stderr, "CSI ");
3301 for (p = 0; p < nargs; p++)
3302 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3303 fprintf (stderr, "%c\n", ch);
3304#endif
3305
3306 /* 2828 /*
3307 * private mode handling 2829 * private mode handling
3308 */ 2830 */
3309 if (priv) 2831 if (priv)
3310 { 2832 {
3311 switch (priv) 2833 switch (priv)
3312 { 2834 {
3313 case '>': 2835 case '>':
3314 if (ch == CSI_DA) /* secondary device attributes */ 2836 if (ch == CSI_DA) /* secondary device attributes */
3315 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 }
3316 break; 2847 break;
2848
3317 case '?': 2849 case '?':
3318 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2850 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3319 process_terminal_mode (ch, priv, nargs, arg); 2851 process_terminal_mode (ch, priv, nargs, arg);
3320 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, ecb_array_length (pm_h), pm_h);
2864 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
3321 } 2865 }
2866 break;
2867 }
2868
3322 return; 2869 return;
3323 } 2870 }
3324 2871
3325 switch (ch) 2872 switch (ch)
3326 { 2873 {
… …
3446 break; 2993 break;
3447 case 6: /* CPR requested */ 2994 case 6: /* CPR requested */
3448 scr_report_position (); 2995 scr_report_position ();
3449 break; 2996 break;
3450 case 7: /* unofficial extension */ 2997 case 7: /* unofficial extension */
3451 if (OPTION (Opt_insecure)) 2998 if (option (Opt_insecure))
3452 tt_printf ("%-.250s\012", rs[Rs_display_name]); 2999 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3453 break; 3000 break;
3454 case 8: /* unofficial extension */ 3001 case 8: /* unofficial extension */
3455 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3002 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3456 break; 3003 break;
… …
3523 break; 3070 break;
3524 case CSI_75: 3071 case CSI_75:
3525 scr_cursor (RESTORE); 3072 scr_cursor (RESTORE);
3526 break; 3073 break;
3527 3074
3528#if ENABLE_FRILLS 3075#if !ENABLE_MINIMAL
3529 case CSI_74: 3076 case CSI_74:
3530 process_window_ops (arg, nargs); 3077 process_window_ops (arg, nargs);
3531 break; 3078 break;
3532#endif 3079#endif
3533 3080
… …
3540 break; 3087 break;
3541 } 3088 }
3542} 3089}
3543/*}}} */ 3090/*}}} */
3544 3091
3545#if ENABLE_FRILLS 3092#if !ENABLE_MINIMAL
3546/* ARGSUSED */
3547void 3093void
3548rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3094rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3549{ 3095{
3550 int x, y; 3096 int x, y;
3551 XWindowAttributes wattr; 3097 XWindowAttributes wattr;
3552 Window wdummy; 3098 Window wdummy;
3553 dDisp; 3099
3100 dLocal (Display *, dpy);
3554 3101
3555 if (nargs == 0) 3102 if (nargs == 0)
3556 return; 3103 return;
3557 3104
3558 switch (args[0]) 3105 switch (args[0])
3559 { 3106 {
3560 /* 3107 /*
3561 * commands 3108 * commands
3562 */ 3109 */
3563 case 1: /* deiconify window */ 3110 case 1: /* deiconify window */
3564 XMapWindow (disp, parent[0]); 3111 XMapWindow (dpy, parent);
3565 break; 3112 break;
3566 case 2: /* iconify window */ 3113 case 2: /* iconify window */
3567 XIconifyWindow (disp, parent[0], display->screen); 3114 XIconifyWindow (dpy, parent, display->screen);
3568 break; 3115 break;
3569 case 3: /* set position (pixels) */ 3116 case 3: /* set position (pixels) */
3570 XMoveWindow (disp, parent[0], args[1], args[2]); 3117 XMoveWindow (dpy, parent, args[1], args[2]);
3571 break; 3118 break;
3572 case 4: /* set size (pixels) */ 3119 case 4: /* set size (pixels) */
3573 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3120 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3574 break; 3121 break;
3575 case 5: /* raise window */ 3122 case 5: /* raise window */
3576 XRaiseWindow (disp, parent[0]); 3123 XRaiseWindow (dpy, parent);
3577 break; 3124 break;
3578 case 6: /* lower window */ 3125 case 6: /* lower window */
3579 XLowerWindow (disp, parent[0]); 3126 XLowerWindow (dpy, parent);
3580 break; 3127 break;
3581 case 7: /* refresh window */ 3128 case 7: /* refresh window */
3582 scr_touch (true); 3129 scr_touch (true);
3583 break; 3130 break;
3584 case 8: /* set size (chars) */ 3131 case 8: /* set size (chars) */
… …
3591 if (args[0] >= 24) /* set height (chars) */ 3138 if (args[0] >= 24) /* set height (chars) */
3592 set_widthheight ((unsigned int)width, 3139 set_widthheight ((unsigned int)width,
3593 (unsigned int) (args[1] * fheight)); 3140 (unsigned int) (args[1] * fheight));
3594 break; 3141 break;
3595 3142
3596
3597 /* 3143 /*
3598 * reports - some output format copied from XTerm 3144 * reports - some output format copied from XTerm
3599 */ 3145 */
3600 case 11: /* report window state */ 3146 case 11: /* report window state */
3601 XGetWindowAttributes (disp, parent[0], &wattr); 3147 XGetWindowAttributes (dpy, parent, &wattr);
3602 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3148 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3603 break; 3149 break;
3604 case 13: /* report window position */ 3150 case 13: /* report window position */
3605 XGetWindowAttributes (disp, parent[0], &wattr); 3151 XGetWindowAttributes (dpy, parent, &wattr);
3606 XTranslateCoordinates (disp, parent[0], wattr.root, 3152 XTranslateCoordinates (dpy, parent, wattr.root,
3607 -wattr.border_width, -wattr.border_width, 3153 -wattr.border_width, -wattr.border_width,
3608 &x, &y, &wdummy); 3154 &x, &y, &wdummy);
3609 tt_printf ("\033[3;%d;%dt", x, y); 3155 tt_printf ("\033[3;%d;%dt", x, y);
3610 break; 3156 break;
3611 case 14: /* report window size (pixels) */ 3157 case 14: /* report window size (pixels) */
3612 XGetWindowAttributes (disp, parent[0], &wattr); 3158 XGetWindowAttributes (dpy, parent, &wattr);
3613 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3159 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3614 break; 3160 break;
3615 case 18: /* report text area size (chars) */ 3161 case 18: /* report text area size (chars) */
3616 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3162 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3617 break; 3163 break;
… …
3619 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3165 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3620 break; 3166 break;
3621 case 20: /* report icon label */ 3167 case 20: /* report icon label */
3622 { 3168 {
3623 char *s; 3169 char *s;
3624 XGetIconName (disp, parent[0], &s); 3170 XGetIconName (dpy, parent, &s);
3625 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 */
3626 XFree (s); 3172 XFree (s);
3627 } 3173 }
3628 break; 3174 break;
3629 case 21: /* report window title */ 3175 case 21: /* report window title */
3630 { 3176 {
3631 char *s; 3177 char *s;
3632 XFetchName (disp, parent[0], &s); 3178 XFetchName (dpy, parent, &s);
3633 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 */
3634 XFree (s); 3180 XFree (s);
3635 } 3181 }
3636 break; 3182 break;
3637 } 3183 }
3638} 3184}
… …
3665 seen_esc = true; 3211 seen_esc = true;
3666 continue; 3212 continue;
3667 } 3213 }
3668 else if (ch == C0_BEL || ch == CHAR_ST) 3214 else if (ch == C0_BEL || ch == CHAR_ST)
3669 break; 3215 break;
3216 else if (ch == C0_SYN)
3217 ch = cmd_get8 ();
3670 else if (ch < 0x20) 3218 else if (ch < 0x20)
3671 return NULL; /* other control character - exit */ 3219 return NULL; /* other control character - exit */
3672 3220
3673 seen_esc = false; 3221 seen_esc = false;
3674 3222
3675 if (n >= STRING_MAX - 1) 3223 if (n >= STRING_MAX - 1)
3676 // stop at some sane length 3224 // stop at some sane length
3677 return NULL; 3225 return NULL;
3678 3226
3679 if (ch == C0_SYN)
3680 string[n++] = cmd_get8 ();
3681 else
3682 string[n++] = ch; 3227 string[n++] = ch;
3683 } 3228 }
3684 3229
3685 string[n++] = '\0'; 3230 string[n++] = '\0';
3686 3231
3687 ends_how = (ch == 0x5c ? C0_ESC : ch); 3232 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3694 * 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)'
3695 */ 3240 */
3696void 3241void
3697rxvt_term::process_dcs_seq () 3242rxvt_term::process_dcs_seq ()
3698{ 3243{
3699 char *s;
3700 unicode_t eh;
3701
3702 /* 3244 /*
3703 * Not handled yet 3245 * Not handled yet
3704 */ 3246 */
3247
3248 unicode_t eh;
3705 s = get_to_st (eh); 3249 char *s = get_to_st (eh);
3706 if (s) 3250 if (s)
3707 free (s); 3251 free (s);
3708 3252
3709 return; 3253 return;
3710} 3254}
… …
3714 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3258 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3715 */ 3259 */
3716void 3260void
3717rxvt_term::process_osc_seq () 3261rxvt_term::process_osc_seq ()
3718{ 3262{
3719 unicode_t ch, eh;
3720 int arg; 3263 int arg;
3721 3264
3722 ch = cmd_getc (); 3265 unicode_t ch = cmd_getc ();
3723 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3266 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3724 arg = arg * 10 + (ch - '0'); 3267 arg = arg * 10 + (ch - '0');
3725 3268
3726 if (ch == ';') 3269 if (ch == ';')
3727 { 3270 {
3271 unicode_t eh;
3728 char *s = get_to_st (eh); 3272 char *s = get_to_st (eh);
3729 3273
3730 if (s) 3274 if (s)
3731 { 3275 {
3732 process_xterm_seq (arg, s, eh); 3276 process_xterm_seq (arg, s, eh);
… …
3738void 3282void
3739rxvt_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)
3740{ 3284{
3741 if (str[0] == '?' && !str[1]) 3285 if (str[0] == '?' && !str[1])
3742 { 3286 {
3743 unsigned short r, g, b; 3287 rgba c;
3744 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
3745 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);
3746 } 3296 }
3747 else 3297 else
3748 set_window_color (color, str); 3298 set_window_color (color, str);
3749} 3299}
3750 3300
3751/* 3301/*
3752 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3302 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3753 */ 3303 */
3754void 3304void
3755rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3305rxvt_term::process_xterm_seq (int op, char *str, char resp)
3756{ 3306{
3757 int color; 3307 int color;
3758 char *buf, *name; 3308 char *buf, *name;
3759 bool query = str[0] == '?' && !str[1]; 3309 bool query = str[0] == '?' && !str[1];
3760 int saveop = op; 3310 int saveop = op;
3761 dDisp; 3311
3312 dLocal (Display *, dpy);
3762 3313
3763 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
3764 switch (op) 3319 switch (op)
3765 { 3320 {
3766 case XTerm_name: 3321 case XTerm_name:
3767 set_title (str); 3322 set_title (str);
3768 /* FALLTHROUGH */ 3323 /* FALLTHROUGH */
… …
3782 unsigned long bytes_after; 3337 unsigned long bytes_after;
3783 unsigned char *value = 0; 3338 unsigned char *value = 0;
3784 const char *str = ""; 3339 const char *str = "";
3785 3340
3786 if (prop 3341 if (prop
3787 && XGetWindowProperty (disp, parent[0], 3342 && XGetWindowProperty (dpy, parent,
3788 prop, 0, 1<<16, 0, AnyPropertyType, 3343 prop, 0, 1<<16, 0, AnyPropertyType,
3789 &actual_type, &actual_format, 3344 &actual_type, &actual_format,
3790 &nitems, &bytes_after, &value) == Success 3345 &nitems, &bytes_after, &value) == Success
3791 && actual_type != None 3346 && actual_type != None
3792 && actual_format == 8) 3347 && actual_format == 8)
3793 str = (const char *)(value); 3348 str = (const char *)(value);
3794 3349
3795 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3350 tt_printf ("\033]%d;%s%c", op, str, resp);
3796 3351
3797 XFree (value); 3352 XFree (value);
3798 } 3353 }
3799 else 3354 else
3800 { 3355 {
3801 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3356 char *eq = strchr (str, '=');
3802 3357
3803 if (eq) 3358 if (eq)
3804 { 3359 {
3805 *eq = 0; 3360 *eq = 0;
3806 set_utf8_property (display->atom (str), eq + 1); 3361 set_utf8_property (display->atom (str), eq + 1);
3807 } 3362 }
3808 else 3363 else
3809 XDeleteProperty (disp, parent[0], 3364 XDeleteProperty (dpy, parent,
3810 display->atom (str)); 3365 display->atom (str));
3811 } 3366 }
3812 break; 3367 break;
3813 3368
3814 case XTerm_Color: 3369 case XTerm_Color:
… …
3824 break; 3379 break;
3825 3380
3826 if ((buf = strchr (name, ';')) != NULL) 3381 if ((buf = strchr (name, ';')) != NULL)
3827 *buf++ = '\0'; 3382 *buf++ = '\0';
3828 3383
3829 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 != ';')
3830 { 3460 {
3831 unsigned short r, g, b; 3461 if (bg_set_file (str)) /* change pixmap */
3832 pix_colors_focused[color].get (display, r, g, b); 3462 {
3833 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 }
3834 } 3470 }
3835 else 3471 else
3836 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 }
3837 } 3488 }
3838 break; 3489 break;
3839 case XTerm_Color00:
3840 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3841 break;
3842 case XTerm_Color01:
3843 process_color_seq (XTerm_Color01, Color_bg, str, resp);
3844 break;
3845#ifndef NO_CURSORCOLOR
3846 case XTerm_Color_cursor:
3847 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3848 break;
3849#endif 3490#endif
3850 case XTerm_Color_pointer_fg:
3851 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);
3852 break;
3853 case XTerm_Color_pointer_bg:
3854 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3855 break;
3856#ifndef NO_BOLD_UNDERLINE_REVERSE
3857 case XTerm_Color_RV:
3858 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3859 break;
3860 case Rxvt_Color_BD:
3861 case URxvt_Color_BD:
3862 process_color_seq (op, Color_BD, str, resp);
3863 break;
3864 case Rxvt_Color_UL:
3865 case URxvt_Color_UL:
3866 process_color_seq (op, Color_UL, str, resp);
3867 break;
3868 case URxvt_Color_IT:
3869 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3870 break;
3871#endif
3872#if TRANSPARENT && TINTING
3873 case URxvt_Color_tint:
3874 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3875 check_our_parents ();
3876 if (am_transparent)
3877 want_full_refresh = want_refresh = 1;
3878 break;
3879#endif
3880
3881 case Rxvt_Pixmap:
3882 {
3883 if (*str != ';')
3884 {
3885#if XPM_BACKGROUND
3886 scale_pixmap (""); /* reset to default scaling */
3887 set_bgPixmap (str); /* change pixmap */
3888 scr_touch (true);
3889#endif
3890 }
3891
3892 int changed = 0;
3893
3894 while ((str = strchr (str, ';')) != NULL)
3895 {
3896 str++;
3897#if XPM_BACKGROUND
3898 changed += scale_pixmap (str);
3899#endif
3900 }
3901
3902 if (changed)
3903 {
3904#ifdef XPM_BACKGROUND
3905 resize_pixmap ();
3906 scr_touch (true);
3907#endif
3908 }
3909 }
3910 break;
3911
3912 case Rxvt_restoreFG:
3913 set_window_color (Color_fg, str);
3914 break;
3915 case Rxvt_restoreBG:
3916 set_window_color (Color_bg, str);
3917 break;
3918 3491
3919 case XTerm_logfile: 3492 case XTerm_logfile:
3920 // TODO, when secure mode? 3493 // TODO, when secure mode?
3921 break; 3494 break;
3922 3495
… …
3940 case URxvt_italicFont: 3513 case URxvt_italicFont:
3941 case URxvt_boldItalicFont: 3514 case URxvt_boldItalicFont:
3942#endif 3515#endif
3943 if (query) 3516 if (query)
3944 tt_printf ("\33]%d;%-.250s%c", saveop, 3517 tt_printf ("\33]%d;%-.250s%c", saveop,
3945 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3518 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3946 ? fontset[op - URxvt_font]->fontdesc : "", 3519 ? fontset[op - URxvt_font]->fontdesc : "",
3947 resp); 3520 resp);
3948 else 3521 else
3949 { 3522 {
3950 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3523 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3953 allocated.push_back ((void *)res); 3526 allocated.push_back ((void *)res);
3954 set_fonts (); 3527 set_fonts ();
3955 } 3528 }
3956 break; 3529 break;
3957 3530
3958#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
3959 case URxvt_locale: 3540 case URxvt_locale:
3960 if (query) 3541 if (query)
3961 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);
3962 else 3543 else
3963 { 3544 {
3964 set_locale (str); 3545 set_locale (str);
3965 pty->set_utf8_mode (enc_utf8); 3546 pty->set_utf8_mode (enc_utf8);
3966 init_xlocale (); 3547 init_xlocale ();
… …
3981 break; 3562 break;
3982#endif 3563#endif
3983 3564
3984#if ENABLE_PERL 3565#if ENABLE_PERL
3985 case URxvt_perl: 3566 case URxvt_perl:
3986 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));
3987 ; // no responses yet
3988 break; 3568 break;
3989#endif 3569#endif
3990 } 3570 }
3991} 3571}
3992/*----------------------------------------------------------------------*/ 3572/*----------------------------------------------------------------------*/
… …
4015 { 3595 {
4016 if (mode == 'r') 3596 if (mode == 'r')
4017 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3597 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
4018 else 3598 else
4019 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3599 state = (mode == 't') ? ! (priv_modes & bit) : mode;
4020 PrivMode (state, bit); 3600
3601 set_privmode (bit, state);
4021 } 3602 }
4022 3603
4023 return state; 3604 return state;
4024} 3605}
4025 3606
4026/* we're not using priv _yet_ */ 3607/* we're not using priv _yet_ */
4027void 3608void
4028rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3609rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
4029{ 3610{
4030 unsigned int i, j; 3611 unsigned int i, j;
4031 int state; 3612 int state;
4032 3613
4033 static const struct 3614 static const struct
4034 { 3615 {
4035 const int argval; 3616 const int argval;
4036 const unsigned long bit; 3617 const unsigned long bit;
4037 }
4038
4039 argtopriv[] = { 3618 } argtopriv[] = {
4040 { 1, PrivMode_aplCUR }, 3619 { 1, PrivMode_aplCUR }, // DECCKM
4041 { 2, PrivMode_vt52 }, 3620 { 2, PrivMode_vt52 },
4042 { 3, PrivMode_132 }, 3621 { 3, PrivMode_132 }, // DECCOLM
4043 { 4, PrivMode_smoothScroll }, 3622 { 4, PrivMode_smoothScroll }, // DECSCLM
4044 { 5, PrivMode_rVideo }, 3623 { 5, PrivMode_rVideo }, // DECSCNM
4045 { 6, PrivMode_relOrigin }, 3624 { 6, PrivMode_relOrigin }, // DECOM
4046 { 7, PrivMode_Autowrap }, 3625 { 7, PrivMode_Autowrap }, // DECAWM
4047 // 8, bi-directional support mode 3626 // 8, auto-repeat keys // DECARM
4048 { 9, PrivMode_MouseX10 }, 3627 { 9, PrivMode_MouseX10 },
4049 // 18, 19 printing-related 3628 // 18 end FF to printer after print screen
3629 // 19 Print screen prints full screen/scroll region
4050 { 25, PrivMode_VisibleCursor }, 3630 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
4051#ifdef scrollBar_esc 3631#ifdef scrollBar_esc
4052 { scrollBar_esc, PrivMode_scrollBar }, 3632 { scrollBar_esc, PrivMode_scrollBar },
4053#endif 3633#endif
4054 { 35, PrivMode_ShiftKeys }, // rxvt extension 3634 { 35, PrivMode_ShiftKeys }, // rxvt extension
3635 // 38, tektronix mode // DECTEK
4055 { 40, PrivMode_132OK }, 3636 { 40, PrivMode_132OK },
4056 // 41 xterm more fixes NYI 3637 // 41 xterm more fixes NYI
4057 // 45 margin bell NYI 3638 // 45 margin bell NYI
4058 // 46 start logging 3639 // 46 start logging
4059 { 47, PrivMode_Screen }, 3640 { 47, PrivMode_Screen },
4060 { 66, PrivMode_aplKP }, 3641 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
4061#ifndef NO_BACKSPACE_KEY 3642#ifndef NO_BACKSPACE_KEY
4062 { 67, PrivMode_BackSpace }, 3643 { 67, PrivMode_BackSpace }, // DECBKM
4063#endif 3644#endif
4064 { 1000, PrivMode_MouseX11 }, 3645 { 1000, PrivMode_MouseX11 },
4065 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3646 { 1002, PrivMode_MouseBtnEvent },
4066 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3647 { 1003, PrivMode_MouseAnyEvent },
4067 // 1003 Use All Motion Mouse Tracking. NYI, TODO 3648#if ENABLE_FRILLS
3649 { 1005, PrivMode_ExtModeMouse },
3650#endif
4068 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3651 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4069 { 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
4070 // 1035 enable modifiers for alt, numlock NYI 3656 // 1035 enable modifiers for alt, numlock NYI
4071 // 1036 send ESC for meta keys NYI 3657 // 1036 send ESC for meta keys NYI
4072 // 1037 send DEL for keypad delete NYI 3658 // 1037 send DEL for keypad delete NYI
4073 { 1047, PrivMode_Screen }, 3659 { 1047, PrivMode_Screen },
4074 // 1048 save and restore cursor 3660 // 1048 save and restore cursor, implemented in code
4075 { 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 */
4076 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3662 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3663 { 2004, PrivMode_BracketPaste },
4077 }; 3664 };
4078 3665
4079 if (nargs == 0) 3666 if (nargs == 0)
4080 return; 3667 return;
4081 3668
… …
4088 for (i = 0; i < nargs; i++) 3675 for (i = 0; i < nargs; i++)
4089 { 3676 {
4090 state = -1; 3677 state = -1;
4091 3678
4092 /* basic handling */ 3679 /* basic handling */
4093 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3680 for (j = 0; j < ecb_array_length (argtopriv); j++)
4094 if (argtopriv[j].argval == arg[i]) 3681 if (argtopriv[j].argval == arg[i])
4095 { 3682 {
4096 state = privcases (mode, argtopriv[j].bit); 3683 state = privcases (mode, argtopriv[j].bit);
4097 break; 3684 break;
4098 } 3685 }
… …
4106 3693
4107 scr_touch (true); 3694 scr_touch (true);
4108 break; 3695 break;
4109#endif 3696#endif
4110 case 1048: /* alternative cursor save */ 3697 case 1048: /* alternative cursor save */
4111 case 1049:
4112 if (OPTION (Opt_secondaryScreen)) 3698 if (option (Opt_secondaryScreen))
4113 if (mode == 0) 3699 if (mode == 0)
4114 scr_cursor (RESTORE); 3700 scr_cursor (RESTORE);
4115 else if (mode == 1) 3701 else if (mode == 1)
4116 scr_cursor (SAVE); 3702 scr_cursor (SAVE);
4117 break; 3703 break;
… …
4125 case 2: /* VT52 mode */ 3711 case 2: /* VT52 mode */
4126 /* oddball mode. should be set regardless of set/reset 3712 /* oddball mode. should be set regardless of set/reset
4127 * parameter. Return from VT52 mode with an ESC < from 3713 * parameter. Return from VT52 mode with an ESC < from
4128 * within VT52 mode 3714 * within VT52 mode
4129 */ 3715 */
4130 PrivMode (1, PrivMode_vt52); 3716 set_privmode (PrivMode_vt52, 1);
4131 break; 3717 break;
4132 case 3: /* 80/132 */ 3718 case 3: /* 80/132 */
4133 if (priv_modes & PrivMode_132OK) 3719 if (priv_modes & PrivMode_132OK)
4134 set_widthheight (((state ? 132 : 80) * fwidth), height); 3720 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
4135 break; 3721 break;
4136 case 4: /* smooth scrolling */ 3722 case 4: /* smooth scrolling */
4137 set_option (Opt_jumpScroll, !state); 3723 set_option (Opt_jumpScroll, !state);
4138 break; 3724 break;
4139 case 5: /* reverse video */ 3725 case 5: /* reverse video */
… …
4146 scr_autowrap (state); 3732 scr_autowrap (state);
4147 break; 3733 break;
4148 /* 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 */
4149 case 9: /* X10 mouse reporting */ 3735 case 9: /* X10 mouse reporting */
4150 if (state) /* orthogonal */ 3736 if (state) /* orthogonal */
4151 priv_modes &= ~PrivMode_MouseX11; 3737 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4152 break; 3738 break;
4153#ifdef scrollBar_esc 3739#ifdef scrollBar_esc
4154 case scrollBar_esc: 3740 case scrollBar_esc:
4155 if (scrollbar_mapping (state)) 3741 if (scrollBar.map (state))
4156 { 3742 {
4157 resize_all_windows (0, 0, 0); 3743 resize_all_windows (0, 0, 0);
4158 scr_touch (true); 3744 scr_touch (true);
4159 } 3745 }
4160 break; 3746 break;
… …
4169 break; 3755 break;
4170 /* case 66: - application key pad */ 3756 /* case 66: - application key pad */
4171 /* case 67: - backspace key */ 3757 /* case 67: - backspace key */
4172 case 1000: /* X11 mouse reporting */ 3758 case 1000: /* X11 mouse reporting */
4173 if (state) /* orthogonal */ 3759 if (state) /* orthogonal */
4174 priv_modes &= ~PrivMode_MouseX10; 3760 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4175 break; 3761 break;
4176#if 0
4177 case 1001: 3762 case 1002:
4178 break; /* X11 mouse highlighting */ 3763 case 1003:
4179#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;
4180 case 1010: /* scroll to bottom on TTY output inhibit */ 3776 case 1010: /* scroll to bottom on TTY output inhibit */
4181 set_option (Opt_scrollTtyOutput, !state); 3777 set_option (Opt_scrollTtyOutput, !state);
4182 break; 3778 break;
4183 case 1011: /* scroll to bottom on key press */ 3779 case 1011: /* scroll to bottom on key press */
4184 set_option (Opt_scrollTtyKeypress, state); 3780 set_option (Opt_scrollTtyKeypress, state);
4185 break; 3781 break;
4186 case 1047: /* secondary screen w/ clearing last */ 3782 case 1047: /* secondary screen w/ clearing last */
4187 if (OPTION (Opt_secondaryScreen)) 3783 if (option (Opt_secondaryScreen))
4188 if (current_screen != PRIMARY) 3784 if (!state)
4189 scr_erase_screen (2); 3785 scr_erase_screen (2);
3786
4190 scr_change_screen (state); 3787 scr_change_screen (state);
4191 break; 3788 break;
4192 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
4193 scr_change_screen (state); 3794 scr_change_screen (state);
3795
4194 if (OPTION (Opt_secondaryScreen)) 3796 if (option (Opt_secondaryScreen))
4195 if (current_screen != PRIMARY) 3797 if (state)
4196 scr_erase_screen (2); 3798 scr_erase_screen (2);
3799 else
3800 scr_cursor (RESTORE);
4197 break; 3801 break;
4198 default: 3802 default:
4199 break; 3803 break;
4200 } 3804 }
4201 } 3805 }
… …
4327 scr_color (Color_bg, Color_bg); 3931 scr_color (Color_bg, Color_bg);
4328 break; 3932 break;
4329 3933
4330 //case 50: // not variable spacing 3934 //case 50: // not variable spacing
4331 3935
4332#if ENABLE_FRILLS 3936#if !ENABLE_MINIMAL
4333 case 90: 3937 case 90:
4334 case 91: /* set bright fg color */ 3938 case 91: /* set bright fg color */
4335 case 92: 3939 case 92:
4336 case 93: 3940 case 93:
4337 case 94: 3941 case 94:
… …
4354 } 3958 }
4355 } 3959 }
4356} 3960}
4357/*}}} */ 3961/*}}} */
4358 3962
4359/*{{{ (do not) process Rob Nation's own graphics mode sequences */
4360void
4361rxvt_term::process_graphics ()
4362{
4363 unicode_t ch, cmd = cmd_getc ();
4364
4365 if (cmd == 'Q')
4366 { /* query graphics */
4367 tt_printf ("\033G0\012"); /* no graphics */
4368 return;
4369 }
4370 /* swallow other graphics sequences until terminating ':' */
4371 do
4372 ch = cmd_getc ();
4373 while (ch != ':');
4374}
4375/*}}} */
4376
4377/* ------------------------------------------------------------------------- */ 3963/* ------------------------------------------------------------------------- */
4378 3964
4379/* 3965/*
4380 * Send printf () formatted output to the command. 3966 * Send printf () formatted output to the command.
4381 * Only use for small amounts of data. 3967 * Only use for small amounts of data.
… …
4394 3980
4395/* ---------------------------------------------------------------------- */ 3981/* ---------------------------------------------------------------------- */
4396/* 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,
4397 * or generated by us in response to a query ESC sequence. 3983 * or generated by us in response to a query ESC sequence.
4398 */ 3984 */
4399const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3985static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4400 3986
4401void 3987void
4402rxvt_term::tt_write (const char *data, unsigned int len) 3988rxvt_term::tt_write (const char *data, unsigned int len)
4403{ 3989{
4404 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)))
… …
4409 3995
4410 if (v_buflen == 0) 3996 if (v_buflen == 0)
4411 { 3997 {
4412 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));
4413 3999
4000 max_it (written, 0);
4001
4414 if ((unsigned int)written == len) 4002 if (written == len)
4415 return; 4003 return;
4416 4004
4417 data += written; 4005 data += written;
4418 len -= written; 4006 len -= written;
4419 } 4007 }
4420 4008
4421 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4009 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
4422 4010
4423 memcpy (v_buffer + v_buflen, data, len); 4011 memcpy (v_buffer + v_buflen, data, len);
4424 v_buflen += len; 4012 v_buflen += len;
4425 4013
4426 pty_ev.set (EVENT_READ | EVENT_WRITE); 4014 pty_ev.set (ev::READ | ev::WRITE);
4427} 4015}
4428 4016
4429void rxvt_term::pty_write () 4017void rxvt_term::pty_write ()
4430{ 4018{
4431 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));
… …
4436 4024
4437 if (v_buflen == 0) 4025 if (v_buflen == 0)
4438 { 4026 {
4439 free (v_buffer); 4027 free (v_buffer);
4440 v_buffer = 0; 4028 v_buffer = 0;
4441 v_buflen = 0;
4442 4029
4443 pty_ev.set (EVENT_READ); 4030 pty_ev.set (ev::READ);
4444 return; 4031 return;
4445 } 4032 }
4446 4033
4447 memmove (v_buffer, v_buffer + written, v_buflen); 4034 memmove (v_buffer, v_buffer + written, v_buflen);
4448 } 4035 }
4449 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4036 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4450 pty_ev.set (EVENT_READ); 4037 pty_ev.set (ev::READ);
4451} 4038}
4452 4039
4453/*----------------------- end-of-file (C source) -----------------------*/ 4040/*----------------------- end-of-file (C source) -----------------------*/
4454 4041

Diff Legend

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