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.386 by ayin, Fri Dec 28 11:02:31 2007 UTC vs.
Revision 1.456 by sf-exg, Fri Oct 22 16:49:26 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_idx (chr[i])];
204 fname[i] = rxvt_utf8towcs (f->name);
201 int width = wcswidth (fname, wcslen (fname)); 205 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
206 }
202 207
203 max_it (width, 8+5); // for char + 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 {
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
320 * Always permit `shift' to override the current setting 421 * Always permit `shift' to override the current setting
321 */ 422 */
322 shft = ev.state & ShiftMask; 423 shft = ev.state & ShiftMask;
323 ctrl = ev.state & ControlMask; 424 ctrl = ev.state & ControlMask;
324 meta = ev.state & ModMetaMask; 425 meta = ev.state & ModMetaMask;
325
326 if (numlock_state || (ev.state & ModNumLockMask))
327 {
328 numlock_state = (ev.state & ModNumLockMask);
329 PrivMode ((!numlock_state), PrivMode_aplKP);
330 }
331 426
332 kbuf[0] = 0; 427 kbuf[0] = 0;
333 428
334#ifdef USE_XIM 429#ifdef USE_XIM
335 if (Input_Context) 430 if (Input_Context)
410#ifdef PAGING_CONTEXT_LINES 505#ifdef PAGING_CONTEXT_LINES
411 lnsppg = nrow - PAGING_CONTEXT_LINES; 506 lnsppg = nrow - PAGING_CONTEXT_LINES;
412#else 507#else
413 lnsppg = nrow * 4 / 5; 508 lnsppg = nrow * 4 / 5;
414#endif 509#endif
510 max_it (lnsppg, 1);
511
415 if (keysym == XK_Prior) 512 if (keysym == XK_Prior)
416 { 513 {
417 scr_page (UP, lnsppg); 514 scr_page (UP, lnsppg);
418 return; 515 return;
419 } 516 }
484 } 581 }
485 } 582 }
486 583
487#if ENABLE_FRILLS || ISO_14755 584#if ENABLE_FRILLS || ISO_14755
488 // ISO 14755 support 585 // ISO 14755 support
489 if (shft && ctrl) 586 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
490 { 587 {
491 int hv; 588 int hv;
492 589
493 if (iso14755buf & ISO_14755_51 590 if (iso14755buf & ISO_14755_51
494 && (keysym == XK_space || keysym == XK_KP_Space 591 && (keysym == XK_space || keysym == XK_KP_Space
524 scr_overlay_off (); 621 scr_overlay_off ();
525# endif 622# endif
526 iso14755buf = 0; 623 iso14755buf = 0;
527 } 624 }
528 } 625 }
626 else if (option (Opt_iso14755) &&
529 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 627 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
530 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 628 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
531 if (!(iso14755buf & ISO_14755_STARTED)) 629 if (!(iso14755buf & ISO_14755_STARTED))
532 { 630 {
533 iso14755buf |= ISO_14755_STARTED; 631 iso14755buf |= ISO_14755_STARTED;
534# if ISO_14755 632# if ISO_14755
535 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 633 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
546 } 644 }
547#endif 645#endif
548 646
549 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 647 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
550 { 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)
551 { 658 {
552 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; 659#ifndef NO_BACKSPACE_KEY
553 newlen = 1; 660 case XK_BackSpace:
554#ifdef XK_KP_Home 661 if (priv_modes & PrivMode_HaveBackSpace)
555 static const KeySym keypadtrans[] = { 662 {
556 XK_KP_7, // XK_KP_Home 663 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
557 XK_KP_4, // XK_KP_Left 664 ^ !!ctrl) ? '\b' : '\177';
558 XK_KP_8, // XK_KP_Up 665 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 }; 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;
571 692
572 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:
573 { 773 {
574 unsigned int index = keysym - XK_KP_Home; 774 int param = map_function_key (keysym);
575 keysym = kp ? keypadtrans[index] : XK_Home + index; 775 if (param > 0)
776 sprintf (kbuf,"\033[%d~", param);
777 else
778 newlen = 0;
576 } 779 }
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; 780 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 } 781 }
782
783 if (newlen)
784 len = strlen (kbuf);
794 785
795 /* 786 /*
796 * Pass meta for all function keys, if 'meta' option set 787 * Pass meta for all function keys, if 'meta' option set
797 */ 788 */
798#ifdef META8_OPTION 789#ifdef META8_OPTION
1032 } 1023 }
1033 while (row < end_row); 1024 while (row < end_row);
1034 } 1025 }
1035 1026
1036 scr_refresh (); 1027 scr_refresh ();
1037 scrollbar_show (1); 1028 scrollBar.show (1);
1038#ifdef USE_XIM 1029#ifdef USE_XIM
1039 IMSendSpot (); 1030 IMSendSpot ();
1040#endif 1031#endif
1041 } 1032 }
1042 1033
1043 display->flush (); 1034 display->flush ();
1044} 1035}
1045 1036
1046/* checks wether a refresh is requested and starts the refresh timer */ 1037/* checks whether a refresh is requested and starts the refresh timer */
1047void 1038void
1048rxvt_term::refresh_check () 1039rxvt_term::refresh_check ()
1049{ 1040{
1050 if (want_refresh && !flush_ev.is_active ()) 1041 if (want_refresh && !flush_ev.is_active ())
1051 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally 1042 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1078{ 1069{
1079 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1070 if (scr_refresh_rend (RS_Blink, RS_Blink))
1080 { 1071 {
1081 hidden_text = !hidden_text; 1072 hidden_text = !hidden_text;
1082 want_refresh = 1; 1073 want_refresh = 1;
1083 refresh_check (); 1074 refresh_check ();
1084 } 1075 }
1085 else 1076 else
1086 w.stop (); 1077 w.stop ();
1087} 1078}
1088#endif 1079#endif
1089 1080
1090#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1081#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1091void 1082void
1092rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1083rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1093{ 1084{
1094 if ((scrollbar_isUp () || scrollbar_isDn ()) 1085 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1095 && scr_page (scrollbar_isUp () ? UP : DN, 1)) 1086 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1096 { 1087 {
1097 want_refresh = 1; 1088 want_refresh = 1;
1098 refresh_check (); 1089 refresh_check ();
1099 } 1090 }
1100 else 1091 else
1144 { 1135 {
1145 // this should really be sched_yield(), but the linux guys thought 1136 // this should really be sched_yield(), but the linux guys thought
1146 // that giving a process calling sched_yield () less cpu time than 1137 // 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 1138 // ones with high nice levels is a useful thing to do. It surely is is
1148 // 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.
1149 1143
1150 struct timespec ts = { 0, 0 }; 1144 struct timespec ts = { 0, 1000 };
1151 nanosleep (&ts, 0); 1145 nanosleep (&ts, 0);
1152 1146
1153 w.stop (); 1147 w.stop ();
1154 } 1148 }
1155 1149
1205{ 1199{
1206 make_current (); 1200 make_current ();
1207 1201
1208 if (revents & ev::READ) 1202 if (revents & ev::READ)
1209 // loop, but don't allow a single term to monopolize us 1203 // loop, but don't allow a single term to monopolize us
1210 while (pty_fill ()) 1204 for (int i = CBUFCNT; i-- && pty_fill (); )
1211 if (cmd_parse ()) 1205 cmd_parse ();
1212 break;
1213 1206
1214 if (revents & ev::WRITE) 1207 if (revents & ev::WRITE)
1215 pty_write (); 1208 pty_write ();
1216 1209
1217 refresh_check (); 1210 refresh_check ();
1437 && ev.xfocus.mode != NotifyGrab) 1430 && ev.xfocus.mode != NotifyGrab)
1438 focus_out (); 1431 focus_out ();
1439 break; 1432 break;
1440 1433
1441 case ConfigureNotify: 1434 case ConfigureNotify:
1442 /* 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,
1444 szHint.width, szHint.height); */
1445 if (ev.xconfigure.window == parent[0]) 1435 if (ev.xconfigure.window == parent[0])
1446 { 1436 {
1447 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1437 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1448 ; 1438 ;
1449 1439
1454 } 1444 }
1455 else 1445 else
1456 { 1446 {
1457#ifdef HAVE_BG_PIXMAP 1447#ifdef HAVE_BG_PIXMAP
1458 if (bgPixmap.window_position_sensitive ()) 1448 if (bgPixmap.window_position_sensitive ())
1449 {
1450 if (mapped)
1459 update_background (); 1451 update_background ();
1452 else
1453 bgPixmap.invalidate ();
1454 }
1460#endif 1455#endif
1461 } 1456 }
1462 1457
1463 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1458 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1464 } 1459 }
1471 selection_property (ev.xproperty.window, ev.xproperty.atom); 1466 selection_property (ev.xproperty.window, ev.xproperty.atom);
1472 1467
1473 break; 1468 break;
1474 1469
1475 case SelectionClear: 1470 case SelectionClear:
1476 selection_clear (); 1471 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1477 break; 1472 break;
1478 1473
1479 case SelectionNotify: 1474 case SelectionNotify:
1480 if (selection_wait == Sel_normal) 1475 if (selection_wait == Sel_normal)
1481 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1476 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1484 case SelectionRequest: 1479 case SelectionRequest:
1485 selection_send (ev.xselectionrequest); 1480 selection_send (ev.xselectionrequest);
1486 break; 1481 break;
1487 1482
1488 case MapNotify: 1483 case MapNotify:
1484#ifdef HAVE_BG_PIXMAP
1485 /* This is needed specifically to fix the case of no window manager or a
1486 * non-reparenting window manager. In those cases we never get first
1487 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1488 * care of multiplicity of ConfigureNotify events arriving while WM does
1489 * reparenting.
1490 * We should not render background immediately, as there could be several
1491 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1492 * by scheduling background redraw as soon as we can, but giving a short
1493 * bit of time for ConfigureNotifies to arrive.
1494 * We should render background PRIOR to drawing any text, but AFTER all
1495 * of ConfigureNotifys for the best results.
1496 */
1497 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1498 update_background_ev.start (0.025);
1499#endif
1489 mapped = 1; 1500 mapped = 1;
1490#ifdef TEXT_BLINK 1501#ifdef TEXT_BLINK
1491 text_blink_ev.start (); 1502 text_blink_ev.start ();
1492#endif 1503#endif
1493 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1504 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1529 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1540 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1530 ; 1541 ;
1531 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1542 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1532 ; 1543 ;
1533 1544
1534 if (isScrollbarWindow (ev.xany.window)) 1545 if (scrollBar.state && ev.xany.window == scrollBar.win)
1535 { 1546 {
1536 scrollBar.setIdle (); 1547 scrollBar.state = STATE_IDLE;
1537 scrollbar_show (0); 1548 scrollBar.show (0);
1538 } 1549 }
1539 } 1550 }
1540 break; 1551 break;
1541 1552
1542 case MotionNotify: 1553 case MotionNotify:
1629#ifdef MOUSE_THRESHOLD 1640#ifdef MOUSE_THRESHOLD
1630 } 1641 }
1631#endif 1642#endif
1632 } 1643 }
1633 } 1644 }
1634 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1645 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1635 { 1646 {
1636 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1647 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1637 MotionNotify, &ev)) 1648 MotionNotify, &ev))
1638 ; 1649 ;
1639 1650
1641 &unused_root, &unused_child, 1652 &unused_root, &unused_child,
1642 &unused_root_x, &unused_root_y, 1653 &unused_root_x, &unused_root_y,
1643 &ev.xbutton.x, &ev.xbutton.y, 1654 &ev.xbutton.x, &ev.xbutton.y,
1644 &unused_mask); 1655 &unused_mask);
1645 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1656 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1646 scrollbar_size ()); 1657 scrollBar.size ());
1647 want_refresh = 1; 1658 want_refresh = 1;
1648 scrollbar_show (1); 1659 scrollBar.show (1);
1649 } 1660 }
1650 break; 1661 break;
1651 } 1662 }
1652 1663
1653#if defined(CURSOR_BLINK) 1664#if defined(CURSOR_BLINK)
1678#endif 1689#endif
1679 1690
1680 refresh_check (); 1691 refresh_check ();
1681} 1692}
1682 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
1683void 1710void
1684rxvt_term::focus_in () 1711rxvt_term::focus_in ()
1685{ 1712{
1686 if (!focus) 1713 if (!focus)
1687 { 1714 {
1688 focus = 1; 1715 focus = 1;
1689 want_refresh = 1; 1716 want_refresh = 1;
1690
1691 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1692 1717
1693#if USE_XIM 1718#if USE_XIM
1694 if (Input_Context != NULL) 1719 if (Input_Context != NULL)
1695 { 1720 {
1696 IMSetPosition (); 1721 IMSetPosition ();
1708 scr_recolour (); 1733 scr_recolour ();
1709 } 1734 }
1710#endif 1735#endif
1711#if ENABLE_FRILLS 1736#if ENABLE_FRILLS
1712 if (option (Opt_urgentOnBell)) 1737 if (option (Opt_urgentOnBell))
1713 { 1738 set_urgency (0);
1714 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1715 {
1716 h->flags &= ~XUrgencyHint;
1717 XSetWMHints (dpy, parent[0], h);
1718 }
1719 }
1720#endif 1739#endif
1740
1741 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1721 } 1742 }
1722} 1743}
1723 1744
1724void 1745void
1725rxvt_term::focus_out () 1746rxvt_term::focus_out ()
1727 if (focus) 1748 if (focus)
1728 { 1749 {
1729 focus = 0; 1750 focus = 0;
1730 want_refresh = 1; 1751 want_refresh = 1;
1731 1752
1732 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1753#if ENABLE_FRILLS
1733 1754 if (option (Opt_urgentOnBell))
1755 set_urgency (0);
1756#endif
1734#if ENABLE_FRILLS || ISO_14755 1757#if ENABLE_FRILLS || ISO_14755
1735 if (iso14755buf) 1758 if (iso14755buf)
1736 { 1759 {
1737 iso14755buf = 0; 1760 iso14755buf = 0;
1738# if ISO_14755 1761# if ISO_14755
1755 { 1778 {
1756 pix_colors = pix_colors_unfocused; 1779 pix_colors = pix_colors_unfocused;
1757 scr_recolour (); 1780 scr_recolour ();
1758 } 1781 }
1759#endif 1782#endif
1783
1784 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1760 } 1785 }
1761} 1786}
1762 1787
1763void 1788void
1764rxvt_term::update_fade_color (unsigned int idx) 1789rxvt_term::update_fade_color (unsigned int idx)
1841 /* save the xbutton state (for ButtonRelease) */ 1866 /* save the xbutton state (for ButtonRelease) */
1842 MEvent.state = ev.state; 1867 MEvent.state = ev.state;
1843#ifdef MOUSE_REPORT_DOUBLECLICK 1868#ifdef MOUSE_REPORT_DOUBLECLICK
1844 if (ev.button == MEvent.button && clickintime) 1869 if (ev.button == MEvent.button && clickintime)
1845 { 1870 {
1846 /* same button, within alloted time */ 1871 /* same button, within allowed time */
1847 MEvent.clicks++; 1872 MEvent.clicks++;
1848 1873
1849 if (MEvent.clicks > 1) 1874 if (MEvent.clicks > 1)
1850 { 1875 {
1851 /* only report double clicks */ 1876 /* only report double clicks */
1923 } 1948 }
1924 1949
1925 /* 1950 /*
1926 * Scrollbar window processing of button press 1951 * Scrollbar window processing of button press
1927 */ 1952 */
1928 if (isScrollbarWindow (ev.window)) 1953 if (scrollBar.state && ev.window == scrollBar.win)
1929 { 1954 {
1930 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;
1931 /* 1963 /*
1932 * Rxvt-style scrollbar: 1964 * Rxvt-style scrollbar:
1933 * move up if mouse is above slider 1965 * move up if mouse is above slider
1934 * move dn if mouse is below slider 1966 * move dn if mouse is below slider
1935 * 1967 *
1944 /* 1976 /*
1945 * Mouse report disabled scrollbar: 1977 * Mouse report disabled scrollbar:
1946 * arrow buttons - send up/down 1978 * arrow buttons - send up/down
1947 * click on scrollbar - send pageup/down 1979 * click on scrollbar - send pageup/down
1948 */ 1980 */
1949 if ((scrollBar.style == R_SB_NEXT 1981 if (direction == UP)
1950 && scrollbarnext_upButton (ev.y))
1951 || (scrollBar.style == R_SB_RXVT
1952 && scrollbarrxvt_upButton (ev.y)))
1953 tt_printf ("\033[A"); 1982 tt_printf ("\033[A");
1954 else if ((scrollBar.style == R_SB_NEXT 1983 else if (direction == DN)
1955 && scrollbarnext_dnButton (ev.y))
1956 || (scrollBar.style == R_SB_RXVT
1957 && scrollbarrxvt_dnButton (ev.y)))
1958 tt_printf ("\033[B"); 1984 tt_printf ("\033[B");
1959 else 1985 else
1960 switch (ev.button) 1986 switch (ev.button)
1961 { 1987 {
1962 case Button2: 1988 case Button2:
1970 break; 1996 break;
1971 } 1997 }
1972 } 1998 }
1973 else 1999 else
1974#endif /* NO_SCROLLBAR_REPORT */ 2000#endif /* NO_SCROLLBAR_REPORT */
1975
1976 {
1977 char upordown = 0;
1978
1979 if (scrollBar.style == R_SB_NEXT)
1980 { 2001 {
1981 if (scrollbarnext_upButton (ev.y)) 2002 if (direction != NO_DIR)
1982 upordown = -1; /* up */
1983 else if (scrollbarnext_dnButton (ev.y))
1984 upordown = 1; /* down */
1985 }
1986 else if (scrollBar.style == R_SB_RXVT)
1987 {
1988 if (scrollbarrxvt_upButton (ev.y))
1989 upordown = -1; /* up */
1990 else if (scrollbarrxvt_dnButton (ev.y))
1991 upordown = 1; /* down */
1992 }
1993
1994 if (upordown)
1995 { 2003 {
1996#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2004#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1997 if (!cont_scroll_ev.is_active ()) 2005 if (!cont_scroll_ev.is_active ())
1998 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2006 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1999#endif 2007#endif
2000 if (scr_page (upordown < 0 ? UP : DN, 1)) 2008 if (scr_page (direction, 1))
2001 { 2009 {
2002 if (upordown < 0) 2010 if (direction == UP)
2003 scrollBar.setUp (); 2011 scrollBar.state = STATE_UP;
2004 else 2012 else
2005 scrollBar.setDn (); 2013 scrollBar.state = STATE_DOWN;
2006 } 2014 }
2007 } 2015 }
2008 else 2016 else
2009 switch (ev.button) 2017 switch (ev.button)
2010 { 2018 {
2011 case Button2: 2019 case Button2:
2012 switch (scrollbar_align) 2020 switch (scrollBar.align)
2013 { 2021 {
2014 case R_SB_ALIGN_TOP: 2022 case R_SB_ALIGN_TOP:
2015 csrO = 0; 2023 csrO = 0;
2016 break; 2024 break;
2017 case R_SB_ALIGN_CENTRE: 2025 case R_SB_ALIGN_CENTRE:
2023 } 2031 }
2024 2032
2025 if (scrollBar.style == R_SB_XTERM 2033 if (scrollBar.style == R_SB_XTERM
2026 || scrollbar_above_slider (ev.y) 2034 || scrollbar_above_slider (ev.y)
2027 || scrollbar_below_slider (ev.y)) 2035 || scrollbar_below_slider (ev.y))
2028 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2036 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2029 2037
2030 scrollBar.setMotion (); 2038 scrollBar.state = STATE_MOTION;
2031 break; 2039 break;
2032 2040
2033 case Button1: 2041 case Button1:
2034 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2042 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2035 csrO = ev.y - scrollBar.top; 2043 csrO = ev.y - scrollBar.top;
2036 /* FALLTHROUGH */ 2044 /* FALLTHROUGH */
2037 2045
2038 case Button3: 2046 case Button3:
2039 if (scrollBar.style != R_SB_XTERM) 2047 if (scrollBar.style != R_SB_XTERM)
2049 scr_page (DN, nrow - 1); 2057 scr_page (DN, nrow - 1);
2050# else 2058# else
2051 scr_page (DN, nrow / 4); 2059 scr_page (DN, nrow / 4);
2052# endif 2060# endif
2053 else 2061 else
2054 scrollBar.setMotion (); 2062 scrollBar.state = STATE_MOTION;
2055 } 2063 }
2056 else 2064 else
2057 { 2065 {
2058 scr_page ((ev.button == Button1 ? DN : UP), 2066 scr_page ((ev.button == Button1 ? DN : UP),
2059 (nrow 2067 (nrow
2060 * scrollbar_position (ev.y) 2068 * scrollbar_position (ev.y)
2061 / scrollbar_size ())); 2069 / scrollBar.size ()));
2062 } 2070 }
2063 2071
2064 break; 2072 break;
2065 } 2073 }
2066 } 2074 }
2076 2084
2077 csrO = 0; /* reset csr Offset */ 2085 csrO = 0; /* reset csr Offset */
2078 if (!bypass_keystate) 2086 if (!bypass_keystate)
2079 reportmode = !! (priv_modes & PrivMode_mouse_report); 2087 reportmode = !! (priv_modes & PrivMode_mouse_report);
2080 2088
2081 if (scrollbar_isUpDn ()) 2089 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2082 { 2090 {
2083 scrollBar.setIdle (); 2091 scrollBar.state = STATE_IDLE;
2084 scrollbar_show (0); 2092 scrollBar.show (0);
2085 } 2093 }
2086 2094
2087#ifdef SELECTION_SCROLLING 2095#ifdef SELECTION_SCROLLING
2088 sel_scroll_ev.stop(); 2096 sel_scroll_ev.stop();
2089#endif 2097#endif
2139 selection_make (ev.time); 2147 selection_make (ev.time);
2140 break; 2148 break;
2141 2149
2142 case Button2: 2150 case Button2:
2143 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?
2144 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2152 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2145 break; 2153 break;
2146 2154
2147#ifdef MOUSE_WHEEL 2155#ifdef MOUSE_WHEEL
2148 case Button4: 2156 case Button4:
2149 case Button5: 2157 case Button5:
2169 2177
2170 if (!slip_wheel_ev.is_active ()) 2178 if (!slip_wheel_ev.is_active ())
2171 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2179 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2172 } 2180 }
2173 else 2181 else
2182# endif
2174 { 2183 {
2175# endif
2176 scr_page (v, i); 2184 scr_page (v, i);
2177 scrollbar_show (1); 2185 scrollBar.show (1);
2178# ifdef MOUSE_SLIP_WHEELING
2179 } 2186 }
2180# endif
2181 } 2187 }
2182 break; 2188 break;
2183#endif 2189#endif
2184 } 2190 }
2185 } 2191 }
2186} 2192}
2187 2193
2188/*}}} */ 2194/*}}} */
2189 2195
2190bool 2196void
2191rxvt_term::cmd_parse () 2197rxvt_term::cmd_parse ()
2192{ 2198{
2193 bool flag = false;
2194 wchar_t ch = NOCHAR; 2199 wchar_t ch = NOCHAR;
2195 char *seq_begin; // remember start of esc-sequence here 2200 char *seq_begin; // remember start of esc-sequence here
2196 2201
2197 for (;;) 2202 for (;;)
2198 { 2203 {
2199 if (ch == NOCHAR) 2204 if (expect_false (ch == NOCHAR))
2200 { 2205 {
2201 seq_begin = cmdbuf_ptr; 2206 seq_begin = cmdbuf_ptr;
2202 ch = next_char (); 2207 ch = next_char ();
2203 2208
2204 if (ch == NOCHAR) 2209 if (ch == NOCHAR)
2205 break; 2210 break;
2206 } 2211 }
2207 2212
2208 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))
2209 { 2214 {
2210 if (!seen_input) 2215 if (expect_false (!seen_input))
2211 { 2216 {
2212 seen_input = 1; 2217 seen_input = 1;
2213 // many badly-written programs (e.g. jed) contain a race condition: 2218 // many badly-written programs (e.g. jed) contain a race condition:
2214 // they first read the screensize and then install a SIGWINCH handler. 2219 // they first read the screensize and then install a SIGWINCH handler.
2215 // some window managers resize the window early, and these programs 2220 // some window managers resize the window early, and these programs
2228 wchar_t *str = buf; 2233 wchar_t *str = buf;
2229 wchar_t *eol = str + min (ncol, UBUFSIZ); 2234 wchar_t *eol = str + min (ncol, UBUFSIZ);
2230 2235
2231 for (;;) 2236 for (;;)
2232 { 2237 {
2233 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)))
2234 break; 2239 break;
2235 2240
2236 *str++ = ch; 2241 *str++ = ch;
2237 2242
2238 if (ch == C0_LF || str >= eol) 2243 if (expect_false (ch == C0_LF || str >= eol))
2239 { 2244 {
2240 if (ch == C0_LF) 2245 if (ch == C0_LF)
2241 nlines++; 2246 nlines++;
2242 2247
2243 refresh_count++; 2248 refresh_count++;
2292 * 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.
2293 * if skipScroll is enabled. 2298 * if skipScroll is enabled.
2294 */ 2299 */
2295 if (refreshnow) 2300 if (refreshnow)
2296 { 2301 {
2297 flag = true;
2298 scr_refresh (); 2302 scr_refresh ();
2299 want_refresh = 1; 2303 want_refresh = 1;
2300 } 2304 }
2301
2302 } 2305 }
2303 else 2306 else
2304 { 2307 {
2305 try 2308 try
2306 { 2309 {
2314 } 2317 }
2315 2318
2316 ch = NOCHAR; 2319 ch = NOCHAR;
2317 } 2320 }
2318 } 2321 }
2319
2320 return flag;
2321} 2322}
2322 2323
2323// read the next character 2324// read the next character
2324wchar_t 2325wchar_t
2325rxvt_term::next_char () NOTHROW 2326rxvt_term::next_char () NOTHROW
2326{ 2327{
2327 while (cmdbuf_ptr < cmdbuf_endp) 2328 while (cmdbuf_ptr < cmdbuf_endp)
2328 { 2329 {
2329 // assume 7-bit to be ascii ALWAYS 2330 // assume 7-bit to be ascii ALWAYS
2330 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2331 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2331 return *cmdbuf_ptr++; 2332 return *cmdbuf_ptr++;
2332 2333
2333 wchar_t wc; 2334 wchar_t wc;
2334 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);
2335 2336
2339 cmdbuf_ptr = cmdbuf_endp; 2340 cmdbuf_ptr = cmdbuf_endp;
2340 break; 2341 break;
2341 } 2342 }
2342 2343
2343 if (len == (size_t)-1) 2344 if (len == (size_t)-1)
2345 {
2346 mbstate.reset (); // reset now undefined conversion state
2344 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 }
2345 2349
2346 // assume wchar == unicode 2350 // assume wchar == unicode
2347 cmdbuf_ptr += len; 2351 cmdbuf_ptr += len;
2348 return wc & UNICODE_MASK; 2352 return wc & UNICODE_MASK;
2349 } 2353 }
2393/*----------------------------------------------------------------------*/ 2397/*----------------------------------------------------------------------*/
2394#ifdef PRINTPIPE 2398#ifdef PRINTPIPE
2395FILE * 2399FILE *
2396rxvt_term::popen_printer () 2400rxvt_term::popen_printer ()
2397{ 2401{
2398 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2402 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2399 2403
2400 if (stream == NULL) 2404 if (stream == NULL)
2401 rxvt_warn ("can't open printer pipe, not printing.\n"); 2405 rxvt_warn ("can't open printer pipe, not printing.\n");
2402 2406
2403 return stream; 2407 return stream;
2414 * simulate attached vt100 printer 2418 * simulate attached vt100 printer
2415 */ 2419 */
2416void 2420void
2417rxvt_term::process_print_pipe () 2421rxvt_term::process_print_pipe ()
2418{ 2422{
2419 int done; 2423 FILE *fd = popen_printer ();
2420 FILE *fd;
2421 2424
2422 if ((fd = popen_printer ()) == NULL) 2425 if (!fd)
2423 return; 2426 return;
2424 2427
2425 /* 2428 /*
2426 * 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
2427 * is received. 2430 * is received.
2428 */ 2431 */
2429 for (done = 0; !done;) 2432 for (int done = 0; !done; )
2430 { 2433 {
2431 unsigned char buf[8]; 2434 unsigned char buf[8];
2432 unicode_t ch; 2435 unicode_t ch;
2433 unsigned int i, len; 2436 unsigned int i, len;
2434 2437
2579 break; 2582 break;
2580 case 'Z': /* identify the terminal type */ 2583 case 'Z': /* identify the terminal type */
2581 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2584 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2582 break; 2585 break;
2583 case '<': /* turn off VT52 mode */ 2586 case '<': /* turn off VT52 mode */
2584 PrivMode (0, PrivMode_vt52); 2587 set_privmode (PrivMode_vt52, 0);
2585 break; 2588 break;
2586 case 'F': /* use special graphics character set */ 2589 case 'F': /* use special graphics character set */
2587 case 'G': /* use regular character set */ 2590 case 'G': /* use regular character set */
2588 /* unimplemented */ 2591 /* unimplemented */
2589 break; 2592 break;
2643 scr_forwardindex (); 2646 scr_forwardindex ();
2644 break; 2647 break;
2645#endif 2648#endif
2646 case '=': 2649 case '=':
2647 case '>': 2650 case '>':
2648 PrivMode ((ch == '='), PrivMode_aplKP); 2651 set_privmode (PrivMode_aplKP, ch == '=');
2649 break; 2652 break;
2650 2653
2651 case C1_40: 2654 case C1_40:
2652 cmd_getc (); 2655 cmd_getc ();
2653 break; 2656 break;
2692 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2695 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2693 case C1_SCI: /* ESC Z */ 2696 case C1_SCI: /* ESC Z */
2694 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2697 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2695 break; /* steal obsolete ESC [ c */ 2698 break; /* steal obsolete ESC [ c */
2696 2699
2697 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2700 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2698 case C1_CSI: /* ESC [ */ 2701 case C1_CSI: /* ESC [ */
2699 process_csi_seq (); 2702 process_csi_seq ();
2700 break; 2703 break;
2701 2704
2702 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2705 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2703 case C1_OSC: /* ESC ] */ 2706 case C1_OSC: /* ESC ] */
2704 process_osc_seq (); 2707 process_osc_seq ();
2705 break; 2708 break;
2706 2709
2707 /* 8.3.106: RESET TO INITIAL STATE */ 2710 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2708 case 'c': 2711 case 'c':
2709 mbstate.reset (); 2712 mbstate.reset ();
2710 scr_poweron (); 2713 scr_poweron ();
2711 scrollbar_show (1); 2714 scrollBar.show (1);
2712 break; 2715 break;
2713 2716
2714 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2717 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2715 case 'n': 2718 case 'n':
2716 scr_charset_choose (2); 2719 scr_charset_choose (2);
2767 2770
2768 nargs = 0; 2771 nargs = 0;
2769 2772
2770 priv = 0; 2773 priv = 0;
2771 ch = cmd_getc (); 2774 ch = cmd_getc ();
2772 if (ch >= '<' && ch <= '?') 2775 if ((ch >= '<' && ch <= '?') || ch == '!')
2773 { 2776 {
2774 /* '<' '=' '>' '?' */ 2777 /* '<' '=' '>' '?' '!' */
2775 priv = ch; 2778 priv = ch;
2776 ch = cmd_getc (); 2779 ch = cmd_getc ();
2777 } 2780 }
2778 2781
2779 /* read any numerical arguments */ 2782 /* read any numerical arguments */
2828 // versions. 2831 // versions.
2829 // 2832 //
2830 tt_printf ("\033[>%d;95;0c", 'U'); 2833 tt_printf ("\033[>%d;95;0c", 'U');
2831 } 2834 }
2832 break; 2835 break;
2836
2833 case '?': 2837 case '?':
2834 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2838 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2835 process_terminal_mode (ch, priv, nargs, arg); 2839 process_terminal_mode (ch, priv, nargs, arg);
2836 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);
2837 } 2853 }
2854 break;
2855 }
2856
2838 return; 2857 return;
2839 } 2858 }
2840 2859
2841 switch (ch) 2860 switch (ch)
2842 { 2861 {
3209 * 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)'
3210 */ 3229 */
3211void 3230void
3212rxvt_term::process_dcs_seq () 3231rxvt_term::process_dcs_seq ()
3213{ 3232{
3214 char *s;
3215 unicode_t eh;
3216
3217 /* 3233 /*
3218 * Not handled yet 3234 * Not handled yet
3219 */ 3235 */
3236
3237 unicode_t eh;
3220 s = get_to_st (eh); 3238 char *s = get_to_st (eh);
3221 if (s) 3239 if (s)
3222 free (s); 3240 free (s);
3223 3241
3224 return; 3242 return;
3225} 3243}
3229 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3247 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3230 */ 3248 */
3231void 3249void
3232rxvt_term::process_osc_seq () 3250rxvt_term::process_osc_seq ()
3233{ 3251{
3234 unicode_t ch, eh;
3235 int arg; 3252 int arg;
3236 3253
3237 ch = cmd_getc (); 3254 unicode_t ch = cmd_getc ();
3238 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3255 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3239 arg = arg * 10 + (ch - '0'); 3256 arg = arg * 10 + (ch - '0');
3240 3257
3241 if (ch == ';') 3258 if (ch == ';')
3242 { 3259 {
3260 unicode_t eh;
3243 char *s = get_to_st (eh); 3261 char *s = get_to_st (eh);
3244 3262
3245 if (s) 3263 if (s)
3246 { 3264 {
3247 process_xterm_seq (arg, s, eh); 3265 process_xterm_seq (arg, s, eh);
3271 3289
3272/* 3290/*
3273 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3291 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3274 */ 3292 */
3275void 3293void
3276rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3294rxvt_term::process_xterm_seq (int op, char *str, char resp)
3277{ 3295{
3278 int color; 3296 int color;
3279 char *buf, *name; 3297 char *buf, *name;
3280 bool query = str[0] == '?' && !str[1]; 3298 bool query = str[0] == '?' && !str[1];
3281 int saveop = op; 3299 int saveop = op;
3322 3340
3323 XFree (value); 3341 XFree (value);
3324 } 3342 }
3325 else 3343 else
3326 { 3344 {
3327 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3345 char *eq = strchr (str, '=');
3328 3346
3329 if (eq) 3347 if (eq)
3330 { 3348 {
3331 *eq = 0; 3349 *eq = 0;
3332 set_utf8_property (display->atom (str), eq + 1); 3350 set_utf8_property (display->atom (str), eq + 1);
3353 *buf++ = '\0'; 3371 *buf++ = '\0';
3354 3372
3355 process_color_seq (op, color, name, resp); 3373 process_color_seq (op, color, name, resp);
3356 } 3374 }
3357 break; 3375 break;
3376 case Rxvt_restoreFG:
3358 case XTerm_Color00: 3377 case XTerm_Color00:
3359 process_color_seq (op, Color_fg, str, resp); 3378 process_color_seq (op, Color_fg, str, resp);
3360 break; 3379 break;
3380 case Rxvt_restoreBG:
3361 case XTerm_Color01: 3381 case XTerm_Color01:
3362 process_color_seq (op, Color_bg, str, resp); 3382 process_color_seq (op, Color_bg, str, resp);
3363 break; 3383 break;
3364#ifndef NO_CURSORCOLOR 3384#ifndef NO_CURSORCOLOR
3365 case XTerm_Color_cursor: 3385 case XTerm_Color_cursor:
3370 process_color_seq (op, Color_pointer_fg, str, resp); 3390 process_color_seq (op, Color_pointer_fg, str, resp);
3371 break; 3391 break;
3372 case XTerm_Color_pointer_bg: 3392 case XTerm_Color_pointer_bg:
3373 process_color_seq (op, Color_pointer_bg, str, resp); 3393 process_color_seq (op, Color_pointer_bg, str, resp);
3374 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
3375#ifndef NO_BOLD_UNDERLINE_REVERSE 3403#ifndef NO_BOLD_UNDERLINE_REVERSE
3376 case XTerm_Color_RV:
3377 process_color_seq (op, Color_RV, str, resp);
3378 break;
3379 case Rxvt_Color_BD:
3380 case URxvt_Color_BD: 3404 case URxvt_Color_BD:
3381 process_color_seq (op, Color_BD, str, resp); 3405 process_color_seq (op, Color_BD, str, resp);
3382 break; 3406 break;
3383 case Rxvt_Color_UL:
3384 case URxvt_Color_UL: 3407 case URxvt_Color_UL:
3385 process_color_seq (op, Color_UL, str, resp); 3408 process_color_seq (op, Color_UL, str, resp);
3386 break; 3409 break;
3387 case URxvt_Color_IT: 3410 case URxvt_Color_IT:
3388 process_color_seq (op, Color_IT, str, resp); 3411 process_color_seq (op, Color_IT, str, resp);
3389 break; 3412 break;
3390#endif 3413#endif
3414 case URxvt_Color_border:
3415 process_color_seq (op, Color_border, str, resp);
3416 break;
3391#if ENABLE_TRANSPARENCY 3417#if ENABLE_TRANSPARENCY
3392 case URxvt_Color_tint: 3418 case URxvt_Color_tint:
3393 process_color_seq (op, Color_tint, str, resp); 3419 process_color_seq (op, Color_tint, str, resp);
3394 { 3420 {
3395 bool changed = false; 3421 bool changed = false;
3410 case Rxvt_Pixmap: 3436 case Rxvt_Pixmap:
3411 if (!strcmp (str, "?")) 3437 if (!strcmp (str, "?"))
3412 { 3438 {
3413 char str[256]; 3439 char str[256];
3414 3440
3415 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3441 sprintf (str, "[%dx%d+%d+%d]",
3416 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3442 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3417 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3443 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3418 process_xterm_seq (XTerm_title, str, CHAR_ST); 3444 process_xterm_seq (XTerm_title, str, CHAR_ST);
3419 } 3445 }
3420 else 3446 else
3444 update_background (); 3470 update_background ();
3445 } 3471 }
3446 break; 3472 break;
3447#endif 3473#endif
3448 3474
3449 case Rxvt_restoreFG:
3450 set_window_color (Color_fg, str);
3451 break;
3452 case Rxvt_restoreBG:
3453 set_window_color (Color_bg, str);
3454 break;
3455
3456 case XTerm_logfile: 3475 case XTerm_logfile:
3457 // TODO, when secure mode? 3476 // TODO, when secure mode?
3458 break; 3477 break;
3459 3478
3460#if 0 3479#if 0
3526 break; 3545 break;
3527#endif 3546#endif
3528 3547
3529#if ENABLE_PERL 3548#if ENABLE_PERL
3530 case URxvt_perl: 3549 case URxvt_perl:
3531 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));
3532 ; // no responses yet
3533 break; 3551 break;
3534#endif 3552#endif
3535 } 3553 }
3536} 3554}
3537/*----------------------------------------------------------------------*/ 3555/*----------------------------------------------------------------------*/
3560 { 3578 {
3561 if (mode == 'r') 3579 if (mode == 'r')
3562 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3580 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3563 else 3581 else
3564 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3582 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3565 PrivMode (state, bit); 3583
3584 set_privmode (bit, state);
3566 } 3585 }
3567 3586
3568 return state; 3587 return state;
3569} 3588}
3570 3589
3578 static const struct 3597 static const struct
3579 { 3598 {
3580 const int argval; 3599 const int argval;
3581 const unsigned long bit; 3600 const unsigned long bit;
3582 } argtopriv[] = { 3601 } argtopriv[] = {
3583 { 1, PrivMode_aplCUR }, 3602 { 1, PrivMode_aplCUR }, // DECCKM
3584 { 2, PrivMode_vt52 }, 3603 { 2, PrivMode_vt52 },
3585 { 3, PrivMode_132 }, 3604 { 3, PrivMode_132 }, // DECCOLM
3586 { 4, PrivMode_smoothScroll }, 3605 { 4, PrivMode_smoothScroll }, // DECSCLM
3587 { 5, PrivMode_rVideo }, 3606 { 5, PrivMode_rVideo }, // DECSCNM
3588 { 6, PrivMode_relOrigin }, 3607 { 6, PrivMode_relOrigin }, // DECOM
3589 { 7, PrivMode_Autowrap }, 3608 { 7, PrivMode_Autowrap }, // DECAWM
3590 // 8, bi-directional support mode 3609 // 8, auto-repeat keys // DECARM
3591 { 9, PrivMode_MouseX10 }, 3610 { 9, PrivMode_MouseX10 },
3592 // 18, 19 printing-related 3611 // 18 end FF to printer after print screen
3612 // 19 Print screen prints full screen/scroll region
3593 { 25, PrivMode_VisibleCursor }, 3613 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3594#ifdef scrollBar_esc 3614#ifdef scrollBar_esc
3595 { scrollBar_esc, PrivMode_scrollBar }, 3615 { scrollBar_esc, PrivMode_scrollBar },
3596#endif 3616#endif
3597 { 35, PrivMode_ShiftKeys }, // rxvt extension 3617 { 35, PrivMode_ShiftKeys }, // rxvt extension
3618 // 38, tektronix mode // DECTEK
3598 { 40, PrivMode_132OK }, 3619 { 40, PrivMode_132OK },
3599 // 41 xterm more fixes NYI 3620 // 41 xterm more fixes NYI
3600 // 45 margin bell NYI 3621 // 45 margin bell NYI
3601 // 46 start logging 3622 // 46 start logging
3602 { 47, PrivMode_Screen }, 3623 { 47, PrivMode_Screen },
3603 { 66, PrivMode_aplKP }, 3624 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
3604#ifndef NO_BACKSPACE_KEY 3625#ifndef NO_BACKSPACE_KEY
3605 { 67, PrivMode_BackSpace }, 3626 { 67, PrivMode_BackSpace }, // DECBKM
3606#endif 3627#endif
3607 { 1000, PrivMode_MouseX11 }, 3628 { 1000, PrivMode_MouseX11 },
3608 { 1002, PrivMode_MouseBtnEvent }, 3629 { 1002, PrivMode_MouseBtnEvent },
3609 { 1003, PrivMode_MouseAnyEvent }, 3630 { 1003, PrivMode_MouseAnyEvent },
3610 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3631 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3614 // 1037 send DEL for keypad delete NYI 3635 // 1037 send DEL for keypad delete NYI
3615 { 1047, PrivMode_Screen }, 3636 { 1047, PrivMode_Screen },
3616 // 1048 save and restore cursor 3637 // 1048 save and restore cursor
3617 { 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 */
3618 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3639 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3640 { 2004, PrivMode_BracketPaste },
3619 }; 3641 };
3620 3642
3621 if (nargs == 0) 3643 if (nargs == 0)
3622 return; 3644 return;
3623 3645
3648 3670
3649 scr_touch (true); 3671 scr_touch (true);
3650 break; 3672 break;
3651#endif 3673#endif
3652 case 1048: /* alternative cursor save */ 3674 case 1048: /* alternative cursor save */
3653 case 1049:
3654 if (option (Opt_secondaryScreen)) 3675 if (option (Opt_secondaryScreen))
3655 if (mode == 0) 3676 if (mode == 0)
3656 scr_cursor (RESTORE); 3677 scr_cursor (RESTORE);
3657 else if (mode == 1) 3678 else if (mode == 1)
3658 scr_cursor (SAVE); 3679 scr_cursor (SAVE);
3667 case 2: /* VT52 mode */ 3688 case 2: /* VT52 mode */
3668 /* oddball mode. should be set regardless of set/reset 3689 /* oddball mode. should be set regardless of set/reset
3669 * parameter. Return from VT52 mode with an ESC < from 3690 * parameter. Return from VT52 mode with an ESC < from
3670 * within VT52 mode 3691 * within VT52 mode
3671 */ 3692 */
3672 PrivMode (1, PrivMode_vt52); 3693 set_privmode (PrivMode_vt52, 1);
3673 break; 3694 break;
3674 case 3: /* 80/132 */ 3695 case 3: /* 80/132 */
3675 if (priv_modes & PrivMode_132OK) 3696 if (priv_modes & PrivMode_132OK)
3676 set_widthheight (((state ? 132 : 80) * fwidth), height); 3697 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3677 break; 3698 break;
3678 case 4: /* smooth scrolling */ 3699 case 4: /* smooth scrolling */
3679 set_option (Opt_jumpScroll, !state); 3700 set_option (Opt_jumpScroll, !state);
3680 break; 3701 break;
3681 case 5: /* reverse video */ 3702 case 5: /* reverse video */
3692 if (state) /* orthogonal */ 3713 if (state) /* orthogonal */
3693 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3714 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3694 break; 3715 break;
3695#ifdef scrollBar_esc 3716#ifdef scrollBar_esc
3696 case scrollBar_esc: 3717 case scrollBar_esc:
3697 if (scrollbar_mapping (state)) 3718 if (scrollBar.map (state))
3698 { 3719 {
3699 resize_all_windows (0, 0, 0); 3720 resize_all_windows (0, 0, 0);
3700 scr_touch (true); 3721 scr_touch (true);
3701 } 3722 }
3702 break; 3723 break;
3723 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3744 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3724 vt_emask_mouse = PointerMotionMask; 3745 vt_emask_mouse = PointerMotionMask;
3725 } 3746 }
3726 else 3747 else
3727 vt_emask_mouse = NoEventMask; 3748 vt_emask_mouse = NoEventMask;
3749
3728 vt_select_input (); 3750 vt_select_input ();
3729 break; 3751 break;
3730 case 1010: /* scroll to bottom on TTY output inhibit */ 3752 case 1010: /* scroll to bottom on TTY output inhibit */
3731 set_option (Opt_scrollTtyOutput, !state); 3753 set_option (Opt_scrollTtyOutput, !state);
3732 break; 3754 break;
3733 case 1011: /* scroll to bottom on key press */ 3755 case 1011: /* scroll to bottom on key press */
3734 set_option (Opt_scrollTtyKeypress, state); 3756 set_option (Opt_scrollTtyKeypress, state);
3735 break; 3757 break;
3736 case 1047: /* secondary screen w/ clearing last */ 3758 case 1047: /* secondary screen w/ clearing last */
3737 if (option (Opt_secondaryScreen)) 3759 if (option (Opt_secondaryScreen))
3738 if (current_screen != PRIMARY) 3760 if (!state)
3739 scr_erase_screen (2); 3761 scr_erase_screen (2);
3762
3740 scr_change_screen (state); 3763 scr_change_screen (state);
3741 break; 3764 break;
3742 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
3743 scr_change_screen (state); 3770 scr_change_screen (state);
3771
3744 if (option (Opt_secondaryScreen)) 3772 if (option (Opt_secondaryScreen))
3745 if (current_screen != PRIMARY) 3773 if (state)
3746 scr_erase_screen (2); 3774 scr_erase_screen (2);
3775 else
3776 scr_cursor (RESTORE);
3747 break; 3777 break;
3748 default: 3778 default:
3749 break; 3779 break;
3750 } 3780 }
3751 } 3781 }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines