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.394 by ayin, Sat Jan 19 15:00:49 2008 UTC vs.
Revision 1.456 by sf-exg, Fri Oct 22 16:49:26 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
1033 } 1023 }
1034 while (row < end_row); 1024 while (row < end_row);
1035 } 1025 }
1036 1026
1037 scr_refresh (); 1027 scr_refresh ();
1038 scrollbar_show (1); 1028 scrollBar.show (1);
1039#ifdef USE_XIM 1029#ifdef USE_XIM
1040 IMSendSpot (); 1030 IMSendSpot ();
1041#endif 1031#endif
1042 } 1032 }
1043 1033
1044 display->flush (); 1034 display->flush ();
1045} 1035}
1046 1036
1047/* checks wether a refresh is requested and starts the refresh timer */ 1037/* checks whether a refresh is requested and starts the refresh timer */
1048void 1038void
1049rxvt_term::refresh_check () 1039rxvt_term::refresh_check ()
1050{ 1040{
1051 if (want_refresh && !flush_ev.is_active ()) 1041 if (want_refresh && !flush_ev.is_active ())
1052 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally 1042 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1090 1080
1091#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1081#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1092void 1082void
1093rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1083rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1094{ 1084{
1095 if ((scrollbar_isUp () || scrollbar_isDn ()) 1085 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1096 && scr_page (scrollbar_isUp () ? UP : DN, 1)) 1086 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1097 { 1087 {
1098 want_refresh = 1; 1088 want_refresh = 1;
1099 refresh_check (); 1089 refresh_check ();
1100 } 1090 }
1101 else 1091 else
1145 { 1135 {
1146 // this should really be sched_yield(), but the linux guys thought 1136 // this should really be sched_yield(), but the linux guys thought
1147 // that giving a process calling sched_yield () less cpu time than 1137 // 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 1138 // ones with high nice levels is a useful thing to do. It surely is is
1149 // allowed by the sus... as is returning ENOSYS. 1139 // allowed by the sus... as is returning ENOSYS.
1140 // since the linux guys additionally thought that breaking the only
1141 // known workaround against their unusable sched_yield hack is cool,
1142 // we just nanosleep a bit and hope for the best.
1150 1143
1151 struct timespec ts = { 0, 0 }; 1144 struct timespec ts = { 0, 1000 };
1152 nanosleep (&ts, 0); 1145 nanosleep (&ts, 0);
1153 1146
1154 w.stop (); 1147 w.stop ();
1155 } 1148 }
1156 1149
1206{ 1199{
1207 make_current (); 1200 make_current ();
1208 1201
1209 if (revents & ev::READ) 1202 if (revents & ev::READ)
1210 // loop, but don't allow a single term to monopolize us 1203 // loop, but don't allow a single term to monopolize us
1211 while (pty_fill ()) 1204 for (int i = CBUFCNT; i-- && pty_fill (); )
1212 if (cmd_parse ()) 1205 cmd_parse ();
1213 break;
1214 1206
1215 if (revents & ev::WRITE) 1207 if (revents & ev::WRITE)
1216 pty_write (); 1208 pty_write ();
1217 1209
1218 refresh_check (); 1210 refresh_check ();
1438 && ev.xfocus.mode != NotifyGrab) 1430 && ev.xfocus.mode != NotifyGrab)
1439 focus_out (); 1431 focus_out ();
1440 break; 1432 break;
1441 1433
1442 case ConfigureNotify: 1434 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]) 1435 if (ev.xconfigure.window == parent[0])
1447 { 1436 {
1448 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1437 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1449 ; 1438 ;
1450 1439
1477 selection_property (ev.xproperty.window, ev.xproperty.atom); 1466 selection_property (ev.xproperty.window, ev.xproperty.atom);
1478 1467
1479 break; 1468 break;
1480 1469
1481 case SelectionClear: 1470 case SelectionClear:
1482 selection_clear (); 1471 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1483 break; 1472 break;
1484 1473
1485 case SelectionNotify: 1474 case SelectionNotify:
1486 if (selection_wait == Sel_normal) 1475 if (selection_wait == Sel_normal)
1487 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1476 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1491 selection_send (ev.xselectionrequest); 1480 selection_send (ev.xselectionrequest);
1492 break; 1481 break;
1493 1482
1494 case MapNotify: 1483 case MapNotify:
1495#ifdef HAVE_BG_PIXMAP 1484#ifdef HAVE_BG_PIXMAP
1496 /* This is needed spcifically to fix the case of no window manager or a 1485 /* 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 1486 * non-reparenting window manager. In those cases we never get first
1498 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1487 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1499 * care of multiplicity of ConfigureNotify events arriwing while WM does 1488 * care of multiplicity of ConfigureNotify events arriving while WM does
1500 * reparenting. 1489 * reparenting.
1501 * We should not render background immidiately, as there could be several 1490 * 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 1491 * 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 1492 * by scheduling background redraw as soon as we can, but giving a short
1504 * bit of time for ConfigureNotifies to arrive. 1493 * bit of time for ConfigureNotifies to arrive.
1505 * We should render background PRIOR to drawing any text, but AFTER all 1494 * We should render background PRIOR to drawing any text, but AFTER all
1506 * of ConfigureNotifys for the best results. 1495 * of ConfigureNotifys for the best results.
1553 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1542 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1554 ; 1543 ;
1555 1544
1556 if (scrollBar.state && ev.xany.window == scrollBar.win) 1545 if (scrollBar.state && ev.xany.window == scrollBar.win)
1557 { 1546 {
1558 scrollBar.setIdle (); 1547 scrollBar.state = STATE_IDLE;
1559 scrollbar_show (0); 1548 scrollBar.show (0);
1560 } 1549 }
1561 } 1550 }
1562 break; 1551 break;
1563 1552
1564 case MotionNotify: 1553 case MotionNotify:
1651#ifdef MOUSE_THRESHOLD 1640#ifdef MOUSE_THRESHOLD
1652 } 1641 }
1653#endif 1642#endif
1654 } 1643 }
1655 } 1644 }
1656 else if (scrollbar_isMotion () && ev.xany.window == scrollBar.win) 1645 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1657 { 1646 {
1658 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1647 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1659 MotionNotify, &ev)) 1648 MotionNotify, &ev))
1660 ; 1649 ;
1661 1650
1663 &unused_root, &unused_child, 1652 &unused_root, &unused_child,
1664 &unused_root_x, &unused_root_y, 1653 &unused_root_x, &unused_root_y,
1665 &ev.xbutton.x, &ev.xbutton.y, 1654 &ev.xbutton.x, &ev.xbutton.y,
1666 &unused_mask); 1655 &unused_mask);
1667 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1656 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1668 scrollbar_size ()); 1657 scrollBar.size ());
1669 want_refresh = 1; 1658 want_refresh = 1;
1670 scrollbar_show (1); 1659 scrollBar.show (1);
1671 } 1660 }
1672 break; 1661 break;
1673 } 1662 }
1674 1663
1675#if defined(CURSOR_BLINK) 1664#if defined(CURSOR_BLINK)
1700#endif 1689#endif
1701 1690
1702 refresh_check (); 1691 refresh_check ();
1703} 1692}
1704 1693
1694#if ENABLE_FRILLS
1695void
1696rxvt_term::set_urgency (bool enable)
1697{
1698 if (enable == urgency_hint)
1699 return;
1700
1701 if (XWMHints *h = XGetWMHints (dpy, parent[0]))
1702 {
1703 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1704 XSetWMHints (dpy, parent[0], h);
1705 urgency_hint = enable;
1706 }
1707}
1708#endif
1709
1705void 1710void
1706rxvt_term::focus_in () 1711rxvt_term::focus_in ()
1707{ 1712{
1708 if (!focus) 1713 if (!focus)
1709 { 1714 {
1710 focus = 1; 1715 focus = 1;
1711 want_refresh = 1; 1716 want_refresh = 1;
1712
1713 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1714 1717
1715#if USE_XIM 1718#if USE_XIM
1716 if (Input_Context != NULL) 1719 if (Input_Context != NULL)
1717 { 1720 {
1718 IMSetPosition (); 1721 IMSetPosition ();
1730 scr_recolour (); 1733 scr_recolour ();
1731 } 1734 }
1732#endif 1735#endif
1733#if ENABLE_FRILLS 1736#if ENABLE_FRILLS
1734 if (option (Opt_urgentOnBell)) 1737 if (option (Opt_urgentOnBell))
1735 { 1738 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 1739#endif
1740
1741 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1743 } 1742 }
1744} 1743}
1745 1744
1746void 1745void
1747rxvt_term::focus_out () 1746rxvt_term::focus_out ()
1749 if (focus) 1748 if (focus)
1750 { 1749 {
1751 focus = 0; 1750 focus = 0;
1752 want_refresh = 1; 1751 want_refresh = 1;
1753 1752
1754 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1753#if ENABLE_FRILLS
1755 1754 if (option (Opt_urgentOnBell))
1755 set_urgency (0);
1756#endif
1756#if ENABLE_FRILLS || ISO_14755 1757#if ENABLE_FRILLS || ISO_14755
1757 if (iso14755buf) 1758 if (iso14755buf)
1758 { 1759 {
1759 iso14755buf = 0; 1760 iso14755buf = 0;
1760# if ISO_14755 1761# if ISO_14755
1777 { 1778 {
1778 pix_colors = pix_colors_unfocused; 1779 pix_colors = pix_colors_unfocused;
1779 scr_recolour (); 1780 scr_recolour ();
1780 } 1781 }
1781#endif 1782#endif
1783
1784 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1782 } 1785 }
1783} 1786}
1784 1787
1785void 1788void
1786rxvt_term::update_fade_color (unsigned int idx) 1789rxvt_term::update_fade_color (unsigned int idx)
1863 /* save the xbutton state (for ButtonRelease) */ 1866 /* save the xbutton state (for ButtonRelease) */
1864 MEvent.state = ev.state; 1867 MEvent.state = ev.state;
1865#ifdef MOUSE_REPORT_DOUBLECLICK 1868#ifdef MOUSE_REPORT_DOUBLECLICK
1866 if (ev.button == MEvent.button && clickintime) 1869 if (ev.button == MEvent.button && clickintime)
1867 { 1870 {
1868 /* same button, within alloted time */ 1871 /* same button, within allowed time */
1869 MEvent.clicks++; 1872 MEvent.clicks++;
1870 1873
1871 if (MEvent.clicks > 1) 1874 if (MEvent.clicks > 1)
1872 { 1875 {
1873 /* only report double clicks */ 1876 /* only report double clicks */
1947 /* 1950 /*
1948 * Scrollbar window processing of button press 1951 * Scrollbar window processing of button press
1949 */ 1952 */
1950 if (scrollBar.state && ev.window == scrollBar.win) 1953 if (scrollBar.state && ev.window == scrollBar.win)
1951 { 1954 {
1952 scrollBar.setIdle (); 1955 page_dirn direction = NO_DIR;
1956
1957 if (scrollBar.upButton (ev.y))
1958 direction = UP; /* up */
1959 else if (scrollBar.dnButton (ev.y))
1960 direction = DN; /* down */
1961
1962 scrollBar.state = STATE_IDLE;
1953 /* 1963 /*
1954 * Rxvt-style scrollbar: 1964 * Rxvt-style scrollbar:
1955 * move up if mouse is above slider 1965 * move up if mouse is above slider
1956 * move dn if mouse is below slider 1966 * move dn if mouse is below slider
1957 * 1967 *
1966 /* 1976 /*
1967 * Mouse report disabled scrollbar: 1977 * Mouse report disabled scrollbar:
1968 * arrow buttons - send up/down 1978 * arrow buttons - send up/down
1969 * click on scrollbar - send pageup/down 1979 * click on scrollbar - send pageup/down
1970 */ 1980 */
1971 if ((scrollBar.style == R_SB_NEXT 1981 if (direction == UP)
1972 && scrollbarnext_upButton (ev.y))
1973 || (scrollBar.style == R_SB_RXVT
1974 && scrollbarrxvt_upButton (ev.y)))
1975 tt_printf ("\033[A"); 1982 tt_printf ("\033[A");
1976 else if ((scrollBar.style == R_SB_NEXT 1983 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"); 1984 tt_printf ("\033[B");
1981 else 1985 else
1982 switch (ev.button) 1986 switch (ev.button)
1983 { 1987 {
1984 case Button2: 1988 case Button2:
1992 break; 1996 break;
1993 } 1997 }
1994 } 1998 }
1995 else 1999 else
1996#endif /* NO_SCROLLBAR_REPORT */ 2000#endif /* NO_SCROLLBAR_REPORT */
1997
1998 {
1999 char upordown = 0;
2000
2001 if (scrollBar.style == R_SB_NEXT)
2002 { 2001 {
2003 if (scrollbarnext_upButton (ev.y)) 2002 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 { 2003 {
2018#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2004#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2019 if (!cont_scroll_ev.is_active ()) 2005 if (!cont_scroll_ev.is_active ())
2020 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2006 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2021#endif 2007#endif
2022 if (scr_page (upordown < 0 ? UP : DN, 1)) 2008 if (scr_page (direction, 1))
2023 { 2009 {
2024 if (upordown < 0) 2010 if (direction == UP)
2025 scrollBar.setUp (); 2011 scrollBar.state = STATE_UP;
2026 else 2012 else
2027 scrollBar.setDn (); 2013 scrollBar.state = STATE_DOWN;
2028 } 2014 }
2029 } 2015 }
2030 else 2016 else
2031 switch (ev.button) 2017 switch (ev.button)
2032 { 2018 {
2045 } 2031 }
2046 2032
2047 if (scrollBar.style == R_SB_XTERM 2033 if (scrollBar.style == R_SB_XTERM
2048 || scrollbar_above_slider (ev.y) 2034 || scrollbar_above_slider (ev.y)
2049 || scrollbar_below_slider (ev.y)) 2035 || scrollbar_below_slider (ev.y))
2050 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2036 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2051 2037
2052 scrollBar.setMotion (); 2038 scrollBar.state = STATE_MOTION;
2053 break; 2039 break;
2054 2040
2055 case Button1: 2041 case Button1:
2056 if (scrollBar.align == R_SB_ALIGN_CENTRE) 2042 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2057 csrO = ev.y - scrollBar.top; 2043 csrO = ev.y - scrollBar.top;
2071 scr_page (DN, nrow - 1); 2057 scr_page (DN, nrow - 1);
2072# else 2058# else
2073 scr_page (DN, nrow / 4); 2059 scr_page (DN, nrow / 4);
2074# endif 2060# endif
2075 else 2061 else
2076 scrollBar.setMotion (); 2062 scrollBar.state = STATE_MOTION;
2077 } 2063 }
2078 else 2064 else
2079 { 2065 {
2080 scr_page ((ev.button == Button1 ? DN : UP), 2066 scr_page ((ev.button == Button1 ? DN : UP),
2081 (nrow 2067 (nrow
2082 * scrollbar_position (ev.y) 2068 * scrollbar_position (ev.y)
2083 / scrollbar_size ())); 2069 / scrollBar.size ()));
2084 } 2070 }
2085 2071
2086 break; 2072 break;
2087 } 2073 }
2088 } 2074 }
2098 2084
2099 csrO = 0; /* reset csr Offset */ 2085 csrO = 0; /* reset csr Offset */
2100 if (!bypass_keystate) 2086 if (!bypass_keystate)
2101 reportmode = !! (priv_modes & PrivMode_mouse_report); 2087 reportmode = !! (priv_modes & PrivMode_mouse_report);
2102 2088
2103 if (scrollbar_isUpDn ()) 2089 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2104 { 2090 {
2105 scrollBar.setIdle (); 2091 scrollBar.state = STATE_IDLE;
2106 scrollbar_show (0); 2092 scrollBar.show (0);
2107 } 2093 }
2108 2094
2109#ifdef SELECTION_SCROLLING 2095#ifdef SELECTION_SCROLLING
2110 sel_scroll_ev.stop(); 2096 sel_scroll_ev.stop();
2111#endif 2097#endif
2161 selection_make (ev.time); 2147 selection_make (ev.time);
2162 break; 2148 break;
2163 2149
2164 case Button2: 2150 case Button2:
2165 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2151 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); 2152 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2167 break; 2153 break;
2168 2154
2169#ifdef MOUSE_WHEEL 2155#ifdef MOUSE_WHEEL
2170 case Button4: 2156 case Button4:
2171 case Button5: 2157 case Button5:
2194 } 2180 }
2195 else 2181 else
2196# endif 2182# endif
2197 { 2183 {
2198 scr_page (v, i); 2184 scr_page (v, i);
2199 scrollbar_show (1); 2185 scrollBar.show (1);
2200 } 2186 }
2201 } 2187 }
2202 break; 2188 break;
2203#endif 2189#endif
2204 } 2190 }
2205 } 2191 }
2206} 2192}
2207 2193
2208/*}}} */ 2194/*}}} */
2209 2195
2210bool 2196void
2211rxvt_term::cmd_parse () 2197rxvt_term::cmd_parse ()
2212{ 2198{
2213 bool flag = false;
2214 wchar_t ch = NOCHAR; 2199 wchar_t ch = NOCHAR;
2215 char *seq_begin; // remember start of esc-sequence here 2200 char *seq_begin; // remember start of esc-sequence here
2216 2201
2217 for (;;) 2202 for (;;)
2218 { 2203 {
2219 if (ch == NOCHAR) 2204 if (expect_false (ch == NOCHAR))
2220 { 2205 {
2221 seq_begin = cmdbuf_ptr; 2206 seq_begin = cmdbuf_ptr;
2222 ch = next_char (); 2207 ch = next_char ();
2223 2208
2224 if (ch == NOCHAR) 2209 if (ch == NOCHAR)
2225 break; 2210 break;
2226 } 2211 }
2227 2212
2228 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2213 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2229 { 2214 {
2230 if (!seen_input) 2215 if (expect_false (!seen_input))
2231 { 2216 {
2232 seen_input = 1; 2217 seen_input = 1;
2233 // many badly-written programs (e.g. jed) contain a race condition: 2218 // many badly-written programs (e.g. jed) contain a race condition:
2234 // they first read the screensize and then install a SIGWINCH handler. 2219 // they first read the screensize and then install a SIGWINCH handler.
2235 // some window managers resize the window early, and these programs 2220 // some window managers resize the window early, and these programs
2248 wchar_t *str = buf; 2233 wchar_t *str = buf;
2249 wchar_t *eol = str + min (ncol, UBUFSIZ); 2234 wchar_t *eol = str + min (ncol, UBUFSIZ);
2250 2235
2251 for (;;) 2236 for (;;)
2252 { 2237 {
2253 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2238 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2254 break; 2239 break;
2255 2240
2256 *str++ = ch; 2241 *str++ = ch;
2257 2242
2258 if (ch == C0_LF || str >= eol) 2243 if (expect_false (ch == C0_LF || str >= eol))
2259 { 2244 {
2260 if (ch == C0_LF) 2245 if (ch == C0_LF)
2261 nlines++; 2246 nlines++;
2262 2247
2263 refresh_count++; 2248 refresh_count++;
2312 * What the heck we'll cheat and only refresh less than every page-full. 2297 * What the heck we'll cheat and only refresh less than every page-full.
2313 * if skipScroll is enabled. 2298 * if skipScroll is enabled.
2314 */ 2299 */
2315 if (refreshnow) 2300 if (refreshnow)
2316 { 2301 {
2317 flag = true;
2318 scr_refresh (); 2302 scr_refresh ();
2319 want_refresh = 1; 2303 want_refresh = 1;
2320 } 2304 }
2321
2322 } 2305 }
2323 else 2306 else
2324 { 2307 {
2325 try 2308 try
2326 { 2309 {
2334 } 2317 }
2335 2318
2336 ch = NOCHAR; 2319 ch = NOCHAR;
2337 } 2320 }
2338 } 2321 }
2339
2340 return flag;
2341} 2322}
2342 2323
2343// read the next character 2324// read the next character
2344wchar_t 2325wchar_t
2345rxvt_term::next_char () NOTHROW 2326rxvt_term::next_char () NOTHROW
2346{ 2327{
2347 while (cmdbuf_ptr < cmdbuf_endp) 2328 while (cmdbuf_ptr < cmdbuf_endp)
2348 { 2329 {
2349 // assume 7-bit to be ascii ALWAYS 2330 // assume 7-bit to be ascii ALWAYS
2350 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2331 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2351 return *cmdbuf_ptr++; 2332 return *cmdbuf_ptr++;
2352 2333
2353 wchar_t wc; 2334 wchar_t wc;
2354 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2335 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2355 2336
2359 cmdbuf_ptr = cmdbuf_endp; 2340 cmdbuf_ptr = cmdbuf_endp;
2360 break; 2341 break;
2361 } 2342 }
2362 2343
2363 if (len == (size_t)-1) 2344 if (len == (size_t)-1)
2345 {
2346 mbstate.reset (); // reset now undefined conversion state
2364 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2347 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2348 }
2365 2349
2366 // assume wchar == unicode 2350 // assume wchar == unicode
2367 cmdbuf_ptr += len; 2351 cmdbuf_ptr += len;
2368 return wc & UNICODE_MASK; 2352 return wc & UNICODE_MASK;
2369 } 2353 }
2413/*----------------------------------------------------------------------*/ 2397/*----------------------------------------------------------------------*/
2414#ifdef PRINTPIPE 2398#ifdef PRINTPIPE
2415FILE * 2399FILE *
2416rxvt_term::popen_printer () 2400rxvt_term::popen_printer ()
2417{ 2401{
2418 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2402 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2419 2403
2420 if (stream == NULL) 2404 if (stream == NULL)
2421 rxvt_warn ("can't open printer pipe, not printing.\n"); 2405 rxvt_warn ("can't open printer pipe, not printing.\n");
2422 2406
2423 return stream; 2407 return stream;
2434 * simulate attached vt100 printer 2418 * simulate attached vt100 printer
2435 */ 2419 */
2436void 2420void
2437rxvt_term::process_print_pipe () 2421rxvt_term::process_print_pipe ()
2438{ 2422{
2439 int done; 2423 FILE *fd = popen_printer ();
2440 FILE *fd;
2441 2424
2442 if ((fd = popen_printer ()) == NULL) 2425 if (!fd)
2443 return; 2426 return;
2444 2427
2445 /* 2428 /*
2446 * Send all input to the printer until either ESC[4i or ESC[?4i 2429 * Send all input to the printer until either ESC[4i or ESC[?4i
2447 * is received. 2430 * is received.
2448 */ 2431 */
2449 for (done = 0; !done;) 2432 for (int done = 0; !done; )
2450 { 2433 {
2451 unsigned char buf[8]; 2434 unsigned char buf[8];
2452 unicode_t ch; 2435 unicode_t ch;
2453 unsigned int i, len; 2436 unsigned int i, len;
2454 2437
2599 break; 2582 break;
2600 case 'Z': /* identify the terminal type */ 2583 case 'Z': /* identify the terminal type */
2601 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2584 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2602 break; 2585 break;
2603 case '<': /* turn off VT52 mode */ 2586 case '<': /* turn off VT52 mode */
2604 PrivMode (0, PrivMode_vt52); 2587 set_privmode (PrivMode_vt52, 0);
2605 break; 2588 break;
2606 case 'F': /* use special graphics character set */ 2589 case 'F': /* use special graphics character set */
2607 case 'G': /* use regular character set */ 2590 case 'G': /* use regular character set */
2608 /* unimplemented */ 2591 /* unimplemented */
2609 break; 2592 break;
2663 scr_forwardindex (); 2646 scr_forwardindex ();
2664 break; 2647 break;
2665#endif 2648#endif
2666 case '=': 2649 case '=':
2667 case '>': 2650 case '>':
2668 PrivMode ((ch == '='), PrivMode_aplKP); 2651 set_privmode (PrivMode_aplKP, ch == '=');
2669 break; 2652 break;
2670 2653
2671 case C1_40: 2654 case C1_40:
2672 cmd_getc (); 2655 cmd_getc ();
2673 break; 2656 break;
2712 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2695 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2713 case C1_SCI: /* ESC Z */ 2696 case C1_SCI: /* ESC Z */
2714 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2697 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2715 break; /* steal obsolete ESC [ c */ 2698 break; /* steal obsolete ESC [ c */
2716 2699
2717 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2700 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2718 case C1_CSI: /* ESC [ */ 2701 case C1_CSI: /* ESC [ */
2719 process_csi_seq (); 2702 process_csi_seq ();
2720 break; 2703 break;
2721 2704
2722 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2705 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2723 case C1_OSC: /* ESC ] */ 2706 case C1_OSC: /* ESC ] */
2724 process_osc_seq (); 2707 process_osc_seq ();
2725 break; 2708 break;
2726 2709
2727 /* 8.3.106: RESET TO INITIAL STATE */ 2710 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2728 case 'c': 2711 case 'c':
2729 mbstate.reset (); 2712 mbstate.reset ();
2730 scr_poweron (); 2713 scr_poweron ();
2731 scrollbar_show (1); 2714 scrollBar.show (1);
2732 break; 2715 break;
2733 2716
2734 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2717 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2735 case 'n': 2718 case 'n':
2736 scr_charset_choose (2); 2719 scr_charset_choose (2);
2787 2770
2788 nargs = 0; 2771 nargs = 0;
2789 2772
2790 priv = 0; 2773 priv = 0;
2791 ch = cmd_getc (); 2774 ch = cmd_getc ();
2792 if (ch >= '<' && ch <= '?') 2775 if ((ch >= '<' && ch <= '?') || ch == '!')
2793 { 2776 {
2794 /* '<' '=' '>' '?' */ 2777 /* '<' '=' '>' '?' '!' */
2795 priv = ch; 2778 priv = ch;
2796 ch = cmd_getc (); 2779 ch = cmd_getc ();
2797 } 2780 }
2798 2781
2799 /* read any numerical arguments */ 2782 /* read any numerical arguments */
2848 // versions. 2831 // versions.
2849 // 2832 //
2850 tt_printf ("\033[>%d;95;0c", 'U'); 2833 tt_printf ("\033[>%d;95;0c", 'U');
2851 } 2834 }
2852 break; 2835 break;
2836
2853 case '?': 2837 case '?':
2854 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2838 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2855 process_terminal_mode (ch, priv, nargs, arg); 2839 process_terminal_mode (ch, priv, nargs, arg);
2856 break; 2840 break;
2841
2842 case '!':
2843 if (ch == CSI_70)
2844 {
2845 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2846 scr_soft_reset ();
2847
2848 static const int pm_h[] = { 7, 25 };
2849 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 };
2850
2851 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h);
2852 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l);
2857 } 2853 }
2854 break;
2855 }
2856
2858 return; 2857 return;
2859 } 2858 }
2860 2859
2861 switch (ch) 2860 switch (ch)
2862 { 2861 {
3229 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3228 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3230 */ 3229 */
3231void 3230void
3232rxvt_term::process_dcs_seq () 3231rxvt_term::process_dcs_seq ()
3233{ 3232{
3234 char *s;
3235 unicode_t eh;
3236
3237 /* 3233 /*
3238 * Not handled yet 3234 * Not handled yet
3239 */ 3235 */
3236
3237 unicode_t eh;
3240 s = get_to_st (eh); 3238 char *s = get_to_st (eh);
3241 if (s) 3239 if (s)
3242 free (s); 3240 free (s);
3243 3241
3244 return; 3242 return;
3245} 3243}
3249 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3247 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3250 */ 3248 */
3251void 3249void
3252rxvt_term::process_osc_seq () 3250rxvt_term::process_osc_seq ()
3253{ 3251{
3254 unicode_t ch, eh;
3255 int arg; 3252 int arg;
3256 3253
3257 ch = cmd_getc (); 3254 unicode_t ch = cmd_getc ();
3258 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3255 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3259 arg = arg * 10 + (ch - '0'); 3256 arg = arg * 10 + (ch - '0');
3260 3257
3261 if (ch == ';') 3258 if (ch == ';')
3262 { 3259 {
3260 unicode_t eh;
3263 char *s = get_to_st (eh); 3261 char *s = get_to_st (eh);
3264 3262
3265 if (s) 3263 if (s)
3266 { 3264 {
3267 process_xterm_seq (arg, s, eh); 3265 process_xterm_seq (arg, s, eh);
3291 3289
3292/* 3290/*
3293 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3291 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3294 */ 3292 */
3295void 3293void
3296rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3294rxvt_term::process_xterm_seq (int op, char *str, char resp)
3297{ 3295{
3298 int color; 3296 int color;
3299 char *buf, *name; 3297 char *buf, *name;
3300 bool query = str[0] == '?' && !str[1]; 3298 bool query = str[0] == '?' && !str[1];
3301 int saveop = op; 3299 int saveop = op;
3342 3340
3343 XFree (value); 3341 XFree (value);
3344 } 3342 }
3345 else 3343 else
3346 { 3344 {
3347 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3345 char *eq = strchr (str, '=');
3348 3346
3349 if (eq) 3347 if (eq)
3350 { 3348 {
3351 *eq = 0; 3349 *eq = 0;
3352 set_utf8_property (display->atom (str), eq + 1); 3350 set_utf8_property (display->atom (str), eq + 1);
3392 process_color_seq (op, Color_pointer_fg, str, resp); 3390 process_color_seq (op, Color_pointer_fg, str, resp);
3393 break; 3391 break;
3394 case XTerm_Color_pointer_bg: 3392 case XTerm_Color_pointer_bg:
3395 process_color_seq (op, Color_pointer_bg, str, resp); 3393 process_color_seq (op, Color_pointer_bg, str, resp);
3396 break; 3394 break;
3395#ifdef OPTION_HC
3396 case XTerm_Color_HC:
3397 process_color_seq (op, Color_HC, str, resp);
3398 break;
3399 case XTerm_Color_HTC:
3400 process_color_seq (op, Color_HTC, str, resp);
3401 break;
3402#endif
3397#ifndef NO_BOLD_UNDERLINE_REVERSE 3403#ifndef NO_BOLD_UNDERLINE_REVERSE
3398 case XTerm_Color_RV:
3399 process_color_seq (op, Color_RV, str, resp);
3400 break;
3401 case Rxvt_Color_BD:
3402 case URxvt_Color_BD: 3404 case URxvt_Color_BD:
3403 process_color_seq (op, Color_BD, str, resp); 3405 process_color_seq (op, Color_BD, str, resp);
3404 break; 3406 break;
3405 case Rxvt_Color_UL:
3406 case URxvt_Color_UL: 3407 case URxvt_Color_UL:
3407 process_color_seq (op, Color_UL, str, resp); 3408 process_color_seq (op, Color_UL, str, resp);
3408 break; 3409 break;
3409 case URxvt_Color_IT: 3410 case URxvt_Color_IT:
3410 process_color_seq (op, Color_IT, str, resp); 3411 process_color_seq (op, Color_IT, str, resp);
3411 break; 3412 break;
3412#endif 3413#endif
3414 case URxvt_Color_border:
3415 process_color_seq (op, Color_border, str, resp);
3416 break;
3413#if ENABLE_TRANSPARENCY 3417#if ENABLE_TRANSPARENCY
3414 case URxvt_Color_tint: 3418 case URxvt_Color_tint:
3415 process_color_seq (op, Color_tint, str, resp); 3419 process_color_seq (op, Color_tint, str, resp);
3416 { 3420 {
3417 bool changed = false; 3421 bool changed = false;
3432 case Rxvt_Pixmap: 3436 case Rxvt_Pixmap:
3433 if (!strcmp (str, "?")) 3437 if (!strcmp (str, "?"))
3434 { 3438 {
3435 char str[256]; 3439 char str[256];
3436 3440
3437 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3441 sprintf (str, "[%dx%d+%d+%d]",
3438 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3442 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3439 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3443 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3440 process_xterm_seq (XTerm_title, str, CHAR_ST); 3444 process_xterm_seq (XTerm_title, str, CHAR_ST);
3441 } 3445 }
3442 else 3446 else
3541 break; 3545 break;
3542#endif 3546#endif
3543 3547
3544#if ENABLE_PERL 3548#if ENABLE_PERL
3545 case URxvt_perl: 3549 case URxvt_perl:
3546 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3550 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3547 ; // no responses yet
3548 break; 3551 break;
3549#endif 3552#endif
3550 } 3553 }
3551} 3554}
3552/*----------------------------------------------------------------------*/ 3555/*----------------------------------------------------------------------*/
3575 { 3578 {
3576 if (mode == 'r') 3579 if (mode == 'r')
3577 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3580 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3578 else 3581 else
3579 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3582 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3580 PrivMode (state, bit); 3583
3584 set_privmode (bit, state);
3581 } 3585 }
3582 3586
3583 return state; 3587 return state;
3584} 3588}
3585 3589
3593 static const struct 3597 static const struct
3594 { 3598 {
3595 const int argval; 3599 const int argval;
3596 const unsigned long bit; 3600 const unsigned long bit;
3597 } argtopriv[] = { 3601 } argtopriv[] = {
3598 { 1, PrivMode_aplCUR }, 3602 { 1, PrivMode_aplCUR }, // DECCKM
3599 { 2, PrivMode_vt52 }, 3603 { 2, PrivMode_vt52 },
3600 { 3, PrivMode_132 }, 3604 { 3, PrivMode_132 }, // DECCOLM
3601 { 4, PrivMode_smoothScroll }, 3605 { 4, PrivMode_smoothScroll }, // DECSCLM
3602 { 5, PrivMode_rVideo }, 3606 { 5, PrivMode_rVideo }, // DECSCNM
3603 { 6, PrivMode_relOrigin }, 3607 { 6, PrivMode_relOrigin }, // DECOM
3604 { 7, PrivMode_Autowrap }, 3608 { 7, PrivMode_Autowrap }, // DECAWM
3605 // 8, bi-directional support mode 3609 // 8, auto-repeat keys // DECARM
3606 { 9, PrivMode_MouseX10 }, 3610 { 9, PrivMode_MouseX10 },
3607 // 18, 19 printing-related 3611 // 18 end FF to printer after print screen
3612 // 19 Print screen prints full screen/scroll region
3608 { 25, PrivMode_VisibleCursor }, 3613 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3609#ifdef scrollBar_esc 3614#ifdef scrollBar_esc
3610 { scrollBar_esc, PrivMode_scrollBar }, 3615 { scrollBar_esc, PrivMode_scrollBar },
3611#endif 3616#endif
3612 { 35, PrivMode_ShiftKeys }, // rxvt extension 3617 { 35, PrivMode_ShiftKeys }, // rxvt extension
3618 // 38, tektronix mode // DECTEK
3613 { 40, PrivMode_132OK }, 3619 { 40, PrivMode_132OK },
3614 // 41 xterm more fixes NYI 3620 // 41 xterm more fixes NYI
3615 // 45 margin bell NYI 3621 // 45 margin bell NYI
3616 // 46 start logging 3622 // 46 start logging
3617 { 47, PrivMode_Screen }, 3623 { 47, PrivMode_Screen },
3618 { 66, PrivMode_aplKP }, 3624 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
3619#ifndef NO_BACKSPACE_KEY 3625#ifndef NO_BACKSPACE_KEY
3620 { 67, PrivMode_BackSpace }, 3626 { 67, PrivMode_BackSpace }, // DECBKM
3621#endif 3627#endif
3622 { 1000, PrivMode_MouseX11 }, 3628 { 1000, PrivMode_MouseX11 },
3623 { 1002, PrivMode_MouseBtnEvent }, 3629 { 1002, PrivMode_MouseBtnEvent },
3624 { 1003, PrivMode_MouseAnyEvent }, 3630 { 1003, PrivMode_MouseAnyEvent },
3625 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3631 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3629 // 1037 send DEL for keypad delete NYI 3635 // 1037 send DEL for keypad delete NYI
3630 { 1047, PrivMode_Screen }, 3636 { 1047, PrivMode_Screen },
3631 // 1048 save and restore cursor 3637 // 1048 save and restore cursor
3632 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3638 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3633 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3639 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3640 { 2004, PrivMode_BracketPaste },
3634 }; 3641 };
3635 3642
3636 if (nargs == 0) 3643 if (nargs == 0)
3637 return; 3644 return;
3638 3645
3663 3670
3664 scr_touch (true); 3671 scr_touch (true);
3665 break; 3672 break;
3666#endif 3673#endif
3667 case 1048: /* alternative cursor save */ 3674 case 1048: /* alternative cursor save */
3668 case 1049:
3669 if (option (Opt_secondaryScreen)) 3675 if (option (Opt_secondaryScreen))
3670 if (mode == 0) 3676 if (mode == 0)
3671 scr_cursor (RESTORE); 3677 scr_cursor (RESTORE);
3672 else if (mode == 1) 3678 else if (mode == 1)
3673 scr_cursor (SAVE); 3679 scr_cursor (SAVE);
3682 case 2: /* VT52 mode */ 3688 case 2: /* VT52 mode */
3683 /* oddball mode. should be set regardless of set/reset 3689 /* oddball mode. should be set regardless of set/reset
3684 * parameter. Return from VT52 mode with an ESC < from 3690 * parameter. Return from VT52 mode with an ESC < from
3685 * within VT52 mode 3691 * within VT52 mode
3686 */ 3692 */
3687 PrivMode (1, PrivMode_vt52); 3693 set_privmode (PrivMode_vt52, 1);
3688 break; 3694 break;
3689 case 3: /* 80/132 */ 3695 case 3: /* 80/132 */
3690 if (priv_modes & PrivMode_132OK) 3696 if (priv_modes & PrivMode_132OK)
3691 {
3692 scr_poweron ();
3693 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight); 3697 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3694 }
3695 break; 3698 break;
3696 case 4: /* smooth scrolling */ 3699 case 4: /* smooth scrolling */
3697 set_option (Opt_jumpScroll, !state); 3700 set_option (Opt_jumpScroll, !state);
3698 break; 3701 break;
3699 case 5: /* reverse video */ 3702 case 5: /* reverse video */
3710 if (state) /* orthogonal */ 3713 if (state) /* orthogonal */
3711 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3714 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3712 break; 3715 break;
3713#ifdef scrollBar_esc 3716#ifdef scrollBar_esc
3714 case scrollBar_esc: 3717 case scrollBar_esc:
3715 if (scrollbar_mapping (state)) 3718 if (scrollBar.map (state))
3716 { 3719 {
3717 resize_all_windows (0, 0, 0); 3720 resize_all_windows (0, 0, 0);
3718 scr_touch (true); 3721 scr_touch (true);
3719 } 3722 }
3720 break; 3723 break;
3741 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3744 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3742 vt_emask_mouse = PointerMotionMask; 3745 vt_emask_mouse = PointerMotionMask;
3743 } 3746 }
3744 else 3747 else
3745 vt_emask_mouse = NoEventMask; 3748 vt_emask_mouse = NoEventMask;
3749
3746 vt_select_input (); 3750 vt_select_input ();
3747 break; 3751 break;
3748 case 1010: /* scroll to bottom on TTY output inhibit */ 3752 case 1010: /* scroll to bottom on TTY output inhibit */
3749 set_option (Opt_scrollTtyOutput, !state); 3753 set_option (Opt_scrollTtyOutput, !state);
3750 break; 3754 break;
3751 case 1011: /* scroll to bottom on key press */ 3755 case 1011: /* scroll to bottom on key press */
3752 set_option (Opt_scrollTtyKeypress, state); 3756 set_option (Opt_scrollTtyKeypress, state);
3753 break; 3757 break;
3754 case 1047: /* secondary screen w/ clearing last */ 3758 case 1047: /* secondary screen w/ clearing last */
3755 if (option (Opt_secondaryScreen)) 3759 if (option (Opt_secondaryScreen))
3756 if (current_screen != PRIMARY) 3760 if (!state)
3757 scr_erase_screen (2); 3761 scr_erase_screen (2);
3762
3758 scr_change_screen (state); 3763 scr_change_screen (state);
3759 break; 3764 break;
3760 case 1049: /* secondary screen w/ clearing first */ 3765 case 1049: /* secondary screen w/ clearing first */
3766 if (option (Opt_secondaryScreen))
3767 if (state)
3768 scr_cursor (SAVE);
3769
3761 scr_change_screen (state); 3770 scr_change_screen (state);
3771
3762 if (option (Opt_secondaryScreen)) 3772 if (option (Opt_secondaryScreen))
3763 if (current_screen != PRIMARY) 3773 if (state)
3764 scr_erase_screen (2); 3774 scr_erase_screen (2);
3775 else
3776 scr_cursor (RESTORE);
3765 break; 3777 break;
3766 default: 3778 default:
3767 break; 3779 break;
3768 } 3780 }
3769 } 3781 }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines