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.384 by ayin, Tue Dec 18 13:07:55 2007 UTC vs.
Revision 1.443 by sf-exg, Wed Mar 31 13:14:50 2010 UTC

26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
31 * 32 *
32 * This program is free software; you can redistribute it and/or modify 33 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 34 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 36 * (at your option) any later version.
161 162
162void 163void
163rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y) 164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
164{ 165{
165 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
166 rxvt_font *f = (*fs)[fs->find_font (ch)];
167 wchar_t *chr, *alloc, ch2, *fname; 167 wchar_t *chr, *alloc, ch2, **fname;
168 int len; 168 int len;
169
170 fname = rxvt_utf8towcs (f->name);
171 169
172# if ENABLE_COMBINING 170# if ENABLE_COMBINING
173 if (IS_COMPOSE (ch)) 171 if (IS_COMPOSE (ch))
174 { 172 {
175 len = rxvt_composite.expand (ch, 0); 173 len = rxvt_composite.expand (ch, 0);
196 r & RS_Blink ? " blink" : "", 194 r & RS_Blink ? " blink" : "",
197 r & RS_RVid ? " rvid" : "", 195 r & RS_RVid ? " rvid" : "",
198 r & RS_Uline ? " uline" : "", 196 r & RS_Uline ? " uline" : "",
199 r & RS_Careful ? " careful" : ""); 197 r & RS_Careful ? " careful" : "");
200 198
199 int width = 0;
200 fname = rxvt_temp_buf<wchar_t *> (len);
201 for (int i = 0; i < len; i++)
202 {
203 rxvt_font *f = (*fs)[fs->find_font (chr[i])];
204 fname[i] = rxvt_utf8towcs (f->name);
201 int width = wcswidth (fname, wcslen (fname)); 205 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
206 }
202 207
203 max_it (width, 8+5); // for char + hex 208 max_it (width, 8+5); // for char + hex
204 max_it (width, strlen (attr)); 209 max_it (width, strlen (attr));
205 210
206 if (y >= 0) 211 if (y >= 0)
207 { 212 {
208 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 213 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
209 x = 0; 214 x = 0;
210 } 215 }
211 216
212 scr_overlay_new (x, y, width, len + 2); 217 scr_overlay_new (x, y, width, len * 2 + 1);
213 218
214 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 219 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
215 220
216 for (int y = 0; y < len; y++) 221 for (int y = 0; y < len; y++)
217 { 222 {
220 ch = *chr++; 225 ch = *chr++;
221 226
222 sprintf (buf, "%8x", ch); 227 sprintf (buf, "%8x", ch);
223 scr_overlay_set (0, y, buf); 228 scr_overlay_set (0, y, buf);
224 scr_overlay_set (9, y, '='); 229 scr_overlay_set (9, y, '=');
225# if !UNICODE3 230# if !UNICODE_3
226 if (ch >= 0x10000) 231 if (ch >= 0x10000)
227 ch = 0xfffd; 232 ch = 0xfffd;
228# endif 233# endif
229 scr_overlay_set (11, y, ch, r); 234 scr_overlay_set (11, y, ch, r);
230 235
236// char buf[4+4+3+1]; 241// char buf[4+4+3+1];
237// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y); 242// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
238// scr_overlay_set (0, 0, buf); 243// scr_overlay_set (0, 0, buf);
239// } 244// }
240 scr_overlay_set (0, len , attr); 245 scr_overlay_set (0, len , attr);
246 for (int i = 0; i < len; i++)
247 {
241 scr_overlay_set (0, len + 1, fname); 248 scr_overlay_set (0, len + 1 + i, fname[i]);
242
243 free (fname); 249 free (fname[i]);
250 }
244 251
245# if ENABLE_COMBINING 252# if ENABLE_COMBINING
246 if (alloc) 253 if (alloc)
247 delete [] alloc; 254 delete [] alloc;
248# endif 255# endif
278 } 285 }
279 286
280 iso14755buf = 0; 287 iso14755buf = 0;
281} 288}
282 289
283int 290static int
284rxvt_term::hex_keyval (XKeyEvent &ev) 291hex_keyval (XKeyEvent &ev)
285{ 292{
286 // check wether this event corresponds to a hex digit 293 // check whether this event corresponds to a hex digit
287 // if the modifiers had not been pressed. 294 // if the modifiers had not been pressed.
288 for (int index = 0; index < 8; index++) 295 for (int index = 0; index < 8; index++)
289 { 296 {
290 KeySym k = XLookupKeysym (&ev, index); 297 KeySym k = XLookupKeysym (&ev, index);
291 298
297 304
298 return -1; 305 return -1;
299} 306}
300#endif 307#endif
301 308
309static inline KeySym
310translate_keypad (KeySym keysym, bool kp)
311{
312#ifdef XK_KP_Home
313 static const KeySym keypadtrans[] = {
314 XK_KP_7, // XK_KP_Home
315 XK_KP_4, // XK_KP_Left
316 XK_KP_8, // XK_KP_Up
317 XK_KP_6, // XK_KP_Right
318 XK_KP_2, // XK_KP_Down
319# ifndef UNSHIFTED_SCROLLKEYS
320 XK_KP_9, // XK_KP_Prior
321 XK_KP_3, // XK_KP_Next
322# else
323 XK_Prior,
324 XK_Next,
325# endif
326 XK_KP_1, // XK_KP_End
327 XK_KP_5, // XK_KP_Begin
328 };
329
330 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
331 {
332 unsigned int index = keysym - XK_KP_Home;
333 keysym = kp ? keypadtrans[index] : XK_Home + index;
334 }
335 else if (keysym == XK_KP_Insert)
336 keysym = kp ? XK_KP_0 : XK_Insert;
337# ifndef NO_DELETE_KEY
338 else if (keysym == XK_KP_Delete)
339 keysym = kp ? XK_KP_Decimal : XK_Delete;
340# endif
341#endif
342 return keysym;
343}
344
345static inline int
346map_function_key (KeySym keysym)
347{
348 int param = 0;
349
350 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
351 {
352 param = 11 + keysym - XK_F1;
353 if (keysym >= XK_F17)
354 param += 4;
355 else if (keysym >= XK_F15)
356 param += 3;
357 else if (keysym >= XK_F11)
358 param += 2;
359 else if (keysym >= XK_F6)
360 param += 1;
361 }
362 else
363 switch (keysym)
364 {
365 case XK_Find:
366 param = 1;
367 break;
368 case XK_Insert:
369 param = 2;
370 break;
371#ifdef DXK_Remove
372 case DXK_Remove:
373#endif
374 case XK_Execute:
375 param = 3;
376 break;
377 case XK_Select:
378 param = 4;
379 break;
380#ifndef UNSHIFTED_SCROLLKEYS
381 case XK_Prior:
382 param = 5;
383 break;
384 case XK_Next:
385 param = 6;
386 break;
387 case XK_Home:
388 param = 7;
389 break;
390 case XK_End:
391 param = 8;
392 break;
393#endif
394 case XK_Help:
395 param = 28;
396 break;
397 case XK_Menu:
398 param = 29;
399 break;
400 }
401 return param;
402}
403
302void 404void
303rxvt_term::key_press (XKeyEvent &ev) 405rxvt_term::key_press (XKeyEvent &ev)
304{ 406{
305 int ctrl, meta, shft, len; 407 int ctrl, meta, shft, len;
306 unsigned int newlen;
307 KeySym keysym; 408 KeySym keysym;
308 int valid_keysym; 409 int valid_keysym;
309 char kbuf[KBUFSZ]; 410 char kbuf[KBUFSZ];
310 411
311#if ISO_14755 412#if ISO_14755
324 meta = ev.state & ModMetaMask; 425 meta = ev.state & ModMetaMask;
325 426
326 if (numlock_state || (ev.state & ModNumLockMask)) 427 if (numlock_state || (ev.state & ModNumLockMask))
327 { 428 {
328 numlock_state = (ev.state & ModNumLockMask); 429 numlock_state = (ev.state & ModNumLockMask);
329 PrivMode ((!numlock_state), PrivMode_aplKP); 430 set_privmode (PrivMode_aplKP, !numlock_state);
330 } 431 }
331 432
332 kbuf[0] = 0; 433 kbuf[0] = 0;
333 434
334#ifdef USE_XIM 435#ifdef USE_XIM
410#ifdef PAGING_CONTEXT_LINES 511#ifdef PAGING_CONTEXT_LINES
411 lnsppg = nrow - PAGING_CONTEXT_LINES; 512 lnsppg = nrow - PAGING_CONTEXT_LINES;
412#else 513#else
413 lnsppg = nrow * 4 / 5; 514 lnsppg = nrow * 4 / 5;
414#endif 515#endif
516 max_it (lnsppg, 1);
517
415 if (keysym == XK_Prior) 518 if (keysym == XK_Prior)
416 { 519 {
417 scr_page (UP, lnsppg); 520 scr_page (UP, lnsppg);
418 return; 521 return;
419 } 522 }
484 } 587 }
485 } 588 }
486 589
487#if ENABLE_FRILLS || ISO_14755 590#if ENABLE_FRILLS || ISO_14755
488 // ISO 14755 support 591 // ISO 14755 support
489 if (shft && ctrl) 592 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
490 { 593 {
491 int hv; 594 int hv;
492 595
493 if (iso14755buf & ISO_14755_51 596 if (iso14755buf & ISO_14755_51
494 && (keysym == XK_space || keysym == XK_KP_Space 597 && (keysym == XK_space || keysym == XK_KP_Space
524 scr_overlay_off (); 627 scr_overlay_off ();
525# endif 628# endif
526 iso14755buf = 0; 629 iso14755buf = 0;
527 } 630 }
528 } 631 }
632 else if (option (Opt_iso14755) &&
529 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 633 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
530 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 634 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
531 if (!(iso14755buf & ISO_14755_STARTED)) 635 if (!(iso14755buf & ISO_14755_STARTED))
532 { 636 {
533 iso14755buf |= ISO_14755_STARTED; 637 iso14755buf |= ISO_14755_STARTED;
534# if ISO_14755 638# if ISO_14755
535 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 639 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
546 } 650 }
547#endif 651#endif
548 652
549 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 653 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
550 { 654 {
655 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
656 unsigned int newlen = 1;
657
658 switch (translate_keypad (keysym, kp))
551 { 659 {
552 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; 660#ifndef NO_BACKSPACE_KEY
553 newlen = 1; 661 case XK_BackSpace:
554#ifdef XK_KP_Home 662 if (priv_modes & PrivMode_HaveBackSpace)
555 static const KeySym keypadtrans[] = { 663 {
556 XK_KP_7, // XK_KP_Home 664 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
557 XK_KP_4, // XK_KP_Left 665 ^ !!ctrl) ? '\b' : '\177';
558 XK_KP_8, // XK_KP_Up 666 kbuf[1] = '\0';
559 XK_KP_6, // XK_KP_Right
560 XK_KP_2, // XK_KP_Down
561#ifndef UNSHIFTED_SCROLLKEYS
562 XK_KP_9, // XK_KP_Prior
563 XK_KP_3, // XK_KP_Next
564#else
565 XK_Prior,
566 XK_Next,
567#endif
568 XK_KP_1, // XK_KP_End
569 XK_KP_5, // XK_KP_Begin
570 }; 667 }
668 else
669 strcpy (kbuf, rs[Rs_backspace_key]);
670 break;
671#endif
672#ifndef NO_DELETE_KEY
673 case XK_Delete:
674 strcpy (kbuf, rs[Rs_delete_key]);
675 break;
676#endif
677 case XK_Tab:
678 if (shft)
679 strcpy (kbuf, "\033[Z");
680 else
681 {
682#ifdef CTRL_TAB_MAKES_META
683 if (ctrl)
684 meta = 1;
685#endif
686#ifdef MOD4_TAB_MAKES_META
687 if (ev.state & Mod4Mask)
688 meta = 1;
689#endif
690 newlen = 0;
691 }
692 break;
571 693
572 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin)) 694 case XK_Up: /* "\033[A" */
695 case XK_Down: /* "\033[B" */
696 case XK_Right: /* "\033[C" */
697 case XK_Left: /* "\033[D" */
698 strcpy (kbuf, "\033[Z");
699 kbuf[2] = "DACB"[keysym - XK_Left];
700 /* do Shift first */
701 if (shft)
702 kbuf[2] = "dacb"[keysym - XK_Left];
703 else if (ctrl)
704 {
705 kbuf[1] = 'O';
706 kbuf[2] = "dacb"[keysym - XK_Left];
707 }
708 else if (priv_modes & PrivMode_aplCUR)
709 kbuf[1] = 'O';
710 break;
711
712 case XK_KP_Enter:
713 /* allow shift to override */
714 if (kp)
715 {
716 strcpy (kbuf, "\033OM");
717 break;
718 }
719
720 /* FALLTHROUGH */
721
722 case XK_Return:
723 if (priv_modes & PrivMode_LFNL)
724 {
725 kbuf[0] = '\015';
726 kbuf[1] = '\012';
727 kbuf[2] = '\0';
728 }
729 else
730 {
731 kbuf[0] = '\015';
732 kbuf[1] = '\0';
733 }
734 break;
735
736 case XK_KP_F1: /* "\033OP" */
737 case XK_KP_F2: /* "\033OQ" */
738 case XK_KP_F3: /* "\033OR" */
739 case XK_KP_F4: /* "\033OS" */
740 strcpy (kbuf, "\033OP");
741 kbuf[2] += (keysym - XK_KP_F1);
742 break;
743
744 case XK_KP_Multiply: /* "\033Oj" : "*" */
745 case XK_KP_Add: /* "\033Ok" : "+" */
746 case XK_KP_Separator: /* "\033Ol" : "," */
747 case XK_KP_Subtract: /* "\033Om" : "-" */
748 case XK_KP_Decimal: /* "\033On" : "." */
749 case XK_KP_Divide: /* "\033Oo" : "/" */
750 case XK_KP_0: /* "\033Op" : "0" */
751 case XK_KP_1: /* "\033Oq" : "1" */
752 case XK_KP_2: /* "\033Or" : "2" */
753 case XK_KP_3: /* "\033Os" : "3" */
754 case XK_KP_4: /* "\033Ot" : "4" */
755 case XK_KP_5: /* "\033Ou" : "5" */
756 case XK_KP_6: /* "\033Ov" : "6" */
757 case XK_KP_7: /* "\033Ow" : "7" */
758 case XK_KP_8: /* "\033Ox" : "8" */
759 case XK_KP_9: /* "\033Oy" : "9" */
760 /* allow shift to override */
761 if (kp)
762 {
763 strcpy (kbuf, "\033Oj");
764 kbuf[2] += (keysym - XK_KP_Multiply);
765 }
766 else
767 {
768 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
769 kbuf[1] = '\0';
770 }
771 break;
772
773 default:
573 { 774 {
574 unsigned int index = keysym - XK_KP_Home; 775 int param = map_function_key (keysym);
575 keysym = kp ? keypadtrans[index] : XK_Home + index; 776 if (param > 0)
777 sprintf (kbuf,"\033[%d~", param);
778 else
779 newlen = 0;
576 } 780 }
577 else if (keysym == XK_KP_Insert)
578 keysym = kp ? XK_KP_0 : XK_Insert;
579#ifndef NO_DELETE_KEY
580 else if (keysym == XK_KP_Delete)
581 keysym = kp ? XK_KP_Decimal : XK_Delete;
582#endif
583#endif
584 switch (keysym)
585 {
586#ifndef NO_BACKSPACE_KEY
587 case XK_BackSpace:
588 if (priv_modes & PrivMode_HaveBackSpace)
589 {
590 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
591 ^ !!ctrl) ? '\b' : '\177';
592 kbuf[1] = '\0';
593 }
594 else
595 strcpy (kbuf, rs[Rs_backspace_key]);
596 break; 781 break;
597#endif
598#ifndef NO_DELETE_KEY
599 case XK_Delete:
600 strcpy (kbuf, rs[Rs_delete_key]);
601 break;
602#endif
603 case XK_Tab:
604 if (shft)
605 strcpy (kbuf, "\033[Z");
606 else
607 {
608#ifdef CTRL_TAB_MAKES_META
609 if (ctrl)
610 meta = 1;
611#endif
612#ifdef MOD4_TAB_MAKES_META
613 if (ev.state & Mod4Mask)
614 meta = 1;
615#endif
616 newlen = 0;
617 }
618 break;
619
620 case XK_Up: /* "\033[A" */
621 case XK_Down: /* "\033[B" */
622 case XK_Right: /* "\033[C" */
623 case XK_Left: /* "\033[D" */
624 strcpy (kbuf, "\033[Z");
625 kbuf[2] = "DACB"[keysym - XK_Left];
626 /* do Shift first */
627 if (shft)
628 kbuf[2] = "dacb"[keysym - XK_Left];
629 else if (ctrl)
630 {
631 kbuf[1] = 'O';
632 kbuf[2] = "dacb"[keysym - XK_Left];
633 }
634 else if (priv_modes & PrivMode_aplCUR)
635 kbuf[1] = 'O';
636 break;
637
638#ifndef UNSHIFTED_SCROLLKEYS
639 case XK_Prior:
640 strcpy (kbuf, "\033[5~");
641 break;
642 case XK_Next:
643 strcpy (kbuf, "\033[6~");
644 break;
645#endif
646 case XK_KP_Enter:
647 /* allow shift to override */
648 if (kp)
649 {
650 strcpy (kbuf, "\033OM");
651 break;
652 }
653
654 /* FALLTHROUGH */
655
656 case XK_Return:
657 if (priv_modes & PrivMode_LFNL)
658 {
659 kbuf[0] = '\015';
660 kbuf[1] = '\012';
661 kbuf[2] = '\0';
662 }
663 else
664 {
665 kbuf[0] = '\015';
666 kbuf[1] = '\0';
667 }
668 break;
669
670 case XK_KP_F1: /* "\033OP" */
671 case XK_KP_F2: /* "\033OQ" */
672 case XK_KP_F3: /* "\033OR" */
673 case XK_KP_F4: /* "\033OS" */
674 strcpy (kbuf, "\033OP");
675 kbuf[2] += (keysym - XK_KP_F1);
676 break;
677
678 case XK_KP_Multiply: /* "\033Oj" : "*" */
679 case XK_KP_Add: /* "\033Ok" : "+" */
680 case XK_KP_Separator: /* "\033Ol" : "," */
681 case XK_KP_Subtract: /* "\033Om" : "-" */
682 case XK_KP_Decimal: /* "\033On" : "." */
683 case XK_KP_Divide: /* "\033Oo" : "/" */
684 case XK_KP_0: /* "\033Op" : "0" */
685 case XK_KP_1: /* "\033Oq" : "1" */
686 case XK_KP_2: /* "\033Or" : "2" */
687 case XK_KP_3: /* "\033Os" : "3" */
688 case XK_KP_4: /* "\033Ot" : "4" */
689 case XK_KP_5: /* "\033Ou" : "5" */
690 case XK_KP_6: /* "\033Ov" : "6" */
691 case XK_KP_7: /* "\033Ow" : "7" */
692 case XK_KP_8: /* "\033Ox" : "8" */
693 case XK_KP_9: /* "\033Oy" : "9" */
694 /* allow shift to override */
695 if (kp)
696 {
697 strcpy (kbuf, "\033Oj");
698 kbuf[2] += (keysym - XK_KP_Multiply);
699 }
700 else
701 {
702 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
703 kbuf[1] = '\0';
704 }
705 break;
706
707 case XK_Find:
708 strcpy (kbuf, "\033[1~");
709 break;
710
711 case XK_Insert:
712 strcpy (kbuf, "\033[2~");
713 break;
714#ifdef DXK_Remove /* support for DEC remove like key */
715 case DXK_Remove:
716 /* FALLTHROUGH */
717#endif
718 case XK_Execute:
719 strcpy (kbuf, "\033[3~");
720 break;
721 case XK_Select:
722 strcpy (kbuf, "\033[4~");
723 break;
724 case XK_End:
725 strcpy (kbuf, KS_END);
726 break;
727 case XK_Home:
728 strcpy (kbuf, KS_HOME);
729 break;
730
731#define FKEY(n, fkey) \
732 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
733
734 case XK_F1: /* "\033[11~" */
735 case XK_F2: /* "\033[12~" */
736 case XK_F3: /* "\033[13~" */
737 case XK_F4: /* "\033[14~" */
738 case XK_F5: /* "\033[15~" */
739 FKEY (11, XK_F1);
740 break;
741 case XK_F6: /* "\033[17~" */
742 case XK_F7: /* "\033[18~" */
743 case XK_F8: /* "\033[19~" */
744 case XK_F9: /* "\033[20~" */
745 case XK_F10: /* "\033[21~" */
746 FKEY (17, XK_F6);
747 break;
748 case XK_F11: /* "\033[23~" */
749 case XK_F12: /* "\033[24~" */
750 case XK_F13: /* "\033[25~" */
751 case XK_F14: /* "\033[26~" */
752 FKEY (23, XK_F11);
753 break;
754 case XK_F15: /* "\033[28~" */
755 case XK_F16: /* "\033[29~" */
756 FKEY (28, XK_F15);
757 break;
758 case XK_Help: /* "\033[28~" */
759 FKEY (28, XK_Help);
760 break;
761 case XK_Menu: /* "\033[29~" */
762 FKEY (29, XK_Menu);
763 break;
764 case XK_F17: /* "\033[31~" */
765 case XK_F18: /* "\033[32~" */
766 case XK_F19: /* "\033[33~" */
767 case XK_F20: /* "\033[34~" */
768 case XK_F21: /* "\033[35~" */
769 case XK_F22: /* "\033[36~" */
770 case XK_F23: /* "\033[37~" */
771 case XK_F24: /* "\033[38~" */
772 case XK_F25: /* "\033[39~" */
773 case XK_F26: /* "\033[40~" */
774 case XK_F27: /* "\033[41~" */
775 case XK_F28: /* "\033[42~" */
776 case XK_F29: /* "\033[43~" */
777 case XK_F30: /* "\033[44~" */
778 case XK_F31: /* "\033[45~" */
779 case XK_F32: /* "\033[46~" */
780 case XK_F33: /* "\033[47~" */
781 case XK_F34: /* "\033[48~" */
782 case XK_F35: /* "\033[49~" */
783 FKEY (31, XK_F17);
784 break;
785#undef FKEY
786 default:
787 newlen = 0;
788 break;
789 }
790
791 if (newlen)
792 len = strlen (kbuf);
793 } 782 }
783
784 if (newlen)
785 len = strlen (kbuf);
794 786
795 /* 787 /*
796 * Pass meta for all function keys, if 'meta' option set 788 * Pass meta for all function keys, if 'meta' option set
797 */ 789 */
798#ifdef META8_OPTION 790#ifdef META8_OPTION
1032 } 1024 }
1033 while (row < end_row); 1025 while (row < end_row);
1034 } 1026 }
1035 1027
1036 scr_refresh (); 1028 scr_refresh ();
1037 scrollbar_show (1); 1029 scrollBar.show (1);
1038#ifdef USE_XIM 1030#ifdef USE_XIM
1039 IMSendSpot (); 1031 IMSendSpot ();
1040#endif 1032#endif
1041 } 1033 }
1042 1034
1043 display->flush (); 1035 display->flush ();
1044} 1036}
1045 1037
1046/* checks wether a refresh is requested and starts the refresh timer */ 1038/* checks whether a refresh is requested and starts the refresh timer */
1047void 1039void
1048rxvt_term::refresh_check () 1040rxvt_term::refresh_check ()
1049{ 1041{
1050 if (want_refresh && !flush_ev.is_active ()) 1042 if (want_refresh && !flush_ev.is_active ())
1051 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally 1043 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1078{ 1070{
1079 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1071 if (scr_refresh_rend (RS_Blink, RS_Blink))
1080 { 1072 {
1081 hidden_text = !hidden_text; 1073 hidden_text = !hidden_text;
1082 want_refresh = 1; 1074 want_refresh = 1;
1083 refresh_check (); 1075 refresh_check ();
1084 } 1076 }
1085 else 1077 else
1086 w.stop (); 1078 w.stop ();
1087} 1079}
1088#endif 1080#endif
1089 1081
1090#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1082#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1091void 1083void
1092rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1084rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1093{ 1085{
1094 if ((scrollbar_isUp () || scrollbar_isDn ()) 1086 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1095 && scr_page (scrollbar_isUp () ? UP : DN, 1)) 1087 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1096 { 1088 {
1097 want_refresh = 1; 1089 want_refresh = 1;
1098 refresh_check (); 1090 refresh_check ();
1099 } 1091 }
1100 else 1092 else
1144 { 1136 {
1145 // this should really be sched_yield(), but the linux guys thought 1137 // this should really be sched_yield(), but the linux guys thought
1146 // that giving a process calling sched_yield () less cpu time than 1138 // that giving a process calling sched_yield () less cpu time than
1147 // 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
1148 // 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.
1149 1144
1150 struct timespec ts = { 0, 0 }; 1145 struct timespec ts = { 0, 1000 };
1151 nanosleep (&ts, 0); 1146 nanosleep (&ts, 0);
1152 1147
1153 w.stop (); 1148 w.stop ();
1154 } 1149 }
1155 1150
1205{ 1200{
1206 make_current (); 1201 make_current ();
1207 1202
1208 if (revents & ev::READ) 1203 if (revents & ev::READ)
1209 // loop, but don't allow a single term to monopolize us 1204 // loop, but don't allow a single term to monopolize us
1210 while (pty_fill ()) 1205 for (int i = CBUFCNT; i-- && pty_fill (); )
1211 if (cmd_parse ()) 1206 cmd_parse ();
1212 break;
1213 1207
1214 if (revents & ev::WRITE) 1208 if (revents & ev::WRITE)
1215 pty_write (); 1209 pty_write ();
1216 1210
1217 refresh_check (); 1211 refresh_check ();
1437 && ev.xfocus.mode != NotifyGrab) 1431 && ev.xfocus.mode != NotifyGrab)
1438 focus_out (); 1432 focus_out ();
1439 break; 1433 break;
1440 1434
1441 case ConfigureNotify: 1435 case ConfigureNotify:
1442 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n", 1436 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1443 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y, 1437 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1444 szHint.width, szHint.height); */ 1438 szHint.width, szHint.height);*/
1445 if (ev.xconfigure.window == parent[0]) 1439 if (ev.xconfigure.window == parent[0])
1446 { 1440 {
1447 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1441 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1448 ; 1442 ;
1449 1443
1454 } 1448 }
1455 else 1449 else
1456 { 1450 {
1457#ifdef HAVE_BG_PIXMAP 1451#ifdef HAVE_BG_PIXMAP
1458 if (bgPixmap.window_position_sensitive ()) 1452 if (bgPixmap.window_position_sensitive ())
1453 {
1454 if (mapped)
1459 update_background (); 1455 update_background ();
1456 else
1457 bgPixmap.invalidate ();
1458 }
1460#endif 1459#endif
1461 } 1460 }
1461
1462 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1462 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1463 } 1463 }
1464 break; 1464 break;
1465 1465
1466 case PropertyNotify: 1466 case PropertyNotify:
1470 selection_property (ev.xproperty.window, ev.xproperty.atom); 1470 selection_property (ev.xproperty.window, ev.xproperty.atom);
1471 1471
1472 break; 1472 break;
1473 1473
1474 case SelectionClear: 1474 case SelectionClear:
1475 selection_clear (); 1475 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1476 break; 1476 break;
1477 1477
1478 case SelectionNotify: 1478 case SelectionNotify:
1479 if (selection_wait == Sel_normal) 1479 if (selection_wait == Sel_normal)
1480 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1480 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1483 case SelectionRequest: 1483 case SelectionRequest:
1484 selection_send (ev.xselectionrequest); 1484 selection_send (ev.xselectionrequest);
1485 break; 1485 break;
1486 1486
1487 case MapNotify: 1487 case MapNotify:
1488#ifdef HAVE_BG_PIXMAP
1489 /* This is needed spcifically to fix the case of no window manager or a
1490 * non-reparenting window manager. In those cases we never get first
1491 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1492 * care of multiplicity of ConfigureNotify events arriwing while WM does
1493 * reparenting.
1494 * We should not render background immidiately, as there could be several
1495 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1496 * by scheduling background redraw as soon as we can, but giving a short
1497 * bit of time for ConfigureNotifies to arrive.
1498 * We should render background PRIOR to drawing any text, but AFTER all
1499 * of ConfigureNotifys for the best results.
1500 */
1501 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1502 update_background_ev.start (0.025);
1503#endif
1488 mapped = 1; 1504 mapped = 1;
1489#ifdef TEXT_BLINK 1505#ifdef TEXT_BLINK
1490 text_blink_ev.start (); 1506 text_blink_ev.start ();
1491#endif 1507#endif
1492 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1508 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1528 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1544 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1529 ; 1545 ;
1530 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1546 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1531 ; 1547 ;
1532 1548
1533 if (isScrollbarWindow (ev.xany.window)) 1549 if (scrollBar.state && ev.xany.window == scrollBar.win)
1534 { 1550 {
1535 scrollBar.setIdle (); 1551 scrollBar.state = STATE_IDLE;
1536 scrollbar_show (0); 1552 scrollBar.show (0);
1537 } 1553 }
1538 } 1554 }
1539 break; 1555 break;
1540 1556
1541 case MotionNotify: 1557 case MotionNotify:
1628#ifdef MOUSE_THRESHOLD 1644#ifdef MOUSE_THRESHOLD
1629 } 1645 }
1630#endif 1646#endif
1631 } 1647 }
1632 } 1648 }
1633 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1649 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1634 { 1650 {
1635 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1651 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1636 MotionNotify, &ev)) 1652 MotionNotify, &ev))
1637 ; 1653 ;
1638 1654
1640 &unused_root, &unused_child, 1656 &unused_root, &unused_child,
1641 &unused_root_x, &unused_root_y, 1657 &unused_root_x, &unused_root_y,
1642 &ev.xbutton.x, &ev.xbutton.y, 1658 &ev.xbutton.x, &ev.xbutton.y,
1643 &unused_mask); 1659 &unused_mask);
1644 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1660 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1645 scrollbar_size ()); 1661 scrollBar.size ());
1646 want_refresh = 1; 1662 want_refresh = 1;
1647 scrollbar_show (1); 1663 scrollBar.show (1);
1648 } 1664 }
1649 break; 1665 break;
1650 } 1666 }
1651 1667
1652#if defined(CURSOR_BLINK) 1668#if defined(CURSOR_BLINK)
1677#endif 1693#endif
1678 1694
1679 refresh_check (); 1695 refresh_check ();
1680} 1696}
1681 1697
1698#if ENABLE_FRILLS
1699void
1700rxvt_term::set_urgency (bool enable)
1701{
1702 if (enable == urgency_hint)
1703 return;
1704
1705 if (XWMHints *h = XGetWMHints (dpy, parent[0]))
1706 {
1707 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1708 XSetWMHints (dpy, parent[0], h);
1709 urgency_hint = enable;
1710 }
1711}
1712#endif
1713
1682void 1714void
1683rxvt_term::focus_in () 1715rxvt_term::focus_in ()
1684{ 1716{
1685 if (!focus) 1717 if (!focus)
1686 { 1718 {
1687 focus = 1; 1719 focus = 1;
1688 want_refresh = 1; 1720 want_refresh = 1;
1689
1690 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1691 1721
1692#if USE_XIM 1722#if USE_XIM
1693 if (Input_Context != NULL) 1723 if (Input_Context != NULL)
1694 { 1724 {
1695 IMSetPosition (); 1725 IMSetPosition ();
1707 scr_recolour (); 1737 scr_recolour ();
1708 } 1738 }
1709#endif 1739#endif
1710#if ENABLE_FRILLS 1740#if ENABLE_FRILLS
1711 if (option (Opt_urgentOnBell)) 1741 if (option (Opt_urgentOnBell))
1712 { 1742 set_urgency (0);
1713 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1714 {
1715 h->flags &= ~XUrgencyHint;
1716 XSetWMHints (dpy, parent[0], h);
1717 }
1718 }
1719#endif 1743#endif
1744
1745 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1720 } 1746 }
1721} 1747}
1722 1748
1723void 1749void
1724rxvt_term::focus_out () 1750rxvt_term::focus_out ()
1726 if (focus) 1752 if (focus)
1727 { 1753 {
1728 focus = 0; 1754 focus = 0;
1729 want_refresh = 1; 1755 want_refresh = 1;
1730 1756
1731 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1757#if ENABLE_FRILLS
1732 1758 if (option (Opt_urgentOnBell))
1759 set_urgency (0);
1760#endif
1733#if ENABLE_FRILLS || ISO_14755 1761#if ENABLE_FRILLS || ISO_14755
1734 if (iso14755buf) 1762 if (iso14755buf)
1735 { 1763 {
1736 iso14755buf = 0; 1764 iso14755buf = 0;
1737# if ISO_14755 1765# if ISO_14755
1754 { 1782 {
1755 pix_colors = pix_colors_unfocused; 1783 pix_colors = pix_colors_unfocused;
1756 scr_recolour (); 1784 scr_recolour ();
1757 } 1785 }
1758#endif 1786#endif
1787
1788 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1759 } 1789 }
1760} 1790}
1761 1791
1762void 1792void
1763rxvt_term::update_fade_color (unsigned int idx) 1793rxvt_term::update_fade_color (unsigned int idx)
1794 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1824 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1795 { 1825 {
1796 bgPixmap.set_root_pixmap (); 1826 bgPixmap.set_root_pixmap ();
1797 update_background (); 1827 update_background ();
1798 } 1828 }
1829
1799 break; 1830 break;
1800 } 1831 }
1801# endif 1832# endif
1802 1833
1803 refresh_check (); 1834 refresh_check ();
1921 } 1952 }
1922 1953
1923 /* 1954 /*
1924 * Scrollbar window processing of button press 1955 * Scrollbar window processing of button press
1925 */ 1956 */
1926 if (isScrollbarWindow (ev.window)) 1957 if (scrollBar.state && ev.window == scrollBar.win)
1927 { 1958 {
1928 scrollBar.setIdle (); 1959 page_dirn direction = NO_DIR;
1960
1961 if (scrollBar.upButton (ev.y))
1962 direction = UP; /* up */
1963 else if (scrollBar.dnButton (ev.y))
1964 direction = DN; /* down */
1965
1966 scrollBar.state = STATE_IDLE;
1929 /* 1967 /*
1930 * Rxvt-style scrollbar: 1968 * Rxvt-style scrollbar:
1931 * move up if mouse is above slider 1969 * move up if mouse is above slider
1932 * move dn if mouse is below slider 1970 * move dn if mouse is below slider
1933 * 1971 *
1942 /* 1980 /*
1943 * Mouse report disabled scrollbar: 1981 * Mouse report disabled scrollbar:
1944 * arrow buttons - send up/down 1982 * arrow buttons - send up/down
1945 * click on scrollbar - send pageup/down 1983 * click on scrollbar - send pageup/down
1946 */ 1984 */
1947 if ((scrollBar.style == R_SB_NEXT 1985 if (direction == UP)
1948 && scrollbarnext_upButton (ev.y))
1949 || (scrollBar.style == R_SB_RXVT
1950 && scrollbarrxvt_upButton (ev.y)))
1951 tt_printf ("\033[A"); 1986 tt_printf ("\033[A");
1952 else if ((scrollBar.style == R_SB_NEXT 1987 else if (direction == DN)
1953 && scrollbarnext_dnButton (ev.y))
1954 || (scrollBar.style == R_SB_RXVT
1955 && scrollbarrxvt_dnButton (ev.y)))
1956 tt_printf ("\033[B"); 1988 tt_printf ("\033[B");
1957 else 1989 else
1958 switch (ev.button) 1990 switch (ev.button)
1959 { 1991 {
1960 case Button2: 1992 case Button2:
1968 break; 2000 break;
1969 } 2001 }
1970 } 2002 }
1971 else 2003 else
1972#endif /* NO_SCROLLBAR_REPORT */ 2004#endif /* NO_SCROLLBAR_REPORT */
1973
1974 {
1975 char upordown = 0;
1976
1977 if (scrollBar.style == R_SB_NEXT)
1978 { 2005 {
1979 if (scrollbarnext_upButton (ev.y)) 2006 if (direction != NO_DIR)
1980 upordown = -1; /* up */
1981 else if (scrollbarnext_dnButton (ev.y))
1982 upordown = 1; /* down */
1983 }
1984 else if (scrollBar.style == R_SB_RXVT)
1985 {
1986 if (scrollbarrxvt_upButton (ev.y))
1987 upordown = -1; /* up */
1988 else if (scrollbarrxvt_dnButton (ev.y))
1989 upordown = 1; /* down */
1990 }
1991
1992 if (upordown)
1993 { 2007 {
1994#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2008#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1995 if (!cont_scroll_ev.is_active ()) 2009 if (!cont_scroll_ev.is_active ())
1996 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2010 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1997#endif 2011#endif
1998 if (scr_page (upordown < 0 ? UP : DN, 1)) 2012 if (scr_page (direction, 1))
1999 { 2013 {
2000 if (upordown < 0) 2014 if (direction == UP)
2001 scrollBar.setUp (); 2015 scrollBar.state = STATE_UP;
2002 else 2016 else
2003 scrollBar.setDn (); 2017 scrollBar.state = STATE_DOWN;
2004 } 2018 }
2005 } 2019 }
2006 else 2020 else
2007 switch (ev.button) 2021 switch (ev.button)
2008 { 2022 {
2009 case Button2: 2023 case Button2:
2010 switch (scrollbar_align) 2024 switch (scrollBar.align)
2011 { 2025 {
2012 case R_SB_ALIGN_TOP: 2026 case R_SB_ALIGN_TOP:
2013 csrO = 0; 2027 csrO = 0;
2014 break; 2028 break;
2015 case R_SB_ALIGN_CENTRE: 2029 case R_SB_ALIGN_CENTRE:
2021 } 2035 }
2022 2036
2023 if (scrollBar.style == R_SB_XTERM 2037 if (scrollBar.style == R_SB_XTERM
2024 || scrollbar_above_slider (ev.y) 2038 || scrollbar_above_slider (ev.y)
2025 || scrollbar_below_slider (ev.y)) 2039 || scrollbar_below_slider (ev.y))
2026 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2040 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2027 2041
2028 scrollBar.setMotion (); 2042 scrollBar.state = STATE_MOTION;
2029 break; 2043 break;
2030 2044
2031 case Button1: 2045 case Button1:
2032 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2046 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2033 csrO = ev.y - scrollBar.top; 2047 csrO = ev.y - scrollBar.top;
2034 /* FALLTHROUGH */ 2048 /* FALLTHROUGH */
2035 2049
2036 case Button3: 2050 case Button3:
2037 if (scrollBar.style != R_SB_XTERM) 2051 if (scrollBar.style != R_SB_XTERM)
2047 scr_page (DN, nrow - 1); 2061 scr_page (DN, nrow - 1);
2048# else 2062# else
2049 scr_page (DN, nrow / 4); 2063 scr_page (DN, nrow / 4);
2050# endif 2064# endif
2051 else 2065 else
2052 scrollBar.setMotion (); 2066 scrollBar.state = STATE_MOTION;
2053 } 2067 }
2054 else 2068 else
2055 { 2069 {
2056 scr_page ((ev.button == Button1 ? DN : UP), 2070 scr_page ((ev.button == Button1 ? DN : UP),
2057 (nrow 2071 (nrow
2058 * scrollbar_position (ev.y) 2072 * scrollbar_position (ev.y)
2059 / scrollbar_size ())); 2073 / scrollBar.size ()));
2060 } 2074 }
2061 2075
2062 break; 2076 break;
2063 } 2077 }
2064 } 2078 }
2074 2088
2075 csrO = 0; /* reset csr Offset */ 2089 csrO = 0; /* reset csr Offset */
2076 if (!bypass_keystate) 2090 if (!bypass_keystate)
2077 reportmode = !! (priv_modes & PrivMode_mouse_report); 2091 reportmode = !! (priv_modes & PrivMode_mouse_report);
2078 2092
2079 if (scrollbar_isUpDn ()) 2093 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2080 { 2094 {
2081 scrollBar.setIdle (); 2095 scrollBar.state = STATE_IDLE;
2082 scrollbar_show (0); 2096 scrollBar.show (0);
2083 } 2097 }
2084 2098
2085#ifdef SELECTION_SCROLLING 2099#ifdef SELECTION_SCROLLING
2086 sel_scroll_ev.stop(); 2100 sel_scroll_ev.stop();
2087#endif 2101#endif
2167 2181
2168 if (!slip_wheel_ev.is_active ()) 2182 if (!slip_wheel_ev.is_active ())
2169 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2183 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2170 } 2184 }
2171 else 2185 else
2186# endif
2172 { 2187 {
2173# endif
2174 scr_page (v, i); 2188 scr_page (v, i);
2175 scrollbar_show (1); 2189 scrollBar.show (1);
2176# ifdef MOUSE_SLIP_WHEELING
2177 } 2190 }
2178# endif
2179 } 2191 }
2180 break; 2192 break;
2181#endif 2193#endif
2182 } 2194 }
2183 } 2195 }
2184} 2196}
2185 2197
2186/*}}} */ 2198/*}}} */
2187 2199
2188bool 2200void
2189rxvt_term::cmd_parse () 2201rxvt_term::cmd_parse ()
2190{ 2202{
2191 bool flag = false;
2192 wchar_t ch = NOCHAR; 2203 wchar_t ch = NOCHAR;
2193 char *seq_begin; // remember start of esc-sequence here 2204 char *seq_begin; // remember start of esc-sequence here
2194 2205
2195 for (;;) 2206 for (;;)
2196 { 2207 {
2197 if (ch == NOCHAR) 2208 if (expect_false (ch == NOCHAR))
2198 { 2209 {
2199 seq_begin = cmdbuf_ptr; 2210 seq_begin = cmdbuf_ptr;
2200 ch = next_char (); 2211 ch = next_char ();
2201 2212
2202 if (ch == NOCHAR) 2213 if (ch == NOCHAR)
2203 break; 2214 break;
2204 } 2215 }
2205 2216
2206 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2217 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2207 { 2218 {
2208 if (!seen_input) 2219 if (expect_false (!seen_input))
2209 { 2220 {
2210 seen_input = 1; 2221 seen_input = 1;
2211 // many badly-written programs (e.g. jed) contain a race condition: 2222 // many badly-written programs (e.g. jed) contain a race condition:
2212 // they first read the screensize and then install a SIGWINCH handler. 2223 // they first read the screensize and then install a SIGWINCH handler.
2213 // some window managers resize the window early, and these programs 2224 // some window managers resize the window early, and these programs
2226 wchar_t *str = buf; 2237 wchar_t *str = buf;
2227 wchar_t *eol = str + min (ncol, UBUFSIZ); 2238 wchar_t *eol = str + min (ncol, UBUFSIZ);
2228 2239
2229 for (;;) 2240 for (;;)
2230 { 2241 {
2231 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2242 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2232 break; 2243 break;
2233 2244
2234 *str++ = ch; 2245 *str++ = ch;
2235 2246
2236 if (ch == C0_LF || str >= eol) 2247 if (expect_false (ch == C0_LF || str >= eol))
2237 { 2248 {
2238 if (ch == C0_LF) 2249 if (ch == C0_LF)
2239 nlines++; 2250 nlines++;
2240 2251
2241 refresh_count++; 2252 refresh_count++;
2290 * What the heck we'll cheat and only refresh less than every page-full. 2301 * What the heck we'll cheat and only refresh less than every page-full.
2291 * if skipScroll is enabled. 2302 * if skipScroll is enabled.
2292 */ 2303 */
2293 if (refreshnow) 2304 if (refreshnow)
2294 { 2305 {
2295 flag = true;
2296 scr_refresh (); 2306 scr_refresh ();
2297 want_refresh = 1; 2307 want_refresh = 1;
2298 } 2308 }
2299
2300 } 2309 }
2301 else 2310 else
2302 { 2311 {
2303 try 2312 try
2304 { 2313 {
2312 } 2321 }
2313 2322
2314 ch = NOCHAR; 2323 ch = NOCHAR;
2315 } 2324 }
2316 } 2325 }
2317
2318 return flag;
2319} 2326}
2320 2327
2321// read the next character 2328// read the next character
2322wchar_t 2329wchar_t
2323rxvt_term::next_char () NOTHROW 2330rxvt_term::next_char () NOTHROW
2324{ 2331{
2325 while (cmdbuf_ptr < cmdbuf_endp) 2332 while (cmdbuf_ptr < cmdbuf_endp)
2326 { 2333 {
2327 // assume 7-bit to be ascii ALWAYS 2334 // assume 7-bit to be ascii ALWAYS
2328 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2335 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2329 return *cmdbuf_ptr++; 2336 return *cmdbuf_ptr++;
2330 2337
2331 wchar_t wc; 2338 wchar_t wc;
2332 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2339 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2333 2340
2337 cmdbuf_ptr = cmdbuf_endp; 2344 cmdbuf_ptr = cmdbuf_endp;
2338 break; 2345 break;
2339 } 2346 }
2340 2347
2341 if (len == (size_t)-1) 2348 if (len == (size_t)-1)
2349 {
2350 mbstate.reset (); // reset now undefined conversion state
2342 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2351 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2352 }
2343 2353
2344 // assume wchar == unicode 2354 // assume wchar == unicode
2345 cmdbuf_ptr += len; 2355 cmdbuf_ptr += len;
2346 return wc & UNICODE_MASK; 2356 return wc & UNICODE_MASK;
2347 } 2357 }
2391/*----------------------------------------------------------------------*/ 2401/*----------------------------------------------------------------------*/
2392#ifdef PRINTPIPE 2402#ifdef PRINTPIPE
2393FILE * 2403FILE *
2394rxvt_term::popen_printer () 2404rxvt_term::popen_printer ()
2395{ 2405{
2396 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2406 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2397 2407
2398 if (stream == NULL) 2408 if (stream == NULL)
2399 rxvt_warn ("can't open printer pipe, not printing.\n"); 2409 rxvt_warn ("can't open printer pipe, not printing.\n");
2400 2410
2401 return stream; 2411 return stream;
2412 * simulate attached vt100 printer 2422 * simulate attached vt100 printer
2413 */ 2423 */
2414void 2424void
2415rxvt_term::process_print_pipe () 2425rxvt_term::process_print_pipe ()
2416{ 2426{
2417 int done; 2427 FILE *fd = popen_printer ();
2418 FILE *fd;
2419 2428
2420 if ((fd = popen_printer ()) == NULL) 2429 if (!fd)
2421 return; 2430 return;
2422 2431
2423 /* 2432 /*
2424 * Send all input to the printer until either ESC[4i or ESC[?4i 2433 * Send all input to the printer until either ESC[4i or ESC[?4i
2425 * is received. 2434 * is received.
2426 */ 2435 */
2427 for (done = 0; !done;) 2436 for (int done = 0; !done; )
2428 { 2437 {
2429 unsigned char buf[8]; 2438 unsigned char buf[8];
2430 unicode_t ch; 2439 unicode_t ch;
2431 unsigned int i, len; 2440 unsigned int i, len;
2432 2441
2577 break; 2586 break;
2578 case 'Z': /* identify the terminal type */ 2587 case 'Z': /* identify the terminal type */
2579 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2588 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2580 break; 2589 break;
2581 case '<': /* turn off VT52 mode */ 2590 case '<': /* turn off VT52 mode */
2582 PrivMode (0, PrivMode_vt52); 2591 set_privmode (PrivMode_vt52, 0);
2583 break; 2592 break;
2584 case 'F': /* use special graphics character set */ 2593 case 'F': /* use special graphics character set */
2585 case 'G': /* use regular character set */ 2594 case 'G': /* use regular character set */
2586 /* unimplemented */ 2595 /* unimplemented */
2587 break; 2596 break;
2641 scr_forwardindex (); 2650 scr_forwardindex ();
2642 break; 2651 break;
2643#endif 2652#endif
2644 case '=': 2653 case '=':
2645 case '>': 2654 case '>':
2646 PrivMode ((ch == '='), PrivMode_aplKP); 2655 set_privmode (PrivMode_aplKP, ch == '=');
2647 break; 2656 break;
2648 2657
2649 case C1_40: 2658 case C1_40:
2650 cmd_getc (); 2659 cmd_getc ();
2651 break; 2660 break;
2690 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2699 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2691 case C1_SCI: /* ESC Z */ 2700 case C1_SCI: /* ESC Z */
2692 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2701 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2693 break; /* steal obsolete ESC [ c */ 2702 break; /* steal obsolete ESC [ c */
2694 2703
2695 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2704 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2696 case C1_CSI: /* ESC [ */ 2705 case C1_CSI: /* ESC [ */
2697 process_csi_seq (); 2706 process_csi_seq ();
2698 break; 2707 break;
2699 2708
2700 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2709 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2701 case C1_OSC: /* ESC ] */ 2710 case C1_OSC: /* ESC ] */
2702 process_osc_seq (); 2711 process_osc_seq ();
2703 break; 2712 break;
2704 2713
2705 /* 8.3.106: RESET TO INITIAL STATE */ 2714 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2706 case 'c': 2715 case 'c':
2707 mbstate.reset (); 2716 mbstate.reset ();
2708 scr_poweron (); 2717 scr_poweron ();
2709 scrollbar_show (1); 2718 scrollBar.show (1);
2710 break; 2719 break;
2711 2720
2712 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2721 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2713 case 'n': 2722 case 'n':
2714 scr_charset_choose (2); 2723 scr_charset_choose (2);
2765 2774
2766 nargs = 0; 2775 nargs = 0;
2767 2776
2768 priv = 0; 2777 priv = 0;
2769 ch = cmd_getc (); 2778 ch = cmd_getc ();
2770 if (ch >= '<' && ch <= '?') 2779 if ((ch >= '<' && ch <= '?') || ch == '!')
2771 { 2780 {
2772 /* '<' '=' '>' '?' */ 2781 /* '<' '=' '>' '?' '!' */
2773 priv = ch; 2782 priv = ch;
2774 ch = cmd_getc (); 2783 ch = cmd_getc ();
2775 } 2784 }
2776 2785
2777 /* read any numerical arguments */ 2786 /* read any numerical arguments */
2826 // versions. 2835 // versions.
2827 // 2836 //
2828 tt_printf ("\033[>%d;95;0c", 'U'); 2837 tt_printf ("\033[>%d;95;0c", 'U');
2829 } 2838 }
2830 break; 2839 break;
2840
2831 case '?': 2841 case '?':
2832 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2842 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2833 process_terminal_mode (ch, priv, nargs, arg); 2843 process_terminal_mode (ch, priv, nargs, arg);
2834 break; 2844 break;
2845
2846 case '!':
2847 if (ch == CSI_70)
2848 {
2849 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2850 scr_soft_reset ();
2851
2852 static const int pm_h[] = { 7, 25 };
2853 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 };
2854
2855 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h);
2856 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l);
2835 } 2857 }
2858 break;
2859 }
2860
2836 return; 2861 return;
2837 } 2862 }
2838 2863
2839 switch (ch) 2864 switch (ch)
2840 { 2865 {
3269 3294
3270/* 3295/*
3271 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3296 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3272 */ 3297 */
3273void 3298void
3274rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3299rxvt_term::process_xterm_seq (int op, char *str, char resp)
3275{ 3300{
3276 int color; 3301 int color;
3277 char *buf, *name; 3302 char *buf, *name;
3278 bool query = str[0] == '?' && !str[1]; 3303 bool query = str[0] == '?' && !str[1];
3279 int saveop = op; 3304 int saveop = op;
3320 3345
3321 XFree (value); 3346 XFree (value);
3322 } 3347 }
3323 else 3348 else
3324 { 3349 {
3325 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3350 char *eq = strchr (str, '=');
3326 3351
3327 if (eq) 3352 if (eq)
3328 { 3353 {
3329 *eq = 0; 3354 *eq = 0;
3330 set_utf8_property (display->atom (str), eq + 1); 3355 set_utf8_property (display->atom (str), eq + 1);
3351 *buf++ = '\0'; 3376 *buf++ = '\0';
3352 3377
3353 process_color_seq (op, color, name, resp); 3378 process_color_seq (op, color, name, resp);
3354 } 3379 }
3355 break; 3380 break;
3381 case Rxvt_restoreFG:
3356 case XTerm_Color00: 3382 case XTerm_Color00:
3357 process_color_seq (op, Color_fg, str, resp); 3383 process_color_seq (op, Color_fg, str, resp);
3358 break; 3384 break;
3385 case Rxvt_restoreBG:
3359 case XTerm_Color01: 3386 case XTerm_Color01:
3360 process_color_seq (op, Color_bg, str, resp); 3387 process_color_seq (op, Color_bg, str, resp);
3361 break; 3388 break;
3362#ifndef NO_CURSORCOLOR 3389#ifndef NO_CURSORCOLOR
3363 case XTerm_Color_cursor: 3390 case XTerm_Color_cursor:
3384 break; 3411 break;
3385 case URxvt_Color_IT: 3412 case URxvt_Color_IT:
3386 process_color_seq (op, Color_IT, str, resp); 3413 process_color_seq (op, Color_IT, str, resp);
3387 break; 3414 break;
3388#endif 3415#endif
3416 case URxvt_Color_border:
3417 process_color_seq (op, Color_border, str, resp);
3418 break;
3389#if ENABLE_TRANSPARENCY 3419#if ENABLE_TRANSPARENCY
3390 case URxvt_Color_tint: 3420 case URxvt_Color_tint:
3391 process_color_seq (op, Color_tint, str, resp); 3421 process_color_seq (op, Color_tint, str, resp);
3392 { 3422 {
3393 bool changed = false; 3423 bool changed = false;
3424
3394 if (ISSET_PIXCOLOR (Color_tint)) 3425 if (ISSET_PIXCOLOR (Color_tint))
3395 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3426 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3396 else 3427 else
3397 changed = bgPixmap.unset_tint (); 3428 changed = bgPixmap.unset_tint ();
3429
3398 if (changed) 3430 if (changed)
3399 update_background (); 3431 update_background ();
3400 } 3432 }
3401 3433
3402 break; 3434 break;
3406 case Rxvt_Pixmap: 3438 case Rxvt_Pixmap:
3407 if (!strcmp (str, "?")) 3439 if (!strcmp (str, "?"))
3408 { 3440 {
3409 char str[256]; 3441 char str[256];
3410 3442
3411 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3443 sprintf (str, "[%dx%d+%d+%d]",
3412 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3444 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3413 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3445 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3414 process_xterm_seq (XTerm_title, str, CHAR_ST); 3446 process_xterm_seq (XTerm_title, str, CHAR_ST);
3415 } 3447 }
3416 else 3448 else
3425 changed++; 3457 changed++;
3426 str = strchr (str, ';'); 3458 str = strchr (str, ';');
3427 if (str == NULL) 3459 if (str == NULL)
3428 bgPixmap.set_defaultGeometry (); 3460 bgPixmap.set_defaultGeometry ();
3429 } 3461 }
3462
3430 while (str) 3463 while (str)
3431 { 3464 {
3432 str++; 3465 str++;
3433 if (bgPixmap.set_geometry (str)) 3466 if (bgPixmap.set_geometry (str))
3434 changed++; 3467 changed++;
3435 str = strchr (str, ';'); 3468 str = strchr (str, ';');
3436 } 3469 }
3470
3437 if (changed) 3471 if (changed)
3438 update_background (); 3472 update_background ();
3439 } 3473 }
3440 break; 3474 break;
3441#endif 3475#endif
3442
3443 case Rxvt_restoreFG:
3444 set_window_color (Color_fg, str);
3445 break;
3446 case Rxvt_restoreBG:
3447 set_window_color (Color_bg, str);
3448 break;
3449 3476
3450 case XTerm_logfile: 3477 case XTerm_logfile:
3451 // TODO, when secure mode? 3478 // TODO, when secure mode?
3452 break; 3479 break;
3453 3480
3520 break; 3547 break;
3521#endif 3548#endif
3522 3549
3523#if ENABLE_PERL 3550#if ENABLE_PERL
3524 case URxvt_perl: 3551 case URxvt_perl:
3525 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3552 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3526 ; // no responses yet
3527 break; 3553 break;
3528#endif 3554#endif
3529 } 3555 }
3530} 3556}
3531/*----------------------------------------------------------------------*/ 3557/*----------------------------------------------------------------------*/
3554 { 3580 {
3555 if (mode == 'r') 3581 if (mode == 'r')
3556 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3582 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3557 else 3583 else
3558 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3584 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3559 PrivMode (state, bit); 3585 set_privmode (bit, state);
3560 } 3586 }
3561 3587
3562 return state; 3588 return state;
3563} 3589}
3564 3590
3572 static const struct 3598 static const struct
3573 { 3599 {
3574 const int argval; 3600 const int argval;
3575 const unsigned long bit; 3601 const unsigned long bit;
3576 } argtopriv[] = { 3602 } argtopriv[] = {
3577 { 1, PrivMode_aplCUR }, 3603 { 1, PrivMode_aplCUR }, // DECCKM
3578 { 2, PrivMode_vt52 }, 3604 { 2, PrivMode_vt52 },
3579 { 3, PrivMode_132 }, 3605 { 3, PrivMode_132 }, // DECCOLM
3580 { 4, PrivMode_smoothScroll }, 3606 { 4, PrivMode_smoothScroll }, // DECSCLM
3581 { 5, PrivMode_rVideo }, 3607 { 5, PrivMode_rVideo }, // DECSCNM
3582 { 6, PrivMode_relOrigin }, 3608 { 6, PrivMode_relOrigin }, // DECOM
3583 { 7, PrivMode_Autowrap }, 3609 { 7, PrivMode_Autowrap }, // DECAWM
3584 // 8, bi-directional support mode 3610 // 8, auto-repeat keys // DECARM
3585 { 9, PrivMode_MouseX10 }, 3611 { 9, PrivMode_MouseX10 },
3586 // 18, 19 printing-related 3612 // 18 end FF to printer after print screen
3613 // 19 Print screen prints full screen/scorll region
3587 { 25, PrivMode_VisibleCursor }, 3614 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3588#ifdef scrollBar_esc 3615#ifdef scrollBar_esc
3589 { scrollBar_esc, PrivMode_scrollBar }, 3616 { scrollBar_esc, PrivMode_scrollBar },
3590#endif 3617#endif
3591 { 35, PrivMode_ShiftKeys }, // rxvt extension 3618 { 35, PrivMode_ShiftKeys }, // rxvt extension
3619 // 38, tektronix mode // DECTEK
3592 { 40, PrivMode_132OK }, 3620 { 40, PrivMode_132OK },
3593 // 41 xterm more fixes NYI 3621 // 41 xterm more fixes NYI
3594 // 45 margin bell NYI 3622 // 45 margin bell NYI
3595 // 46 start logging 3623 // 46 start logging
3596 { 47, PrivMode_Screen }, 3624 { 47, PrivMode_Screen },
3597 { 66, PrivMode_aplKP }, 3625 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
3598#ifndef NO_BACKSPACE_KEY 3626#ifndef NO_BACKSPACE_KEY
3599 { 67, PrivMode_BackSpace }, 3627 { 67, PrivMode_BackSpace }, // DECBKM
3600#endif 3628#endif
3601 { 1000, PrivMode_MouseX11 }, 3629 { 1000, PrivMode_MouseX11 },
3602 { 1002, PrivMode_MouseBtnEvent }, 3630 { 1002, PrivMode_MouseBtnEvent },
3603 { 1003, PrivMode_MouseAnyEvent }, 3631 { 1003, PrivMode_MouseAnyEvent },
3604 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3632 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3608 // 1037 send DEL for keypad delete NYI 3636 // 1037 send DEL for keypad delete NYI
3609 { 1047, PrivMode_Screen }, 3637 { 1047, PrivMode_Screen },
3610 // 1048 save and restore cursor 3638 // 1048 save and restore cursor
3611 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3639 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3612 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3640 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3641 { 2004, PrivMode_BracketPaste },
3613 }; 3642 };
3614 3643
3615 if (nargs == 0) 3644 if (nargs == 0)
3616 return; 3645 return;
3617 3646
3642 3671
3643 scr_touch (true); 3672 scr_touch (true);
3644 break; 3673 break;
3645#endif 3674#endif
3646 case 1048: /* alternative cursor save */ 3675 case 1048: /* alternative cursor save */
3647 case 1049:
3648 if (option (Opt_secondaryScreen)) 3676 if (option (Opt_secondaryScreen))
3649 if (mode == 0) 3677 if (mode == 0)
3650 scr_cursor (RESTORE); 3678 scr_cursor (RESTORE);
3651 else if (mode == 1) 3679 else if (mode == 1)
3652 scr_cursor (SAVE); 3680 scr_cursor (SAVE);
3661 case 2: /* VT52 mode */ 3689 case 2: /* VT52 mode */
3662 /* oddball mode. should be set regardless of set/reset 3690 /* oddball mode. should be set regardless of set/reset
3663 * parameter. Return from VT52 mode with an ESC < from 3691 * parameter. Return from VT52 mode with an ESC < from
3664 * within VT52 mode 3692 * within VT52 mode
3665 */ 3693 */
3666 PrivMode (1, PrivMode_vt52); 3694 set_privmode (PrivMode_vt52, 1);
3667 break; 3695 break;
3668 case 3: /* 80/132 */ 3696 case 3: /* 80/132 */
3669 if (priv_modes & PrivMode_132OK) 3697 if (priv_modes & PrivMode_132OK)
3670 set_widthheight (((state ? 132 : 80) * fwidth), height); 3698 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3671 break; 3699 break;
3672 case 4: /* smooth scrolling */ 3700 case 4: /* smooth scrolling */
3673 set_option (Opt_jumpScroll, !state); 3701 set_option (Opt_jumpScroll, !state);
3674 break; 3702 break;
3675 case 5: /* reverse video */ 3703 case 5: /* reverse video */
3686 if (state) /* orthogonal */ 3714 if (state) /* orthogonal */
3687 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3715 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3688 break; 3716 break;
3689#ifdef scrollBar_esc 3717#ifdef scrollBar_esc
3690 case scrollBar_esc: 3718 case scrollBar_esc:
3691 if (scrollbar_mapping (state)) 3719 if (scrollBar.map (state))
3692 { 3720 {
3693 resize_all_windows (0, 0, 0); 3721 resize_all_windows (0, 0, 0);
3694 scr_touch (true); 3722 scr_touch (true);
3695 } 3723 }
3696 break; 3724 break;
3717 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3745 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3718 vt_emask_mouse = PointerMotionMask; 3746 vt_emask_mouse = PointerMotionMask;
3719 } 3747 }
3720 else 3748 else
3721 vt_emask_mouse = NoEventMask; 3749 vt_emask_mouse = NoEventMask;
3750
3722 vt_select_input (); 3751 vt_select_input ();
3723 break; 3752 break;
3724 case 1010: /* scroll to bottom on TTY output inhibit */ 3753 case 1010: /* scroll to bottom on TTY output inhibit */
3725 set_option (Opt_scrollTtyOutput, !state); 3754 set_option (Opt_scrollTtyOutput, !state);
3726 break; 3755 break;
3727 case 1011: /* scroll to bottom on key press */ 3756 case 1011: /* scroll to bottom on key press */
3728 set_option (Opt_scrollTtyKeypress, state); 3757 set_option (Opt_scrollTtyKeypress, state);
3729 break; 3758 break;
3730 case 1047: /* secondary screen w/ clearing last */ 3759 case 1047: /* secondary screen w/ clearing last */
3731 if (option (Opt_secondaryScreen)) 3760 if (option (Opt_secondaryScreen))
3732 if (current_screen != PRIMARY) 3761 if (!state)
3733 scr_erase_screen (2); 3762 scr_erase_screen (2);
3763
3734 scr_change_screen (state); 3764 scr_change_screen (state);
3735 break; 3765 break;
3736 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
3737 scr_change_screen (state); 3771 scr_change_screen (state);
3772
3738 if (option (Opt_secondaryScreen)) 3773 if (option (Opt_secondaryScreen))
3739 if (current_screen != PRIMARY) 3774 if (state)
3740 scr_erase_screen (2); 3775 scr_erase_screen (2);
3776 else
3777 scr_cursor (RESTORE);
3741 break; 3778 break;
3742 default: 3779 default:
3743 break; 3780 break;
3744 } 3781 }
3745 } 3782 }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines