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.375 by root, Tue Dec 11 21:10:46 2007 UTC vs.
Revision 1.467 by sf-exg, Tue Dec 21 10:37:42 2010 UTC

25 * - extensive modifications 25 * - extensive modifications
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-2006 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
898 commit_iso14755 (); 889 commit_iso14755 ();
899 890
900 return; 891 return;
901 } 892 }
902 893
903 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 894 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
904 if (i[0] == keysym) 895 if (i[0] == keysym)
905 { 896 {
906 iso14755buf = ISO_14755_51 | i[1]; 897 iso14755buf = ISO_14755_51 | i[1];
907 commit_iso14755 (); 898 commit_iso14755 ();
908 899
984rxvt_term::flush () 975rxvt_term::flush ()
985{ 976{
986 flush_ev.stop (); 977 flush_ev.stop ();
987 978
988#ifdef HAVE_BG_PIXMAP 979#ifdef HAVE_BG_PIXMAP
989 if (bgPixmap.check_clearChanged ()) 980 if (bgPixmap.flags & bgPixmap_t::hasChanged)
990 { 981 {
982 bgPixmap.flags &= ~bgPixmap_t::hasChanged;
991// scr_clear (true); This needs to be researched further! 983// scr_clear (true); This needs to be researched further!
992 scr_touch (false); 984 scr_touch (false);
993 } 985 }
994#endif 986#endif
995 987
1032 } 1024 }
1033 while (row < end_row); 1025 while (row < end_row);
1034 } 1026 }
1035 1027
1036 scr_refresh (); 1028 scr_refresh ();
1037 scrollbar_show (1); 1029 scrollBar.show (1);
1038#ifdef USE_XIM 1030#ifdef USE_XIM
1039 IMSendSpot (); 1031 IMSendSpot ();
1040#endif 1032#endif
1041 } 1033 }
1042 1034
1043 display->flush (); 1035 display->flush ();
1044} 1036}
1045 1037
1038/* checks whether a refresh is requested and starts the refresh timer */
1046void 1039void
1047rxvt_term::prepare_cb (ev::prepare &w, int revents) 1040rxvt_term::refresh_check ()
1048{ 1041{
1049 make_current (); 1042 if (want_refresh && !flush_ev.is_active ())
1043 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1050 1044
1051 display->flush (); 1045 display->flush ();
1052
1053 if (want_refresh && !ev_is_active (&flush_ev))
1054 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1055} 1046}
1056 1047
1057void 1048void
1058rxvt_term::flush_cb (ev::timer &w, int revents) 1049rxvt_term::flush_cb (ev::timer &w, int revents)
1059{ 1050{
1067void 1058void
1068rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 1059rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1069{ 1060{
1070 hidden_cursor = !hidden_cursor; 1061 hidden_cursor = !hidden_cursor;
1071 want_refresh = 1; 1062 want_refresh = 1;
1063 refresh_check ();
1072} 1064}
1073#endif 1065#endif
1074 1066
1075#ifdef TEXT_BLINK 1067#ifdef TEXT_BLINK
1076void 1068void
1078{ 1070{
1079 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1071 if (scr_refresh_rend (RS_Blink, RS_Blink))
1080 { 1072 {
1081 hidden_text = !hidden_text; 1073 hidden_text = !hidden_text;
1082 want_refresh = 1; 1074 want_refresh = 1;
1075 refresh_check ();
1083 } 1076 }
1084 else 1077 else
1085 w.stop (); 1078 w.stop ();
1086} 1079}
1087#endif 1080#endif
1088 1081
1089#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1082#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1090void 1083void
1091rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1084rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1092{ 1085{
1093 if ((scrollbar_isUp() || scrollbar_isDn()) && 1086 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1094 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1087 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1088 {
1095 want_refresh = 1; 1089 want_refresh = 1;
1090 refresh_check ();
1091 }
1096 else 1092 else
1097 w.stop (); 1093 w.stop ();
1098} 1094}
1099#endif 1095#endif
1100 1096
1104{ 1100{
1105 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1101 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1106 { 1102 {
1107 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1103 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1108 want_refresh = 1; 1104 want_refresh = 1;
1105 refresh_check ();
1109 } 1106 }
1110 else 1107 else
1111 w.stop (); 1108 w.stop ();
1112} 1109}
1113#endif 1110#endif
1114 1111
1115#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1112#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1116void 1113void
1117rxvt_term::slip_wheel_cb (ev::timer &w, int revents) 1114rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1118{ 1115{
1119 if (mouse_slip_wheel_speed == 0 1116 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1120 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1121 : scr_page (UP, mouse_slip_wheel_speed))
1122 { 1117 {
1123 if (view_start == top_row || view_start == 0)
1124 mouse_slip_wheel_speed = 0;
1125
1126 want_refresh = 1; 1118 want_refresh = 1;
1119 refresh_check ();
1120 }
1121
1122 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1127 } 1123 {
1128 else 1124 mouse_slip_wheel_speed = 0;
1129 w.stop (); 1125 w.stop ();
1126 }
1130} 1127}
1131#endif 1128#endif
1132 1129
1133#if LINUX_YIELD_HACK 1130#if LINUX_YIELD_HACK
1134static struct event_handler 1131static struct event_handler
1139 { 1136 {
1140 // this should really be sched_yield(), but the linux guys thought 1137 // this should really be sched_yield(), but the linux guys thought
1141 // that giving a process calling sched_yield () less cpu time than 1138 // that giving a process calling sched_yield () less cpu time than
1142 // ones with high nice levels is a useful thing to do. It surely is is 1139 // ones with high nice levels is a useful thing to do. It surely is is
1143 // allowed by the sus... as is returning ENOSYS. 1140 // allowed by the sus... as is returning ENOSYS.
1141 // since the linux guys additionally thought that breaking the only
1142 // known workaround against their unusable sched_yield hack is cool,
1143 // we just nanosleep a bit and hope for the best.
1144 1144
1145 struct timespec ts = { 0, 0 }; 1145 struct timespec ts = { 0, 1000 };
1146 nanosleep (&ts, 0); 1146 nanosleep (&ts, 0);
1147 1147
1148 w.stop (); 1148 w.stop ();
1149 } 1149 }
1150 1150
1200{ 1200{
1201 make_current (); 1201 make_current ();
1202 1202
1203 if (revents & ev::READ) 1203 if (revents & ev::READ)
1204 // loop, but don't allow a single term to monopolize us 1204 // loop, but don't allow a single term to monopolize us
1205 while (pty_fill ()) 1205 for (int i = CBUFCNT; i-- && pty_fill (); )
1206 if (cmd_parse ()) 1206 cmd_parse ();
1207 break;
1208 1207
1209 if (revents & ev::WRITE) 1208 if (revents & ev::WRITE)
1210 pty_write (); 1209 pty_write ();
1210
1211 refresh_check ();
1211} 1212}
1212 1213
1213void 1214void
1214rxvt_term::pointer_unblank () 1215rxvt_term::pointer_unblank ()
1215{ 1216{
1251{ 1252{
1252 int button_number, key_state = 0; 1253 int button_number, key_state = 0;
1253 int x, y; 1254 int x, y;
1254 int code = 32; 1255 int code = 32;
1255 1256
1256 x = Pixel2Col (ev.x); 1257 x = Pixel2Col (ev.x) + 1;
1257 y = Pixel2Row (ev.y); 1258 y = Pixel2Row (ev.y) + 1;
1259
1258 if (ev.type == MotionNotify) 1260 if (ev.type == MotionNotify)
1259 { 1261 {
1260 if (x == mouse_row && y == mouse_col) 1262 if (x == mouse_row && y == mouse_col)
1261 return; 1263 return;
1264
1262 mouse_row = x; 1265 mouse_row = x;
1263 mouse_col = y; 1266 mouse_col = y;
1264 code += 32; 1267 code += 32;
1265 } 1268 }
1266 1269
1269 else 1272 else
1270 { 1273 {
1271 button_number = MEvent.button - Button1; 1274 button_number = MEvent.button - Button1;
1272 /* add 0x3D for wheel events, like xterm does */ 1275 /* add 0x3D for wheel events, like xterm does */
1273 if (button_number >= 3) 1276 if (button_number >= 3)
1274 button_number += (64 - 3); 1277 button_number += 64 - 3;
1275 } 1278 }
1276 1279
1277 if (priv_modes & PrivMode_MouseX10) 1280 if (priv_modes & PrivMode_MouseX10)
1278 { 1281 {
1279 /* 1282 /*
1311 fputc ('A', stderr); 1314 fputc ('A', stderr);
1312 if (key_state & 32) 1315 if (key_state & 32)
1313 fputc ('2', stderr); 1316 fputc ('2', stderr);
1314 fprintf (stderr, "]: <%d>, %d/%d\n", 1317 fprintf (stderr, "]: <%d>, %d/%d\n",
1315 button_number, 1318 button_number,
1316 x + 1, 1319 x,
1317 y + 1); 1320 y);
1318#endif 1321#endif
1319 1322
1323#if ENABLE_FRILLS
1324 if (priv_modes & PrivMode_ExtMouseRight)
1325 tt_printf ("\033[%d;%d;%dM",
1326 code + button_number + key_state,
1327 x,
1328 y);
1329 else if (priv_modes & PrivMode_ExtModeMouse)
1330 tt_printf ("\033[M%c%lc%lc",
1331 code + button_number + key_state,
1332 wint_t (32 + x),
1333 wint_t (32 + y));
1334 else
1335#endif
1320 tt_printf ("\033[M%c%c%c", 1336 tt_printf ("\033[M%c%c%c",
1321 (code + button_number + key_state), 1337 code + button_number + key_state,
1322 (32 + x + 1), 1338 32 + x,
1323 (32 + y + 1)); 1339 32 + y);
1324} 1340}
1325 1341
1326/*{{{ process an X event */ 1342/*{{{ process an X event */
1327void 1343void
1328rxvt_term::x_cb (XEvent &ev) 1344rxvt_term::x_cb (XEvent &ev)
1430 && ev.xfocus.mode != NotifyGrab) 1446 && ev.xfocus.mode != NotifyGrab)
1431 focus_out (); 1447 focus_out ();
1432 break; 1448 break;
1433 1449
1434 case ConfigureNotify: 1450 case ConfigureNotify:
1435 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1436 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1437 szHint.width, szHint.height); */
1438 if (ev.xconfigure.window == parent[0]) 1451 if (ev.xconfigure.window == parent[0])
1439 { 1452 {
1440 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1453 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1441 ; 1454 ;
1455
1456#ifdef HAVE_BG_PIXMAP
1457 bool moved = false;
1458 if (bgPixmap.window_position_sensitive ())
1459 {
1460 int x, y;
1461 if (ev.xconfigure.send_event)
1462 {
1463 x = ev.xconfigure.x;
1464 y = ev.xconfigure.y;
1465 }
1466 else
1467 get_window_origin (x, y);
1468
1469 if (bgPixmap.set_position (x, y)
1470 || (bgPixmap.flags & bgPixmap_t::isInvalid))
1471 moved = true;
1472 }
1473#endif
1442 1474
1443 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1475 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1444 { 1476 {
1445 seen_resize = 1; 1477 seen_resize = 1;
1446 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1478 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1447 } 1479 }
1448 else 1480 else
1449 { 1481 {
1450#ifdef HAVE_BG_PIXMAP 1482#ifdef HAVE_BG_PIXMAP
1451 if (bgPixmap.window_position_sensitive ()) 1483 if (moved)
1484 {
1485 if (mapped)
1452 update_background (); 1486 update_background ();
1487 else
1488 bgPixmap.invalidate ();
1489 }
1453#endif 1490#endif
1454 } 1491 }
1492
1455 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1493 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1456 } 1494 }
1457 break; 1495 break;
1458 1496
1459 case PropertyNotify: 1497 case PropertyNotify:
1463 selection_property (ev.xproperty.window, ev.xproperty.atom); 1501 selection_property (ev.xproperty.window, ev.xproperty.atom);
1464 1502
1465 break; 1503 break;
1466 1504
1467 case SelectionClear: 1505 case SelectionClear:
1468 selection_clear (); 1506 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1469 break; 1507 break;
1470 1508
1471 case SelectionNotify: 1509 case SelectionNotify:
1472 if (selection_wait == Sel_normal) 1510 if (selection_wait == Sel_normal)
1473 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1511 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1476 case SelectionRequest: 1514 case SelectionRequest:
1477 selection_send (ev.xselectionrequest); 1515 selection_send (ev.xselectionrequest);
1478 break; 1516 break;
1479 1517
1480 case MapNotify: 1518 case MapNotify:
1519#ifdef HAVE_BG_PIXMAP
1520 /* This is needed specifically to fix the case of no window manager or a
1521 * non-reparenting window manager. In those cases we never get first
1522 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1523 * care of multiplicity of ConfigureNotify events arriving while WM does
1524 * reparenting.
1525 * We should not render background immediately, as there could be several
1526 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1527 * by scheduling background redraw as soon as we can, but giving a short
1528 * bit of time for ConfigureNotifies to arrive.
1529 * We should render background PRIOR to drawing any text, but AFTER all
1530 * of ConfigureNotifys for the best results.
1531 */
1532 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1533 update_background_ev.start (0.025);
1534#endif
1481 mapped = 1; 1535 mapped = 1;
1482#ifdef TEXT_BLINK 1536#ifdef TEXT_BLINK
1483 text_blink_ev.start (); 1537 text_blink_ev.start ();
1484#endif 1538#endif
1485 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1539 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1509 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1563 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1510 { 1564 {
1511 scr_expose (ev.xexpose.x, ev.xexpose.y, 1565 scr_expose (ev.xexpose.x, ev.xexpose.y,
1512 ev.xexpose.width, ev.xexpose.height, False); 1566 ev.xexpose.width, ev.xexpose.height, False);
1513 } 1567 }
1568
1514 want_refresh = 1; 1569 want_refresh = 1;
1515 } 1570 }
1516 else 1571 else
1517 { 1572 {
1518 XEvent unused_event; 1573 XEvent unused_event;
1520 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1575 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1521 ; 1576 ;
1522 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1577 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1523 ; 1578 ;
1524 1579
1525 if (isScrollbarWindow (ev.xany.window)) 1580 if (scrollBar.state && ev.xany.window == scrollBar.win)
1526 { 1581 {
1527 scrollBar.setIdle (); 1582 scrollBar.state = STATE_IDLE;
1528 scrollbar_show (0); 1583 scrollBar.show (0);
1529 } 1584 }
1530 } 1585 }
1531 break; 1586 break;
1532 1587
1533 case MotionNotify: 1588 case MotionNotify:
1579 int dist; 1634 int dist;
1580 1635
1581 /* don't clobber the current delay if we are 1636 /* don't clobber the current delay if we are
1582 * already in the middle of scrolling. 1637 * already in the middle of scrolling.
1583 */ 1638 */
1584 if (!ev_is_active (&sel_scroll_ev)) 1639 if (!sel_scroll_ev.is_active ())
1585 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 1640 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1586 1641
1587 /* save the event params so we can highlight 1642 /* save the event params so we can highlight
1588 * the selection in the pending-scroll loop 1643 * the selection in the pending-scroll loop
1589 */ 1644 */
1612 else 1667 else
1613 { 1668 {
1614 /* we are within the text window, so we 1669 /* we are within the text window, so we
1615 * shouldn't be scrolling 1670 * shouldn't be scrolling
1616 */ 1671 */
1617 if (ev_is_active (&sel_scroll_ev))
1618 sel_scroll_ev.stop(); 1672 sel_scroll_ev.stop();
1619 } 1673 }
1620#endif 1674#endif
1621#ifdef MOUSE_THRESHOLD 1675#ifdef MOUSE_THRESHOLD
1622 } 1676 }
1623#endif 1677#endif
1624 } 1678 }
1625 } 1679 }
1626 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1680 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1627 { 1681 {
1628 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1682 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1629 MotionNotify, &ev)) 1683 MotionNotify, &ev))
1630 ; 1684 ;
1631 1685
1633 &unused_root, &unused_child, 1687 &unused_root, &unused_child,
1634 &unused_root_x, &unused_root_y, 1688 &unused_root_x, &unused_root_y,
1635 &ev.xbutton.x, &ev.xbutton.y, 1689 &ev.xbutton.x, &ev.xbutton.y,
1636 &unused_mask); 1690 &unused_mask);
1637 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1691 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1638 scrollbar_size ()); 1692 scrollBar.size ());
1639 want_refresh = 1; 1693 want_refresh = 1;
1640 scrollbar_show (1); 1694 scrollBar.show (1);
1641 } 1695 }
1642 break; 1696 break;
1643 } 1697 }
1644 1698
1645#if defined(CURSOR_BLINK) 1699#if defined(CURSOR_BLINK)
1666 1720
1667 if (ev.type == KeyPress && hidden_pointer == 0) 1721 if (ev.type == KeyPress && hidden_pointer == 0)
1668 pointer_blank (); 1722 pointer_blank ();
1669 } 1723 }
1670#endif 1724#endif
1725
1726 refresh_check ();
1671} 1727}
1728
1729#if ENABLE_FRILLS
1730void
1731rxvt_term::set_urgency (bool enable)
1732{
1733 if (enable == urgency_hint)
1734 return;
1735
1736 if (XWMHints *h = XGetWMHints (dpy, parent[0]))
1737 {
1738 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1739 XSetWMHints (dpy, parent[0], h);
1740 urgency_hint = enable;
1741 }
1742}
1743#endif
1672 1744
1673void 1745void
1674rxvt_term::focus_in () 1746rxvt_term::focus_in ()
1675{ 1747{
1676 if (!focus) 1748 if (!focus)
1677 { 1749 {
1678 focus = 1; 1750 focus = 1;
1679 want_refresh = 1; 1751 want_refresh = 1;
1680
1681 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1682 1752
1683#if USE_XIM 1753#if USE_XIM
1684 if (Input_Context != NULL) 1754 if (Input_Context != NULL)
1685 { 1755 {
1686 IMSetPosition (); 1756 IMSetPosition ();
1698 scr_recolour (); 1768 scr_recolour ();
1699 } 1769 }
1700#endif 1770#endif
1701#if ENABLE_FRILLS 1771#if ENABLE_FRILLS
1702 if (option (Opt_urgentOnBell)) 1772 if (option (Opt_urgentOnBell))
1703 { 1773 set_urgency (0);
1704 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1705 {
1706 h->flags &= ~XUrgencyHint;
1707 XSetWMHints (dpy, parent[0], h);
1708 }
1709 }
1710#endif 1774#endif
1775
1776 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1711 } 1777 }
1712} 1778}
1713 1779
1714void 1780void
1715rxvt_term::focus_out () 1781rxvt_term::focus_out ()
1717 if (focus) 1783 if (focus)
1718 { 1784 {
1719 focus = 0; 1785 focus = 0;
1720 want_refresh = 1; 1786 want_refresh = 1;
1721 1787
1722 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1788#if ENABLE_FRILLS
1723 1789 if (option (Opt_urgentOnBell))
1790 set_urgency (0);
1791#endif
1724#if ENABLE_FRILLS || ISO_14755 1792#if ENABLE_FRILLS || ISO_14755
1725 if (iso14755buf) 1793 if (iso14755buf)
1726 { 1794 {
1727 iso14755buf = 0; 1795 iso14755buf = 0;
1728# if ISO_14755 1796# if ISO_14755
1745 { 1813 {
1746 pix_colors = pix_colors_unfocused; 1814 pix_colors = pix_colors_unfocused;
1747 scr_recolour (); 1815 scr_recolour ();
1748 } 1816 }
1749#endif 1817#endif
1818
1819 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1750 } 1820 }
1751} 1821}
1752 1822
1753void 1823void
1754rxvt_term::update_fade_color (unsigned int idx) 1824rxvt_term::update_fade_color (unsigned int idx)
1785 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1855 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1786 { 1856 {
1787 bgPixmap.set_root_pixmap (); 1857 bgPixmap.set_root_pixmap ();
1788 update_background (); 1858 update_background ();
1789 } 1859 }
1860
1790 break; 1861 break;
1791 } 1862 }
1792# endif 1863# endif
1864
1865 refresh_check ();
1793} 1866}
1794#endif 1867#endif
1795 1868
1796void 1869void
1797rxvt_term::button_press (XButtonEvent &ev) 1870rxvt_term::button_press (XButtonEvent &ev)
1828 /* save the xbutton state (for ButtonRelease) */ 1901 /* save the xbutton state (for ButtonRelease) */
1829 MEvent.state = ev.state; 1902 MEvent.state = ev.state;
1830#ifdef MOUSE_REPORT_DOUBLECLICK 1903#ifdef MOUSE_REPORT_DOUBLECLICK
1831 if (ev.button == MEvent.button && clickintime) 1904 if (ev.button == MEvent.button && clickintime)
1832 { 1905 {
1833 /* same button, within alloted time */ 1906 /* same button, within allowed time */
1834 MEvent.clicks++; 1907 MEvent.clicks++;
1835 1908
1836 if (MEvent.clicks > 1) 1909 if (MEvent.clicks > 1)
1837 { 1910 {
1838 /* only report double clicks */ 1911 /* only report double clicks */
1910 } 1983 }
1911 1984
1912 /* 1985 /*
1913 * Scrollbar window processing of button press 1986 * Scrollbar window processing of button press
1914 */ 1987 */
1915 if (isScrollbarWindow (ev.window)) 1988 if (scrollBar.state && ev.window == scrollBar.win)
1916 { 1989 {
1917 scrollBar.setIdle (); 1990 page_dirn direction = NO_DIR;
1991
1992 if (scrollBar.upButton (ev.y))
1993 direction = UP; /* up */
1994 else if (scrollBar.dnButton (ev.y))
1995 direction = DN; /* down */
1996
1997 scrollBar.state = STATE_IDLE;
1918 /* 1998 /*
1919 * Rxvt-style scrollbar: 1999 * Rxvt-style scrollbar:
1920 * move up if mouse is above slider 2000 * move up if mouse is above slider
1921 * move dn if mouse is below slider 2001 * move dn if mouse is below slider
1922 * 2002 *
1931 /* 2011 /*
1932 * Mouse report disabled scrollbar: 2012 * Mouse report disabled scrollbar:
1933 * arrow buttons - send up/down 2013 * arrow buttons - send up/down
1934 * click on scrollbar - send pageup/down 2014 * click on scrollbar - send pageup/down
1935 */ 2015 */
1936 if ((scrollBar.style == R_SB_NEXT 2016 if (direction == UP)
1937 && scrollbarnext_upButton (ev.y))
1938 || (scrollBar.style == R_SB_RXVT
1939 && scrollbarrxvt_upButton (ev.y)))
1940 tt_printf ("\033[A"); 2017 tt_printf ("\033[A");
1941 else if ((scrollBar.style == R_SB_NEXT 2018 else if (direction == DN)
1942 && scrollbarnext_dnButton (ev.y))
1943 || (scrollBar.style == R_SB_RXVT
1944 && scrollbarrxvt_dnButton (ev.y)))
1945 tt_printf ("\033[B"); 2019 tt_printf ("\033[B");
1946 else 2020 else
1947 switch (ev.button) 2021 switch (ev.button)
1948 { 2022 {
1949 case Button2: 2023 case Button2:
1957 break; 2031 break;
1958 } 2032 }
1959 } 2033 }
1960 else 2034 else
1961#endif /* NO_SCROLLBAR_REPORT */ 2035#endif /* NO_SCROLLBAR_REPORT */
1962
1963 {
1964 char upordown = 0;
1965
1966 if (scrollBar.style == R_SB_NEXT)
1967 { 2036 {
1968 if (scrollbarnext_upButton (ev.y)) 2037 if (direction != NO_DIR)
1969 upordown = -1; /* up */
1970 else if (scrollbarnext_dnButton (ev.y))
1971 upordown = 1; /* down */
1972 }
1973 else if (scrollBar.style == R_SB_RXVT)
1974 {
1975 if (scrollbarrxvt_upButton (ev.y))
1976 upordown = -1; /* up */
1977 else if (scrollbarrxvt_dnButton (ev.y))
1978 upordown = 1; /* down */
1979 }
1980 if (upordown)
1981 { 2038 {
1982#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2039#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2040 if (!cont_scroll_ev.is_active ())
1983 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2041 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1984#endif 2042#endif
1985 if (scr_page (upordown < 0 ? UP : DN, 1)) 2043 if (scr_page (direction, 1))
1986 { 2044 {
1987 if (upordown < 0) 2045 if (direction == UP)
1988 scrollBar.setUp (); 2046 scrollBar.state = STATE_UP;
1989 else 2047 else
1990 scrollBar.setDn (); 2048 scrollBar.state = STATE_DOWN;
1991 } 2049 }
1992 } 2050 }
1993 else 2051 else
1994 switch (ev.button) 2052 switch (ev.button)
1995 { 2053 {
1996 case Button2: 2054 case Button2:
1997 switch (scrollbar_align) 2055 switch (scrollBar.align)
1998 { 2056 {
1999 case R_SB_ALIGN_TOP: 2057 case R_SB_ALIGN_TOP:
2000 csrO = 0; 2058 csrO = 0;
2001 break; 2059 break;
2002 case R_SB_ALIGN_CENTRE: 2060 case R_SB_ALIGN_CENTRE:
2008 } 2066 }
2009 2067
2010 if (scrollBar.style == R_SB_XTERM 2068 if (scrollBar.style == R_SB_XTERM
2011 || scrollbar_above_slider (ev.y) 2069 || scrollbar_above_slider (ev.y)
2012 || scrollbar_below_slider (ev.y)) 2070 || scrollbar_below_slider (ev.y))
2013 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2071 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2014 2072
2015 scrollBar.setMotion (); 2073 scrollBar.state = STATE_MOTION;
2016 break; 2074 break;
2017 2075
2018 case Button1: 2076 case Button1:
2019 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2077 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2020 csrO = ev.y - scrollBar.top; 2078 csrO = ev.y - scrollBar.top;
2021 /* FALLTHROUGH */ 2079 /* FALLTHROUGH */
2022 2080
2023 case Button3: 2081 case Button3:
2024 if (scrollBar.style != R_SB_XTERM) 2082 if (scrollBar.style != R_SB_XTERM)
2034 scr_page (DN, nrow - 1); 2092 scr_page (DN, nrow - 1);
2035# else 2093# else
2036 scr_page (DN, nrow / 4); 2094 scr_page (DN, nrow / 4);
2037# endif 2095# endif
2038 else 2096 else
2039 scrollBar.setMotion (); 2097 scrollBar.state = STATE_MOTION;
2040 } 2098 }
2041 else 2099 else
2042 { 2100 {
2043 scr_page ((ev.button == Button1 ? DN : UP), 2101 scr_page ((ev.button == Button1 ? DN : UP),
2044 (nrow 2102 (nrow
2045 * scrollbar_position (ev.y) 2103 * scrollbar_position (ev.y)
2046 / scrollbar_size ())); 2104 / scrollBar.size ()));
2047 } 2105 }
2048 2106
2049 break; 2107 break;
2050 } 2108 }
2051 } 2109 }
2061 2119
2062 csrO = 0; /* reset csr Offset */ 2120 csrO = 0; /* reset csr Offset */
2063 if (!bypass_keystate) 2121 if (!bypass_keystate)
2064 reportmode = !! (priv_modes & PrivMode_mouse_report); 2122 reportmode = !! (priv_modes & PrivMode_mouse_report);
2065 2123
2066 if (scrollbar_isUpDn ()) 2124 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2067 { 2125 {
2068 scrollBar.setIdle (); 2126 scrollBar.state = STATE_IDLE;
2069 scrollbar_show (0); 2127 scrollBar.show (0);
2070 } 2128 }
2071 2129
2072#ifdef SELECTION_SCROLLING 2130#ifdef SELECTION_SCROLLING
2073 if (ev_is_active (&sel_scroll_ev))
2074 sel_scroll_ev.stop(); 2131 sel_scroll_ev.stop();
2075#endif 2132#endif
2076 2133
2077 if (ev.window == vt) 2134 if (ev.window == vt)
2078 { 2135 {
2079 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2136 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2125 selection_make (ev.time); 2182 selection_make (ev.time);
2126 break; 2183 break;
2127 2184
2128 case Button2: 2185 case Button2:
2129 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2186 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2130 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2187 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2131 break; 2188 break;
2132 2189
2133#ifdef MOUSE_WHEEL 2190#ifdef MOUSE_WHEEL
2134 case Button4: 2191 case Button4:
2135 case Button5: 2192 case Button5:
2151 { 2208 {
2152 mouse_slip_wheel_speed += v ? -1 : 1; 2209 mouse_slip_wheel_speed += v ? -1 : 1;
2153 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2210 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2154 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2211 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2155 2212
2213 if (!slip_wheel_ev.is_active ())
2156 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2214 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2157 } 2215 }
2158 else 2216 else
2217# endif
2159 { 2218 {
2160# endif
2161 scr_page (v, i); 2219 scr_page (v, i);
2162 scrollbar_show (1); 2220 scrollBar.show (1);
2163# ifdef MOUSE_SLIP_WHEELING
2164 } 2221 }
2165# endif
2166 } 2222 }
2167 break; 2223 break;
2168#endif 2224#endif
2169 } 2225 }
2170 } 2226 }
2171} 2227}
2172 2228
2173/*}}} */ 2229/*}}} */
2174 2230
2175bool 2231void
2176rxvt_term::cmd_parse () 2232rxvt_term::cmd_parse ()
2177{ 2233{
2178 bool flag = false;
2179 wchar_t ch = NOCHAR; 2234 wchar_t ch = NOCHAR;
2180 char *seq_begin; // remember start of esc-sequence here 2235 char *seq_begin; // remember start of esc-sequence here
2181 2236
2182 for (;;) 2237 for (;;)
2183 { 2238 {
2184 if (ch == NOCHAR) 2239 if (expect_false (ch == NOCHAR))
2185 { 2240 {
2186 seq_begin = cmdbuf_ptr; 2241 seq_begin = cmdbuf_ptr;
2187 ch = next_char (); 2242 ch = next_char ();
2188 2243
2189 if (ch == NOCHAR) 2244 if (ch == NOCHAR)
2190 break; 2245 break;
2191 } 2246 }
2192 2247
2193 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2248 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2194 { 2249 {
2195 if (!seen_input) 2250 if (expect_false (!seen_input))
2196 { 2251 {
2197 seen_input = 1; 2252 seen_input = 1;
2198 // many badly-written programs (e.g. jed) contain a race condition: 2253 // many badly-written programs (e.g. jed) contain a race condition:
2199 // they first read the screensize and then install a SIGWINCH handler. 2254 // they first read the screensize and then install a SIGWINCH handler.
2200 // some window managers resize the window early, and these programs 2255 // some window managers resize the window early, and these programs
2213 wchar_t *str = buf; 2268 wchar_t *str = buf;
2214 wchar_t *eol = str + min (ncol, UBUFSIZ); 2269 wchar_t *eol = str + min (ncol, UBUFSIZ);
2215 2270
2216 for (;;) 2271 for (;;)
2217 { 2272 {
2218 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2273 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2219 break; 2274 break;
2220 2275
2221 *str++ = ch; 2276 *str++ = ch;
2222 2277
2223 if (ch == C0_LF || str >= eol) 2278 if (expect_false (ch == C0_LF || str >= eol))
2224 { 2279 {
2225 if (ch == C0_LF) 2280 if (ch == C0_LF)
2226 nlines++; 2281 nlines++;
2227 2282
2228 refresh_count++; 2283 refresh_count++;
2277 * What the heck we'll cheat and only refresh less than every page-full. 2332 * What the heck we'll cheat and only refresh less than every page-full.
2278 * if skipScroll is enabled. 2333 * if skipScroll is enabled.
2279 */ 2334 */
2280 if (refreshnow) 2335 if (refreshnow)
2281 { 2336 {
2282 flag = true;
2283 scr_refresh (); 2337 scr_refresh ();
2284 want_refresh = 1; 2338 want_refresh = 1;
2285 } 2339 }
2286
2287 } 2340 }
2288 else 2341 else
2289 { 2342 {
2290 try 2343 try
2291 { 2344 {
2299 } 2352 }
2300 2353
2301 ch = NOCHAR; 2354 ch = NOCHAR;
2302 } 2355 }
2303 } 2356 }
2304
2305 return flag;
2306} 2357}
2307 2358
2308// read the next character 2359// read the next character
2309wchar_t 2360wchar_t
2310rxvt_term::next_char () NOTHROW 2361rxvt_term::next_char () NOTHROW
2311{ 2362{
2312 while (cmdbuf_ptr < cmdbuf_endp) 2363 while (cmdbuf_ptr < cmdbuf_endp)
2313 { 2364 {
2314 // assume 7-bit to be ascii ALWAYS 2365 // assume 7-bit to be ascii ALWAYS
2315 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2366 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2316 return *cmdbuf_ptr++; 2367 return *cmdbuf_ptr++;
2317 2368
2318 wchar_t wc; 2369 wchar_t wc;
2319 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2370 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2320 2371
2324 cmdbuf_ptr = cmdbuf_endp; 2375 cmdbuf_ptr = cmdbuf_endp;
2325 break; 2376 break;
2326 } 2377 }
2327 2378
2328 if (len == (size_t)-1) 2379 if (len == (size_t)-1)
2380 {
2381 mbstate.reset (); // reset now undefined conversion state
2329 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2382 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2383 }
2330 2384
2331 // assume wchar == unicode 2385 // assume wchar == unicode
2332 cmdbuf_ptr += len; 2386 cmdbuf_ptr += len;
2333 return wc & UNICODE_MASK; 2387 return wc & UNICODE_MASK;
2334 } 2388 }
2378/*----------------------------------------------------------------------*/ 2432/*----------------------------------------------------------------------*/
2379#ifdef PRINTPIPE 2433#ifdef PRINTPIPE
2380FILE * 2434FILE *
2381rxvt_term::popen_printer () 2435rxvt_term::popen_printer ()
2382{ 2436{
2383 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2437 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2384 2438
2385 if (stream == NULL) 2439 if (stream == NULL)
2386 rxvt_warn ("can't open printer pipe, not printing.\n"); 2440 rxvt_warn ("can't open printer pipe, not printing.\n");
2387 2441
2388 return stream; 2442 return stream;
2399 * simulate attached vt100 printer 2453 * simulate attached vt100 printer
2400 */ 2454 */
2401void 2455void
2402rxvt_term::process_print_pipe () 2456rxvt_term::process_print_pipe ()
2403{ 2457{
2404 int done; 2458 FILE *fd = popen_printer ();
2405 FILE *fd;
2406 2459
2407 if ((fd = popen_printer ()) == NULL) 2460 if (!fd)
2408 return; 2461 return;
2409 2462
2410 /* 2463 /*
2411 * Send all input to the printer until either ESC[4i or ESC[?4i 2464 * Send all input to the printer until either ESC[4i or ESC[?4i
2412 * is received. 2465 * is received.
2413 */ 2466 */
2414 for (done = 0; !done;) 2467 for (int done = 0; !done; )
2415 { 2468 {
2416 unsigned char buf[8]; 2469 unsigned char buf[8];
2417 unicode_t ch; 2470 unicode_t ch;
2418 unsigned int i, len; 2471 unsigned int i, len;
2419 2472
2564 break; 2617 break;
2565 case 'Z': /* identify the terminal type */ 2618 case 'Z': /* identify the terminal type */
2566 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2619 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2567 break; 2620 break;
2568 case '<': /* turn off VT52 mode */ 2621 case '<': /* turn off VT52 mode */
2569 PrivMode (0, PrivMode_vt52); 2622 set_privmode (PrivMode_vt52, 0);
2570 break; 2623 break;
2571 case 'F': /* use special graphics character set */ 2624 case 'F': /* use special graphics character set */
2572 case 'G': /* use regular character set */ 2625 case 'G': /* use regular character set */
2573 /* unimplemented */ 2626 /* unimplemented */
2574 break; 2627 break;
2628 scr_forwardindex (); 2681 scr_forwardindex ();
2629 break; 2682 break;
2630#endif 2683#endif
2631 case '=': 2684 case '=':
2632 case '>': 2685 case '>':
2633 PrivMode ((ch == '='), PrivMode_aplKP); 2686 set_privmode (PrivMode_aplKP, ch == '=');
2634 break; 2687 break;
2635 2688
2636 case C1_40: 2689 case C1_40:
2637 cmd_getc (); 2690 cmd_getc ();
2638 break; 2691 break;
2642 2695
2643 /* 8.3.87: NEXT LINE */ 2696 /* 8.3.87: NEXT LINE */
2644 case C1_NEL: /* ESC E */ 2697 case C1_NEL: /* ESC E */
2645 { 2698 {
2646 wchar_t nlcr[] = { C0_LF, C0_CR }; 2699 wchar_t nlcr[] = { C0_LF, C0_CR };
2647 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2700 scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1);
2648 } 2701 }
2649 break; 2702 break;
2650 2703
2651 /* kidnapped escape sequence: Should be 8.3.48 */ 2704 /* kidnapped escape sequence: Should be 8.3.48 */
2652 case C1_ESA: /* ESC G */ 2705 case C1_ESA: /* ESC G */
2677 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2730 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2678 case C1_SCI: /* ESC Z */ 2731 case C1_SCI: /* ESC Z */
2679 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2732 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2680 break; /* steal obsolete ESC [ c */ 2733 break; /* steal obsolete ESC [ c */
2681 2734
2682 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2735 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2683 case C1_CSI: /* ESC [ */ 2736 case C1_CSI: /* ESC [ */
2684 process_csi_seq (); 2737 process_csi_seq ();
2685 break; 2738 break;
2686 2739
2687 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2740 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2688 case C1_OSC: /* ESC ] */ 2741 case C1_OSC: /* ESC ] */
2689 process_osc_seq (); 2742 process_osc_seq ();
2690 break; 2743 break;
2691 2744
2692 /* 8.3.106: RESET TO INITIAL STATE */ 2745 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2693 case 'c': 2746 case 'c':
2694 mbstate.reset (); 2747 mbstate.reset ();
2695 scr_poweron (); 2748 scr_poweron ();
2696 scrollbar_show (1); 2749 scrollBar.show (1);
2697 break; 2750 break;
2698 2751
2699 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2752 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2700 case 'n': 2753 case 'n':
2701 scr_charset_choose (2); 2754 scr_charset_choose (2);
2721 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2774 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2722 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2775 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2723 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2776 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2724}; 2777};
2725 2778
2726#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2779#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2727 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2780 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2728 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2781 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2729#define get_byte_array_bit(array, bit) \ 2782#define get_byte_array_bit(array, bit) \
2730 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2783 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2731 2784
2732const unsigned char csi_defaults[] = 2785static const unsigned char csi_defaults[] =
2733 { 2786 {
2734 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2787 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2735 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2788 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2736 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2789 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2737 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2790 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2752 2805
2753 nargs = 0; 2806 nargs = 0;
2754 2807
2755 priv = 0; 2808 priv = 0;
2756 ch = cmd_getc (); 2809 ch = cmd_getc ();
2757 if (ch >= '<' && ch <= '?') 2810 if ((ch >= '<' && ch <= '?') || ch == '!')
2758 { 2811 {
2759 /* '<' '=' '>' '?' */ 2812 /* '<' '=' '>' '?' '!' */
2760 priv = ch; 2813 priv = ch;
2761 ch = cmd_getc (); 2814 ch = cmd_getc ();
2762 } 2815 }
2763 2816
2764 /* read any numerical arguments */ 2817 /* read any numerical arguments */
2813 // versions. 2866 // versions.
2814 // 2867 //
2815 tt_printf ("\033[>%d;95;0c", 'U'); 2868 tt_printf ("\033[>%d;95;0c", 'U');
2816 } 2869 }
2817 break; 2870 break;
2871
2818 case '?': 2872 case '?':
2819 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2873 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2820 process_terminal_mode (ch, priv, nargs, arg); 2874 process_terminal_mode (ch, priv, nargs, arg);
2821 break; 2875 break;
2876
2877 case '!':
2878 if (ch == CSI_70)
2879 {
2880 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2881 scr_soft_reset ();
2882
2883 static const int pm_h[] = { 7, 25 };
2884 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2885
2886 process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h);
2887 process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l);
2822 } 2888 }
2889 break;
2890 }
2891
2823 return; 2892 return;
2824 } 2893 }
2825 2894
2826 switch (ch) 2895 switch (ch)
2827 { 2896 {
3194 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3263 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3195 */ 3264 */
3196void 3265void
3197rxvt_term::process_dcs_seq () 3266rxvt_term::process_dcs_seq ()
3198{ 3267{
3199 char *s;
3200 unicode_t eh;
3201
3202 /* 3268 /*
3203 * Not handled yet 3269 * Not handled yet
3204 */ 3270 */
3271
3272 unicode_t eh;
3205 s = get_to_st (eh); 3273 char *s = get_to_st (eh);
3206 if (s) 3274 if (s)
3207 free (s); 3275 free (s);
3208 3276
3209 return; 3277 return;
3210} 3278}
3214 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3282 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3215 */ 3283 */
3216void 3284void
3217rxvt_term::process_osc_seq () 3285rxvt_term::process_osc_seq ()
3218{ 3286{
3219 unicode_t ch, eh;
3220 int arg; 3287 int arg;
3221 3288
3222 ch = cmd_getc (); 3289 unicode_t ch = cmd_getc ();
3223 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3290 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3224 arg = arg * 10 + (ch - '0'); 3291 arg = arg * 10 + (ch - '0');
3225 3292
3226 if (ch == ';') 3293 if (ch == ';')
3227 { 3294 {
3295 unicode_t eh;
3228 char *s = get_to_st (eh); 3296 char *s = get_to_st (eh);
3229 3297
3230 if (s) 3298 if (s)
3231 { 3299 {
3232 process_xterm_seq (arg, s, eh); 3300 process_xterm_seq (arg, s, eh);
3307 3375
3308 XFree (value); 3376 XFree (value);
3309 } 3377 }
3310 else 3378 else
3311 { 3379 {
3312 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3380 char *eq = strchr (str, '=');
3313 3381
3314 if (eq) 3382 if (eq)
3315 { 3383 {
3316 *eq = 0; 3384 *eq = 0;
3317 set_utf8_property (display->atom (str), eq + 1); 3385 set_utf8_property (display->atom (str), eq + 1);
3338 *buf++ = '\0'; 3406 *buf++ = '\0';
3339 3407
3340 process_color_seq (op, color, name, resp); 3408 process_color_seq (op, color, name, resp);
3341 } 3409 }
3342 break; 3410 break;
3411 case Rxvt_restoreFG:
3343 case XTerm_Color00: 3412 case XTerm_Color00:
3344 process_color_seq (op, Color_fg, str, resp); 3413 process_color_seq (op, Color_fg, str, resp);
3345 break; 3414 break;
3415 case Rxvt_restoreBG:
3346 case XTerm_Color01: 3416 case XTerm_Color01:
3347 process_color_seq (op, Color_bg, str, resp); 3417 process_color_seq (op, Color_bg, str, resp);
3348 break; 3418 break;
3349#ifndef NO_CURSORCOLOR 3419#ifndef NO_CURSORCOLOR
3350 case XTerm_Color_cursor: 3420 case XTerm_Color_cursor:
3355 process_color_seq (op, Color_pointer_fg, str, resp); 3425 process_color_seq (op, Color_pointer_fg, str, resp);
3356 break; 3426 break;
3357 case XTerm_Color_pointer_bg: 3427 case XTerm_Color_pointer_bg:
3358 process_color_seq (op, Color_pointer_bg, str, resp); 3428 process_color_seq (op, Color_pointer_bg, str, resp);
3359 break; 3429 break;
3430#ifdef OPTION_HC
3431 case XTerm_Color_HC:
3432 process_color_seq (op, Color_HC, str, resp);
3433 break;
3434 case XTerm_Color_HTC:
3435 process_color_seq (op, Color_HTC, str, resp);
3436 break;
3437#endif
3360#ifndef NO_BOLD_UNDERLINE_REVERSE 3438#ifndef NO_BOLD_UNDERLINE_REVERSE
3361 case XTerm_Color_RV:
3362 process_color_seq (op, Color_RV, str, resp);
3363 break;
3364 case Rxvt_Color_BD:
3365 case URxvt_Color_BD: 3439 case URxvt_Color_BD:
3366 process_color_seq (op, Color_BD, str, resp); 3440 process_color_seq (op, Color_BD, str, resp);
3367 break; 3441 break;
3368 case Rxvt_Color_UL:
3369 case URxvt_Color_UL: 3442 case URxvt_Color_UL:
3370 process_color_seq (op, Color_UL, str, resp); 3443 process_color_seq (op, Color_UL, str, resp);
3371 break; 3444 break;
3372 case URxvt_Color_IT: 3445 case URxvt_Color_IT:
3373 process_color_seq (op, Color_IT, str, resp); 3446 process_color_seq (op, Color_IT, str, resp);
3374 break; 3447 break;
3375#endif 3448#endif
3449 case URxvt_Color_border:
3450 process_color_seq (op, Color_border, str, resp);
3451 break;
3376#if ENABLE_TRANSPARENCY 3452#if ENABLE_TRANSPARENCY
3377 case URxvt_Color_tint: 3453 case URxvt_Color_tint:
3378 process_color_seq (op, Color_tint, str, resp); 3454 process_color_seq (op, Color_tint, str, resp);
3379 { 3455 {
3380 bool changed = false; 3456 bool changed = false;
3457
3381 if (ISSET_PIXCOLOR (Color_tint)) 3458 if (ISSET_PIXCOLOR (Color_tint))
3382 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3459 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3383 else 3460 else
3384 changed = bgPixmap.unset_tint (); 3461 changed = bgPixmap.unset_tint ();
3462
3385 if (changed) 3463 if (changed)
3386 update_background (); 3464 update_background ();
3387 } 3465 }
3388 3466
3389 break; 3467 break;
3393 case Rxvt_Pixmap: 3471 case Rxvt_Pixmap:
3394 if (!strcmp (str, "?")) 3472 if (!strcmp (str, "?"))
3395 { 3473 {
3396 char str[256]; 3474 char str[256];
3397 3475
3398 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3476 sprintf (str, "[%dx%d+%d+%d]",
3399 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3477 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3400 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3478 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3401 process_xterm_seq (XTerm_title, str, CHAR_ST); 3479 process_xterm_seq (XTerm_title, str, CHAR_ST);
3402 } 3480 }
3403 else 3481 else
3404 { 3482 {
3405 int changed = 0; 3483 int changed = 0;
3406 3484
3407 if (*str != ';') 3485 if (*str != ';')
3408 { 3486 {
3409 /* reset to default scaling :*/
3410 bgPixmap.unset_geometry ();
3411 if (bgPixmap.set_file (str)) /* change pixmap */ 3487 if (bgPixmap.set_file (str)) /* change pixmap */
3488 {
3412 changed++; 3489 changed++;
3413 str = strchr (str, ';'); 3490 str = strchr (str, ';');
3414 if (str == NULL) 3491 if (str == NULL)
3415 bgPixmap.set_defaultGeometry (); 3492 bgPixmap.set_defaultGeometry ();
3493 else
3494 bgPixmap.set_geometry (str+1);
3495 }
3416 } 3496 }
3417 while (str) 3497 else
3418 { 3498 {
3419 str++; 3499 str++;
3420 if (bgPixmap.set_geometry (str)) 3500 if (bgPixmap.set_geometry (str, true))
3421 changed++; 3501 changed++;
3422 str = strchr (str, ';');
3423 } 3502 }
3503
3424 if (changed) 3504 if (changed)
3505 {
3506 if (bgPixmap.window_position_sensitive ())
3507 {
3508 int x, y;
3509 get_window_origin (x, y);
3510 bgPixmap.set_position (x, y);
3511 }
3425 update_background (); 3512 update_background ();
3513 }
3426 } 3514 }
3427 break; 3515 break;
3428#endif 3516#endif
3429
3430 case Rxvt_restoreFG:
3431 set_window_color (Color_fg, str);
3432 break;
3433 case Rxvt_restoreBG:
3434 set_window_color (Color_bg, str);
3435 break;
3436 3517
3437 case XTerm_logfile: 3518 case XTerm_logfile:
3438 // TODO, when secure mode? 3519 // TODO, when secure mode?
3439 break; 3520 break;
3440 3521
3507 break; 3588 break;
3508#endif 3589#endif
3509 3590
3510#if ENABLE_PERL 3591#if ENABLE_PERL
3511 case URxvt_perl: 3592 case URxvt_perl:
3512 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3593 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3513 ; // no responses yet
3514 break; 3594 break;
3515#endif 3595#endif
3516 } 3596 }
3517} 3597}
3518/*----------------------------------------------------------------------*/ 3598/*----------------------------------------------------------------------*/
3541 { 3621 {
3542 if (mode == 'r') 3622 if (mode == 'r')
3543 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3623 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3544 else 3624 else
3545 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3625 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3546 PrivMode (state, bit); 3626
3627 set_privmode (bit, state);
3547 } 3628 }
3548 3629
3549 return state; 3630 return state;
3550} 3631}
3551 3632
3559 static const struct 3640 static const struct
3560 { 3641 {
3561 const int argval; 3642 const int argval;
3562 const unsigned long bit; 3643 const unsigned long bit;
3563 } argtopriv[] = { 3644 } argtopriv[] = {
3564 { 1, PrivMode_aplCUR }, 3645 { 1, PrivMode_aplCUR }, // DECCKM
3565 { 2, PrivMode_vt52 }, 3646 { 2, PrivMode_vt52 },
3566 { 3, PrivMode_132 }, 3647 { 3, PrivMode_132 }, // DECCOLM
3567 { 4, PrivMode_smoothScroll }, 3648 { 4, PrivMode_smoothScroll }, // DECSCLM
3568 { 5, PrivMode_rVideo }, 3649 { 5, PrivMode_rVideo }, // DECSCNM
3569 { 6, PrivMode_relOrigin }, 3650 { 6, PrivMode_relOrigin }, // DECOM
3570 { 7, PrivMode_Autowrap }, 3651 { 7, PrivMode_Autowrap }, // DECAWM
3571 // 8, bi-directional support mode 3652 // 8, auto-repeat keys // DECARM
3572 { 9, PrivMode_MouseX10 }, 3653 { 9, PrivMode_MouseX10 },
3573 // 18, 19 printing-related 3654 // 18 end FF to printer after print screen
3655 // 19 Print screen prints full screen/scroll region
3574 { 25, PrivMode_VisibleCursor }, 3656 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3575#ifdef scrollBar_esc 3657#ifdef scrollBar_esc
3576 { scrollBar_esc, PrivMode_scrollBar }, 3658 { scrollBar_esc, PrivMode_scrollBar },
3577#endif 3659#endif
3578 { 35, PrivMode_ShiftKeys }, // rxvt extension 3660 { 35, PrivMode_ShiftKeys }, // rxvt extension
3661 // 38, tektronix mode // DECTEK
3579 { 40, PrivMode_132OK }, 3662 { 40, PrivMode_132OK },
3580 // 41 xterm more fixes NYI 3663 // 41 xterm more fixes NYI
3581 // 45 margin bell NYI 3664 // 45 margin bell NYI
3582 // 46 start logging 3665 // 46 start logging
3583 { 47, PrivMode_Screen }, 3666 { 47, PrivMode_Screen },
3584 { 66, PrivMode_aplKP }, 3667 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
3585#ifndef NO_BACKSPACE_KEY 3668#ifndef NO_BACKSPACE_KEY
3586 { 67, PrivMode_BackSpace }, 3669 { 67, PrivMode_BackSpace }, // DECBKM
3587#endif 3670#endif
3588 { 1000, PrivMode_MouseX11 }, 3671 { 1000, PrivMode_MouseX11 },
3589 { 1002, PrivMode_MouseBtnEvent }, 3672 { 1002, PrivMode_MouseBtnEvent },
3590 { 1003, PrivMode_MouseAnyEvent }, 3673 { 1003, PrivMode_MouseAnyEvent },
3674#if ENABLE_FRILLS
3675 { 1005, PrivMode_ExtModeMouse },
3676#endif
3591 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3677 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3592 { 1011, PrivMode_Keypress }, // rxvt extension 3678 { 1011, PrivMode_Keypress }, // rxvt extension
3679#if ENABLE_FRILLS
3680 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3681#endif
3593 // 1035 enable modifiers for alt, numlock NYI 3682 // 1035 enable modifiers for alt, numlock NYI
3594 // 1036 send ESC for meta keys NYI 3683 // 1036 send ESC for meta keys NYI
3595 // 1037 send DEL for keypad delete NYI 3684 // 1037 send DEL for keypad delete NYI
3596 { 1047, PrivMode_Screen }, 3685 { 1047, PrivMode_Screen },
3597 // 1048 save and restore cursor 3686 // 1048 save and restore cursor, implemented in code
3598 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3687 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3599 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3688 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3689 { 2004, PrivMode_BracketPaste },
3600 }; 3690 };
3601 3691
3602 if (nargs == 0) 3692 if (nargs == 0)
3603 return; 3693 return;
3604 3694
3611 for (i = 0; i < nargs; i++) 3701 for (i = 0; i < nargs; i++)
3612 { 3702 {
3613 state = -1; 3703 state = -1;
3614 3704
3615 /* basic handling */ 3705 /* basic handling */
3616 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3706 for (j = 0; j < ARRAY_LENGTH(argtopriv); j++)
3617 if (argtopriv[j].argval == arg[i]) 3707 if (argtopriv[j].argval == arg[i])
3618 { 3708 {
3619 state = privcases (mode, argtopriv[j].bit); 3709 state = privcases (mode, argtopriv[j].bit);
3620 break; 3710 break;
3621 } 3711 }
3629 3719
3630 scr_touch (true); 3720 scr_touch (true);
3631 break; 3721 break;
3632#endif 3722#endif
3633 case 1048: /* alternative cursor save */ 3723 case 1048: /* alternative cursor save */
3634 case 1049:
3635 if (option (Opt_secondaryScreen)) 3724 if (option (Opt_secondaryScreen))
3636 if (mode == 0) 3725 if (mode == 0)
3637 scr_cursor (RESTORE); 3726 scr_cursor (RESTORE);
3638 else if (mode == 1) 3727 else if (mode == 1)
3639 scr_cursor (SAVE); 3728 scr_cursor (SAVE);
3648 case 2: /* VT52 mode */ 3737 case 2: /* VT52 mode */
3649 /* oddball mode. should be set regardless of set/reset 3738 /* oddball mode. should be set regardless of set/reset
3650 * parameter. Return from VT52 mode with an ESC < from 3739 * parameter. Return from VT52 mode with an ESC < from
3651 * within VT52 mode 3740 * within VT52 mode
3652 */ 3741 */
3653 PrivMode (1, PrivMode_vt52); 3742 set_privmode (PrivMode_vt52, 1);
3654 break; 3743 break;
3655 case 3: /* 80/132 */ 3744 case 3: /* 80/132 */
3656 if (priv_modes & PrivMode_132OK) 3745 if (priv_modes & PrivMode_132OK)
3657 set_widthheight (((state ? 132 : 80) * fwidth), height); 3746 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3658 break; 3747 break;
3659 case 4: /* smooth scrolling */ 3748 case 4: /* smooth scrolling */
3660 set_option (Opt_jumpScroll, !state); 3749 set_option (Opt_jumpScroll, !state);
3661 break; 3750 break;
3662 case 5: /* reverse video */ 3751 case 5: /* reverse video */
3673 if (state) /* orthogonal */ 3762 if (state) /* orthogonal */
3674 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3763 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3675 break; 3764 break;
3676#ifdef scrollBar_esc 3765#ifdef scrollBar_esc
3677 case scrollBar_esc: 3766 case scrollBar_esc:
3678 if (scrollbar_mapping (state)) 3767 if (scrollBar.map (state))
3679 { 3768 {
3680 resize_all_windows (0, 0, 0); 3769 resize_all_windows (0, 0, 0);
3681 scr_touch (true); 3770 scr_touch (true);
3682 } 3771 }
3683 break; 3772 break;
3700 case 1003: 3789 case 1003:
3701 if (state) 3790 if (state)
3702 { 3791 {
3703 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3792 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3704 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3793 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3794 mouse_row = mouse_col = 0;
3705 vt_emask_mouse = PointerMotionMask; 3795 vt_emask_mouse = PointerMotionMask;
3706 } 3796 }
3707 else 3797 else
3708 vt_emask_mouse = NoEventMask; 3798 vt_emask_mouse = NoEventMask;
3799
3709 vt_select_input (); 3800 vt_select_input ();
3710 break; 3801 break;
3711 case 1010: /* scroll to bottom on TTY output inhibit */ 3802 case 1010: /* scroll to bottom on TTY output inhibit */
3712 set_option (Opt_scrollTtyOutput, !state); 3803 set_option (Opt_scrollTtyOutput, !state);
3713 break; 3804 break;
3714 case 1011: /* scroll to bottom on key press */ 3805 case 1011: /* scroll to bottom on key press */
3715 set_option (Opt_scrollTtyKeypress, state); 3806 set_option (Opt_scrollTtyKeypress, state);
3716 break; 3807 break;
3717 case 1047: /* secondary screen w/ clearing last */ 3808 case 1047: /* secondary screen w/ clearing last */
3718 if (option (Opt_secondaryScreen)) 3809 if (option (Opt_secondaryScreen))
3719 if (current_screen != PRIMARY) 3810 if (!state)
3720 scr_erase_screen (2); 3811 scr_erase_screen (2);
3812
3721 scr_change_screen (state); 3813 scr_change_screen (state);
3722 break; 3814 break;
3723 case 1049: /* secondary screen w/ clearing first */ 3815 case 1049: /* secondary screen w/ clearing first */
3816 if (option (Opt_secondaryScreen))
3817 if (state)
3818 scr_cursor (SAVE);
3819
3724 scr_change_screen (state); 3820 scr_change_screen (state);
3821
3725 if (option (Opt_secondaryScreen)) 3822 if (option (Opt_secondaryScreen))
3726 if (current_screen != PRIMARY) 3823 if (state)
3727 scr_erase_screen (2); 3824 scr_erase_screen (2);
3825 else
3826 scr_cursor (RESTORE);
3728 break; 3827 break;
3729 default: 3828 default:
3730 break; 3829 break;
3731 } 3830 }
3732 } 3831 }
3926 4025
3927/* ---------------------------------------------------------------------- */ 4026/* ---------------------------------------------------------------------- */
3928/* Write data to the pty as typed by the user, pasted with the mouse, 4027/* Write data to the pty as typed by the user, pasted with the mouse,
3929 * or generated by us in response to a query ESC sequence. 4028 * or generated by us in response to a query ESC sequence.
3930 */ 4029 */
3931const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4030static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3932 4031
3933void 4032void
3934rxvt_term::tt_write (const char *data, unsigned int len) 4033rxvt_term::tt_write (const char *data, unsigned int len)
3935{ 4034{
3936 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4035 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines