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.349 by ayin, Sun Aug 26 18:16:52 2007 UTC vs.
Revision 1.444 by sf-exg, Thu Apr 1 08:40:33 2010 UTC

25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
31 * 32 *
32 * This program is free software; you can redistribute it and/or modify 33 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 34 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 36 * (at your option) any later version.
161 162
162void 163void
163rxvt_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)
164{ 165{
165 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
166 rxvt_font *f = (*fs)[fs->find_font (ch)];
167 wchar_t *chr, *alloc, ch2, *fname; 167 wchar_t *chr, *alloc, ch2, **fname;
168 int len; 168 int len;
169
170 fname = rxvt_utf8towcs (f->name);
171 169
172# if ENABLE_COMBINING 170# if ENABLE_COMBINING
173 if (IS_COMPOSE (ch)) 171 if (IS_COMPOSE (ch))
174 { 172 {
175 len = rxvt_composite.expand (ch, 0); 173 len = rxvt_composite.expand (ch, 0);
196 r & RS_Blink ? " blink" : "", 194 r & RS_Blink ? " blink" : "",
197 r & RS_RVid ? " rvid" : "", 195 r & RS_RVid ? " rvid" : "",
198 r & RS_Uline ? " uline" : "", 196 r & RS_Uline ? " uline" : "",
199 r & RS_Careful ? " careful" : ""); 197 r & RS_Careful ? " careful" : "");
200 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);
201 int width = wcswidth (fname, wcslen (fname)); 205 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
206 }
202 207
203 max_it (width, 8+5); // for char + hey 208 max_it (width, 8+5); // for char + hex
204 max_it (width, strlen (attr)); 209 max_it (width, strlen (attr));
205 210
206 if (y >= 0) 211 if (y >= 0)
207 { 212 {
208 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 213 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
209 x = 0; 214 x = 0;
210 } 215 }
211 216
212 scr_overlay_new (x, y, width, len + 2); 217 scr_overlay_new (x, y, width, len * 2 + 1);
213 218
214 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 219 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
215 220
216 for (int y = 0; y < len; y++) 221 for (int y = 0; y < len; y++)
217 { 222 {
220 ch = *chr++; 225 ch = *chr++;
221 226
222 sprintf (buf, "%8x", ch); 227 sprintf (buf, "%8x", ch);
223 scr_overlay_set (0, y, buf); 228 scr_overlay_set (0, y, buf);
224 scr_overlay_set (9, y, '='); 229 scr_overlay_set (9, y, '=');
225# if !UNICODE3 230# if !UNICODE_3
226 if (ch >= 0x10000) 231 if (ch >= 0x10000)
227 ch = 0xfffd; 232 ch = 0xfffd;
228# endif 233# endif
229 scr_overlay_set (11, y, ch, r); 234 scr_overlay_set (11, y, ch, r);
230 235
236// char buf[4+4+3+1]; 241// char buf[4+4+3+1];
237// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y); 242// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
238// scr_overlay_set (0, 0, buf); 243// scr_overlay_set (0, 0, buf);
239// } 244// }
240 scr_overlay_set (0, len , attr); 245 scr_overlay_set (0, len , attr);
246 for (int i = 0; i < len; i++)
247 {
241 scr_overlay_set (0, len + 1, fname); 248 scr_overlay_set (0, len + 1 + i, fname[i]);
242
243 free (fname); 249 free (fname[i]);
250 }
244 251
245# if ENABLE_COMBINING 252# if ENABLE_COMBINING
246 if (alloc) 253 if (alloc)
247 delete [] alloc; 254 delete [] alloc;
248# endif 255# endif
278 } 285 }
279 286
280 iso14755buf = 0; 287 iso14755buf = 0;
281} 288}
282 289
283int 290static int
284rxvt_term::hex_keyval (XKeyEvent &ev) 291hex_keyval (XKeyEvent &ev)
285{ 292{
286 // check wether this event corresponds to a hex digit 293 // check whether this event corresponds to a hex digit
287 // if the modifiers had not been pressed. 294 // if the modifiers had not been pressed.
288 for (int index = 0; index < 8; index++) 295 for (int index = 0; index < 8; index++)
289 { 296 {
290 KeySym k = XLookupKeysym (&ev, index); 297 KeySym k = XLookupKeysym (&ev, index);
291 298
297 304
298 return -1; 305 return -1;
299} 306}
300#endif 307#endif
301 308
309static inline KeySym
310translate_keypad (KeySym keysym, bool kp)
311{
312#ifdef XK_KP_Home
313 static const KeySym keypadtrans[] = {
314 XK_KP_7, // XK_KP_Home
315 XK_KP_4, // XK_KP_Left
316 XK_KP_8, // XK_KP_Up
317 XK_KP_6, // XK_KP_Right
318 XK_KP_2, // XK_KP_Down
319# ifndef UNSHIFTED_SCROLLKEYS
320 XK_KP_9, // XK_KP_Prior
321 XK_KP_3, // XK_KP_Next
322# else
323 XK_Prior,
324 XK_Next,
325# endif
326 XK_KP_1, // XK_KP_End
327 XK_KP_5, // XK_KP_Begin
328 };
329
330 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
331 {
332 unsigned int index = keysym - XK_KP_Home;
333 keysym = kp ? keypadtrans[index] : XK_Home + index;
334 }
335 else if (keysym == XK_KP_Insert)
336 keysym = kp ? XK_KP_0 : XK_Insert;
337# ifndef NO_DELETE_KEY
338 else if (keysym == XK_KP_Delete)
339 keysym = kp ? XK_KP_Decimal : XK_Delete;
340# endif
341#endif
342 return keysym;
343}
344
345static inline int
346map_function_key (KeySym keysym)
347{
348 int param = 0;
349
350 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
351 {
352 param = 11 + keysym - XK_F1;
353 if (keysym >= XK_F17)
354 param += 4;
355 else if (keysym >= XK_F15)
356 param += 3;
357 else if (keysym >= XK_F11)
358 param += 2;
359 else if (keysym >= XK_F6)
360 param += 1;
361 }
362 else
363 switch (keysym)
364 {
365 case XK_Find:
366 param = 1;
367 break;
368 case XK_Insert:
369 param = 2;
370 break;
371#ifdef DXK_Remove
372 case DXK_Remove:
373#endif
374 case XK_Execute:
375 param = 3;
376 break;
377 case XK_Select:
378 param = 4;
379 break;
380#ifndef UNSHIFTED_SCROLLKEYS
381 case XK_Prior:
382 param = 5;
383 break;
384 case XK_Next:
385 param = 6;
386 break;
387 case XK_Home:
388 param = 7;
389 break;
390 case XK_End:
391 param = 8;
392 break;
393#endif
394 case XK_Help:
395 param = 28;
396 break;
397 case XK_Menu:
398 param = 29;
399 break;
400 }
401 return param;
402}
403
302void 404void
303rxvt_term::key_press (XKeyEvent &ev) 405rxvt_term::key_press (XKeyEvent &ev)
304{ 406{
305 int ctrl, meta, shft, len; 407 int ctrl, meta, shft, len;
306 unsigned int newlen;
307 KeySym keysym; 408 KeySym keysym;
308 int valid_keysym; 409 int valid_keysym;
309 char kbuf[KBUFSZ]; 410 char kbuf[KBUFSZ];
310 411
311#if ISO_14755 412#if ISO_14755
324 meta = ev.state & ModMetaMask; 425 meta = ev.state & ModMetaMask;
325 426
326 if (numlock_state || (ev.state & ModNumLockMask)) 427 if (numlock_state || (ev.state & ModNumLockMask))
327 { 428 {
328 numlock_state = (ev.state & ModNumLockMask); 429 numlock_state = (ev.state & ModNumLockMask);
329 PrivMode ((!numlock_state), PrivMode_aplKP); 430 set_privmode (PrivMode_aplKP, !numlock_state);
330 } 431 }
331 432
332 kbuf[0] = 0; 433 kbuf[0] = 0;
333 434
334#ifdef USE_XIM 435#ifdef USE_XIM
410#ifdef PAGING_CONTEXT_LINES 511#ifdef PAGING_CONTEXT_LINES
411 lnsppg = nrow - PAGING_CONTEXT_LINES; 512 lnsppg = nrow - PAGING_CONTEXT_LINES;
412#else 513#else
413 lnsppg = nrow * 4 / 5; 514 lnsppg = nrow * 4 / 5;
414#endif 515#endif
516 max_it (lnsppg, 1);
517
415 if (keysym == XK_Prior) 518 if (keysym == XK_Prior)
416 { 519 {
417 scr_page (UP, lnsppg); 520 scr_page (UP, lnsppg);
418 return; 521 return;
419 } 522 }
484 } 587 }
485 } 588 }
486 589
487#if ENABLE_FRILLS || ISO_14755 590#if ENABLE_FRILLS || ISO_14755
488 // ISO 14755 support 591 // ISO 14755 support
489 if (shft && ctrl) 592 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
490 { 593 {
491 int hv; 594 int hv;
492 595
493 if (iso14755buf & ISO_14755_51 596 if (iso14755buf & ISO_14755_51
494 && (keysym == XK_space || keysym == XK_KP_Space 597 && (keysym == XK_space || keysym == XK_KP_Space
524 scr_overlay_off (); 627 scr_overlay_off ();
525# endif 628# endif
526 iso14755buf = 0; 629 iso14755buf = 0;
527 } 630 }
528 } 631 }
632 else if (option (Opt_iso14755) &&
529 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 633 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
530 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 634 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
531 if (!(iso14755buf & ISO_14755_STARTED)) 635 if (!(iso14755buf & ISO_14755_STARTED))
532 { 636 {
533 iso14755buf |= ISO_14755_STARTED; 637 iso14755buf |= ISO_14755_STARTED;
534# if ISO_14755 638# if ISO_14755
535 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 639 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
546 } 650 }
547#endif 651#endif
548 652
549 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 653 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
550 { 654 {
655 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
656 unsigned int newlen = 1;
657
658 switch (translate_keypad (keysym, kp))
551 { 659 {
660#ifndef NO_BACKSPACE_KEY
661 case XK_BackSpace:
662 if (priv_modes & PrivMode_HaveBackSpace)
663 {
664 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
665 ^ !!ctrl) ? '\b' : '\177';
666 kbuf[1] = '\0';
667 }
668 else
669 strcpy (kbuf, rs[Rs_backspace_key]);
670 break;
671#endif
672#ifndef NO_DELETE_KEY
673 case XK_Delete:
674 strcpy (kbuf, rs[Rs_delete_key]);
675 break;
676#endif
677 case XK_Tab:
678 if (shft)
679 strcpy (kbuf, "\033[Z");
680 else
681 {
682#ifdef CTRL_TAB_MAKES_META
683 if (ctrl)
684 meta = 1;
685#endif
686#ifdef MOD4_TAB_MAKES_META
687 if (ev.state & Mod4Mask)
688 meta = 1;
689#endif
552 newlen = 1; 690 newlen = 0;
553 switch (keysym) 691 }
692 break;
693
694 case XK_Up: /* "\033[A" */
695 case XK_Down: /* "\033[B" */
696 case XK_Right: /* "\033[C" */
697 case XK_Left: /* "\033[D" */
698 strcpy (kbuf, "\033[Z");
699 kbuf[2] = "DACB"[keysym - XK_Left];
700 /* do Shift first */
701 if (shft)
702 kbuf[2] = "dacb"[keysym - XK_Left];
703 else if (ctrl)
704 {
705 kbuf[1] = 'O';
706 kbuf[2] = "dacb"[keysym - XK_Left];
707 }
708 else if (priv_modes & PrivMode_aplCUR)
709 kbuf[1] = 'O';
710 break;
711
712 case XK_KP_Enter:
713 /* allow shift to override */
714 if (kp)
715 {
716 strcpy (kbuf, "\033OM");
717 break;
718 }
719
720 /* FALLTHROUGH */
721
722 case XK_Return:
723 if (priv_modes & PrivMode_LFNL)
724 {
725 kbuf[0] = '\015';
726 kbuf[1] = '\012';
727 kbuf[2] = '\0';
728 }
729 else
730 {
731 kbuf[0] = '\015';
732 kbuf[1] = '\0';
733 }
734 break;
735
736 case XK_KP_F1: /* "\033OP" */
737 case XK_KP_F2: /* "\033OQ" */
738 case XK_KP_F3: /* "\033OR" */
739 case XK_KP_F4: /* "\033OS" */
740 strcpy (kbuf, "\033OP");
741 kbuf[2] += (keysym - XK_KP_F1);
742 break;
743
744 case XK_KP_Multiply: /* "\033Oj" : "*" */
745 case XK_KP_Add: /* "\033Ok" : "+" */
746 case XK_KP_Separator: /* "\033Ol" : "," */
747 case XK_KP_Subtract: /* "\033Om" : "-" */
748 case XK_KP_Decimal: /* "\033On" : "." */
749 case XK_KP_Divide: /* "\033Oo" : "/" */
750 case XK_KP_0: /* "\033Op" : "0" */
751 case XK_KP_1: /* "\033Oq" : "1" */
752 case XK_KP_2: /* "\033Or" : "2" */
753 case XK_KP_3: /* "\033Os" : "3" */
754 case XK_KP_4: /* "\033Ot" : "4" */
755 case XK_KP_5: /* "\033Ou" : "5" */
756 case XK_KP_6: /* "\033Ov" : "6" */
757 case XK_KP_7: /* "\033Ow" : "7" */
758 case XK_KP_8: /* "\033Ox" : "8" */
759 case XK_KP_9: /* "\033Oy" : "9" */
760 /* allow shift to override */
761 if (kp)
762 {
763 strcpy (kbuf, "\033Oj");
764 kbuf[2] += (keysym - XK_KP_Multiply);
765 }
766 else
767 {
768 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
769 kbuf[1] = '\0';
770 }
771 break;
772
773 default:
554 { 774 {
555#ifndef NO_BACKSPACE_KEY 775 int param = map_function_key (keysym);
556 case XK_BackSpace: 776 if (param > 0)
557 if (priv_modes & PrivMode_HaveBackSpace) 777 sprintf (kbuf,"\033[%d~", param);
558 {
559 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
560 ^ !!ctrl) ? '\b' : '\177';
561 kbuf[1] = '\0';
562 }
563 else 778 else
564 strcpy (kbuf, key_backspace);
565 break;
566#endif
567#ifndef NO_DELETE_KEY
568# ifdef XK_KP_Prior
569 case XK_KP_Delete:
570 /* allow shift to override */
571 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
572 {
573 strcpy (kbuf, "\033On");
574 break;
575 }
576 /* FALLTHROUGH */
577# endif
578 case XK_Delete:
579 strcpy (kbuf, key_delete);
580 break;
581#endif
582 case XK_Tab:
583 if (shft)
584 strcpy (kbuf, "\033[Z");
585 else
586 {
587#ifdef CTRL_TAB_MAKES_META
588 if (ctrl)
589 meta = 1;
590#endif
591#ifdef MOD4_TAB_MAKES_META
592 if (ev.state & Mod4Mask)
593 meta = 1;
594#endif
595 newlen = 0;
596 }
597 break;
598
599#ifdef XK_KP_Left
600 case XK_KP_Up: /* \033Ox or standard */
601 case XK_KP_Down: /* \033Or or standard */
602 case XK_KP_Right: /* \033Ov or standard */
603 case XK_KP_Left: /* \033Ot or standard */
604 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
605 {
606 strcpy (kbuf, "\033OZ");
607 kbuf[2] = "txvr"[keysym - XK_KP_Left];
608 break;
609 }
610 else
611 /* translate to std. cursor key */
612 keysym = XK_Left + (keysym - XK_KP_Left);
613 /* FALLTHROUGH */
614#endif
615 case XK_Up: /* "\033[A" */
616 case XK_Down: /* "\033[B" */
617 case XK_Right: /* "\033[C" */
618 case XK_Left: /* "\033[D" */
619 strcpy (kbuf, "\033[Z");
620 kbuf[2] = "DACB"[keysym - XK_Left];
621 /* do Shift first */
622 if (shft)
623 kbuf[2] = "dacb"[keysym - XK_Left];
624 else if (ctrl)
625 {
626 kbuf[1] = 'O';
627 kbuf[2] = "dacb"[keysym - XK_Left];
628 }
629 else if (priv_modes & PrivMode_aplCUR)
630 kbuf[1] = 'O';
631 break;
632
633#ifndef UNSHIFTED_SCROLLKEYS
634# ifdef XK_KP_Prior
635 case XK_KP_Prior:
636 /* allow shift to override */
637 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
638 {
639 strcpy (kbuf, "\033Oy");
640 break;
641 }
642 /* FALLTHROUGH */
643# endif
644 case XK_Prior:
645 strcpy (kbuf, "\033[5~");
646 break;
647# ifdef XK_KP_Next
648 case XK_KP_Next:
649 /* allow shift to override */
650 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
651 {
652 strcpy (kbuf, "\033Os");
653 break;
654 }
655 /* FALLTHROUGH */
656# endif
657 case XK_Next:
658 strcpy (kbuf, "\033[6~");
659 break;
660#endif
661 case XK_KP_Enter:
662 /* allow shift to override */
663 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
664 {
665 strcpy (kbuf, "\033OM");
666 break;
667 }
668
669 /* FALLTHROUGH */
670
671 case XK_Return:
672 if (priv_modes & PrivMode_LFNL)
673 {
674 kbuf[0] = '\015';
675 kbuf[1] = '\012';
676 kbuf[2] = '\0';
677 }
678 else
679 {
680 kbuf[0] = '\015';
681 kbuf[1] = '\0';
682 }
683 break;
684
685#ifdef XK_KP_Begin
686 case XK_KP_Begin:
687 strcpy (kbuf, "\033Ou");
688 break;
689
690#endif
691 case XK_KP_F1: /* "\033OP" */
692 case XK_KP_F2: /* "\033OQ" */
693 case XK_KP_F3: /* "\033OR" */
694 case XK_KP_F4: /* "\033OS" */
695 strcpy (kbuf, "\033OP");
696 kbuf[2] += (keysym - XK_KP_F1);
697 break;
698
699 case XK_KP_Multiply: /* "\033Oj" : "*" */
700 case XK_KP_Add: /* "\033Ok" : "+" */
701 case XK_KP_Separator: /* "\033Ol" : "," */
702 case XK_KP_Subtract: /* "\033Om" : "-" */
703 case XK_KP_Decimal: /* "\033On" : "." */
704 case XK_KP_Divide: /* "\033Oo" : "/" */
705 case XK_KP_0: /* "\033Op" : "0" */
706 case XK_KP_1: /* "\033Oq" : "1" */
707 case XK_KP_2: /* "\033Or" : "2" */
708 case XK_KP_3: /* "\033Os" : "3" */
709 case XK_KP_4: /* "\033Ot" : "4" */
710 case XK_KP_5: /* "\033Ou" : "5" */
711 case XK_KP_6: /* "\033Ov" : "6" */
712 case XK_KP_7: /* "\033Ow" : "7" */
713 case XK_KP_8: /* "\033Ox" : "8" */
714 case XK_KP_9: /* "\033Oy" : "9" */
715 /* allow shift to override */
716 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
717 {
718 strcpy (kbuf, "\033Oj");
719 kbuf[2] += (keysym - XK_KP_Multiply);
720 }
721 else
722 {
723 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
724 kbuf[1] = '\0';
725 }
726 break;
727
728 case XK_Find:
729 strcpy (kbuf, "\033[1~");
730 break;
731
732#ifdef XK_KP_Insert
733 case XK_KP_Insert:
734 /* allow shift to override */
735 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
736 {
737 strcpy (kbuf, "\033Op");
738 break;
739 }
740 /* FALLTHROUGH */
741#endif
742 case XK_Insert:
743 strcpy (kbuf, "\033[2~");
744 break;
745#ifdef DXK_Remove /* support for DEC remove like key */
746 case DXK_Remove:
747 /* FALLTHROUGH */
748#endif
749 case XK_Execute:
750 strcpy (kbuf, "\033[3~");
751 break;
752 case XK_Select:
753 strcpy (kbuf, "\033[4~");
754 break;
755#ifdef XK_KP_End
756 case XK_KP_End:
757 /* allow shift to override */
758 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
759 {
760 strcpy (kbuf, "\033Oq");
761 break;
762 }
763 /* FALLTHROUGH */
764#endif
765 case XK_End:
766 strcpy (kbuf, KS_END);
767 break;
768#ifdef XK_KP_Home
769 case XK_KP_Home:
770 /* allow shift to override */
771 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
772 {
773 strcpy (kbuf, "\033Ow");
774 break;
775 }
776 /* FALLTHROUGH */
777#endif
778 case XK_Home:
779 strcpy (kbuf, KS_HOME);
780 break;
781
782#define FKEY(n, fkey) \
783 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
784
785 case XK_F1: /* "\033[11~" */
786 case XK_F2: /* "\033[12~" */
787 case XK_F3: /* "\033[13~" */
788 case XK_F4: /* "\033[14~" */
789 case XK_F5: /* "\033[15~" */
790 FKEY (11, XK_F1);
791 break;
792 case XK_F6: /* "\033[17~" */
793 case XK_F7: /* "\033[18~" */
794 case XK_F8: /* "\033[19~" */
795 case XK_F9: /* "\033[20~" */
796 case XK_F10: /* "\033[21~" */
797 FKEY (17, XK_F6);
798 break;
799 case XK_F11: /* "\033[23~" */
800 case XK_F12: /* "\033[24~" */
801 case XK_F13: /* "\033[25~" */
802 case XK_F14: /* "\033[26~" */
803 FKEY (23, XK_F11);
804 break;
805 case XK_F15: /* "\033[28~" */
806 case XK_F16: /* "\033[29~" */
807 FKEY (28, XK_F15);
808 break;
809 case XK_Help: /* "\033[28~" */
810 FKEY (28, XK_Help);
811 break;
812 case XK_Menu: /* "\033[29~" */
813 FKEY (29, XK_Menu);
814 break;
815 case XK_F17: /* "\033[31~" */
816 case XK_F18: /* "\033[32~" */
817 case XK_F19: /* "\033[33~" */
818 case XK_F20: /* "\033[34~" */
819 case XK_F21: /* "\033[35~" */
820 case XK_F22: /* "\033[36~" */
821 case XK_F23: /* "\033[37~" */
822 case XK_F24: /* "\033[38~" */
823 case XK_F25: /* "\033[39~" */
824 case XK_F26: /* "\033[40~" */
825 case XK_F27: /* "\033[41~" */
826 case XK_F28: /* "\033[42~" */
827 case XK_F29: /* "\033[43~" */
828 case XK_F30: /* "\033[44~" */
829 case XK_F31: /* "\033[45~" */
830 case XK_F32: /* "\033[46~" */
831 case XK_F33: /* "\033[47~" */
832 case XK_F34: /* "\033[48~" */
833 case XK_F35: /* "\033[49~" */
834 FKEY (31, XK_F17);
835 break;
836#undef FKEY
837 default:
838 newlen = 0; 779 newlen = 0;
839 break;
840 } 780 }
841 781 break;
842 if (newlen)
843 len = strlen (kbuf);
844 } 782 }
783
784 if (newlen)
785 len = strlen (kbuf);
845 786
846 /* 787 /*
847 * Pass meta for all function keys, if 'meta' option set 788 * Pass meta for all function keys, if 'meta' option set
848 */ 789 */
849#ifdef META8_OPTION 790#ifdef META8_OPTION
1034void 975void
1035rxvt_term::flush () 976rxvt_term::flush ()
1036{ 977{
1037 flush_ev.stop (); 978 flush_ev.stop ();
1038 979
1039#ifdef ENABLE_TRANSPARENCY 980#ifdef HAVE_BG_PIXMAP
1040 if (want_full_refresh) 981 if (bgPixmap.check_clearChanged ())
1041 { 982 {
1042 want_full_refresh = 0; 983// scr_clear (true); This needs to be researched further!
1043 scr_clear ();
1044 scr_touch (false); 984 scr_touch (false);
1045 } 985 }
1046#endif 986#endif
1047 987
1048 if (want_refresh) 988 if (want_refresh)
1084 } 1024 }
1085 while (row < end_row); 1025 while (row < end_row);
1086 } 1026 }
1087 1027
1088 scr_refresh (); 1028 scr_refresh ();
1089 scrollbar_show (1); 1029 scrollBar.show (1);
1090#ifdef USE_XIM 1030#ifdef USE_XIM
1091 IMSendSpot (); 1031 IMSendSpot ();
1092#endif 1032#endif
1093 } 1033 }
1094 1034
1095 display->flush (); 1035 display->flush ();
1096} 1036}
1097 1037
1038/* checks whether a refresh is requested and starts the refresh timer */
1098void 1039void
1099rxvt_term::check_cb (check_watcher &w) 1040rxvt_term::refresh_check ()
1100{ 1041{
1101 make_current (); 1042 if (want_refresh && !flush_ev.is_active ())
1043 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1102 1044
1103 display->flush (); 1045 display->flush ();
1104
1105 if (want_refresh && !flush_ev.active)
1106 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1107} 1046}
1108 1047
1109void 1048void
1110rxvt_term::flush_cb (time_watcher &w) 1049rxvt_term::flush_cb (ev::timer &w, int revents)
1111{ 1050{
1112 make_current (); 1051 make_current ();
1113 1052
1114 refresh_count = 0; 1053 refresh_count = 0;
1115 flush (); 1054 flush ();
1116} 1055}
1117 1056
1118#ifdef CURSOR_BLINK 1057#ifdef CURSOR_BLINK
1119void 1058void
1120rxvt_term::cursor_blink_cb (time_watcher &w) 1059rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1121{ 1060{
1122 hidden_cursor = !hidden_cursor; 1061 hidden_cursor = !hidden_cursor;
1123 want_refresh = 1; 1062 want_refresh = 1;
1124 1063 refresh_check ();
1125 w.start (w.at + CURSOR_BLINK_INTERVAL);
1126} 1064}
1127#endif 1065#endif
1128 1066
1129#ifdef TEXT_BLINK 1067#ifdef TEXT_BLINK
1130void 1068void
1131rxvt_term::text_blink_cb (time_watcher &w) 1069rxvt_term::text_blink_cb (ev::timer &w, int revents)
1132{ 1070{
1133 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1071 if (scr_refresh_rend (RS_Blink, RS_Blink))
1134 { 1072 {
1135 hidden_text = !hidden_text; 1073 hidden_text = !hidden_text;
1136 want_refresh = 1; 1074 want_refresh = 1;
1137 w.start (w.at + TEXT_BLINK_INTERVAL); 1075 refresh_check ();
1138 } 1076 }
1077 else
1078 w.stop ();
1139} 1079}
1140#endif 1080#endif
1141 1081
1142#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1082#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1143void 1083void
1144rxvt_term::cont_scroll_cb (time_watcher &w) 1084rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1145{ 1085{
1146 if ((scrollbar_isUp() || scrollbar_isDn()) && 1086 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1147 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1087 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1148 { 1088 {
1149 want_refresh = 1; 1089 want_refresh = 1;
1150 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1090 refresh_check ();
1151 } 1091 }
1092 else
1093 w.stop ();
1152} 1094}
1153#endif 1095#endif
1154 1096
1155#ifdef SELECTION_SCROLLING 1097#ifdef SELECTION_SCROLLING
1156void 1098void
1157rxvt_term::sel_scroll_cb (time_watcher &w) 1099rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1158{ 1100{
1159 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1101 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1160 { 1102 {
1161 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1103 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1162 want_refresh = 1; 1104 want_refresh = 1;
1163 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1105 refresh_check ();
1164 } 1106 }
1107 else
1108 w.stop ();
1165} 1109}
1166#endif 1110#endif
1167 1111
1168#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1112#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1169void 1113void
1170rxvt_term::slip_wheel_cb (time_watcher &w) 1114rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1171{ 1115{
1172 if (mouse_slip_wheel_speed == 0 1116 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1173 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1174 : scr_page (UP, mouse_slip_wheel_speed))
1175 { 1117 {
1176 if (view_start == top_row || view_start == 0)
1177 mouse_slip_wheel_speed = 0;
1178
1179 want_refresh = 1; 1118 want_refresh = 1;
1180 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1119 refresh_check ();
1120 }
1121
1122 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1123 {
1124 mouse_slip_wheel_speed = 0;
1125 w.stop ();
1181 } 1126 }
1182} 1127}
1183#endif 1128#endif
1184 1129
1185#if LINUX_YIELD_HACK 1130#if LINUX_YIELD_HACK
1186static struct event_handler 1131static struct event_handler
1187{ 1132{
1188 check_watcher yield_ev; 1133 ev::prepare yield_ev;
1189 1134
1190 void yield_cb (check_watcher &w) 1135 void yield_cb (ev::prepare &w, int revents)
1191 { 1136 {
1192 // this should really be sched_yield(), but the linux guys thought 1137 // this should really be sched_yield(), but the linux guys thought
1193 // that giving a process calling sched_yield () less cpu time than 1138 // that giving a process calling sched_yield () less cpu time than
1194 // ones with high nice levels is a useful thing to do. It surely is is 1139 // ones with high nice levels is a useful thing to do. It surely is is
1195 // allowed by the sus... as is returning ENOSYS. 1140 // allowed by the sus... as is returning ENOSYS.
1141 // since the linux guys additionally thought that breaking the only
1142 // known workaround against their unusable sched_yield hack is cool,
1143 // we just nanosleep a bit and hope for the best.
1196 1144
1197 struct timespec ts = { 0, 0 }; 1145 struct timespec ts = { 0, 1000 };
1198 nanosleep (&ts, 0); 1146 nanosleep (&ts, 0);
1199 1147
1200 w.stop (); 1148 w.stop ();
1201 } 1149 }
1202 1150
1246 1194
1247 return false; 1195 return false;
1248} 1196}
1249 1197
1250void 1198void
1251rxvt_term::pty_cb (io_watcher &w, short revents) 1199rxvt_term::pty_cb (ev::io &w, int revents)
1252{ 1200{
1253 make_current (); 1201 make_current ();
1254 1202
1255 if (revents & EVENT_READ) 1203 if (revents & ev::READ)
1256 // loop, but don't allow a single term to monopolize us 1204 // loop, but don't allow a single term to monopolize us
1257 while (pty_fill ()) 1205 for (int i = CBUFCNT; i-- && pty_fill (); )
1258 if (cmd_parse ()) 1206 cmd_parse ();
1259 break;
1260 1207
1261 if (revents & EVENT_WRITE) 1208 if (revents & ev::WRITE)
1262 pty_write (); 1209 pty_write ();
1210
1211 refresh_check ();
1263} 1212}
1264 1213
1265void 1214void
1266rxvt_term::pointer_unblank () 1215rxvt_term::pointer_unblank ()
1267{ 1216{
1270 1219
1271#ifdef POINTER_BLANK 1220#ifdef POINTER_BLANK
1272 hidden_pointer = 0; 1221 hidden_pointer = 0;
1273 1222
1274 if (option (Opt_pointerBlank)) 1223 if (option (Opt_pointerBlank))
1275 pointer_ev.start (NOW + pointerBlankDelay); 1224 pointer_ev.start (pointerBlankDelay);
1276#endif 1225#endif
1277} 1226}
1278 1227
1279#ifdef POINTER_BLANK 1228#ifdef POINTER_BLANK
1280void 1229void
1288 1237
1289 hidden_pointer = 1; 1238 hidden_pointer = 1;
1290} 1239}
1291 1240
1292void 1241void
1293rxvt_term::pointer_cb (time_watcher &w) 1242rxvt_term::pointer_cb (ev::timer &w, int revents)
1294{ 1243{
1295 make_current (); 1244 make_current ();
1296 1245
1297 pointer_blank (); 1246 pointer_blank ();
1298} 1247}
1301void 1250void
1302rxvt_term::mouse_report (XButtonEvent &ev) 1251rxvt_term::mouse_report (XButtonEvent &ev)
1303{ 1252{
1304 int button_number, key_state = 0; 1253 int button_number, key_state = 0;
1305 int x, y; 1254 int x, y;
1255 int code = 32;
1306 1256
1307 x = ev.x; 1257 x = Pixel2Col (ev.x);
1308 y = ev.y; 1258 y = Pixel2Row (ev.y);
1309 pixel_position (&x, &y); 1259 if (ev.type == MotionNotify)
1260 {
1261 if (x == mouse_row && y == mouse_col)
1262 return;
1263 mouse_row = x;
1264 mouse_col = y;
1265 code += 32;
1266 }
1310 1267
1311 if (MEvent.button == AnyButton) 1268 if (MEvent.button == AnyButton)
1312 button_number = 3; 1269 button_number = 3;
1313 else 1270 else
1314 { 1271 {
1360 x + 1, 1317 x + 1,
1361 y + 1); 1318 y + 1);
1362#endif 1319#endif
1363 1320
1364 tt_printf ("\033[M%c%c%c", 1321 tt_printf ("\033[M%c%c%c",
1365 (32 + button_number + key_state), 1322 (code + button_number + key_state),
1366 (32 + x + 1), 1323 (32 + x + 1),
1367 (32 + y + 1)); 1324 (32 + y + 1));
1368} 1325}
1369 1326
1370/*{{{ process an X event */ 1327/*{{{ process an X event */
1474 && ev.xfocus.mode != NotifyGrab) 1431 && ev.xfocus.mode != NotifyGrab)
1475 focus_out (); 1432 focus_out ();
1476 break; 1433 break;
1477 1434
1478 case ConfigureNotify: 1435 case ConfigureNotify:
1479/* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n", 1436 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1480 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y, 1437 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1481 szHint.width, szHint.height);*/ 1438 szHint.width, szHint.height);*/
1482 if (ev.xconfigure.window == parent[0]) 1439 if (ev.xconfigure.window == parent[0])
1483 { 1440 {
1484 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1441 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1489 seen_resize = 1; 1446 seen_resize = 1;
1490 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1447 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1491 } 1448 }
1492 else 1449 else
1493 { 1450 {
1494#ifdef ENABLE_TRANSPARENCY 1451#ifdef HAVE_BG_PIXMAP
1495 if (option (Opt_transparent)) 1452 if (bgPixmap.window_position_sensitive ())
1453 {
1454 if (mapped)
1496 update_background (); 1455 update_background ();
1456 else
1457 bgPixmap.invalidate ();
1458 }
1497#endif 1459#endif
1498 } 1460 }
1461
1499 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1462 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1500 } 1463 }
1501 break; 1464 break;
1502 1465
1503 case PropertyNotify: 1466 case PropertyNotify:
1507 selection_property (ev.xproperty.window, ev.xproperty.atom); 1470 selection_property (ev.xproperty.window, ev.xproperty.atom);
1508 1471
1509 break; 1472 break;
1510 1473
1511 case SelectionClear: 1474 case SelectionClear:
1512 selection_clear (); 1475 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1513 break; 1476 break;
1514 1477
1515 case SelectionNotify: 1478 case SelectionNotify:
1516 if (selection_wait == Sel_normal) 1479 if (selection_wait == Sel_normal)
1517 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1480 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1520 case SelectionRequest: 1483 case SelectionRequest:
1521 selection_send (ev.xselectionrequest); 1484 selection_send (ev.xselectionrequest);
1522 break; 1485 break;
1523 1486
1524 case MapNotify: 1487 case MapNotify:
1488#ifdef HAVE_BG_PIXMAP
1489 /* This is needed spcifically to fix the case of no window manager or a
1490 * non-reparenting window manager. In those cases we never get first
1491 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1492 * care of multiplicity of ConfigureNotify events arriwing while WM does
1493 * reparenting.
1494 * We should not render background immidiately, as there could be several
1495 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1496 * by scheduling background redraw as soon as we can, but giving a short
1497 * bit of time for ConfigureNotifies to arrive.
1498 * We should render background PRIOR to drawing any text, but AFTER all
1499 * of ConfigureNotifys for the best results.
1500 */
1501 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1502 update_background_ev.start (0.025);
1503#endif
1525 mapped = 1; 1504 mapped = 1;
1526#ifdef TEXT_BLINK 1505#ifdef TEXT_BLINK
1527 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1506 text_blink_ev.start ();
1528#endif 1507#endif
1529 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1508 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1530 break; 1509 break;
1531 1510
1532 case UnmapNotify: 1511 case UnmapNotify:
1534#ifdef TEXT_BLINK 1513#ifdef TEXT_BLINK
1535 text_blink_ev.stop (); 1514 text_blink_ev.stop ();
1536#endif 1515#endif
1537 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1516 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1538 break; 1517 break;
1539
1540#ifdef ENABLE_TRANSPARENCY
1541 case ReparentNotify:
1542 rootwin_cb (ev);
1543 break;
1544#endif /* ENABLE_TRANSPARENCY */
1545 1518
1546 case GraphicsExpose: 1519 case GraphicsExpose:
1547 case Expose: 1520 case Expose:
1548 if (ev.xany.window == vt) 1521 if (ev.xany.window == vt)
1549 { 1522 {
1550 do 1523 do
1524 {
1551 scr_expose (ev.xexpose.x, ev.xexpose.y, 1525 scr_expose (ev.xexpose.x, ev.xexpose.y,
1552 ev.xexpose.width, ev.xexpose.height, False); 1526 ev.xexpose.width, ev.xexpose.height, False);
1527 }
1553 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1528 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1554 1529
1555 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1530 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1556 1531
1557 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1532 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1533 {
1558 scr_expose (ev.xexpose.x, ev.xexpose.y, 1534 scr_expose (ev.xexpose.x, ev.xexpose.y,
1559 ev.xexpose.width, ev.xexpose.height, False); 1535 ev.xexpose.width, ev.xexpose.height, False);
1536 }
1560 1537
1561 want_refresh = 1; 1538 want_refresh = 1;
1562 } 1539 }
1563 else 1540 else
1564 { 1541 {
1567 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1544 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1568 ; 1545 ;
1569 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1546 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1570 ; 1547 ;
1571 1548
1572 if (isScrollbarWindow (ev.xany.window)) 1549 if (scrollBar.state && ev.xany.window == scrollBar.win)
1573 { 1550 {
1574 scrollBar.setIdle (); 1551 scrollBar.state = STATE_IDLE;
1575 scrollbar_show (0); 1552 scrollBar.show (0);
1576 } 1553 }
1577 } 1554 }
1578 break; 1555 break;
1579 1556
1580 case MotionNotify: 1557 case MotionNotify:
1581#ifdef POINTER_BLANK 1558#ifdef POINTER_BLANK
1582 if (hidden_pointer) 1559 if (hidden_pointer)
1583 pointer_unblank (); 1560 pointer_unblank ();
1584#endif 1561#endif
1562 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1563 || priv_modes & PrivMode_MouseAnyEvent)
1564 mouse_report (ev.xbutton);
1585 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1565 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1586 break; 1566 break;
1587 1567
1588 if (ev.xany.window == vt) 1568 if (ev.xany.window == vt)
1589 { 1569 {
1623 int dist; 1603 int dist;
1624 1604
1625 /* don't clobber the current delay if we are 1605 /* don't clobber the current delay if we are
1626 * already in the middle of scrolling. 1606 * already in the middle of scrolling.
1627 */ 1607 */
1628 if (!sel_scroll_ev.active) 1608 if (!sel_scroll_ev.is_active ())
1629 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1609 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1630 1610
1631 /* save the event params so we can highlight 1611 /* save the event params so we can highlight
1632 * the selection in the pending-scroll loop 1612 * the selection in the pending-scroll loop
1633 */ 1613 */
1634 selection_save_x = ev.xbutton.x; 1614 selection_save_x = ev.xbutton.x;
1656 else 1636 else
1657 { 1637 {
1658 /* we are within the text window, so we 1638 /* we are within the text window, so we
1659 * shouldn't be scrolling 1639 * shouldn't be scrolling
1660 */ 1640 */
1661 if (sel_scroll_ev.active)
1662 sel_scroll_ev.stop(); 1641 sel_scroll_ev.stop();
1663 } 1642 }
1664#endif 1643#endif
1665#ifdef MOUSE_THRESHOLD 1644#ifdef MOUSE_THRESHOLD
1666 } 1645 }
1667#endif 1646#endif
1668 } 1647 }
1669 } 1648 }
1670 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1649 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1671 { 1650 {
1672 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1651 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1673 MotionNotify, &ev)) 1652 MotionNotify, &ev))
1674 ; 1653 ;
1675 1654
1677 &unused_root, &unused_child, 1656 &unused_root, &unused_child,
1678 &unused_root_x, &unused_root_y, 1657 &unused_root_x, &unused_root_y,
1679 &ev.xbutton.x, &ev.xbutton.y, 1658 &ev.xbutton.x, &ev.xbutton.y,
1680 &unused_mask); 1659 &unused_mask);
1681 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1660 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1682 scrollbar_size ()); 1661 scrollBar.size ());
1683 want_refresh = 1; 1662 want_refresh = 1;
1684 scrollbar_show (1); 1663 scrollBar.show (1);
1685 } 1664 }
1686 break; 1665 break;
1687 } 1666 }
1688 1667
1689#if defined(CURSOR_BLINK) 1668#if defined(CURSOR_BLINK)
1693 { 1672 {
1694 hidden_cursor = 0; 1673 hidden_cursor = 0;
1695 want_refresh = 1; 1674 want_refresh = 1;
1696 } 1675 }
1697 1676
1698 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1677 cursor_blink_ev.again ();
1699 } 1678 }
1700#endif 1679#endif
1701 1680
1702#if defined(POINTER_BLANK) 1681#if defined(POINTER_BLANK)
1703 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1682 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1710 1689
1711 if (ev.type == KeyPress && hidden_pointer == 0) 1690 if (ev.type == KeyPress && hidden_pointer == 0)
1712 pointer_blank (); 1691 pointer_blank ();
1713 } 1692 }
1714#endif 1693#endif
1694
1695 refresh_check ();
1715} 1696}
1697
1698#if ENABLE_FRILLS
1699void
1700rxvt_term::set_urgency (bool enable)
1701{
1702 if (enable == urgency_hint)
1703 return;
1704
1705 if (XWMHints *h = XGetWMHints (dpy, parent[0]))
1706 {
1707 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1708 XSetWMHints (dpy, parent[0], h);
1709 urgency_hint = enable;
1710 }
1711}
1712#endif
1716 1713
1717void 1714void
1718rxvt_term::focus_in () 1715rxvt_term::focus_in ()
1719{ 1716{
1720 if (!focus) 1717 if (!focus)
1721 { 1718 {
1722 focus = 1; 1719 focus = 1;
1723 want_refresh = 1; 1720 want_refresh = 1;
1724 1721
1725 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1726
1727#if USE_XIM 1722#if USE_XIM
1728 if (Input_Context != NULL) 1723 if (Input_Context != NULL)
1729 { 1724 {
1730 IMSetPosition (); 1725 IMSetPosition ();
1731 XSetICFocus (Input_Context); 1726 XSetICFocus (Input_Context);
1732 } 1727 }
1733#endif 1728#endif
1734#if CURSOR_BLINK 1729#if CURSOR_BLINK
1735 if (option (Opt_cursorBlink)) 1730 if (option (Opt_cursorBlink))
1736 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1731 cursor_blink_ev.again ();
1737#endif 1732#endif
1738#if OFF_FOCUS_FADING 1733#if OFF_FOCUS_FADING
1739 if (rs[Rs_fade]) 1734 if (rs[Rs_fade])
1740 { 1735 {
1741 pix_colors = pix_colors_focused; 1736 pix_colors = pix_colors_focused;
1742 scr_recolour (); 1737 scr_recolour ();
1743 } 1738 }
1744#endif 1739#endif
1745#if ENABLE_FRILLS 1740#if ENABLE_FRILLS
1746 if (option (Opt_urgentOnBell)) 1741 if (option (Opt_urgentOnBell))
1747 { 1742 set_urgency (0);
1748 XWMHints *h;
1749
1750 h = XGetWMHints(dpy, parent[0]);
1751 if (h != NULL)
1752 {
1753 h->flags &= ~XUrgencyHint;
1754 XSetWMHints(dpy, parent[0], h);
1755 }
1756 }
1757#endif 1743#endif
1744
1745 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1758 } 1746 }
1759} 1747}
1760 1748
1761void 1749void
1762rxvt_term::focus_out () 1750rxvt_term::focus_out ()
1764 if (focus) 1752 if (focus)
1765 { 1753 {
1766 focus = 0; 1754 focus = 0;
1767 want_refresh = 1; 1755 want_refresh = 1;
1768 1756
1769 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1757#if ENABLE_FRILLS
1770 1758 if (option (Opt_urgentOnBell))
1759 set_urgency (0);
1760#endif
1771#if ENABLE_FRILLS || ISO_14755 1761#if ENABLE_FRILLS || ISO_14755
1772 if (iso14755buf) 1762 if (iso14755buf)
1773 { 1763 {
1774 iso14755buf = 0; 1764 iso14755buf = 0;
1775# if ISO_14755 1765# if ISO_14755
1782 XUnsetICFocus (Input_Context); 1772 XUnsetICFocus (Input_Context);
1783#endif 1773#endif
1784#if CURSOR_BLINK 1774#if CURSOR_BLINK
1785 if (option (Opt_cursorBlink)) 1775 if (option (Opt_cursorBlink))
1786 cursor_blink_ev.stop (); 1776 cursor_blink_ev.stop ();
1777
1787 hidden_cursor = 0; 1778 hidden_cursor = 0;
1788#endif 1779#endif
1789#if OFF_FOCUS_FADING 1780#if OFF_FOCUS_FADING
1790 if (rs[Rs_fade]) 1781 if (rs[Rs_fade])
1791 { 1782 {
1792 pix_colors = pix_colors_unfocused; 1783 pix_colors = pix_colors_unfocused;
1793 scr_recolour (); 1784 scr_recolour ();
1794 } 1785 }
1795#endif 1786#endif
1787
1788 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1796 } 1789 }
1797} 1790}
1798 1791
1799void 1792void
1800rxvt_term::update_fade_color (unsigned int idx) 1793rxvt_term::update_fade_color (unsigned int idx)
1831 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1824 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1832 { 1825 {
1833 bgPixmap.set_root_pixmap (); 1826 bgPixmap.set_root_pixmap ();
1834 update_background (); 1827 update_background ();
1835 } 1828 }
1829
1836 break; 1830 break;
1837 } 1831 }
1838# endif 1832# endif
1833
1834 refresh_check ();
1839} 1835}
1840#endif 1836#endif
1841 1837
1842void 1838void
1843rxvt_term::button_press (XButtonEvent &ev) 1839rxvt_term::button_press (XButtonEvent &ev)
1898 mouse_report (ev); 1894 mouse_report (ev);
1899 } 1895 }
1900#else 1896#else
1901 MEvent.button = ev.button; 1897 MEvent.button = ev.button;
1902 mouse_report (ev); 1898 mouse_report (ev);
1903#endif /* MOUSE_REPORT_DOUBLECLICK */ 1899#endif /* MOUSE_REPORT_DOUBLECLICK */
1904 1900
1905 } 1901 }
1906 else 1902 else
1907 { 1903 {
1908 if (ev.button != MEvent.button) 1904 if (ev.button != MEvent.button)
1956 } 1952 }
1957 1953
1958 /* 1954 /*
1959 * Scrollbar window processing of button press 1955 * Scrollbar window processing of button press
1960 */ 1956 */
1961 if (isScrollbarWindow (ev.window)) 1957 if (scrollBar.state && ev.window == scrollBar.win)
1962 { 1958 {
1963 scrollBar.setIdle (); 1959 page_dirn direction = NO_DIR;
1960
1961 if (scrollBar.upButton (ev.y))
1962 direction = UP; /* up */
1963 else if (scrollBar.dnButton (ev.y))
1964 direction = DN; /* down */
1965
1966 scrollBar.state = STATE_IDLE;
1964 /* 1967 /*
1965 * Rxvt-style scrollbar: 1968 * Rxvt-style scrollbar:
1966 * move up if mouse is above slider 1969 * move up if mouse is above slider
1967 * move dn if mouse is below slider 1970 * move dn if mouse is below slider
1968 * 1971 *
1977 /* 1980 /*
1978 * Mouse report disabled scrollbar: 1981 * Mouse report disabled scrollbar:
1979 * arrow buttons - send up/down 1982 * arrow buttons - send up/down
1980 * click on scrollbar - send pageup/down 1983 * click on scrollbar - send pageup/down
1981 */ 1984 */
1982 if ((scrollBar.style == R_SB_NEXT 1985 if (direction == UP)
1983 && scrollbarnext_upButton (ev.y))
1984 || (scrollBar.style == R_SB_RXVT
1985 && scrollbarrxvt_upButton (ev.y)))
1986 tt_printf ("\033[A"); 1986 tt_printf ("\033[A");
1987 else if ((scrollBar.style == R_SB_NEXT 1987 else if (direction == DN)
1988 && scrollbarnext_dnButton (ev.y))
1989 || (scrollBar.style == R_SB_RXVT
1990 && scrollbarrxvt_dnButton (ev.y)))
1991 tt_printf ("\033[B"); 1988 tt_printf ("\033[B");
1992 else 1989 else
1993 switch (ev.button) 1990 switch (ev.button)
1994 { 1991 {
1995 case Button2: 1992 case Button2:
2002 tt_printf ("\033[5~"); 1999 tt_printf ("\033[5~");
2003 break; 2000 break;
2004 } 2001 }
2005 } 2002 }
2006 else 2003 else
2007#endif /* NO_SCROLLBAR_REPORT */ 2004#endif /* NO_SCROLLBAR_REPORT */
2008
2009 {
2010 char upordown = 0;
2011
2012 if (scrollBar.style == R_SB_NEXT)
2013 { 2005 {
2014 if (scrollbarnext_upButton (ev.y)) 2006 if (direction != NO_DIR)
2015 upordown = -1; /* up */
2016 else if (scrollbarnext_dnButton (ev.y))
2017 upordown = 1; /* down */
2018 }
2019 else if (scrollBar.style == R_SB_RXVT)
2020 {
2021 if (scrollbarrxvt_upButton (ev.y))
2022 upordown = -1; /* up */
2023 else if (scrollbarrxvt_dnButton (ev.y))
2024 upordown = 1; /* down */
2025 }
2026 if (upordown)
2027 { 2007 {
2028#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2008#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2009 if (!cont_scroll_ev.is_active ())
2029 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2010 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2030#endif 2011#endif
2031 if (scr_page (upordown < 0 ? UP : DN, 1)) 2012 if (scr_page (direction, 1))
2032 { 2013 {
2033 if (upordown < 0) 2014 if (direction == UP)
2034 scrollBar.setUp (); 2015 scrollBar.state = STATE_UP;
2035 else 2016 else
2036 scrollBar.setDn (); 2017 scrollBar.state = STATE_DOWN;
2037 } 2018 }
2038 } 2019 }
2039 else 2020 else
2040 switch (ev.button) 2021 switch (ev.button)
2041 { 2022 {
2042 case Button2: 2023 case Button2:
2043 switch (scrollbar_align) 2024 switch (scrollBar.align)
2044 { 2025 {
2045 case R_SB_ALIGN_TOP: 2026 case R_SB_ALIGN_TOP:
2046 csrO = 0; 2027 csrO = 0;
2047 break; 2028 break;
2048 case R_SB_ALIGN_CENTRE: 2029 case R_SB_ALIGN_CENTRE:
2054 } 2035 }
2055 2036
2056 if (scrollBar.style == R_SB_XTERM 2037 if (scrollBar.style == R_SB_XTERM
2057 || scrollbar_above_slider (ev.y) 2038 || scrollbar_above_slider (ev.y)
2058 || scrollbar_below_slider (ev.y)) 2039 || scrollbar_below_slider (ev.y))
2059 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2040 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2060 2041
2061 scrollBar.setMotion (); 2042 scrollBar.state = STATE_MOTION;
2062 break; 2043 break;
2063 2044
2064 case Button1: 2045 case Button1:
2065 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2046 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2066 csrO = ev.y - scrollBar.top; 2047 csrO = ev.y - scrollBar.top;
2067 /* FALLTHROUGH */ 2048 /* FALLTHROUGH */
2068 2049
2069 case Button3: 2050 case Button3:
2070 if (scrollBar.style != R_SB_XTERM) 2051 if (scrollBar.style != R_SB_XTERM)
2080 scr_page (DN, nrow - 1); 2061 scr_page (DN, nrow - 1);
2081# else 2062# else
2082 scr_page (DN, nrow / 4); 2063 scr_page (DN, nrow / 4);
2083# endif 2064# endif
2084 else 2065 else
2085 scrollBar.setMotion (); 2066 scrollBar.state = STATE_MOTION;
2086 } 2067 }
2087 else 2068 else
2088 { 2069 {
2089 scr_page ((ev.button == Button1 ? DN : UP), 2070 scr_page ((ev.button == Button1 ? DN : UP),
2090 (nrow 2071 (nrow
2091 * scrollbar_position (ev.y) 2072 * scrollbar_position (ev.y)
2092 / scrollbar_size ())); 2073 / scrollBar.size ()));
2093 } 2074 }
2094 2075
2095 break; 2076 break;
2096 } 2077 }
2097 } 2078 }
2107 2088
2108 csrO = 0; /* reset csr Offset */ 2089 csrO = 0; /* reset csr Offset */
2109 if (!bypass_keystate) 2090 if (!bypass_keystate)
2110 reportmode = !! (priv_modes & PrivMode_mouse_report); 2091 reportmode = !! (priv_modes & PrivMode_mouse_report);
2111 2092
2112 if (scrollbar_isUpDn ()) 2093 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2113 { 2094 {
2114 scrollBar.setIdle (); 2095 scrollBar.state = STATE_IDLE;
2115 scrollbar_show (0); 2096 scrollBar.show (0);
2116 } 2097 }
2117 2098
2118#ifdef SELECTION_SCROLLING 2099#ifdef SELECTION_SCROLLING
2119 if (sel_scroll_ev.active)
2120 sel_scroll_ev.stop(); 2100 sel_scroll_ev.stop();
2121#endif 2101#endif
2122 2102
2123 if (ev.window == vt) 2103 if (ev.window == vt)
2124 { 2104 {
2125 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2105 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2149 mouse_report (ev); 2129 mouse_report (ev);
2150 } 2130 }
2151#else /* MOUSE_REPORT_DOUBLECLICK */ 2131#else /* MOUSE_REPORT_DOUBLECLICK */
2152 MEvent.button = AnyButton; 2132 MEvent.button = AnyButton;
2153 mouse_report (ev); 2133 mouse_report (ev);
2154#endif /* MOUSE_REPORT_DOUBLECLICK */ 2134#endif /* MOUSE_REPORT_DOUBLECLICK */
2155 return; 2135 return;
2156 } 2136 }
2157 2137
2158 /* 2138 /*
2159 * dumb hack to compensate for the failure of click-and-drag 2139 * dumb hack to compensate for the failure of click-and-drag
2197 { 2177 {
2198 mouse_slip_wheel_speed += v ? -1 : 1; 2178 mouse_slip_wheel_speed += v ? -1 : 1;
2199 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2179 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2200 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2180 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2201 2181
2202 if (slip_wheel_ev.at < NOW) 2182 if (!slip_wheel_ev.is_active ())
2203 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2183 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2204
2205 slip_wheel_ev.start ();
2206 } 2184 }
2207 else 2185 else
2186# endif
2208 { 2187 {
2209# endif
2210 scr_page (v, i); 2188 scr_page (v, i);
2211 scrollbar_show (1); 2189 scrollBar.show (1);
2212# ifdef MOUSE_SLIP_WHEELING
2213 } 2190 }
2214# endif
2215 } 2191 }
2216 break; 2192 break;
2217#endif 2193#endif
2218 } 2194 }
2219 } 2195 }
2220} 2196}
2221 2197
2222/*}}} */ 2198/*}}} */
2223 2199
2224bool 2200void
2225rxvt_term::cmd_parse () 2201rxvt_term::cmd_parse ()
2226{ 2202{
2227 bool flag = false;
2228 wchar_t ch = NOCHAR; 2203 wchar_t ch = NOCHAR;
2229 char *seq_begin; // remember start of esc-sequence here 2204 char *seq_begin; // remember start of esc-sequence here
2230 2205
2231 for (;;) 2206 for (;;)
2232 { 2207 {
2233 if (ch == NOCHAR) 2208 if (expect_false (ch == NOCHAR))
2234 { 2209 {
2235 seq_begin = cmdbuf_ptr; 2210 seq_begin = cmdbuf_ptr;
2236 ch = next_char (); 2211 ch = next_char ();
2237 2212
2238 if (ch == NOCHAR) 2213 if (ch == NOCHAR)
2239 break; 2214 break;
2240 } 2215 }
2241 2216
2242 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2217 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2243 { 2218 {
2244 if (!seen_input) 2219 if (expect_false (!seen_input))
2245 { 2220 {
2246 seen_input = 1; 2221 seen_input = 1;
2247 // many badly-written programs (e.g. jed) contain a race condition: 2222 // many badly-written programs (e.g. jed) contain a race condition:
2248 // they first read the screensize and then install a SIGWINCH handler. 2223 // they first read the screensize and then install a SIGWINCH handler.
2249 // some window managers resize the window early, and these programs 2224 // some window managers resize the window early, and these programs
2262 wchar_t *str = buf; 2237 wchar_t *str = buf;
2263 wchar_t *eol = str + min (ncol, UBUFSIZ); 2238 wchar_t *eol = str + min (ncol, UBUFSIZ);
2264 2239
2265 for (;;) 2240 for (;;)
2266 { 2241 {
2267 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2242 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2268 break; 2243 break;
2269 2244
2270 *str++ = ch; 2245 *str++ = ch;
2271 2246
2272 if (ch == C0_LF || str >= eol) 2247 if (expect_false (ch == C0_LF || str >= eol))
2273 { 2248 {
2274 if (ch == C0_LF) 2249 if (ch == C0_LF)
2275 nlines++; 2250 nlines++;
2276 2251
2277 refresh_count++; 2252 refresh_count++;
2278 2253
2279 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1) 2254 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2280 { 2255 {
2281 refresh_count = 0; 2256 refresh_count = 0;
2282 2257
2283 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.) 2258 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2284 { 2259 {
2285 refreshnow = true; 2260 refreshnow = true;
2286 ch = NOCHAR; 2261 ch = NOCHAR;
2287 break; 2262 break;
2288 } 2263 }
2326 * What the heck we'll cheat and only refresh less than every page-full. 2301 * What the heck we'll cheat and only refresh less than every page-full.
2327 * if skipScroll is enabled. 2302 * if skipScroll is enabled.
2328 */ 2303 */
2329 if (refreshnow) 2304 if (refreshnow)
2330 { 2305 {
2331 flag = true;
2332 scr_refresh (); 2306 scr_refresh ();
2333 want_refresh = 1; 2307 want_refresh = 1;
2334 } 2308 }
2335
2336 } 2309 }
2337 else 2310 else
2338 { 2311 {
2339 try 2312 try
2340 { 2313 {
2348 } 2321 }
2349 2322
2350 ch = NOCHAR; 2323 ch = NOCHAR;
2351 } 2324 }
2352 } 2325 }
2353
2354 return flag;
2355} 2326}
2356 2327
2357// read the next character 2328// read the next character
2358wchar_t 2329wchar_t
2359rxvt_term::next_char () NOTHROW 2330rxvt_term::next_char () NOTHROW
2360{ 2331{
2361 while (cmdbuf_ptr < cmdbuf_endp) 2332 while (cmdbuf_ptr < cmdbuf_endp)
2362 { 2333 {
2363 // assume 7-bit to be ascii ALWAYS 2334 // assume 7-bit to be ascii ALWAYS
2364 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2335 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2365 return *cmdbuf_ptr++; 2336 return *cmdbuf_ptr++;
2366 2337
2367 wchar_t wc; 2338 wchar_t wc;
2368 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2339 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2369 2340
2373 cmdbuf_ptr = cmdbuf_endp; 2344 cmdbuf_ptr = cmdbuf_endp;
2374 break; 2345 break;
2375 } 2346 }
2376 2347
2377 if (len == (size_t)-1) 2348 if (len == (size_t)-1)
2349 {
2350 mbstate.reset (); // reset now undefined conversion state
2378 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2351 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2352 }
2379 2353
2380 // assume wchar == unicode 2354 // assume wchar == unicode
2381 cmdbuf_ptr += len; 2355 cmdbuf_ptr += len;
2382 return wc & UNICODE_MASK; 2356 return wc & UNICODE_MASK;
2383 } 2357 }
2427/*----------------------------------------------------------------------*/ 2401/*----------------------------------------------------------------------*/
2428#ifdef PRINTPIPE 2402#ifdef PRINTPIPE
2429FILE * 2403FILE *
2430rxvt_term::popen_printer () 2404rxvt_term::popen_printer ()
2431{ 2405{
2432 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2406 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2433 2407
2434 if (stream == NULL) 2408 if (stream == NULL)
2435 rxvt_warn ("can't open printer pipe, not printing.\n"); 2409 rxvt_warn ("can't open printer pipe, not printing.\n");
2436 2410
2437 return stream; 2411 return stream;
2448 * simulate attached vt100 printer 2422 * simulate attached vt100 printer
2449 */ 2423 */
2450void 2424void
2451rxvt_term::process_print_pipe () 2425rxvt_term::process_print_pipe ()
2452{ 2426{
2453 int done; 2427 FILE *fd = popen_printer ();
2454 FILE *fd;
2455 2428
2456 if ((fd = popen_printer ()) == NULL) 2429 if (!fd)
2457 return; 2430 return;
2458 2431
2459 /* 2432 /*
2460 * Send all input to the printer until either ESC[4i or ESC[?4i 2433 * Send all input to the printer until either ESC[4i or ESC[?4i
2461 * is received. 2434 * is received.
2462 */ 2435 */
2463 for (done = 0; !done;) 2436 for (int done = 0; !done; )
2464 { 2437 {
2465 unsigned char buf[8]; 2438 unsigned char buf[8];
2466 unicode_t ch; 2439 unicode_t ch;
2467 unsigned int i, len; 2440 unsigned int i, len;
2468 2441
2499 } 2472 }
2500 } 2473 }
2501 2474
2502 pclose_printer (fd); 2475 pclose_printer (fd);
2503} 2476}
2504#endif /* PRINTPIPE */ 2477#endif /* PRINTPIPE */
2505/*}}} */ 2478/*}}} */
2506 2479
2507/* *INDENT-OFF* */ 2480/* *INDENT-OFF* */
2508enum { 2481enum {
2509 C1_40 = 0x40, 2482 C1_40 = 0x40,
2613 break; 2586 break;
2614 case 'Z': /* identify the terminal type */ 2587 case 'Z': /* identify the terminal type */
2615 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2588 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2616 break; 2589 break;
2617 case '<': /* turn off VT52 mode */ 2590 case '<': /* turn off VT52 mode */
2618 PrivMode (0, PrivMode_vt52); 2591 set_privmode (PrivMode_vt52, 0);
2619 break; 2592 break;
2620 case 'F': /* use special graphics character set */ 2593 case 'F': /* use special graphics character set */
2621 case 'G': /* use regular character set */ 2594 case 'G': /* use regular character set */
2622 /* unimplemented */ 2595 /* unimplemented */
2623 break; 2596 break;
2677 scr_forwardindex (); 2650 scr_forwardindex ();
2678 break; 2651 break;
2679#endif 2652#endif
2680 case '=': 2653 case '=':
2681 case '>': 2654 case '>':
2682 PrivMode ((ch == '='), PrivMode_aplKP); 2655 set_privmode (PrivMode_aplKP, ch == '=');
2683 break; 2656 break;
2684 2657
2685 case C1_40: 2658 case C1_40:
2686 cmd_getc (); 2659 cmd_getc ();
2687 break; 2660 break;
2726 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2699 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2727 case C1_SCI: /* ESC Z */ 2700 case C1_SCI: /* ESC Z */
2728 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2701 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2729 break; /* steal obsolete ESC [ c */ 2702 break; /* steal obsolete ESC [ c */
2730 2703
2731 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2704 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2732 case C1_CSI: /* ESC [ */ 2705 case C1_CSI: /* ESC [ */
2733 process_csi_seq (); 2706 process_csi_seq ();
2734 break; 2707 break;
2735 2708
2736 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2709 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2737 case C1_OSC: /* ESC ] */ 2710 case C1_OSC: /* ESC ] */
2738 process_osc_seq (); 2711 process_osc_seq ();
2739 break; 2712 break;
2740 2713
2741 /* 8.3.106: RESET TO INITIAL STATE */ 2714 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2742 case 'c': 2715 case 'c':
2743 mbstate.reset (); 2716 mbstate.reset ();
2744 scr_poweron (); 2717 scr_poweron ();
2745 scrollbar_show (1); 2718 scrollBar.show (1);
2746 break; 2719 break;
2747 2720
2748 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2721 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2749 case 'n': 2722 case 'n':
2750 scr_charset_choose (2); 2723 scr_charset_choose (2);
2801 2774
2802 nargs = 0; 2775 nargs = 0;
2803 2776
2804 priv = 0; 2777 priv = 0;
2805 ch = cmd_getc (); 2778 ch = cmd_getc ();
2806 if (ch >= '<' && ch <= '?') 2779 if ((ch >= '<' && ch <= '?') || ch == '!')
2780 {
2807 { /* '<' '=' '>' '?' */ 2781 /* '<' '=' '>' '?' '!' */
2808 priv = ch; 2782 priv = ch;
2809 ch = cmd_getc (); 2783 ch = cmd_getc ();
2810 } 2784 }
2811 2785
2812 /* read any numerical arguments */ 2786 /* read any numerical arguments */
2855 { 2829 {
2856 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt, 2830 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2857 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2831 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2858 // 2832 //
2859 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2833 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2860 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2834 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2861 // that we do not support xterm mouse reporting (should be 95 when we do). 2835 // versions.
2862 // 2836 //
2863 tt_printf ("\033[>%d;94;0c", 'U'); 2837 tt_printf ("\033[>%d;95;0c", 'U');
2864 } 2838 }
2865 break; 2839 break;
2840
2866 case '?': 2841 case '?':
2867 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2842 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2868 process_terminal_mode (ch, priv, nargs, arg); 2843 process_terminal_mode (ch, priv, nargs, arg);
2869 break; 2844 break;
2845
2846 case '!':
2847 if (ch == CSI_70)
2848 {
2849 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2850 scr_soft_reset ();
2851
2852 static const int pm_h[] = { 7, 25 };
2853 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 };
2854
2855 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h);
2856 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l);
2870 } 2857 }
2858 break;
2859 }
2860
2871 return; 2861 return;
2872 } 2862 }
2873 2863
2874 switch (ch) 2864 switch (ch)
2875 { 2865 {
3304 3294
3305/* 3295/*
3306 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3296 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3307 */ 3297 */
3308void 3298void
3309rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3299rxvt_term::process_xterm_seq (int op, char *str, char resp)
3310{ 3300{
3311 int color; 3301 int color;
3312 char *buf, *name; 3302 char *buf, *name;
3313 bool query = str[0] == '?' && !str[1]; 3303 bool query = str[0] == '?' && !str[1];
3314 int saveop = op; 3304 int saveop = op;
3355 3345
3356 XFree (value); 3346 XFree (value);
3357 } 3347 }
3358 else 3348 else
3359 { 3349 {
3360 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3350 char *eq = strchr (str, '=');
3361 3351
3362 if (eq) 3352 if (eq)
3363 { 3353 {
3364 *eq = 0; 3354 *eq = 0;
3365 set_utf8_property (display->atom (str), eq + 1); 3355 set_utf8_property (display->atom (str), eq + 1);
3386 *buf++ = '\0'; 3376 *buf++ = '\0';
3387 3377
3388 process_color_seq (op, color, name, resp); 3378 process_color_seq (op, color, name, resp);
3389 } 3379 }
3390 break; 3380 break;
3381 case Rxvt_restoreFG:
3391 case XTerm_Color00: 3382 case XTerm_Color00:
3392 process_color_seq (op, Color_fg, str, resp); 3383 process_color_seq (op, Color_fg, str, resp);
3393 break; 3384 break;
3385 case Rxvt_restoreBG:
3394 case XTerm_Color01: 3386 case XTerm_Color01:
3395 process_color_seq (op, Color_bg, str, resp); 3387 process_color_seq (op, Color_bg, str, resp);
3396 break; 3388 break;
3397#ifndef NO_CURSORCOLOR 3389#ifndef NO_CURSORCOLOR
3398 case XTerm_Color_cursor: 3390 case XTerm_Color_cursor:
3419 break; 3411 break;
3420 case URxvt_Color_IT: 3412 case URxvt_Color_IT:
3421 process_color_seq (op, Color_IT, str, resp); 3413 process_color_seq (op, Color_IT, str, resp);
3422 break; 3414 break;
3423#endif 3415#endif
3416 case URxvt_Color_border:
3417 process_color_seq (op, Color_border, str, resp);
3418 break;
3424#if ENABLE_TRANSPARENCY 3419#if ENABLE_TRANSPARENCY
3425 case URxvt_Color_tint: 3420 case URxvt_Color_tint:
3426 process_color_seq (op, Color_tint, str, resp); 3421 process_color_seq (op, Color_tint, str, resp);
3427 { 3422 {
3428 bool changed = false; 3423 bool changed = false;
3424
3429 if (ISSET_PIXCOLOR (Color_tint)) 3425 if (ISSET_PIXCOLOR (Color_tint))
3430 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3426 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3431 else 3427 else
3432 changed = bgPixmap.unset_tint (); 3428 changed = bgPixmap.unset_tint ();
3429
3433 if (changed) 3430 if (changed)
3434 update_background (); 3431 update_background ();
3435 } 3432 }
3436 3433
3437 break; 3434 break;
3438#endif 3435#endif
3439 3436
3440#if XPM_BACKGROUND 3437#if BG_IMAGE_FROM_FILE
3441 case Rxvt_Pixmap: 3438 case Rxvt_Pixmap:
3442 if (!strcmp (str, "?")) 3439 if (!strcmp (str, "?"))
3443 { 3440 {
3444 char str[256]; 3441 char str[256];
3445 3442
3446 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3443 sprintf (str, "[%dx%d+%d+%d]",
3447 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3444 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3448 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3445 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3449 process_xterm_seq (XTerm_title, str, CHAR_ST); 3446 process_xterm_seq (XTerm_title, str, CHAR_ST);
3450 } 3447 }
3451 else 3448 else
3460 changed++; 3457 changed++;
3461 str = strchr (str, ';'); 3458 str = strchr (str, ';');
3462 if (str == NULL) 3459 if (str == NULL)
3463 bgPixmap.set_defaultGeometry (); 3460 bgPixmap.set_defaultGeometry ();
3464 } 3461 }
3462
3465 while (str) 3463 while (str)
3466 { 3464 {
3467 str++; 3465 str++;
3468 if (bgPixmap.set_geometry (str)) 3466 if (bgPixmap.set_geometry (str))
3469 changed++; 3467 changed++;
3470 str = strchr (str, ';'); 3468 str = strchr (str, ';');
3471 } 3469 }
3470
3472 if (changed) 3471 if (changed)
3473 update_background (); 3472 update_background ();
3474 } 3473 }
3475 break; 3474 break;
3476#endif 3475#endif
3477
3478 case Rxvt_restoreFG:
3479 set_window_color (Color_fg, str);
3480 break;
3481 case Rxvt_restoreBG:
3482 set_window_color (Color_bg, str);
3483 break;
3484 3476
3485 case XTerm_logfile: 3477 case XTerm_logfile:
3486 // TODO, when secure mode? 3478 // TODO, when secure mode?
3487 break; 3479 break;
3488 3480
3555 break; 3547 break;
3556#endif 3548#endif
3557 3549
3558#if ENABLE_PERL 3550#if ENABLE_PERL
3559 case URxvt_perl: 3551 case URxvt_perl:
3560 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3552 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3561 ; // no responses yet
3562 break; 3553 break;
3563#endif 3554#endif
3564 } 3555 }
3565} 3556}
3566/*----------------------------------------------------------------------*/ 3557/*----------------------------------------------------------------------*/
3589 { 3580 {
3590 if (mode == 'r') 3581 if (mode == 'r')
3591 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3582 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3592 else 3583 else
3593 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3584 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3594 PrivMode (state, bit); 3585 set_privmode (bit, state);
3595 } 3586 }
3596 3587
3597 return state; 3588 return state;
3598} 3589}
3599 3590
3607 static const struct 3598 static const struct
3608 { 3599 {
3609 const int argval; 3600 const int argval;
3610 const unsigned long bit; 3601 const unsigned long bit;
3611 } argtopriv[] = { 3602 } argtopriv[] = {
3612 { 1, PrivMode_aplCUR }, 3603 { 1, PrivMode_aplCUR }, // DECCKM
3613 { 2, PrivMode_vt52 }, 3604 { 2, PrivMode_vt52 },
3614 { 3, PrivMode_132 }, 3605 { 3, PrivMode_132 }, // DECCOLM
3615 { 4, PrivMode_smoothScroll }, 3606 { 4, PrivMode_smoothScroll }, // DECSCLM
3616 { 5, PrivMode_rVideo }, 3607 { 5, PrivMode_rVideo }, // DECSCNM
3617 { 6, PrivMode_relOrigin }, 3608 { 6, PrivMode_relOrigin }, // DECOM
3618 { 7, PrivMode_Autowrap }, 3609 { 7, PrivMode_Autowrap }, // DECAWM
3619 // 8, bi-directional support mode 3610 // 8, auto-repeat keys // DECARM
3620 { 9, PrivMode_MouseX10 }, 3611 { 9, PrivMode_MouseX10 },
3621 // 18, 19 printing-related 3612 // 18 end FF to printer after print screen
3613 // 19 Print screen prints full screen/scorll region
3622 { 25, PrivMode_VisibleCursor }, 3614 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3623#ifdef scrollBar_esc 3615#ifdef scrollBar_esc
3624 { scrollBar_esc, PrivMode_scrollBar }, 3616 { scrollBar_esc, PrivMode_scrollBar },
3625#endif 3617#endif
3626 { 35, PrivMode_ShiftKeys }, // rxvt extension 3618 { 35, PrivMode_ShiftKeys }, // rxvt extension
3619 // 38, tektronix mode // DECTEK
3627 { 40, PrivMode_132OK }, 3620 { 40, PrivMode_132OK },
3628 // 41 xterm more fixes NYI 3621 // 41 xterm more fixes NYI
3629 // 45 margin bell NYI 3622 // 45 margin bell NYI
3630 // 46 start logging 3623 // 46 start logging
3631 { 47, PrivMode_Screen }, 3624 { 47, PrivMode_Screen },
3632 { 66, PrivMode_aplKP }, 3625 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
3633#ifndef NO_BACKSPACE_KEY 3626#ifndef NO_BACKSPACE_KEY
3634 { 67, PrivMode_BackSpace }, 3627 { 67, PrivMode_BackSpace }, // DECBKM
3635#endif 3628#endif
3636 { 1000, PrivMode_MouseX11 }, 3629 { 1000, PrivMode_MouseX11 },
3637 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3630 { 1002, PrivMode_MouseBtnEvent },
3638 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3631 { 1003, PrivMode_MouseAnyEvent },
3639 // 1003 Use All Motion Mouse Tracking. NYI, TODO
3640 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3632 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3641 { 1011, PrivMode_Keypress }, // rxvt extension 3633 { 1011, PrivMode_Keypress }, // rxvt extension
3642 // 1035 enable modifiers for alt, numlock NYI 3634 // 1035 enable modifiers for alt, numlock NYI
3643 // 1036 send ESC for meta keys NYI 3635 // 1036 send ESC for meta keys NYI
3644 // 1037 send DEL for keypad delete NYI 3636 // 1037 send DEL for keypad delete NYI
3645 { 1047, PrivMode_Screen }, 3637 { 1047, PrivMode_Screen },
3646 // 1048 save and restore cursor 3638 // 1048 save and restore cursor
3647 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3639 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3648 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3640 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3641 { 2004, PrivMode_BracketPaste },
3649 }; 3642 };
3650 3643
3651 if (nargs == 0) 3644 if (nargs == 0)
3652 return; 3645 return;
3653 3646
3678 3671
3679 scr_touch (true); 3672 scr_touch (true);
3680 break; 3673 break;
3681#endif 3674#endif
3682 case 1048: /* alternative cursor save */ 3675 case 1048: /* alternative cursor save */
3683 case 1049:
3684 if (option (Opt_secondaryScreen)) 3676 if (option (Opt_secondaryScreen))
3685 if (mode == 0) 3677 if (mode == 0)
3686 scr_cursor (RESTORE); 3678 scr_cursor (RESTORE);
3687 else if (mode == 1) 3679 else if (mode == 1)
3688 scr_cursor (SAVE); 3680 scr_cursor (SAVE);
3697 case 2: /* VT52 mode */ 3689 case 2: /* VT52 mode */
3698 /* oddball mode. should be set regardless of set/reset 3690 /* oddball mode. should be set regardless of set/reset
3699 * parameter. Return from VT52 mode with an ESC < from 3691 * parameter. Return from VT52 mode with an ESC < from
3700 * within VT52 mode 3692 * within VT52 mode
3701 */ 3693 */
3702 PrivMode (1, PrivMode_vt52); 3694 set_privmode (PrivMode_vt52, 1);
3703 break; 3695 break;
3704 case 3: /* 80/132 */ 3696 case 3: /* 80/132 */
3705 if (priv_modes & PrivMode_132OK) 3697 if (priv_modes & PrivMode_132OK)
3706 set_widthheight (((state ? 132 : 80) * fwidth), height); 3698 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3707 break; 3699 break;
3708 case 4: /* smooth scrolling */ 3700 case 4: /* smooth scrolling */
3709 set_option (Opt_jumpScroll, !state); 3701 set_option (Opt_jumpScroll, !state);
3710 break; 3702 break;
3711 case 5: /* reverse video */ 3703 case 5: /* reverse video */
3718 scr_autowrap (state); 3710 scr_autowrap (state);
3719 break; 3711 break;
3720 /* case 8: - auto repeat, can't do on a per window basis */ 3712 /* case 8: - auto repeat, can't do on a per window basis */
3721 case 9: /* X10 mouse reporting */ 3713 case 9: /* X10 mouse reporting */
3722 if (state) /* orthogonal */ 3714 if (state) /* orthogonal */
3723 priv_modes &= ~PrivMode_MouseX11; 3715 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3724 break; 3716 break;
3725#ifdef scrollBar_esc 3717#ifdef scrollBar_esc
3726 case scrollBar_esc: 3718 case scrollBar_esc:
3727 if (scrollbar_mapping (state)) 3719 if (scrollBar.map (state))
3728 { 3720 {
3729 resize_all_windows (0, 0, 0); 3721 resize_all_windows (0, 0, 0);
3730 scr_touch (true); 3722 scr_touch (true);
3731 } 3723 }
3732 break; 3724 break;
3741 break; 3733 break;
3742 /* case 66: - application key pad */ 3734 /* case 66: - application key pad */
3743 /* case 67: - backspace key */ 3735 /* case 67: - backspace key */
3744 case 1000: /* X11 mouse reporting */ 3736 case 1000: /* X11 mouse reporting */
3745 if (state) /* orthogonal */ 3737 if (state) /* orthogonal */
3746 priv_modes &= ~PrivMode_MouseX10; 3738 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3747 break; 3739 break;
3748#if 0
3749 case 1001: 3740 case 1002:
3750 break; /* X11 mouse highlighting */ 3741 case 1003:
3751#endif 3742 if (state)
3743 {
3744 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3745 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3746 vt_emask_mouse = PointerMotionMask;
3747 }
3748 else
3749 vt_emask_mouse = NoEventMask;
3750
3751 vt_select_input ();
3752 break;
3752 case 1010: /* scroll to bottom on TTY output inhibit */ 3753 case 1010: /* scroll to bottom on TTY output inhibit */
3753 set_option (Opt_scrollTtyOutput, !state); 3754 set_option (Opt_scrollTtyOutput, !state);
3754 break; 3755 break;
3755 case 1011: /* scroll to bottom on key press */ 3756 case 1011: /* scroll to bottom on key press */
3756 set_option (Opt_scrollTtyKeypress, state); 3757 set_option (Opt_scrollTtyKeypress, state);
3757 break; 3758 break;
3758 case 1047: /* secondary screen w/ clearing last */ 3759 case 1047: /* secondary screen w/ clearing last */
3759 if (option (Opt_secondaryScreen)) 3760 if (option (Opt_secondaryScreen))
3760 if (current_screen != PRIMARY) 3761 if (!state)
3761 scr_erase_screen (2); 3762 scr_erase_screen (2);
3763
3762 scr_change_screen (state); 3764 scr_change_screen (state);
3763 break; 3765 break;
3764 case 1049: /* secondary screen w/ clearing first */ 3766 case 1049: /* secondary screen w/ clearing first */
3767 if (option (Opt_secondaryScreen))
3768 if (state)
3769 scr_cursor (SAVE);
3770
3765 scr_change_screen (state); 3771 scr_change_screen (state);
3772
3766 if (option (Opt_secondaryScreen)) 3773 if (option (Opt_secondaryScreen))
3767 if (current_screen != PRIMARY) 3774 if (state)
3768 scr_erase_screen (2); 3775 scr_erase_screen (2);
3776 else
3777 scr_cursor (RESTORE);
3769 break; 3778 break;
3770 default: 3779 default:
3771 break; 3780 break;
3772 } 3781 }
3773 } 3782 }
3933rxvt_term::process_graphics () 3942rxvt_term::process_graphics ()
3934{ 3943{
3935 unicode_t ch, cmd = cmd_getc (); 3944 unicode_t ch, cmd = cmd_getc ();
3936 3945
3937 if (cmd == 'Q') 3946 if (cmd == 'Q')
3947 {
3938 { /* query graphics */ 3948 /* query graphics */
3939 tt_printf ("\033G0\012"); /* no graphics */ 3949 tt_printf ("\033G0\012"); /* no graphics */
3940 return; 3950 return;
3941 } 3951 }
3942 /* swallow other graphics sequences until terminating ':' */ 3952 /* swallow other graphics sequences until terminating ':' */
3943 do 3953 do
3993 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4003 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
3994 4004
3995 memcpy (v_buffer + v_buflen, data, len); 4005 memcpy (v_buffer + v_buflen, data, len);
3996 v_buflen += len; 4006 v_buflen += len;
3997 4007
3998 pty_ev.set (EVENT_READ | EVENT_WRITE); 4008 pty_ev.set (ev::READ | ev::WRITE);
3999} 4009}
4000 4010
4001void rxvt_term::pty_write () 4011void rxvt_term::pty_write ()
4002{ 4012{
4003 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));
4008 4018
4009 if (v_buflen == 0) 4019 if (v_buflen == 0)
4010 { 4020 {
4011 free (v_buffer); 4021 free (v_buffer);
4012 v_buffer = 0; 4022 v_buffer = 0;
4013 v_buflen = 0;
4014 4023
4015 pty_ev.set (EVENT_READ); 4024 pty_ev.set (ev::READ);
4016 return; 4025 return;
4017 } 4026 }
4018 4027
4019 memmove (v_buffer, v_buffer + written, v_buflen); 4028 memmove (v_buffer, v_buffer + written, v_buflen);
4020 } 4029 }
4021 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4030 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4022 pty_ev.set (EVENT_READ); 4031 pty_ev.set (ev::READ);
4023} 4032}
4024 4033
4025/*----------------------- end-of-file (C source) -----------------------*/ 4034/*----------------------- end-of-file (C source) -----------------------*/
4026 4035

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines