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.396 by ayin, Sun Jan 20 14:12:39 2008 UTC vs.
Revision 1.457 by sf-exg, Fri Oct 22 18:03:10 2010 UTC

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 + hex 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 {
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
279 } 285 }
280 286
281 iso14755buf = 0; 287 iso14755buf = 0;
282} 288}
283 289
284int 290static int
285rxvt_term::hex_keyval (XKeyEvent &ev) 291hex_keyval (XKeyEvent &ev)
286{ 292{
287 // check wether this event corresponds to a hex digit 293 // check whether this event corresponds to a hex digit
288 // if the modifiers had not been pressed. 294 // if the modifiers had not been pressed.
289 for (int index = 0; index < 8; index++) 295 for (int index = 0; index < 8; index++)
290 { 296 {
291 KeySym k = XLookupKeysym (&ev, index); 297 KeySym k = XLookupKeysym (&ev, index);
292 298
298 304
299 return -1; 305 return -1;
300} 306}
301#endif 307#endif
302 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
303void 404void
304rxvt_term::key_press (XKeyEvent &ev) 405rxvt_term::key_press (XKeyEvent &ev)
305{ 406{
306 int ctrl, meta, shft, len; 407 int ctrl, meta, shft, len;
307 unsigned int newlen;
308 KeySym keysym; 408 KeySym keysym;
309 int valid_keysym; 409 int valid_keysym;
310 char kbuf[KBUFSZ]; 410 char kbuf[KBUFSZ];
311 411
312#if ISO_14755 412#if ISO_14755
321 * Always permit `shift' to override the current setting 421 * Always permit `shift' to override the current setting
322 */ 422 */
323 shft = ev.state & ShiftMask; 423 shft = ev.state & ShiftMask;
324 ctrl = ev.state & ControlMask; 424 ctrl = ev.state & ControlMask;
325 meta = ev.state & ModMetaMask; 425 meta = ev.state & ModMetaMask;
326
327 if (numlock_state || (ev.state & ModNumLockMask))
328 {
329 numlock_state = (ev.state & ModNumLockMask);
330 PrivMode ((!numlock_state), PrivMode_aplKP);
331 }
332 426
333 kbuf[0] = 0; 427 kbuf[0] = 0;
334 428
335#ifdef USE_XIM 429#ifdef USE_XIM
336 if (Input_Context) 430 if (Input_Context)
411#ifdef PAGING_CONTEXT_LINES 505#ifdef PAGING_CONTEXT_LINES
412 lnsppg = nrow - PAGING_CONTEXT_LINES; 506 lnsppg = nrow - PAGING_CONTEXT_LINES;
413#else 507#else
414 lnsppg = nrow * 4 / 5; 508 lnsppg = nrow * 4 / 5;
415#endif 509#endif
510 max_it (lnsppg, 1);
511
416 if (keysym == XK_Prior) 512 if (keysym == XK_Prior)
417 { 513 {
418 scr_page (UP, lnsppg); 514 scr_page (UP, lnsppg);
419 return; 515 return;
420 } 516 }
485 } 581 }
486 } 582 }
487 583
488#if ENABLE_FRILLS || ISO_14755 584#if ENABLE_FRILLS || ISO_14755
489 // ISO 14755 support 585 // ISO 14755 support
490 if (shft && ctrl) 586 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
491 { 587 {
492 int hv; 588 int hv;
493 589
494 if (iso14755buf & ISO_14755_51 590 if (iso14755buf & ISO_14755_51
495 && (keysym == XK_space || keysym == XK_KP_Space 591 && (keysym == XK_space || keysym == XK_KP_Space
525 scr_overlay_off (); 621 scr_overlay_off ();
526# endif 622# endif
527 iso14755buf = 0; 623 iso14755buf = 0;
528 } 624 }
529 } 625 }
626 else if (option (Opt_iso14755) &&
530 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 627 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
531 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 628 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
532 if (!(iso14755buf & ISO_14755_STARTED)) 629 if (!(iso14755buf & ISO_14755_STARTED))
533 { 630 {
534 iso14755buf |= ISO_14755_STARTED; 631 iso14755buf |= ISO_14755_STARTED;
535# if ISO_14755 632# if ISO_14755
536 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 633 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
547 } 644 }
548#endif 645#endif
549 646
550 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 647 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
551 { 648 {
649 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
650 unsigned int newlen = 1;
651
652 if (ev.state & ModNumLockMask)
653 kp = false;
654
655 keysym = translate_keypad (keysym, kp);
656
657 switch (keysym)
552 { 658 {
553 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; 659#ifndef NO_BACKSPACE_KEY
554 newlen = 1; 660 case XK_BackSpace:
555#ifdef XK_KP_Home 661 if (priv_modes & PrivMode_HaveBackSpace)
556 static const KeySym keypadtrans[] = { 662 {
557 XK_KP_7, // XK_KP_Home 663 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
558 XK_KP_4, // XK_KP_Left 664 ^ !!ctrl) ? '\b' : '\177';
559 XK_KP_8, // XK_KP_Up 665 kbuf[1] = '\0';
560 XK_KP_6, // XK_KP_Right
561 XK_KP_2, // XK_KP_Down
562#ifndef UNSHIFTED_SCROLLKEYS
563 XK_KP_9, // XK_KP_Prior
564 XK_KP_3, // XK_KP_Next
565#else
566 XK_Prior,
567 XK_Next,
568#endif
569 XK_KP_1, // XK_KP_End
570 XK_KP_5, // XK_KP_Begin
571 }; 666 }
667 else
668 strcpy (kbuf, rs[Rs_backspace_key]);
669 break;
670#endif
671#ifndef NO_DELETE_KEY
672 case XK_Delete:
673 strcpy (kbuf, rs[Rs_delete_key]);
674 break;
675#endif
676 case XK_Tab:
677 if (shft)
678 strcpy (kbuf, "\033[Z");
679 else
680 {
681#ifdef CTRL_TAB_MAKES_META
682 if (ctrl)
683 meta = 1;
684#endif
685#ifdef MOD4_TAB_MAKES_META
686 if (ev.state & Mod4Mask)
687 meta = 1;
688#endif
689 newlen = 0;
690 }
691 break;
572 692
573 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin)) 693 case XK_Up: /* "\033[A" */
694 case XK_Down: /* "\033[B" */
695 case XK_Right: /* "\033[C" */
696 case XK_Left: /* "\033[D" */
697 strcpy (kbuf, "\033[Z");
698 kbuf[2] = "DACB"[keysym - XK_Left];
699 /* do Shift first */
700 if (shft)
701 kbuf[2] = "dacb"[keysym - XK_Left];
702 else if (ctrl)
703 {
704 kbuf[1] = 'O';
705 kbuf[2] = "dacb"[keysym - XK_Left];
706 }
707 else if (priv_modes & PrivMode_aplCUR)
708 kbuf[1] = 'O';
709 break;
710
711 case XK_KP_Enter:
712 /* allow shift to override */
713 if (kp)
714 {
715 strcpy (kbuf, "\033OM");
716 break;
717 }
718
719 /* FALLTHROUGH */
720
721 case XK_Return:
722 if (priv_modes & PrivMode_LFNL)
723 {
724 kbuf[0] = '\015';
725 kbuf[1] = '\012';
726 kbuf[2] = '\0';
727 }
728 else
729 {
730 kbuf[0] = '\015';
731 kbuf[1] = '\0';
732 }
733 break;
734
735 case XK_KP_F1: /* "\033OP" */
736 case XK_KP_F2: /* "\033OQ" */
737 case XK_KP_F3: /* "\033OR" */
738 case XK_KP_F4: /* "\033OS" */
739 strcpy (kbuf, "\033OP");
740 kbuf[2] += (keysym - XK_KP_F1);
741 break;
742
743 case XK_KP_Multiply: /* "\033Oj" : "*" */
744 case XK_KP_Add: /* "\033Ok" : "+" */
745 case XK_KP_Separator: /* "\033Ol" : "," */
746 case XK_KP_Subtract: /* "\033Om" : "-" */
747 case XK_KP_Decimal: /* "\033On" : "." */
748 case XK_KP_Divide: /* "\033Oo" : "/" */
749 case XK_KP_0: /* "\033Op" : "0" */
750 case XK_KP_1: /* "\033Oq" : "1" */
751 case XK_KP_2: /* "\033Or" : "2" */
752 case XK_KP_3: /* "\033Os" : "3" */
753 case XK_KP_4: /* "\033Ot" : "4" */
754 case XK_KP_5: /* "\033Ou" : "5" */
755 case XK_KP_6: /* "\033Ov" : "6" */
756 case XK_KP_7: /* "\033Ow" : "7" */
757 case XK_KP_8: /* "\033Ox" : "8" */
758 case XK_KP_9: /* "\033Oy" : "9" */
759 /* allow shift to override */
760 if (kp)
761 {
762 strcpy (kbuf, "\033Oj");
763 kbuf[2] += (keysym - XK_KP_Multiply);
764 }
765 else
766 {
767 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
768 kbuf[1] = '\0';
769 }
770 break;
771
772 default:
574 { 773 {
575 unsigned int index = keysym - XK_KP_Home; 774 int param = map_function_key (keysym);
576 keysym = kp ? keypadtrans[index] : XK_Home + index; 775 if (param > 0)
776 sprintf (kbuf,"\033[%d~", param);
777 else
778 newlen = 0;
577 } 779 }
578 else if (keysym == XK_KP_Insert)
579 keysym = kp ? XK_KP_0 : XK_Insert;
580#ifndef NO_DELETE_KEY
581 else if (keysym == XK_KP_Delete)
582 keysym = kp ? XK_KP_Decimal : XK_Delete;
583#endif
584#endif
585 switch (keysym)
586 {
587#ifndef NO_BACKSPACE_KEY
588 case XK_BackSpace:
589 if (priv_modes & PrivMode_HaveBackSpace)
590 {
591 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
592 ^ !!ctrl) ? '\b' : '\177';
593 kbuf[1] = '\0';
594 }
595 else
596 strcpy (kbuf, rs[Rs_backspace_key]);
597 break; 780 break;
598#endif
599#ifndef NO_DELETE_KEY
600 case XK_Delete:
601 strcpy (kbuf, rs[Rs_delete_key]);
602 break;
603#endif
604 case XK_Tab:
605 if (shft)
606 strcpy (kbuf, "\033[Z");
607 else
608 {
609#ifdef CTRL_TAB_MAKES_META
610 if (ctrl)
611 meta = 1;
612#endif
613#ifdef MOD4_TAB_MAKES_META
614 if (ev.state & Mod4Mask)
615 meta = 1;
616#endif
617 newlen = 0;
618 }
619 break;
620
621 case XK_Up: /* "\033[A" */
622 case XK_Down: /* "\033[B" */
623 case XK_Right: /* "\033[C" */
624 case XK_Left: /* "\033[D" */
625 strcpy (kbuf, "\033[Z");
626 kbuf[2] = "DACB"[keysym - XK_Left];
627 /* do Shift first */
628 if (shft)
629 kbuf[2] = "dacb"[keysym - XK_Left];
630 else if (ctrl)
631 {
632 kbuf[1] = 'O';
633 kbuf[2] = "dacb"[keysym - XK_Left];
634 }
635 else if (priv_modes & PrivMode_aplCUR)
636 kbuf[1] = 'O';
637 break;
638
639#ifndef UNSHIFTED_SCROLLKEYS
640 case XK_Prior:
641 strcpy (kbuf, "\033[5~");
642 break;
643 case XK_Next:
644 strcpy (kbuf, "\033[6~");
645 break;
646#endif
647 case XK_KP_Enter:
648 /* allow shift to override */
649 if (kp)
650 {
651 strcpy (kbuf, "\033OM");
652 break;
653 }
654
655 /* FALLTHROUGH */
656
657 case XK_Return:
658 if (priv_modes & PrivMode_LFNL)
659 {
660 kbuf[0] = '\015';
661 kbuf[1] = '\012';
662 kbuf[2] = '\0';
663 }
664 else
665 {
666 kbuf[0] = '\015';
667 kbuf[1] = '\0';
668 }
669 break;
670
671 case XK_KP_F1: /* "\033OP" */
672 case XK_KP_F2: /* "\033OQ" */
673 case XK_KP_F3: /* "\033OR" */
674 case XK_KP_F4: /* "\033OS" */
675 strcpy (kbuf, "\033OP");
676 kbuf[2] += (keysym - XK_KP_F1);
677 break;
678
679 case XK_KP_Multiply: /* "\033Oj" : "*" */
680 case XK_KP_Add: /* "\033Ok" : "+" */
681 case XK_KP_Separator: /* "\033Ol" : "," */
682 case XK_KP_Subtract: /* "\033Om" : "-" */
683 case XK_KP_Decimal: /* "\033On" : "." */
684 case XK_KP_Divide: /* "\033Oo" : "/" */
685 case XK_KP_0: /* "\033Op" : "0" */
686 case XK_KP_1: /* "\033Oq" : "1" */
687 case XK_KP_2: /* "\033Or" : "2" */
688 case XK_KP_3: /* "\033Os" : "3" */
689 case XK_KP_4: /* "\033Ot" : "4" */
690 case XK_KP_5: /* "\033Ou" : "5" */
691 case XK_KP_6: /* "\033Ov" : "6" */
692 case XK_KP_7: /* "\033Ow" : "7" */
693 case XK_KP_8: /* "\033Ox" : "8" */
694 case XK_KP_9: /* "\033Oy" : "9" */
695 /* allow shift to override */
696 if (kp)
697 {
698 strcpy (kbuf, "\033Oj");
699 kbuf[2] += (keysym - XK_KP_Multiply);
700 }
701 else
702 {
703 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
704 kbuf[1] = '\0';
705 }
706 break;
707
708 case XK_Find:
709 strcpy (kbuf, "\033[1~");
710 break;
711
712 case XK_Insert:
713 strcpy (kbuf, "\033[2~");
714 break;
715#ifdef DXK_Remove /* support for DEC remove like key */
716 case DXK_Remove:
717 /* FALLTHROUGH */
718#endif
719 case XK_Execute:
720 strcpy (kbuf, "\033[3~");
721 break;
722 case XK_Select:
723 strcpy (kbuf, "\033[4~");
724 break;
725 case XK_End:
726 strcpy (kbuf, KS_END);
727 break;
728 case XK_Home:
729 strcpy (kbuf, KS_HOME);
730 break;
731
732#define FKEY(n, fkey) \
733 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
734
735 case XK_F1: /* "\033[11~" */
736 case XK_F2: /* "\033[12~" */
737 case XK_F3: /* "\033[13~" */
738 case XK_F4: /* "\033[14~" */
739 case XK_F5: /* "\033[15~" */
740 FKEY (11, XK_F1);
741 break;
742 case XK_F6: /* "\033[17~" */
743 case XK_F7: /* "\033[18~" */
744 case XK_F8: /* "\033[19~" */
745 case XK_F9: /* "\033[20~" */
746 case XK_F10: /* "\033[21~" */
747 FKEY (17, XK_F6);
748 break;
749 case XK_F11: /* "\033[23~" */
750 case XK_F12: /* "\033[24~" */
751 case XK_F13: /* "\033[25~" */
752 case XK_F14: /* "\033[26~" */
753 FKEY (23, XK_F11);
754 break;
755 case XK_F15: /* "\033[28~" */
756 case XK_F16: /* "\033[29~" */
757 FKEY (28, XK_F15);
758 break;
759 case XK_Help: /* "\033[28~" */
760 FKEY (28, XK_Help);
761 break;
762 case XK_Menu: /* "\033[29~" */
763 FKEY (29, XK_Menu);
764 break;
765 case XK_F17: /* "\033[31~" */
766 case XK_F18: /* "\033[32~" */
767 case XK_F19: /* "\033[33~" */
768 case XK_F20: /* "\033[34~" */
769 case XK_F21: /* "\033[35~" */
770 case XK_F22: /* "\033[36~" */
771 case XK_F23: /* "\033[37~" */
772 case XK_F24: /* "\033[38~" */
773 case XK_F25: /* "\033[39~" */
774 case XK_F26: /* "\033[40~" */
775 case XK_F27: /* "\033[41~" */
776 case XK_F28: /* "\033[42~" */
777 case XK_F29: /* "\033[43~" */
778 case XK_F30: /* "\033[44~" */
779 case XK_F31: /* "\033[45~" */
780 case XK_F32: /* "\033[46~" */
781 case XK_F33: /* "\033[47~" */
782 case XK_F34: /* "\033[48~" */
783 case XK_F35: /* "\033[49~" */
784 FKEY (31, XK_F17);
785 break;
786#undef FKEY
787 default:
788 newlen = 0;
789 break;
790 }
791
792 if (newlen)
793 len = strlen (kbuf);
794 } 781 }
782
783 if (newlen)
784 len = strlen (kbuf);
795 785
796 /* 786 /*
797 * Pass meta for all function keys, if 'meta' option set 787 * Pass meta for all function keys, if 'meta' option set
798 */ 788 */
799#ifdef META8_OPTION 789#ifdef META8_OPTION
985rxvt_term::flush () 975rxvt_term::flush ()
986{ 976{
987 flush_ev.stop (); 977 flush_ev.stop ();
988 978
989#ifdef HAVE_BG_PIXMAP 979#ifdef HAVE_BG_PIXMAP
990 if (bgPixmap.check_clearChanged ()) 980 if (bgPixmap.flags & bgPixmap_t::hasChanged)
991 { 981 {
982 bgPixmap.flags &= ~bgPixmap_t::hasChanged;
992// scr_clear (true); This needs to be researched further! 983// scr_clear (true); This needs to be researched further!
993 scr_touch (false); 984 scr_touch (false);
994 } 985 }
995#endif 986#endif
996 987
1033 } 1024 }
1034 while (row < end_row); 1025 while (row < end_row);
1035 } 1026 }
1036 1027
1037 scr_refresh (); 1028 scr_refresh ();
1038 scrollbar_show (1); 1029 scrollBar.show (1);
1039#ifdef USE_XIM 1030#ifdef USE_XIM
1040 IMSendSpot (); 1031 IMSendSpot ();
1041#endif 1032#endif
1042 } 1033 }
1043 1034
1044 display->flush (); 1035 display->flush ();
1045} 1036}
1046 1037
1047/* checks wether a refresh is requested and starts the refresh timer */ 1038/* checks whether a refresh is requested and starts the refresh timer */
1048void 1039void
1049rxvt_term::refresh_check () 1040rxvt_term::refresh_check ()
1050{ 1041{
1051 if (want_refresh && !flush_ev.is_active ()) 1042 if (want_refresh && !flush_ev.is_active ())
1052 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally 1043 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1090 1081
1091#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1082#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1092void 1083void
1093rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1084rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1094{ 1085{
1095 if ((scrollbar_isUp () || scrollbar_isDn ()) 1086 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1096 && scr_page (scrollbar_isUp () ? UP : DN, 1)) 1087 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1097 { 1088 {
1098 want_refresh = 1; 1089 want_refresh = 1;
1099 refresh_check (); 1090 refresh_check ();
1100 } 1091 }
1101 else 1092 else
1145 { 1136 {
1146 // this should really be sched_yield(), but the linux guys thought 1137 // this should really be sched_yield(), but the linux guys thought
1147 // that giving a process calling sched_yield () less cpu time than 1138 // that giving a process calling sched_yield () less cpu time than
1148 // 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
1149 // 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.
1150 1144
1151 struct timespec ts = { 0, 0 }; 1145 struct timespec ts = { 0, 1000 };
1152 nanosleep (&ts, 0); 1146 nanosleep (&ts, 0);
1153 1147
1154 w.stop (); 1148 w.stop ();
1155 } 1149 }
1156 1150
1206{ 1200{
1207 make_current (); 1201 make_current ();
1208 1202
1209 if (revents & ev::READ) 1203 if (revents & ev::READ)
1210 // loop, but don't allow a single term to monopolize us 1204 // loop, but don't allow a single term to monopolize us
1211 while (pty_fill ()) 1205 for (int i = CBUFCNT; i-- && pty_fill (); )
1212 if (cmd_parse ()) 1206 cmd_parse ();
1213 break;
1214 1207
1215 if (revents & ev::WRITE) 1208 if (revents & ev::WRITE)
1216 pty_write (); 1209 pty_write ();
1217 1210
1218 refresh_check (); 1211 refresh_check ();
1438 && ev.xfocus.mode != NotifyGrab) 1431 && ev.xfocus.mode != NotifyGrab)
1439 focus_out (); 1432 focus_out ();
1440 break; 1433 break;
1441 1434
1442 case ConfigureNotify: 1435 case ConfigureNotify:
1443 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1444 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1445 szHint.width, szHint.height); */
1446 if (ev.xconfigure.window == parent[0]) 1436 if (ev.xconfigure.window == parent[0])
1447 { 1437 {
1448 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1438 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1449 ; 1439 ;
1450 1440
1477 selection_property (ev.xproperty.window, ev.xproperty.atom); 1467 selection_property (ev.xproperty.window, ev.xproperty.atom);
1478 1468
1479 break; 1469 break;
1480 1470
1481 case SelectionClear: 1471 case SelectionClear:
1482 selection_clear (); 1472 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1483 break; 1473 break;
1484 1474
1485 case SelectionNotify: 1475 case SelectionNotify:
1486 if (selection_wait == Sel_normal) 1476 if (selection_wait == Sel_normal)
1487 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1477 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1491 selection_send (ev.xselectionrequest); 1481 selection_send (ev.xselectionrequest);
1492 break; 1482 break;
1493 1483
1494 case MapNotify: 1484 case MapNotify:
1495#ifdef HAVE_BG_PIXMAP 1485#ifdef HAVE_BG_PIXMAP
1496 /* This is needed spcifically to fix the case of no window manager or a 1486 /* This is needed specifically to fix the case of no window manager or a
1497 * non-reparenting window manager. In those cases we never get first 1487 * non-reparenting window manager. In those cases we never get first
1498 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1488 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1499 * care of multiplicity of ConfigureNotify events arriwing while WM does 1489 * care of multiplicity of ConfigureNotify events arriving while WM does
1500 * reparenting. 1490 * reparenting.
1501 * We should not render background immidiately, as there could be several 1491 * We should not render background immediately, as there could be several
1502 * ConfigureNotify's to follow. Lets take care of all of them in one scoop 1492 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1503 * by scheduling background redraw as soon as we can, but giving a short 1493 * by scheduling background redraw as soon as we can, but giving a short
1504 * bit of time for ConfigureNotifies to arrive. 1494 * bit of time for ConfigureNotifies to arrive.
1505 * We should render background PRIOR to drawing any text, but AFTER all 1495 * We should render background PRIOR to drawing any text, but AFTER all
1506 * of ConfigureNotifys for the best results. 1496 * of ConfigureNotifys for the best results.
1553 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1543 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1554 ; 1544 ;
1555 1545
1556 if (scrollBar.state && ev.xany.window == scrollBar.win) 1546 if (scrollBar.state && ev.xany.window == scrollBar.win)
1557 { 1547 {
1558 scrollBar.setIdle (); 1548 scrollBar.state = STATE_IDLE;
1559 scrollbar_show (0); 1549 scrollBar.show (0);
1560 } 1550 }
1561 } 1551 }
1562 break; 1552 break;
1563 1553
1564 case MotionNotify: 1554 case MotionNotify:
1651#ifdef MOUSE_THRESHOLD 1641#ifdef MOUSE_THRESHOLD
1652 } 1642 }
1653#endif 1643#endif
1654 } 1644 }
1655 } 1645 }
1656 else if (scrollbar_isMotion () && ev.xany.window == scrollBar.win) 1646 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1657 { 1647 {
1658 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1648 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1659 MotionNotify, &ev)) 1649 MotionNotify, &ev))
1660 ; 1650 ;
1661 1651
1663 &unused_root, &unused_child, 1653 &unused_root, &unused_child,
1664 &unused_root_x, &unused_root_y, 1654 &unused_root_x, &unused_root_y,
1665 &ev.xbutton.x, &ev.xbutton.y, 1655 &ev.xbutton.x, &ev.xbutton.y,
1666 &unused_mask); 1656 &unused_mask);
1667 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1657 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1668 scrollbar_size ()); 1658 scrollBar.size ());
1669 want_refresh = 1; 1659 want_refresh = 1;
1670 scrollbar_show (1); 1660 scrollBar.show (1);
1671 } 1661 }
1672 break; 1662 break;
1673 } 1663 }
1674 1664
1675#if defined(CURSOR_BLINK) 1665#if defined(CURSOR_BLINK)
1700#endif 1690#endif
1701 1691
1702 refresh_check (); 1692 refresh_check ();
1703} 1693}
1704 1694
1695#if ENABLE_FRILLS
1696void
1697rxvt_term::set_urgency (bool enable)
1698{
1699 if (enable == urgency_hint)
1700 return;
1701
1702 if (XWMHints *h = XGetWMHints (dpy, parent[0]))
1703 {
1704 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1705 XSetWMHints (dpy, parent[0], h);
1706 urgency_hint = enable;
1707 }
1708}
1709#endif
1710
1705void 1711void
1706rxvt_term::focus_in () 1712rxvt_term::focus_in ()
1707{ 1713{
1708 if (!focus) 1714 if (!focus)
1709 { 1715 {
1710 focus = 1; 1716 focus = 1;
1711 want_refresh = 1; 1717 want_refresh = 1;
1712
1713 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1714 1718
1715#if USE_XIM 1719#if USE_XIM
1716 if (Input_Context != NULL) 1720 if (Input_Context != NULL)
1717 { 1721 {
1718 IMSetPosition (); 1722 IMSetPosition ();
1730 scr_recolour (); 1734 scr_recolour ();
1731 } 1735 }
1732#endif 1736#endif
1733#if ENABLE_FRILLS 1737#if ENABLE_FRILLS
1734 if (option (Opt_urgentOnBell)) 1738 if (option (Opt_urgentOnBell))
1735 { 1739 set_urgency (0);
1736 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1737 {
1738 h->flags &= ~XUrgencyHint;
1739 XSetWMHints (dpy, parent[0], h);
1740 }
1741 }
1742#endif 1740#endif
1741
1742 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1743 } 1743 }
1744} 1744}
1745 1745
1746void 1746void
1747rxvt_term::focus_out () 1747rxvt_term::focus_out ()
1749 if (focus) 1749 if (focus)
1750 { 1750 {
1751 focus = 0; 1751 focus = 0;
1752 want_refresh = 1; 1752 want_refresh = 1;
1753 1753
1754 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1754#if ENABLE_FRILLS
1755 1755 if (option (Opt_urgentOnBell))
1756 set_urgency (0);
1757#endif
1756#if ENABLE_FRILLS || ISO_14755 1758#if ENABLE_FRILLS || ISO_14755
1757 if (iso14755buf) 1759 if (iso14755buf)
1758 { 1760 {
1759 iso14755buf = 0; 1761 iso14755buf = 0;
1760# if ISO_14755 1762# if ISO_14755
1777 { 1779 {
1778 pix_colors = pix_colors_unfocused; 1780 pix_colors = pix_colors_unfocused;
1779 scr_recolour (); 1781 scr_recolour ();
1780 } 1782 }
1781#endif 1783#endif
1784
1785 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1782 } 1786 }
1783} 1787}
1784 1788
1785void 1789void
1786rxvt_term::update_fade_color (unsigned int idx) 1790rxvt_term::update_fade_color (unsigned int idx)
1863 /* save the xbutton state (for ButtonRelease) */ 1867 /* save the xbutton state (for ButtonRelease) */
1864 MEvent.state = ev.state; 1868 MEvent.state = ev.state;
1865#ifdef MOUSE_REPORT_DOUBLECLICK 1869#ifdef MOUSE_REPORT_DOUBLECLICK
1866 if (ev.button == MEvent.button && clickintime) 1870 if (ev.button == MEvent.button && clickintime)
1867 { 1871 {
1868 /* same button, within alloted time */ 1872 /* same button, within allowed time */
1869 MEvent.clicks++; 1873 MEvent.clicks++;
1870 1874
1871 if (MEvent.clicks > 1) 1875 if (MEvent.clicks > 1)
1872 { 1876 {
1873 /* only report double clicks */ 1877 /* only report double clicks */
1947 /* 1951 /*
1948 * Scrollbar window processing of button press 1952 * Scrollbar window processing of button press
1949 */ 1953 */
1950 if (scrollBar.state && ev.window == scrollBar.win) 1954 if (scrollBar.state && ev.window == scrollBar.win)
1951 { 1955 {
1952 scrollBar.setIdle (); 1956 page_dirn direction = NO_DIR;
1957
1958 if (scrollBar.upButton (ev.y))
1959 direction = UP; /* up */
1960 else if (scrollBar.dnButton (ev.y))
1961 direction = DN; /* down */
1962
1963 scrollBar.state = STATE_IDLE;
1953 /* 1964 /*
1954 * Rxvt-style scrollbar: 1965 * Rxvt-style scrollbar:
1955 * move up if mouse is above slider 1966 * move up if mouse is above slider
1956 * move dn if mouse is below slider 1967 * move dn if mouse is below slider
1957 * 1968 *
1966 /* 1977 /*
1967 * Mouse report disabled scrollbar: 1978 * Mouse report disabled scrollbar:
1968 * arrow buttons - send up/down 1979 * arrow buttons - send up/down
1969 * click on scrollbar - send pageup/down 1980 * click on scrollbar - send pageup/down
1970 */ 1981 */
1971 if ((scrollBar.style == R_SB_NEXT 1982 if (direction == UP)
1972 && scrollbarnext_upButton (ev.y))
1973 || (scrollBar.style == R_SB_RXVT
1974 && scrollbarrxvt_upButton (ev.y)))
1975 tt_printf ("\033[A"); 1983 tt_printf ("\033[A");
1976 else if ((scrollBar.style == R_SB_NEXT 1984 else if (direction == DN)
1977 && scrollbarnext_dnButton (ev.y))
1978 || (scrollBar.style == R_SB_RXVT
1979 && scrollbarrxvt_dnButton (ev.y)))
1980 tt_printf ("\033[B"); 1985 tt_printf ("\033[B");
1981 else 1986 else
1982 switch (ev.button) 1987 switch (ev.button)
1983 { 1988 {
1984 case Button2: 1989 case Button2:
1992 break; 1997 break;
1993 } 1998 }
1994 } 1999 }
1995 else 2000 else
1996#endif /* NO_SCROLLBAR_REPORT */ 2001#endif /* NO_SCROLLBAR_REPORT */
1997
1998 {
1999 char upordown = 0;
2000
2001 if (scrollBar.style == R_SB_NEXT)
2002 { 2002 {
2003 if (scrollbarnext_upButton (ev.y)) 2003 if (direction != NO_DIR)
2004 upordown = -1; /* up */
2005 else if (scrollbarnext_dnButton (ev.y))
2006 upordown = 1; /* down */
2007 }
2008 else if (scrollBar.style == R_SB_RXVT)
2009 {
2010 if (scrollbarrxvt_upButton (ev.y))
2011 upordown = -1; /* up */
2012 else if (scrollbarrxvt_dnButton (ev.y))
2013 upordown = 1; /* down */
2014 }
2015
2016 if (upordown)
2017 { 2004 {
2018#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2005#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2019 if (!cont_scroll_ev.is_active ()) 2006 if (!cont_scroll_ev.is_active ())
2020 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2007 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2021#endif 2008#endif
2022 if (scr_page (upordown < 0 ? UP : DN, 1)) 2009 if (scr_page (direction, 1))
2023 { 2010 {
2024 if (upordown < 0) 2011 if (direction == UP)
2025 scrollBar.setUp (); 2012 scrollBar.state = STATE_UP;
2026 else 2013 else
2027 scrollBar.setDn (); 2014 scrollBar.state = STATE_DOWN;
2028 } 2015 }
2029 } 2016 }
2030 else 2017 else
2031 switch (ev.button) 2018 switch (ev.button)
2032 { 2019 {
2045 } 2032 }
2046 2033
2047 if (scrollBar.style == R_SB_XTERM 2034 if (scrollBar.style == R_SB_XTERM
2048 || scrollbar_above_slider (ev.y) 2035 || scrollbar_above_slider (ev.y)
2049 || scrollbar_below_slider (ev.y)) 2036 || scrollbar_below_slider (ev.y))
2050 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2037 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2051 2038
2052 scrollBar.setMotion (); 2039 scrollBar.state = STATE_MOTION;
2053 break; 2040 break;
2054 2041
2055 case Button1: 2042 case Button1:
2056 if (scrollBar.align == R_SB_ALIGN_CENTRE) 2043 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2057 csrO = ev.y - scrollBar.top; 2044 csrO = ev.y - scrollBar.top;
2071 scr_page (DN, nrow - 1); 2058 scr_page (DN, nrow - 1);
2072# else 2059# else
2073 scr_page (DN, nrow / 4); 2060 scr_page (DN, nrow / 4);
2074# endif 2061# endif
2075 else 2062 else
2076 scrollBar.setMotion (); 2063 scrollBar.state = STATE_MOTION;
2077 } 2064 }
2078 else 2065 else
2079 { 2066 {
2080 scr_page ((ev.button == Button1 ? DN : UP), 2067 scr_page ((ev.button == Button1 ? DN : UP),
2081 (nrow 2068 (nrow
2082 * scrollbar_position (ev.y) 2069 * scrollbar_position (ev.y)
2083 / scrollbar_size ())); 2070 / scrollBar.size ()));
2084 } 2071 }
2085 2072
2086 break; 2073 break;
2087 } 2074 }
2088 } 2075 }
2098 2085
2099 csrO = 0; /* reset csr Offset */ 2086 csrO = 0; /* reset csr Offset */
2100 if (!bypass_keystate) 2087 if (!bypass_keystate)
2101 reportmode = !! (priv_modes & PrivMode_mouse_report); 2088 reportmode = !! (priv_modes & PrivMode_mouse_report);
2102 2089
2103 if (scrollbar_isUpDn ()) 2090 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2104 { 2091 {
2105 scrollBar.setIdle (); 2092 scrollBar.state = STATE_IDLE;
2106 scrollbar_show (0); 2093 scrollBar.show (0);
2107 } 2094 }
2108 2095
2109#ifdef SELECTION_SCROLLING 2096#ifdef SELECTION_SCROLLING
2110 sel_scroll_ev.stop(); 2097 sel_scroll_ev.stop();
2111#endif 2098#endif
2161 selection_make (ev.time); 2148 selection_make (ev.time);
2162 break; 2149 break;
2163 2150
2164 case Button2: 2151 case Button2:
2165 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2152 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2166 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2153 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2167 break; 2154 break;
2168 2155
2169#ifdef MOUSE_WHEEL 2156#ifdef MOUSE_WHEEL
2170 case Button4: 2157 case Button4:
2171 case Button5: 2158 case Button5:
2194 } 2181 }
2195 else 2182 else
2196# endif 2183# endif
2197 { 2184 {
2198 scr_page (v, i); 2185 scr_page (v, i);
2199 scrollbar_show (1); 2186 scrollBar.show (1);
2200 } 2187 }
2201 } 2188 }
2202 break; 2189 break;
2203#endif 2190#endif
2204 } 2191 }
2205 } 2192 }
2206} 2193}
2207 2194
2208/*}}} */ 2195/*}}} */
2209 2196
2210bool 2197void
2211rxvt_term::cmd_parse () 2198rxvt_term::cmd_parse ()
2212{ 2199{
2213 bool flag = false;
2214 wchar_t ch = NOCHAR; 2200 wchar_t ch = NOCHAR;
2215 char *seq_begin; // remember start of esc-sequence here 2201 char *seq_begin; // remember start of esc-sequence here
2216 2202
2217 for (;;) 2203 for (;;)
2218 { 2204 {
2219 if (ch == NOCHAR) 2205 if (expect_false (ch == NOCHAR))
2220 { 2206 {
2221 seq_begin = cmdbuf_ptr; 2207 seq_begin = cmdbuf_ptr;
2222 ch = next_char (); 2208 ch = next_char ();
2223 2209
2224 if (ch == NOCHAR) 2210 if (ch == NOCHAR)
2225 break; 2211 break;
2226 } 2212 }
2227 2213
2228 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2214 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2229 { 2215 {
2230 if (!seen_input) 2216 if (expect_false (!seen_input))
2231 { 2217 {
2232 seen_input = 1; 2218 seen_input = 1;
2233 // many badly-written programs (e.g. jed) contain a race condition: 2219 // many badly-written programs (e.g. jed) contain a race condition:
2234 // they first read the screensize and then install a SIGWINCH handler. 2220 // they first read the screensize and then install a SIGWINCH handler.
2235 // some window managers resize the window early, and these programs 2221 // some window managers resize the window early, and these programs
2248 wchar_t *str = buf; 2234 wchar_t *str = buf;
2249 wchar_t *eol = str + min (ncol, UBUFSIZ); 2235 wchar_t *eol = str + min (ncol, UBUFSIZ);
2250 2236
2251 for (;;) 2237 for (;;)
2252 { 2238 {
2253 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2239 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2254 break; 2240 break;
2255 2241
2256 *str++ = ch; 2242 *str++ = ch;
2257 2243
2258 if (ch == C0_LF || str >= eol) 2244 if (expect_false (ch == C0_LF || str >= eol))
2259 { 2245 {
2260 if (ch == C0_LF) 2246 if (ch == C0_LF)
2261 nlines++; 2247 nlines++;
2262 2248
2263 refresh_count++; 2249 refresh_count++;
2312 * What the heck we'll cheat and only refresh less than every page-full. 2298 * What the heck we'll cheat and only refresh less than every page-full.
2313 * if skipScroll is enabled. 2299 * if skipScroll is enabled.
2314 */ 2300 */
2315 if (refreshnow) 2301 if (refreshnow)
2316 { 2302 {
2317 flag = true;
2318 scr_refresh (); 2303 scr_refresh ();
2319 want_refresh = 1; 2304 want_refresh = 1;
2320 } 2305 }
2321
2322 } 2306 }
2323 else 2307 else
2324 { 2308 {
2325 try 2309 try
2326 { 2310 {
2334 } 2318 }
2335 2319
2336 ch = NOCHAR; 2320 ch = NOCHAR;
2337 } 2321 }
2338 } 2322 }
2339
2340 return flag;
2341} 2323}
2342 2324
2343// read the next character 2325// read the next character
2344wchar_t 2326wchar_t
2345rxvt_term::next_char () NOTHROW 2327rxvt_term::next_char () NOTHROW
2346{ 2328{
2347 while (cmdbuf_ptr < cmdbuf_endp) 2329 while (cmdbuf_ptr < cmdbuf_endp)
2348 { 2330 {
2349 // assume 7-bit to be ascii ALWAYS 2331 // assume 7-bit to be ascii ALWAYS
2350 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2332 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2351 return *cmdbuf_ptr++; 2333 return *cmdbuf_ptr++;
2352 2334
2353 wchar_t wc; 2335 wchar_t wc;
2354 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2336 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2355 2337
2359 cmdbuf_ptr = cmdbuf_endp; 2341 cmdbuf_ptr = cmdbuf_endp;
2360 break; 2342 break;
2361 } 2343 }
2362 2344
2363 if (len == (size_t)-1) 2345 if (len == (size_t)-1)
2346 {
2347 mbstate.reset (); // reset now undefined conversion state
2364 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2348 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2349 }
2365 2350
2366 // assume wchar == unicode 2351 // assume wchar == unicode
2367 cmdbuf_ptr += len; 2352 cmdbuf_ptr += len;
2368 return wc & UNICODE_MASK; 2353 return wc & UNICODE_MASK;
2369 } 2354 }
2413/*----------------------------------------------------------------------*/ 2398/*----------------------------------------------------------------------*/
2414#ifdef PRINTPIPE 2399#ifdef PRINTPIPE
2415FILE * 2400FILE *
2416rxvt_term::popen_printer () 2401rxvt_term::popen_printer ()
2417{ 2402{
2418 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2403 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2419 2404
2420 if (stream == NULL) 2405 if (stream == NULL)
2421 rxvt_warn ("can't open printer pipe, not printing.\n"); 2406 rxvt_warn ("can't open printer pipe, not printing.\n");
2422 2407
2423 return stream; 2408 return stream;
2434 * simulate attached vt100 printer 2419 * simulate attached vt100 printer
2435 */ 2420 */
2436void 2421void
2437rxvt_term::process_print_pipe () 2422rxvt_term::process_print_pipe ()
2438{ 2423{
2439 int done; 2424 FILE *fd = popen_printer ();
2440 FILE *fd;
2441 2425
2442 if ((fd = popen_printer ()) == NULL) 2426 if (!fd)
2443 return; 2427 return;
2444 2428
2445 /* 2429 /*
2446 * Send all input to the printer until either ESC[4i or ESC[?4i 2430 * Send all input to the printer until either ESC[4i or ESC[?4i
2447 * is received. 2431 * is received.
2448 */ 2432 */
2449 for (done = 0; !done;) 2433 for (int done = 0; !done; )
2450 { 2434 {
2451 unsigned char buf[8]; 2435 unsigned char buf[8];
2452 unicode_t ch; 2436 unicode_t ch;
2453 unsigned int i, len; 2437 unsigned int i, len;
2454 2438
2599 break; 2583 break;
2600 case 'Z': /* identify the terminal type */ 2584 case 'Z': /* identify the terminal type */
2601 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2585 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2602 break; 2586 break;
2603 case '<': /* turn off VT52 mode */ 2587 case '<': /* turn off VT52 mode */
2604 PrivMode (0, PrivMode_vt52); 2588 set_privmode (PrivMode_vt52, 0);
2605 break; 2589 break;
2606 case 'F': /* use special graphics character set */ 2590 case 'F': /* use special graphics character set */
2607 case 'G': /* use regular character set */ 2591 case 'G': /* use regular character set */
2608 /* unimplemented */ 2592 /* unimplemented */
2609 break; 2593 break;
2663 scr_forwardindex (); 2647 scr_forwardindex ();
2664 break; 2648 break;
2665#endif 2649#endif
2666 case '=': 2650 case '=':
2667 case '>': 2651 case '>':
2668 PrivMode ((ch == '='), PrivMode_aplKP); 2652 set_privmode (PrivMode_aplKP, ch == '=');
2669 break; 2653 break;
2670 2654
2671 case C1_40: 2655 case C1_40:
2672 cmd_getc (); 2656 cmd_getc ();
2673 break; 2657 break;
2712 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2696 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2713 case C1_SCI: /* ESC Z */ 2697 case C1_SCI: /* ESC Z */
2714 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2698 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2715 break; /* steal obsolete ESC [ c */ 2699 break; /* steal obsolete ESC [ c */
2716 2700
2717 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2701 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2718 case C1_CSI: /* ESC [ */ 2702 case C1_CSI: /* ESC [ */
2719 process_csi_seq (); 2703 process_csi_seq ();
2720 break; 2704 break;
2721 2705
2722 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2706 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2723 case C1_OSC: /* ESC ] */ 2707 case C1_OSC: /* ESC ] */
2724 process_osc_seq (); 2708 process_osc_seq ();
2725 break; 2709 break;
2726 2710
2727 /* 8.3.106: RESET TO INITIAL STATE */ 2711 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2728 case 'c': 2712 case 'c':
2729 mbstate.reset (); 2713 mbstate.reset ();
2730 scr_poweron (); 2714 scr_poweron ();
2731 scrollbar_show (1); 2715 scrollBar.show (1);
2732 break; 2716 break;
2733 2717
2734 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2718 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2735 case 'n': 2719 case 'n':
2736 scr_charset_choose (2); 2720 scr_charset_choose (2);
2787 2771
2788 nargs = 0; 2772 nargs = 0;
2789 2773
2790 priv = 0; 2774 priv = 0;
2791 ch = cmd_getc (); 2775 ch = cmd_getc ();
2792 if (ch >= '<' && ch <= '?') 2776 if ((ch >= '<' && ch <= '?') || ch == '!')
2793 { 2777 {
2794 /* '<' '=' '>' '?' */ 2778 /* '<' '=' '>' '?' '!' */
2795 priv = ch; 2779 priv = ch;
2796 ch = cmd_getc (); 2780 ch = cmd_getc ();
2797 } 2781 }
2798 2782
2799 /* read any numerical arguments */ 2783 /* read any numerical arguments */
2853 2837
2854 case '?': 2838 case '?':
2855 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2839 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2856 process_terminal_mode (ch, priv, nargs, arg); 2840 process_terminal_mode (ch, priv, nargs, arg);
2857 break; 2841 break;
2842
2843 case '!':
2844 if (ch == CSI_70)
2845 {
2846 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2847 scr_soft_reset ();
2848
2849 static const int pm_h[] = { 7, 25 };
2850 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 };
2851
2852 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h);
2853 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l);
2858 } 2854 }
2855 break;
2856 }
2857
2859 return; 2858 return;
2860 } 2859 }
2861 2860
2862 switch (ch) 2861 switch (ch)
2863 { 2862 {
3230 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3229 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3231 */ 3230 */
3232void 3231void
3233rxvt_term::process_dcs_seq () 3232rxvt_term::process_dcs_seq ()
3234{ 3233{
3235 char *s;
3236 unicode_t eh;
3237
3238 /* 3234 /*
3239 * Not handled yet 3235 * Not handled yet
3240 */ 3236 */
3237
3238 unicode_t eh;
3241 s = get_to_st (eh); 3239 char *s = get_to_st (eh);
3242 if (s) 3240 if (s)
3243 free (s); 3241 free (s);
3244 3242
3245 return; 3243 return;
3246} 3244}
3250 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3248 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3251 */ 3249 */
3252void 3250void
3253rxvt_term::process_osc_seq () 3251rxvt_term::process_osc_seq ()
3254{ 3252{
3255 unicode_t ch, eh;
3256 int arg; 3253 int arg;
3257 3254
3258 ch = cmd_getc (); 3255 unicode_t ch = cmd_getc ();
3259 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3256 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3260 arg = arg * 10 + (ch - '0'); 3257 arg = arg * 10 + (ch - '0');
3261 3258
3262 if (ch == ';') 3259 if (ch == ';')
3263 { 3260 {
3261 unicode_t eh;
3264 char *s = get_to_st (eh); 3262 char *s = get_to_st (eh);
3265 3263
3266 if (s) 3264 if (s)
3267 { 3265 {
3268 process_xterm_seq (arg, s, eh); 3266 process_xterm_seq (arg, s, eh);
3292 3290
3293/* 3291/*
3294 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3292 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3295 */ 3293 */
3296void 3294void
3297rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3295rxvt_term::process_xterm_seq (int op, char *str, char resp)
3298{ 3296{
3299 int color; 3297 int color;
3300 char *buf, *name; 3298 char *buf, *name;
3301 bool query = str[0] == '?' && !str[1]; 3299 bool query = str[0] == '?' && !str[1];
3302 int saveop = op; 3300 int saveop = op;
3343 3341
3344 XFree (value); 3342 XFree (value);
3345 } 3343 }
3346 else 3344 else
3347 { 3345 {
3348 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3346 char *eq = strchr (str, '=');
3349 3347
3350 if (eq) 3348 if (eq)
3351 { 3349 {
3352 *eq = 0; 3350 *eq = 0;
3353 set_utf8_property (display->atom (str), eq + 1); 3351 set_utf8_property (display->atom (str), eq + 1);
3393 process_color_seq (op, Color_pointer_fg, str, resp); 3391 process_color_seq (op, Color_pointer_fg, str, resp);
3394 break; 3392 break;
3395 case XTerm_Color_pointer_bg: 3393 case XTerm_Color_pointer_bg:
3396 process_color_seq (op, Color_pointer_bg, str, resp); 3394 process_color_seq (op, Color_pointer_bg, str, resp);
3397 break; 3395 break;
3396#ifdef OPTION_HC
3397 case XTerm_Color_HC:
3398 process_color_seq (op, Color_HC, str, resp);
3399 break;
3400 case XTerm_Color_HTC:
3401 process_color_seq (op, Color_HTC, str, resp);
3402 break;
3403#endif
3398#ifndef NO_BOLD_UNDERLINE_REVERSE 3404#ifndef NO_BOLD_UNDERLINE_REVERSE
3399 case XTerm_Color_RV:
3400 process_color_seq (op, Color_RV, str, resp);
3401 break;
3402 case Rxvt_Color_BD:
3403 case URxvt_Color_BD: 3405 case URxvt_Color_BD:
3404 process_color_seq (op, Color_BD, str, resp); 3406 process_color_seq (op, Color_BD, str, resp);
3405 break; 3407 break;
3406 case Rxvt_Color_UL:
3407 case URxvt_Color_UL: 3408 case URxvt_Color_UL:
3408 process_color_seq (op, Color_UL, str, resp); 3409 process_color_seq (op, Color_UL, str, resp);
3409 break; 3410 break;
3410 case URxvt_Color_IT: 3411 case URxvt_Color_IT:
3411 process_color_seq (op, Color_IT, str, resp); 3412 process_color_seq (op, Color_IT, str, resp);
3412 break; 3413 break;
3413#endif 3414#endif
3415 case URxvt_Color_border:
3416 process_color_seq (op, Color_border, str, resp);
3417 break;
3414#if ENABLE_TRANSPARENCY 3418#if ENABLE_TRANSPARENCY
3415 case URxvt_Color_tint: 3419 case URxvt_Color_tint:
3416 process_color_seq (op, Color_tint, str, resp); 3420 process_color_seq (op, Color_tint, str, resp);
3417 { 3421 {
3418 bool changed = false; 3422 bool changed = false;
3433 case Rxvt_Pixmap: 3437 case Rxvt_Pixmap:
3434 if (!strcmp (str, "?")) 3438 if (!strcmp (str, "?"))
3435 { 3439 {
3436 char str[256]; 3440 char str[256];
3437 3441
3438 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3442 sprintf (str, "[%dx%d+%d+%d]",
3439 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3443 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3440 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3444 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3441 process_xterm_seq (XTerm_title, str, CHAR_ST); 3445 process_xterm_seq (XTerm_title, str, CHAR_ST);
3442 } 3446 }
3443 else 3447 else
3542 break; 3546 break;
3543#endif 3547#endif
3544 3548
3545#if ENABLE_PERL 3549#if ENABLE_PERL
3546 case URxvt_perl: 3550 case URxvt_perl:
3547 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3551 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3548 ; // no responses yet
3549 break; 3552 break;
3550#endif 3553#endif
3551 } 3554 }
3552} 3555}
3553/*----------------------------------------------------------------------*/ 3556/*----------------------------------------------------------------------*/
3576 { 3579 {
3577 if (mode == 'r') 3580 if (mode == 'r')
3578 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3581 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3579 else 3582 else
3580 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3583 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3581 PrivMode (state, bit); 3584
3585 set_privmode (bit, state);
3582 } 3586 }
3583 3587
3584 return state; 3588 return state;
3585} 3589}
3586 3590
3594 static const struct 3598 static const struct
3595 { 3599 {
3596 const int argval; 3600 const int argval;
3597 const unsigned long bit; 3601 const unsigned long bit;
3598 } argtopriv[] = { 3602 } argtopriv[] = {
3599 { 1, PrivMode_aplCUR }, 3603 { 1, PrivMode_aplCUR }, // DECCKM
3600 { 2, PrivMode_vt52 }, 3604 { 2, PrivMode_vt52 },
3601 { 3, PrivMode_132 }, 3605 { 3, PrivMode_132 }, // DECCOLM
3602 { 4, PrivMode_smoothScroll }, 3606 { 4, PrivMode_smoothScroll }, // DECSCLM
3603 { 5, PrivMode_rVideo }, 3607 { 5, PrivMode_rVideo }, // DECSCNM
3604 { 6, PrivMode_relOrigin }, 3608 { 6, PrivMode_relOrigin }, // DECOM
3605 { 7, PrivMode_Autowrap }, 3609 { 7, PrivMode_Autowrap }, // DECAWM
3606 // 8, bi-directional support mode 3610 // 8, auto-repeat keys // DECARM
3607 { 9, PrivMode_MouseX10 }, 3611 { 9, PrivMode_MouseX10 },
3608 // 18, 19 printing-related 3612 // 18 end FF to printer after print screen
3613 // 19 Print screen prints full screen/scroll region
3609 { 25, PrivMode_VisibleCursor }, 3614 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3610#ifdef scrollBar_esc 3615#ifdef scrollBar_esc
3611 { scrollBar_esc, PrivMode_scrollBar }, 3616 { scrollBar_esc, PrivMode_scrollBar },
3612#endif 3617#endif
3613 { 35, PrivMode_ShiftKeys }, // rxvt extension 3618 { 35, PrivMode_ShiftKeys }, // rxvt extension
3619 // 38, tektronix mode // DECTEK
3614 { 40, PrivMode_132OK }, 3620 { 40, PrivMode_132OK },
3615 // 41 xterm more fixes NYI 3621 // 41 xterm more fixes NYI
3616 // 45 margin bell NYI 3622 // 45 margin bell NYI
3617 // 46 start logging 3623 // 46 start logging
3618 { 47, PrivMode_Screen }, 3624 { 47, PrivMode_Screen },
3619 { 66, PrivMode_aplKP }, 3625 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
3620#ifndef NO_BACKSPACE_KEY 3626#ifndef NO_BACKSPACE_KEY
3621 { 67, PrivMode_BackSpace }, 3627 { 67, PrivMode_BackSpace }, // DECBKM
3622#endif 3628#endif
3623 { 1000, PrivMode_MouseX11 }, 3629 { 1000, PrivMode_MouseX11 },
3624 { 1002, PrivMode_MouseBtnEvent }, 3630 { 1002, PrivMode_MouseBtnEvent },
3625 { 1003, PrivMode_MouseAnyEvent }, 3631 { 1003, PrivMode_MouseAnyEvent },
3626 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3632 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3665 3671
3666 scr_touch (true); 3672 scr_touch (true);
3667 break; 3673 break;
3668#endif 3674#endif
3669 case 1048: /* alternative cursor save */ 3675 case 1048: /* alternative cursor save */
3670 case 1049:
3671 if (option (Opt_secondaryScreen)) 3676 if (option (Opt_secondaryScreen))
3672 if (mode == 0) 3677 if (mode == 0)
3673 scr_cursor (RESTORE); 3678 scr_cursor (RESTORE);
3674 else if (mode == 1) 3679 else if (mode == 1)
3675 scr_cursor (SAVE); 3680 scr_cursor (SAVE);
3684 case 2: /* VT52 mode */ 3689 case 2: /* VT52 mode */
3685 /* oddball mode. should be set regardless of set/reset 3690 /* oddball mode. should be set regardless of set/reset
3686 * parameter. Return from VT52 mode with an ESC < from 3691 * parameter. Return from VT52 mode with an ESC < from
3687 * within VT52 mode 3692 * within VT52 mode
3688 */ 3693 */
3689 PrivMode (1, PrivMode_vt52); 3694 set_privmode (PrivMode_vt52, 1);
3690 break; 3695 break;
3691 case 3: /* 80/132 */ 3696 case 3: /* 80/132 */
3692 if (priv_modes & PrivMode_132OK) 3697 if (priv_modes & PrivMode_132OK)
3693 {
3694 scr_poweron ();
3695 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight); 3698 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3696 }
3697 break; 3699 break;
3698 case 4: /* smooth scrolling */ 3700 case 4: /* smooth scrolling */
3699 set_option (Opt_jumpScroll, !state); 3701 set_option (Opt_jumpScroll, !state);
3700 break; 3702 break;
3701 case 5: /* reverse video */ 3703 case 5: /* reverse video */
3712 if (state) /* orthogonal */ 3714 if (state) /* orthogonal */
3713 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3715 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3714 break; 3716 break;
3715#ifdef scrollBar_esc 3717#ifdef scrollBar_esc
3716 case scrollBar_esc: 3718 case scrollBar_esc:
3717 if (scrollbar_mapping (state)) 3719 if (scrollBar.map (state))
3718 { 3720 {
3719 resize_all_windows (0, 0, 0); 3721 resize_all_windows (0, 0, 0);
3720 scr_touch (true); 3722 scr_touch (true);
3721 } 3723 }
3722 break; 3724 break;
3743 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3745 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3744 vt_emask_mouse = PointerMotionMask; 3746 vt_emask_mouse = PointerMotionMask;
3745 } 3747 }
3746 else 3748 else
3747 vt_emask_mouse = NoEventMask; 3749 vt_emask_mouse = NoEventMask;
3750
3748 vt_select_input (); 3751 vt_select_input ();
3749 break; 3752 break;
3750 case 1010: /* scroll to bottom on TTY output inhibit */ 3753 case 1010: /* scroll to bottom on TTY output inhibit */
3751 set_option (Opt_scrollTtyOutput, !state); 3754 set_option (Opt_scrollTtyOutput, !state);
3752 break; 3755 break;
3753 case 1011: /* scroll to bottom on key press */ 3756 case 1011: /* scroll to bottom on key press */
3754 set_option (Opt_scrollTtyKeypress, state); 3757 set_option (Opt_scrollTtyKeypress, state);
3755 break; 3758 break;
3756 case 1047: /* secondary screen w/ clearing last */ 3759 case 1047: /* secondary screen w/ clearing last */
3757 if (option (Opt_secondaryScreen)) 3760 if (option (Opt_secondaryScreen))
3758 if (current_screen != PRIMARY) 3761 if (!state)
3759 scr_erase_screen (2); 3762 scr_erase_screen (2);
3763
3760 scr_change_screen (state); 3764 scr_change_screen (state);
3761 break; 3765 break;
3762 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
3763 scr_change_screen (state); 3771 scr_change_screen (state);
3772
3764 if (option (Opt_secondaryScreen)) 3773 if (option (Opt_secondaryScreen))
3765 if (current_screen != PRIMARY) 3774 if (state)
3766 scr_erase_screen (2); 3775 scr_erase_screen (2);
3776 else
3777 scr_cursor (RESTORE);
3767 break; 3778 break;
3768 default: 3779 default:
3769 break; 3780 break;
3770 } 3781 }
3771 } 3782 }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines