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

Diff Legend

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