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.381 by root, Fri Dec 14 05:25:23 2007 UTC vs.
Revision 1.449 by sf-exg, Sun Apr 18 11:06:46 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 + hey 208 max_it (width, 8+5); // for char + hex
204 max_it (width, strlen (attr)); 209 max_it (width, strlen (attr));
205 210
206 if (y >= 0) 211 if (y >= 0)
207 { 212 {
208 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 213 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
209 x = 0; 214 x = 0;
210 } 215 }
211 216
212 scr_overlay_new (x, y, width, len + 2); 217 scr_overlay_new (x, y, width, len * 2 + 1);
213 218
214 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 219 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
215 220
216 for (int y = 0; y < len; y++) 221 for (int y = 0; y < len; y++)
217 { 222 {
220 ch = *chr++; 225 ch = *chr++;
221 226
222 sprintf (buf, "%8x", ch); 227 sprintf (buf, "%8x", ch);
223 scr_overlay_set (0, y, buf); 228 scr_overlay_set (0, y, buf);
224 scr_overlay_set (9, y, '='); 229 scr_overlay_set (9, y, '=');
225# if !UNICODE3 230# if !UNICODE_3
226 if (ch >= 0x10000) 231 if (ch >= 0x10000)
227 ch = 0xfffd; 232 ch = 0xfffd;
228# endif 233# endif
229 scr_overlay_set (11, y, ch, r); 234 scr_overlay_set (11, y, ch, r);
230 235
236// char buf[4+4+3+1]; 241// char buf[4+4+3+1];
237// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y); 242// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
238// scr_overlay_set (0, 0, buf); 243// scr_overlay_set (0, 0, buf);
239// } 244// }
240 scr_overlay_set (0, len , attr); 245 scr_overlay_set (0, len , attr);
246 for (int i = 0; i < len; i++)
247 {
241 scr_overlay_set (0, len + 1, fname); 248 scr_overlay_set (0, len + 1 + i, fname[i]);
242
243 free (fname); 249 free (fname[i]);
250 }
244 251
245# if ENABLE_COMBINING 252# if ENABLE_COMBINING
246 if (alloc) 253 if (alloc)
247 delete [] alloc; 254 delete [] alloc;
248# endif 255# endif
278 } 285 }
279 286
280 iso14755buf = 0; 287 iso14755buf = 0;
281} 288}
282 289
283int 290static int
284rxvt_term::hex_keyval (XKeyEvent &ev) 291hex_keyval (XKeyEvent &ev)
285{ 292{
286 // check wether this event corresponds to a hex digit 293 // check whether this event corresponds to a hex digit
287 // if the modifiers had not been pressed. 294 // if the modifiers had not been pressed.
288 for (int index = 0; index < 8; index++) 295 for (int index = 0; index < 8; index++)
289 { 296 {
290 KeySym k = XLookupKeysym (&ev, index); 297 KeySym k = XLookupKeysym (&ev, index);
291 298
297 304
298 return -1; 305 return -1;
299} 306}
300#endif 307#endif
301 308
309static inline KeySym
310translate_keypad (KeySym keysym, bool kp)
311{
312#ifdef XK_KP_Home
313 static const KeySym keypadtrans[] = {
314 XK_KP_7, // XK_KP_Home
315 XK_KP_4, // XK_KP_Left
316 XK_KP_8, // XK_KP_Up
317 XK_KP_6, // XK_KP_Right
318 XK_KP_2, // XK_KP_Down
319# ifndef UNSHIFTED_SCROLLKEYS
320 XK_KP_9, // XK_KP_Prior
321 XK_KP_3, // XK_KP_Next
322# else
323 XK_Prior,
324 XK_Next,
325# endif
326 XK_KP_1, // XK_KP_End
327 XK_KP_5, // XK_KP_Begin
328 };
329
330 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
331 {
332 unsigned int index = keysym - XK_KP_Home;
333 keysym = kp ? keypadtrans[index] : XK_Home + index;
334 }
335 else if (keysym == XK_KP_Insert)
336 keysym = kp ? XK_KP_0 : XK_Insert;
337# ifndef NO_DELETE_KEY
338 else if (keysym == XK_KP_Delete)
339 keysym = kp ? XK_KP_Decimal : XK_Delete;
340# endif
341#endif
342 return keysym;
343}
344
345static inline int
346map_function_key (KeySym keysym)
347{
348 int param = 0;
349
350 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
351 {
352 param = 11 + keysym - XK_F1;
353 if (keysym >= XK_F17)
354 param += 4;
355 else if (keysym >= XK_F15)
356 param += 3;
357 else if (keysym >= XK_F11)
358 param += 2;
359 else if (keysym >= XK_F6)
360 param += 1;
361 }
362 else
363 switch (keysym)
364 {
365 case XK_Find:
366 param = 1;
367 break;
368 case XK_Insert:
369 param = 2;
370 break;
371#ifdef DXK_Remove
372 case DXK_Remove:
373#endif
374 case XK_Execute:
375 param = 3;
376 break;
377 case XK_Select:
378 param = 4;
379 break;
380#ifndef UNSHIFTED_SCROLLKEYS
381 case XK_Prior:
382 param = 5;
383 break;
384 case XK_Next:
385 param = 6;
386 break;
387 case XK_Home:
388 param = 7;
389 break;
390 case XK_End:
391 param = 8;
392 break;
393#endif
394 case XK_Help:
395 param = 28;
396 break;
397 case XK_Menu:
398 param = 29;
399 break;
400 }
401 return param;
402}
403
302void 404void
303rxvt_term::key_press (XKeyEvent &ev) 405rxvt_term::key_press (XKeyEvent &ev)
304{ 406{
305 int ctrl, meta, shft, len; 407 int ctrl, meta, shft, len;
306 unsigned int newlen;
307 KeySym keysym; 408 KeySym keysym;
308 int valid_keysym; 409 int valid_keysym;
309 char kbuf[KBUFSZ]; 410 char kbuf[KBUFSZ];
310 411
311#if ISO_14755 412#if ISO_14755
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
1043
1044 display->flush ();
1052} 1045}
1053 1046
1054void 1047void
1055rxvt_term::flush_cb (ev::timer &w, int revents) 1048rxvt_term::flush_cb (ev::timer &w, int revents)
1056{ 1049{
1076{ 1069{
1077 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1070 if (scr_refresh_rend (RS_Blink, RS_Blink))
1078 { 1071 {
1079 hidden_text = !hidden_text; 1072 hidden_text = !hidden_text;
1080 want_refresh = 1; 1073 want_refresh = 1;
1081 refresh_check (); 1074 refresh_check ();
1082 } 1075 }
1083 else 1076 else
1084 w.stop (); 1077 w.stop ();
1085} 1078}
1086#endif 1079#endif
1087 1080
1088#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1081#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1089void 1082void
1090rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1083rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1091{ 1084{
1092 if ((scrollbar_isUp () || scrollbar_isDn ()) 1085 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1093 && scr_page (scrollbar_isUp () ? UP : DN, 1)) 1086 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1094 { 1087 {
1095 want_refresh = 1; 1088 want_refresh = 1;
1096 refresh_check (); 1089 refresh_check ();
1097 } 1090 }
1098 else 1091 else
1142 { 1135 {
1143 // this should really be sched_yield(), but the linux guys thought 1136 // this should really be sched_yield(), but the linux guys thought
1144 // that giving a process calling sched_yield () less cpu time than 1137 // that giving a process calling sched_yield () less cpu time than
1145 // 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
1146 // 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.
1147 1143
1148 struct timespec ts = { 0, 0 }; 1144 struct timespec ts = { 0, 1000 };
1149 nanosleep (&ts, 0); 1145 nanosleep (&ts, 0);
1150 1146
1151 w.stop (); 1147 w.stop ();
1152 } 1148 }
1153 1149
1203{ 1199{
1204 make_current (); 1200 make_current ();
1205 1201
1206 if (revents & ev::READ) 1202 if (revents & ev::READ)
1207 // loop, but don't allow a single term to monopolize us 1203 // loop, but don't allow a single term to monopolize us
1208 while (pty_fill ()) 1204 for (int i = CBUFCNT; i-- && pty_fill (); )
1209 if (cmd_parse ()) 1205 cmd_parse ();
1210 break;
1211 1206
1212 if (revents & ev::WRITE) 1207 if (revents & ev::WRITE)
1213 pty_write (); 1208 pty_write ();
1209
1210 refresh_check ();
1214} 1211}
1215 1212
1216void 1213void
1217rxvt_term::pointer_unblank () 1214rxvt_term::pointer_unblank ()
1218{ 1215{
1433 && ev.xfocus.mode != NotifyGrab) 1430 && ev.xfocus.mode != NotifyGrab)
1434 focus_out (); 1431 focus_out ();
1435 break; 1432 break;
1436 1433
1437 case ConfigureNotify: 1434 case ConfigureNotify:
1438 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n", 1435 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1439 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y, 1436 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1440 szHint.width, szHint.height); */ 1437 szHint.width, szHint.height);*/
1441 if (ev.xconfigure.window == parent[0]) 1438 if (ev.xconfigure.window == parent[0])
1442 { 1439 {
1443 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1440 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1444 ; 1441 ;
1445 1442
1450 } 1447 }
1451 else 1448 else
1452 { 1449 {
1453#ifdef HAVE_BG_PIXMAP 1450#ifdef HAVE_BG_PIXMAP
1454 if (bgPixmap.window_position_sensitive ()) 1451 if (bgPixmap.window_position_sensitive ())
1452 {
1453 if (mapped)
1455 update_background (); 1454 update_background ();
1455 else
1456 bgPixmap.invalidate ();
1457 }
1456#endif 1458#endif
1457 } 1459 }
1460
1458 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1461 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1459 } 1462 }
1460 break; 1463 break;
1461 1464
1462 case PropertyNotify: 1465 case PropertyNotify:
1466 selection_property (ev.xproperty.window, ev.xproperty.atom); 1469 selection_property (ev.xproperty.window, ev.xproperty.atom);
1467 1470
1468 break; 1471 break;
1469 1472
1470 case SelectionClear: 1473 case SelectionClear:
1471 selection_clear (); 1474 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1472 break; 1475 break;
1473 1476
1474 case SelectionNotify: 1477 case SelectionNotify:
1475 if (selection_wait == Sel_normal) 1478 if (selection_wait == Sel_normal)
1476 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1479 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1479 case SelectionRequest: 1482 case SelectionRequest:
1480 selection_send (ev.xselectionrequest); 1483 selection_send (ev.xselectionrequest);
1481 break; 1484 break;
1482 1485
1483 case MapNotify: 1486 case MapNotify:
1487#ifdef HAVE_BG_PIXMAP
1488 /* This is needed spcifically to fix the case of no window manager or a
1489 * non-reparenting window manager. In those cases we never get first
1490 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1491 * care of multiplicity of ConfigureNotify events arriwing while WM does
1492 * reparenting.
1493 * We should not render background immidiately, as there could be several
1494 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1495 * by scheduling background redraw as soon as we can, but giving a short
1496 * bit of time for ConfigureNotifies to arrive.
1497 * We should render background PRIOR to drawing any text, but AFTER all
1498 * of ConfigureNotifys for the best results.
1499 */
1500 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1501 update_background_ev.start (0.025);
1502#endif
1484 mapped = 1; 1503 mapped = 1;
1485#ifdef TEXT_BLINK 1504#ifdef TEXT_BLINK
1486 text_blink_ev.start (); 1505 text_blink_ev.start ();
1487#endif 1506#endif
1488 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1507 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1524 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1543 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1525 ; 1544 ;
1526 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1545 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1527 ; 1546 ;
1528 1547
1529 if (isScrollbarWindow (ev.xany.window)) 1548 if (scrollBar.state && ev.xany.window == scrollBar.win)
1530 { 1549 {
1531 scrollBar.setIdle (); 1550 scrollBar.state = STATE_IDLE;
1532 scrollbar_show (0); 1551 scrollBar.show (0);
1533 } 1552 }
1534 } 1553 }
1535 break; 1554 break;
1536 1555
1537 case MotionNotify: 1556 case MotionNotify:
1624#ifdef MOUSE_THRESHOLD 1643#ifdef MOUSE_THRESHOLD
1625 } 1644 }
1626#endif 1645#endif
1627 } 1646 }
1628 } 1647 }
1629 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1648 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1630 { 1649 {
1631 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1650 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1632 MotionNotify, &ev)) 1651 MotionNotify, &ev))
1633 ; 1652 ;
1634 1653
1636 &unused_root, &unused_child, 1655 &unused_root, &unused_child,
1637 &unused_root_x, &unused_root_y, 1656 &unused_root_x, &unused_root_y,
1638 &ev.xbutton.x, &ev.xbutton.y, 1657 &ev.xbutton.x, &ev.xbutton.y,
1639 &unused_mask); 1658 &unused_mask);
1640 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1659 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1641 scrollbar_size ()); 1660 scrollBar.size ());
1642 want_refresh = 1; 1661 want_refresh = 1;
1643 scrollbar_show (1); 1662 scrollBar.show (1);
1644 } 1663 }
1645 break; 1664 break;
1646 } 1665 }
1647 1666
1648#if defined(CURSOR_BLINK) 1667#if defined(CURSOR_BLINK)
1673#endif 1692#endif
1674 1693
1675 refresh_check (); 1694 refresh_check ();
1676} 1695}
1677 1696
1697#if ENABLE_FRILLS
1698void
1699rxvt_term::set_urgency (bool enable)
1700{
1701 if (enable == urgency_hint)
1702 return;
1703
1704 if (XWMHints *h = XGetWMHints (dpy, parent[0]))
1705 {
1706 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1707 XSetWMHints (dpy, parent[0], h);
1708 urgency_hint = enable;
1709 }
1710}
1711#endif
1712
1678void 1713void
1679rxvt_term::focus_in () 1714rxvt_term::focus_in ()
1680{ 1715{
1681 if (!focus) 1716 if (!focus)
1682 { 1717 {
1683 focus = 1; 1718 focus = 1;
1684 want_refresh = 1; 1719 want_refresh = 1;
1685
1686 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1687 1720
1688#if USE_XIM 1721#if USE_XIM
1689 if (Input_Context != NULL) 1722 if (Input_Context != NULL)
1690 { 1723 {
1691 IMSetPosition (); 1724 IMSetPosition ();
1703 scr_recolour (); 1736 scr_recolour ();
1704 } 1737 }
1705#endif 1738#endif
1706#if ENABLE_FRILLS 1739#if ENABLE_FRILLS
1707 if (option (Opt_urgentOnBell)) 1740 if (option (Opt_urgentOnBell))
1708 { 1741 set_urgency (0);
1709 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1710 {
1711 h->flags &= ~XUrgencyHint;
1712 XSetWMHints (dpy, parent[0], h);
1713 }
1714 }
1715#endif 1742#endif
1743
1744 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1716 } 1745 }
1717} 1746}
1718 1747
1719void 1748void
1720rxvt_term::focus_out () 1749rxvt_term::focus_out ()
1722 if (focus) 1751 if (focus)
1723 { 1752 {
1724 focus = 0; 1753 focus = 0;
1725 want_refresh = 1; 1754 want_refresh = 1;
1726 1755
1727 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1756#if ENABLE_FRILLS
1728 1757 if (option (Opt_urgentOnBell))
1758 set_urgency (0);
1759#endif
1729#if ENABLE_FRILLS || ISO_14755 1760#if ENABLE_FRILLS || ISO_14755
1730 if (iso14755buf) 1761 if (iso14755buf)
1731 { 1762 {
1732 iso14755buf = 0; 1763 iso14755buf = 0;
1733# if ISO_14755 1764# if ISO_14755
1750 { 1781 {
1751 pix_colors = pix_colors_unfocused; 1782 pix_colors = pix_colors_unfocused;
1752 scr_recolour (); 1783 scr_recolour ();
1753 } 1784 }
1754#endif 1785#endif
1786
1787 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1755 } 1788 }
1756} 1789}
1757 1790
1758void 1791void
1759rxvt_term::update_fade_color (unsigned int idx) 1792rxvt_term::update_fade_color (unsigned int idx)
1790 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1823 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1791 { 1824 {
1792 bgPixmap.set_root_pixmap (); 1825 bgPixmap.set_root_pixmap ();
1793 update_background (); 1826 update_background ();
1794 } 1827 }
1828
1795 break; 1829 break;
1796 } 1830 }
1797# endif 1831# endif
1798 1832
1799 refresh_check (); 1833 refresh_check ();
1917 } 1951 }
1918 1952
1919 /* 1953 /*
1920 * Scrollbar window processing of button press 1954 * Scrollbar window processing of button press
1921 */ 1955 */
1922 if (isScrollbarWindow (ev.window)) 1956 if (scrollBar.state && ev.window == scrollBar.win)
1923 { 1957 {
1924 scrollBar.setIdle (); 1958 page_dirn direction = NO_DIR;
1959
1960 if (scrollBar.upButton (ev.y))
1961 direction = UP; /* up */
1962 else if (scrollBar.dnButton (ev.y))
1963 direction = DN; /* down */
1964
1965 scrollBar.state = STATE_IDLE;
1925 /* 1966 /*
1926 * Rxvt-style scrollbar: 1967 * Rxvt-style scrollbar:
1927 * move up if mouse is above slider 1968 * move up if mouse is above slider
1928 * move dn if mouse is below slider 1969 * move dn if mouse is below slider
1929 * 1970 *
1938 /* 1979 /*
1939 * Mouse report disabled scrollbar: 1980 * Mouse report disabled scrollbar:
1940 * arrow buttons - send up/down 1981 * arrow buttons - send up/down
1941 * click on scrollbar - send pageup/down 1982 * click on scrollbar - send pageup/down
1942 */ 1983 */
1943 if ((scrollBar.style == R_SB_NEXT 1984 if (direction == UP)
1944 && scrollbarnext_upButton (ev.y))
1945 || (scrollBar.style == R_SB_RXVT
1946 && scrollbarrxvt_upButton (ev.y)))
1947 tt_printf ("\033[A"); 1985 tt_printf ("\033[A");
1948 else if ((scrollBar.style == R_SB_NEXT 1986 else if (direction == DN)
1949 && scrollbarnext_dnButton (ev.y))
1950 || (scrollBar.style == R_SB_RXVT
1951 && scrollbarrxvt_dnButton (ev.y)))
1952 tt_printf ("\033[B"); 1987 tt_printf ("\033[B");
1953 else 1988 else
1954 switch (ev.button) 1989 switch (ev.button)
1955 { 1990 {
1956 case Button2: 1991 case Button2:
1964 break; 1999 break;
1965 } 2000 }
1966 } 2001 }
1967 else 2002 else
1968#endif /* NO_SCROLLBAR_REPORT */ 2003#endif /* NO_SCROLLBAR_REPORT */
1969
1970 {
1971 char upordown = 0;
1972
1973 if (scrollBar.style == R_SB_NEXT)
1974 { 2004 {
1975 if (scrollbarnext_upButton (ev.y)) 2005 if (direction != NO_DIR)
1976 upordown = -1; /* up */
1977 else if (scrollbarnext_dnButton (ev.y))
1978 upordown = 1; /* down */
1979 }
1980 else if (scrollBar.style == R_SB_RXVT)
1981 {
1982 if (scrollbarrxvt_upButton (ev.y))
1983 upordown = -1; /* up */
1984 else if (scrollbarrxvt_dnButton (ev.y))
1985 upordown = 1; /* down */
1986 }
1987
1988 if (upordown)
1989 { 2006 {
1990#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2007#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1991 if (!cont_scroll_ev.is_active ()) 2008 if (!cont_scroll_ev.is_active ())
1992 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2009 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1993#endif 2010#endif
1994 if (scr_page (upordown < 0 ? UP : DN, 1)) 2011 if (scr_page (direction, 1))
1995 { 2012 {
1996 if (upordown < 0) 2013 if (direction == UP)
1997 scrollBar.setUp (); 2014 scrollBar.state = STATE_UP;
1998 else 2015 else
1999 scrollBar.setDn (); 2016 scrollBar.state = STATE_DOWN;
2000 } 2017 }
2001 } 2018 }
2002 else 2019 else
2003 switch (ev.button) 2020 switch (ev.button)
2004 { 2021 {
2005 case Button2: 2022 case Button2:
2006 switch (scrollbar_align) 2023 switch (scrollBar.align)
2007 { 2024 {
2008 case R_SB_ALIGN_TOP: 2025 case R_SB_ALIGN_TOP:
2009 csrO = 0; 2026 csrO = 0;
2010 break; 2027 break;
2011 case R_SB_ALIGN_CENTRE: 2028 case R_SB_ALIGN_CENTRE:
2017 } 2034 }
2018 2035
2019 if (scrollBar.style == R_SB_XTERM 2036 if (scrollBar.style == R_SB_XTERM
2020 || scrollbar_above_slider (ev.y) 2037 || scrollbar_above_slider (ev.y)
2021 || scrollbar_below_slider (ev.y)) 2038 || scrollbar_below_slider (ev.y))
2022 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2039 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2023 2040
2024 scrollBar.setMotion (); 2041 scrollBar.state = STATE_MOTION;
2025 break; 2042 break;
2026 2043
2027 case Button1: 2044 case Button1:
2028 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2045 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2029 csrO = ev.y - scrollBar.top; 2046 csrO = ev.y - scrollBar.top;
2030 /* FALLTHROUGH */ 2047 /* FALLTHROUGH */
2031 2048
2032 case Button3: 2049 case Button3:
2033 if (scrollBar.style != R_SB_XTERM) 2050 if (scrollBar.style != R_SB_XTERM)
2043 scr_page (DN, nrow - 1); 2060 scr_page (DN, nrow - 1);
2044# else 2061# else
2045 scr_page (DN, nrow / 4); 2062 scr_page (DN, nrow / 4);
2046# endif 2063# endif
2047 else 2064 else
2048 scrollBar.setMotion (); 2065 scrollBar.state = STATE_MOTION;
2049 } 2066 }
2050 else 2067 else
2051 { 2068 {
2052 scr_page ((ev.button == Button1 ? DN : UP), 2069 scr_page ((ev.button == Button1 ? DN : UP),
2053 (nrow 2070 (nrow
2054 * scrollbar_position (ev.y) 2071 * scrollbar_position (ev.y)
2055 / scrollbar_size ())); 2072 / scrollBar.size ()));
2056 } 2073 }
2057 2074
2058 break; 2075 break;
2059 } 2076 }
2060 } 2077 }
2070 2087
2071 csrO = 0; /* reset csr Offset */ 2088 csrO = 0; /* reset csr Offset */
2072 if (!bypass_keystate) 2089 if (!bypass_keystate)
2073 reportmode = !! (priv_modes & PrivMode_mouse_report); 2090 reportmode = !! (priv_modes & PrivMode_mouse_report);
2074 2091
2075 if (scrollbar_isUpDn ()) 2092 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2076 { 2093 {
2077 scrollBar.setIdle (); 2094 scrollBar.state = STATE_IDLE;
2078 scrollbar_show (0); 2095 scrollBar.show (0);
2079 } 2096 }
2080 2097
2081#ifdef SELECTION_SCROLLING 2098#ifdef SELECTION_SCROLLING
2082 sel_scroll_ev.stop(); 2099 sel_scroll_ev.stop();
2083#endif 2100#endif
2133 selection_make (ev.time); 2150 selection_make (ev.time);
2134 break; 2151 break;
2135 2152
2136 case Button2: 2153 case Button2:
2137 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2154 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2138 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2155 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2139 break; 2156 break;
2140 2157
2141#ifdef MOUSE_WHEEL 2158#ifdef MOUSE_WHEEL
2142 case Button4: 2159 case Button4:
2143 case Button5: 2160 case Button5:
2163 2180
2164 if (!slip_wheel_ev.is_active ()) 2181 if (!slip_wheel_ev.is_active ())
2165 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2182 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2166 } 2183 }
2167 else 2184 else
2185# endif
2168 { 2186 {
2169# endif
2170 scr_page (v, i); 2187 scr_page (v, i);
2171 scrollbar_show (1); 2188 scrollBar.show (1);
2172# ifdef MOUSE_SLIP_WHEELING
2173 } 2189 }
2174# endif
2175 } 2190 }
2176 break; 2191 break;
2177#endif 2192#endif
2178 } 2193 }
2179 } 2194 }
2180} 2195}
2181 2196
2182/*}}} */ 2197/*}}} */
2183 2198
2184bool 2199void
2185rxvt_term::cmd_parse () 2200rxvt_term::cmd_parse ()
2186{ 2201{
2187 bool flag = false;
2188 wchar_t ch = NOCHAR; 2202 wchar_t ch = NOCHAR;
2189 char *seq_begin; // remember start of esc-sequence here 2203 char *seq_begin; // remember start of esc-sequence here
2190 2204
2191 for (;;) 2205 for (;;)
2192 { 2206 {
2193 if (ch == NOCHAR) 2207 if (expect_false (ch == NOCHAR))
2194 { 2208 {
2195 seq_begin = cmdbuf_ptr; 2209 seq_begin = cmdbuf_ptr;
2196 ch = next_char (); 2210 ch = next_char ();
2197 2211
2198 if (ch == NOCHAR) 2212 if (ch == NOCHAR)
2199 break; 2213 break;
2200 } 2214 }
2201 2215
2202 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2216 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2203 { 2217 {
2204 if (!seen_input) 2218 if (expect_false (!seen_input))
2205 { 2219 {
2206 seen_input = 1; 2220 seen_input = 1;
2207 // many badly-written programs (e.g. jed) contain a race condition: 2221 // many badly-written programs (e.g. jed) contain a race condition:
2208 // they first read the screensize and then install a SIGWINCH handler. 2222 // they first read the screensize and then install a SIGWINCH handler.
2209 // some window managers resize the window early, and these programs 2223 // some window managers resize the window early, and these programs
2222 wchar_t *str = buf; 2236 wchar_t *str = buf;
2223 wchar_t *eol = str + min (ncol, UBUFSIZ); 2237 wchar_t *eol = str + min (ncol, UBUFSIZ);
2224 2238
2225 for (;;) 2239 for (;;)
2226 { 2240 {
2227 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2241 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2228 break; 2242 break;
2229 2243
2230 *str++ = ch; 2244 *str++ = ch;
2231 2245
2232 if (ch == C0_LF || str >= eol) 2246 if (expect_false (ch == C0_LF || str >= eol))
2233 { 2247 {
2234 if (ch == C0_LF) 2248 if (ch == C0_LF)
2235 nlines++; 2249 nlines++;
2236 2250
2237 refresh_count++; 2251 refresh_count++;
2286 * What the heck we'll cheat and only refresh less than every page-full. 2300 * What the heck we'll cheat and only refresh less than every page-full.
2287 * if skipScroll is enabled. 2301 * if skipScroll is enabled.
2288 */ 2302 */
2289 if (refreshnow) 2303 if (refreshnow)
2290 { 2304 {
2291 flag = true;
2292 scr_refresh (); 2305 scr_refresh ();
2293 want_refresh = 1; 2306 want_refresh = 1;
2294 } 2307 }
2295
2296 } 2308 }
2297 else 2309 else
2298 { 2310 {
2299 try 2311 try
2300 { 2312 {
2308 } 2320 }
2309 2321
2310 ch = NOCHAR; 2322 ch = NOCHAR;
2311 } 2323 }
2312 } 2324 }
2313
2314 refresh_check ();
2315
2316 return flag;
2317} 2325}
2318 2326
2319// read the next character 2327// read the next character
2320wchar_t 2328wchar_t
2321rxvt_term::next_char () NOTHROW 2329rxvt_term::next_char () NOTHROW
2322{ 2330{
2323 while (cmdbuf_ptr < cmdbuf_endp) 2331 while (cmdbuf_ptr < cmdbuf_endp)
2324 { 2332 {
2325 // assume 7-bit to be ascii ALWAYS 2333 // assume 7-bit to be ascii ALWAYS
2326 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2334 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2327 return *cmdbuf_ptr++; 2335 return *cmdbuf_ptr++;
2328 2336
2329 wchar_t wc; 2337 wchar_t wc;
2330 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2338 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2331 2339
2335 cmdbuf_ptr = cmdbuf_endp; 2343 cmdbuf_ptr = cmdbuf_endp;
2336 break; 2344 break;
2337 } 2345 }
2338 2346
2339 if (len == (size_t)-1) 2347 if (len == (size_t)-1)
2348 {
2349 mbstate.reset (); // reset now undefined conversion state
2340 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2350 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2351 }
2341 2352
2342 // assume wchar == unicode 2353 // assume wchar == unicode
2343 cmdbuf_ptr += len; 2354 cmdbuf_ptr += len;
2344 return wc & UNICODE_MASK; 2355 return wc & UNICODE_MASK;
2345 } 2356 }
2389/*----------------------------------------------------------------------*/ 2400/*----------------------------------------------------------------------*/
2390#ifdef PRINTPIPE 2401#ifdef PRINTPIPE
2391FILE * 2402FILE *
2392rxvt_term::popen_printer () 2403rxvt_term::popen_printer ()
2393{ 2404{
2394 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2405 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2395 2406
2396 if (stream == NULL) 2407 if (stream == NULL)
2397 rxvt_warn ("can't open printer pipe, not printing.\n"); 2408 rxvt_warn ("can't open printer pipe, not printing.\n");
2398 2409
2399 return stream; 2410 return stream;
2410 * simulate attached vt100 printer 2421 * simulate attached vt100 printer
2411 */ 2422 */
2412void 2423void
2413rxvt_term::process_print_pipe () 2424rxvt_term::process_print_pipe ()
2414{ 2425{
2415 int done; 2426 FILE *fd = popen_printer ();
2416 FILE *fd;
2417 2427
2418 if ((fd = popen_printer ()) == NULL) 2428 if (!fd)
2419 return; 2429 return;
2420 2430
2421 /* 2431 /*
2422 * Send all input to the printer until either ESC[4i or ESC[?4i 2432 * Send all input to the printer until either ESC[4i or ESC[?4i
2423 * is received. 2433 * is received.
2424 */ 2434 */
2425 for (done = 0; !done;) 2435 for (int done = 0; !done; )
2426 { 2436 {
2427 unsigned char buf[8]; 2437 unsigned char buf[8];
2428 unicode_t ch; 2438 unicode_t ch;
2429 unsigned int i, len; 2439 unsigned int i, len;
2430 2440
2575 break; 2585 break;
2576 case 'Z': /* identify the terminal type */ 2586 case 'Z': /* identify the terminal type */
2577 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2587 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2578 break; 2588 break;
2579 case '<': /* turn off VT52 mode */ 2589 case '<': /* turn off VT52 mode */
2580 PrivMode (0, PrivMode_vt52); 2590 set_privmode (PrivMode_vt52, 0);
2581 break; 2591 break;
2582 case 'F': /* use special graphics character set */ 2592 case 'F': /* use special graphics character set */
2583 case 'G': /* use regular character set */ 2593 case 'G': /* use regular character set */
2584 /* unimplemented */ 2594 /* unimplemented */
2585 break; 2595 break;
2639 scr_forwardindex (); 2649 scr_forwardindex ();
2640 break; 2650 break;
2641#endif 2651#endif
2642 case '=': 2652 case '=':
2643 case '>': 2653 case '>':
2644 PrivMode ((ch == '='), PrivMode_aplKP); 2654 set_privmode (PrivMode_aplKP, ch == '=');
2645 break; 2655 break;
2646 2656
2647 case C1_40: 2657 case C1_40:
2648 cmd_getc (); 2658 cmd_getc ();
2649 break; 2659 break;
2688 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2698 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2689 case C1_SCI: /* ESC Z */ 2699 case C1_SCI: /* ESC Z */
2690 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2700 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2691 break; /* steal obsolete ESC [ c */ 2701 break; /* steal obsolete ESC [ c */
2692 2702
2693 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2703 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2694 case C1_CSI: /* ESC [ */ 2704 case C1_CSI: /* ESC [ */
2695 process_csi_seq (); 2705 process_csi_seq ();
2696 break; 2706 break;
2697 2707
2698 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2708 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2699 case C1_OSC: /* ESC ] */ 2709 case C1_OSC: /* ESC ] */
2700 process_osc_seq (); 2710 process_osc_seq ();
2701 break; 2711 break;
2702 2712
2703 /* 8.3.106: RESET TO INITIAL STATE */ 2713 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2704 case 'c': 2714 case 'c':
2705 mbstate.reset (); 2715 mbstate.reset ();
2706 scr_poweron (); 2716 scr_poweron ();
2707 scrollbar_show (1); 2717 scrollBar.show (1);
2708 break; 2718 break;
2709 2719
2710 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2720 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2711 case 'n': 2721 case 'n':
2712 scr_charset_choose (2); 2722 scr_charset_choose (2);
2763 2773
2764 nargs = 0; 2774 nargs = 0;
2765 2775
2766 priv = 0; 2776 priv = 0;
2767 ch = cmd_getc (); 2777 ch = cmd_getc ();
2768 if (ch >= '<' && ch <= '?') 2778 if ((ch >= '<' && ch <= '?') || ch == '!')
2769 { 2779 {
2770 /* '<' '=' '>' '?' */ 2780 /* '<' '=' '>' '?' '!' */
2771 priv = ch; 2781 priv = ch;
2772 ch = cmd_getc (); 2782 ch = cmd_getc ();
2773 } 2783 }
2774 2784
2775 /* read any numerical arguments */ 2785 /* read any numerical arguments */
2824 // versions. 2834 // versions.
2825 // 2835 //
2826 tt_printf ("\033[>%d;95;0c", 'U'); 2836 tt_printf ("\033[>%d;95;0c", 'U');
2827 } 2837 }
2828 break; 2838 break;
2839
2829 case '?': 2840 case '?':
2830 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2841 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2831 process_terminal_mode (ch, priv, nargs, arg); 2842 process_terminal_mode (ch, priv, nargs, arg);
2832 break; 2843 break;
2844
2845 case '!':
2846 if (ch == CSI_70)
2847 {
2848 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2849 scr_soft_reset ();
2850
2851 static const int pm_h[] = { 7, 25 };
2852 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 };
2853
2854 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h);
2855 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l);
2833 } 2856 }
2857 break;
2858 }
2859
2834 return; 2860 return;
2835 } 2861 }
2836 2862
2837 switch (ch) 2863 switch (ch)
2838 { 2864 {
3267 3293
3268/* 3294/*
3269 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3295 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3270 */ 3296 */
3271void 3297void
3272rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3298rxvt_term::process_xterm_seq (int op, char *str, char resp)
3273{ 3299{
3274 int color; 3300 int color;
3275 char *buf, *name; 3301 char *buf, *name;
3276 bool query = str[0] == '?' && !str[1]; 3302 bool query = str[0] == '?' && !str[1];
3277 int saveop = op; 3303 int saveop = op;
3318 3344
3319 XFree (value); 3345 XFree (value);
3320 } 3346 }
3321 else 3347 else
3322 { 3348 {
3323 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3349 char *eq = strchr (str, '=');
3324 3350
3325 if (eq) 3351 if (eq)
3326 { 3352 {
3327 *eq = 0; 3353 *eq = 0;
3328 set_utf8_property (display->atom (str), eq + 1); 3354 set_utf8_property (display->atom (str), eq + 1);
3349 *buf++ = '\0'; 3375 *buf++ = '\0';
3350 3376
3351 process_color_seq (op, color, name, resp); 3377 process_color_seq (op, color, name, resp);
3352 } 3378 }
3353 break; 3379 break;
3380 case Rxvt_restoreFG:
3354 case XTerm_Color00: 3381 case XTerm_Color00:
3355 process_color_seq (op, Color_fg, str, resp); 3382 process_color_seq (op, Color_fg, str, resp);
3356 break; 3383 break;
3384 case Rxvt_restoreBG:
3357 case XTerm_Color01: 3385 case XTerm_Color01:
3358 process_color_seq (op, Color_bg, str, resp); 3386 process_color_seq (op, Color_bg, str, resp);
3359 break; 3387 break;
3360#ifndef NO_CURSORCOLOR 3388#ifndef NO_CURSORCOLOR
3361 case XTerm_Color_cursor: 3389 case XTerm_Color_cursor:
3366 process_color_seq (op, Color_pointer_fg, str, resp); 3394 process_color_seq (op, Color_pointer_fg, str, resp);
3367 break; 3395 break;
3368 case XTerm_Color_pointer_bg: 3396 case XTerm_Color_pointer_bg:
3369 process_color_seq (op, Color_pointer_bg, str, resp); 3397 process_color_seq (op, Color_pointer_bg, str, resp);
3370 break; 3398 break;
3399#ifdef OPTION_HC
3400 case XTerm_Color_HC:
3401 process_color_seq (op, Color_HC, str, resp);
3402 break;
3403#endif
3371#ifndef NO_BOLD_UNDERLINE_REVERSE 3404#ifndef NO_BOLD_UNDERLINE_REVERSE
3372 case XTerm_Color_RV:
3373 process_color_seq (op, Color_RV, str, resp);
3374 break;
3375 case Rxvt_Color_BD:
3376 case URxvt_Color_BD: 3405 case URxvt_Color_BD:
3377 process_color_seq (op, Color_BD, str, resp); 3406 process_color_seq (op, Color_BD, str, resp);
3378 break; 3407 break;
3379 case Rxvt_Color_UL:
3380 case URxvt_Color_UL: 3408 case URxvt_Color_UL:
3381 process_color_seq (op, Color_UL, str, resp); 3409 process_color_seq (op, Color_UL, str, resp);
3382 break; 3410 break;
3383 case URxvt_Color_IT: 3411 case URxvt_Color_IT:
3384 process_color_seq (op, Color_IT, str, resp); 3412 process_color_seq (op, Color_IT, str, resp);
3385 break; 3413 break;
3386#endif 3414#endif
3415 case URxvt_Color_border:
3416 process_color_seq (op, Color_border, str, resp);
3417 break;
3387#if ENABLE_TRANSPARENCY 3418#if ENABLE_TRANSPARENCY
3388 case URxvt_Color_tint: 3419 case URxvt_Color_tint:
3389 process_color_seq (op, Color_tint, str, resp); 3420 process_color_seq (op, Color_tint, str, resp);
3390 { 3421 {
3391 bool changed = false; 3422 bool changed = false;
3423
3392 if (ISSET_PIXCOLOR (Color_tint)) 3424 if (ISSET_PIXCOLOR (Color_tint))
3393 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3425 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3394 else 3426 else
3395 changed = bgPixmap.unset_tint (); 3427 changed = bgPixmap.unset_tint ();
3428
3396 if (changed) 3429 if (changed)
3397 update_background (); 3430 update_background ();
3398 } 3431 }
3399 3432
3400 break; 3433 break;
3404 case Rxvt_Pixmap: 3437 case Rxvt_Pixmap:
3405 if (!strcmp (str, "?")) 3438 if (!strcmp (str, "?"))
3406 { 3439 {
3407 char str[256]; 3440 char str[256];
3408 3441
3409 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3442 sprintf (str, "[%dx%d+%d+%d]",
3410 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3443 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3411 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3444 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3412 process_xterm_seq (XTerm_title, str, CHAR_ST); 3445 process_xterm_seq (XTerm_title, str, CHAR_ST);
3413 } 3446 }
3414 else 3447 else
3423 changed++; 3456 changed++;
3424 str = strchr (str, ';'); 3457 str = strchr (str, ';');
3425 if (str == NULL) 3458 if (str == NULL)
3426 bgPixmap.set_defaultGeometry (); 3459 bgPixmap.set_defaultGeometry ();
3427 } 3460 }
3461
3428 while (str) 3462 while (str)
3429 { 3463 {
3430 str++; 3464 str++;
3431 if (bgPixmap.set_geometry (str)) 3465 if (bgPixmap.set_geometry (str))
3432 changed++; 3466 changed++;
3433 str = strchr (str, ';'); 3467 str = strchr (str, ';');
3434 } 3468 }
3469
3435 if (changed) 3470 if (changed)
3436 update_background (); 3471 update_background ();
3437 } 3472 }
3438 break; 3473 break;
3439#endif 3474#endif
3440
3441 case Rxvt_restoreFG:
3442 set_window_color (Color_fg, str);
3443 break;
3444 case Rxvt_restoreBG:
3445 set_window_color (Color_bg, str);
3446 break;
3447 3475
3448 case XTerm_logfile: 3476 case XTerm_logfile:
3449 // TODO, when secure mode? 3477 // TODO, when secure mode?
3450 break; 3478 break;
3451 3479
3518 break; 3546 break;
3519#endif 3547#endif
3520 3548
3521#if ENABLE_PERL 3549#if ENABLE_PERL
3522 case URxvt_perl: 3550 case URxvt_perl:
3523 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3551 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3524 ; // no responses yet
3525 break; 3552 break;
3526#endif 3553#endif
3527 } 3554 }
3528} 3555}
3529/*----------------------------------------------------------------------*/ 3556/*----------------------------------------------------------------------*/
3552 { 3579 {
3553 if (mode == 'r') 3580 if (mode == 'r')
3554 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3581 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3555 else 3582 else
3556 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3583 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3557 PrivMode (state, bit); 3584 set_privmode (bit, state);
3558 } 3585 }
3559 3586
3560 return state; 3587 return state;
3561} 3588}
3562 3589
3570 static const struct 3597 static const struct
3571 { 3598 {
3572 const int argval; 3599 const int argval;
3573 const unsigned long bit; 3600 const unsigned long bit;
3574 } argtopriv[] = { 3601 } argtopriv[] = {
3575 { 1, PrivMode_aplCUR }, 3602 { 1, PrivMode_aplCUR }, // DECCKM
3576 { 2, PrivMode_vt52 }, 3603 { 2, PrivMode_vt52 },
3577 { 3, PrivMode_132 }, 3604 { 3, PrivMode_132 }, // DECCOLM
3578 { 4, PrivMode_smoothScroll }, 3605 { 4, PrivMode_smoothScroll }, // DECSCLM
3579 { 5, PrivMode_rVideo }, 3606 { 5, PrivMode_rVideo }, // DECSCNM
3580 { 6, PrivMode_relOrigin }, 3607 { 6, PrivMode_relOrigin }, // DECOM
3581 { 7, PrivMode_Autowrap }, 3608 { 7, PrivMode_Autowrap }, // DECAWM
3582 // 8, bi-directional support mode 3609 // 8, auto-repeat keys // DECARM
3583 { 9, PrivMode_MouseX10 }, 3610 { 9, PrivMode_MouseX10 },
3584 // 18, 19 printing-related 3611 // 18 end FF to printer after print screen
3612 // 19 Print screen prints full screen/scorll region
3585 { 25, PrivMode_VisibleCursor }, 3613 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3586#ifdef scrollBar_esc 3614#ifdef scrollBar_esc
3587 { scrollBar_esc, PrivMode_scrollBar }, 3615 { scrollBar_esc, PrivMode_scrollBar },
3588#endif 3616#endif
3589 { 35, PrivMode_ShiftKeys }, // rxvt extension 3617 { 35, PrivMode_ShiftKeys }, // rxvt extension
3618 // 38, tektronix mode // DECTEK
3590 { 40, PrivMode_132OK }, 3619 { 40, PrivMode_132OK },
3591 // 41 xterm more fixes NYI 3620 // 41 xterm more fixes NYI
3592 // 45 margin bell NYI 3621 // 45 margin bell NYI
3593 // 46 start logging 3622 // 46 start logging
3594 { 47, PrivMode_Screen }, 3623 { 47, PrivMode_Screen },
3595 { 66, PrivMode_aplKP }, 3624 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
3596#ifndef NO_BACKSPACE_KEY 3625#ifndef NO_BACKSPACE_KEY
3597 { 67, PrivMode_BackSpace }, 3626 { 67, PrivMode_BackSpace }, // DECBKM
3598#endif 3627#endif
3599 { 1000, PrivMode_MouseX11 }, 3628 { 1000, PrivMode_MouseX11 },
3600 { 1002, PrivMode_MouseBtnEvent }, 3629 { 1002, PrivMode_MouseBtnEvent },
3601 { 1003, PrivMode_MouseAnyEvent }, 3630 { 1003, PrivMode_MouseAnyEvent },
3602 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3631 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3606 // 1037 send DEL for keypad delete NYI 3635 // 1037 send DEL for keypad delete NYI
3607 { 1047, PrivMode_Screen }, 3636 { 1047, PrivMode_Screen },
3608 // 1048 save and restore cursor 3637 // 1048 save and restore cursor
3609 { 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 */
3610 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3639 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3640 { 2004, PrivMode_BracketPaste },
3611 }; 3641 };
3612 3642
3613 if (nargs == 0) 3643 if (nargs == 0)
3614 return; 3644 return;
3615 3645
3640 3670
3641 scr_touch (true); 3671 scr_touch (true);
3642 break; 3672 break;
3643#endif 3673#endif
3644 case 1048: /* alternative cursor save */ 3674 case 1048: /* alternative cursor save */
3645 case 1049:
3646 if (option (Opt_secondaryScreen)) 3675 if (option (Opt_secondaryScreen))
3647 if (mode == 0) 3676 if (mode == 0)
3648 scr_cursor (RESTORE); 3677 scr_cursor (RESTORE);
3649 else if (mode == 1) 3678 else if (mode == 1)
3650 scr_cursor (SAVE); 3679 scr_cursor (SAVE);
3659 case 2: /* VT52 mode */ 3688 case 2: /* VT52 mode */
3660 /* oddball mode. should be set regardless of set/reset 3689 /* oddball mode. should be set regardless of set/reset
3661 * parameter. Return from VT52 mode with an ESC < from 3690 * parameter. Return from VT52 mode with an ESC < from
3662 * within VT52 mode 3691 * within VT52 mode
3663 */ 3692 */
3664 PrivMode (1, PrivMode_vt52); 3693 set_privmode (PrivMode_vt52, 1);
3665 break; 3694 break;
3666 case 3: /* 80/132 */ 3695 case 3: /* 80/132 */
3667 if (priv_modes & PrivMode_132OK) 3696 if (priv_modes & PrivMode_132OK)
3668 set_widthheight (((state ? 132 : 80) * fwidth), height); 3697 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3669 break; 3698 break;
3670 case 4: /* smooth scrolling */ 3699 case 4: /* smooth scrolling */
3671 set_option (Opt_jumpScroll, !state); 3700 set_option (Opt_jumpScroll, !state);
3672 break; 3701 break;
3673 case 5: /* reverse video */ 3702 case 5: /* reverse video */
3684 if (state) /* orthogonal */ 3713 if (state) /* orthogonal */
3685 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3714 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3686 break; 3715 break;
3687#ifdef scrollBar_esc 3716#ifdef scrollBar_esc
3688 case scrollBar_esc: 3717 case scrollBar_esc:
3689 if (scrollbar_mapping (state)) 3718 if (scrollBar.map (state))
3690 { 3719 {
3691 resize_all_windows (0, 0, 0); 3720 resize_all_windows (0, 0, 0);
3692 scr_touch (true); 3721 scr_touch (true);
3693 } 3722 }
3694 break; 3723 break;
3715 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3744 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3716 vt_emask_mouse = PointerMotionMask; 3745 vt_emask_mouse = PointerMotionMask;
3717 } 3746 }
3718 else 3747 else
3719 vt_emask_mouse = NoEventMask; 3748 vt_emask_mouse = NoEventMask;
3749
3720 vt_select_input (); 3750 vt_select_input ();
3721 break; 3751 break;
3722 case 1010: /* scroll to bottom on TTY output inhibit */ 3752 case 1010: /* scroll to bottom on TTY output inhibit */
3723 set_option (Opt_scrollTtyOutput, !state); 3753 set_option (Opt_scrollTtyOutput, !state);
3724 break; 3754 break;
3725 case 1011: /* scroll to bottom on key press */ 3755 case 1011: /* scroll to bottom on key press */
3726 set_option (Opt_scrollTtyKeypress, state); 3756 set_option (Opt_scrollTtyKeypress, state);
3727 break; 3757 break;
3728 case 1047: /* secondary screen w/ clearing last */ 3758 case 1047: /* secondary screen w/ clearing last */
3729 if (option (Opt_secondaryScreen)) 3759 if (option (Opt_secondaryScreen))
3730 if (current_screen != PRIMARY) 3760 if (!state)
3731 scr_erase_screen (2); 3761 scr_erase_screen (2);
3762
3732 scr_change_screen (state); 3763 scr_change_screen (state);
3733 break; 3764 break;
3734 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
3735 scr_change_screen (state); 3770 scr_change_screen (state);
3771
3736 if (option (Opt_secondaryScreen)) 3772 if (option (Opt_secondaryScreen))
3737 if (current_screen != PRIMARY) 3773 if (state)
3738 scr_erase_screen (2); 3774 scr_erase_screen (2);
3775 else
3776 scr_cursor (RESTORE);
3739 break; 3777 break;
3740 default: 3778 default:
3741 break; 3779 break;
3742 } 3780 }
3743 } 3781 }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines