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.382 by root, Fri Dec 14 06:04:56 2007 UTC vs.
Revision 1.445 by sf-exg, Fri Apr 2 13:52:30 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 switch (translate_keypad (keysym, kp))
551 { 655 {
552 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; 656#ifndef NO_BACKSPACE_KEY
553 newlen = 1; 657 case XK_BackSpace:
554#ifdef XK_KP_Home 658 if (priv_modes & PrivMode_HaveBackSpace)
555 static const KeySym keypadtrans[] = { 659 {
556 XK_KP_7, // XK_KP_Home 660 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
557 XK_KP_4, // XK_KP_Left 661 ^ !!ctrl) ? '\b' : '\177';
558 XK_KP_8, // XK_KP_Up 662 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 }; 663 }
664 else
665 strcpy (kbuf, rs[Rs_backspace_key]);
666 break;
667#endif
668#ifndef NO_DELETE_KEY
669 case XK_Delete:
670 strcpy (kbuf, rs[Rs_delete_key]);
671 break;
672#endif
673 case XK_Tab:
674 if (shft)
675 strcpy (kbuf, "\033[Z");
676 else
677 {
678#ifdef CTRL_TAB_MAKES_META
679 if (ctrl)
680 meta = 1;
681#endif
682#ifdef MOD4_TAB_MAKES_META
683 if (ev.state & Mod4Mask)
684 meta = 1;
685#endif
686 newlen = 0;
687 }
688 break;
571 689
572 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin)) 690 case XK_Up: /* "\033[A" */
691 case XK_Down: /* "\033[B" */
692 case XK_Right: /* "\033[C" */
693 case XK_Left: /* "\033[D" */
694 strcpy (kbuf, "\033[Z");
695 kbuf[2] = "DACB"[keysym - XK_Left];
696 /* do Shift first */
697 if (shft)
698 kbuf[2] = "dacb"[keysym - XK_Left];
699 else if (ctrl)
700 {
701 kbuf[1] = 'O';
702 kbuf[2] = "dacb"[keysym - XK_Left];
703 }
704 else if (priv_modes & PrivMode_aplCUR)
705 kbuf[1] = 'O';
706 break;
707
708 case XK_KP_Enter:
709 /* allow shift to override */
710 if (kp)
711 {
712 strcpy (kbuf, "\033OM");
713 break;
714 }
715
716 /* FALLTHROUGH */
717
718 case XK_Return:
719 if (priv_modes & PrivMode_LFNL)
720 {
721 kbuf[0] = '\015';
722 kbuf[1] = '\012';
723 kbuf[2] = '\0';
724 }
725 else
726 {
727 kbuf[0] = '\015';
728 kbuf[1] = '\0';
729 }
730 break;
731
732 case XK_KP_F1: /* "\033OP" */
733 case XK_KP_F2: /* "\033OQ" */
734 case XK_KP_F3: /* "\033OR" */
735 case XK_KP_F4: /* "\033OS" */
736 strcpy (kbuf, "\033OP");
737 kbuf[2] += (keysym - XK_KP_F1);
738 break;
739
740 case XK_KP_Multiply: /* "\033Oj" : "*" */
741 case XK_KP_Add: /* "\033Ok" : "+" */
742 case XK_KP_Separator: /* "\033Ol" : "," */
743 case XK_KP_Subtract: /* "\033Om" : "-" */
744 case XK_KP_Decimal: /* "\033On" : "." */
745 case XK_KP_Divide: /* "\033Oo" : "/" */
746 case XK_KP_0: /* "\033Op" : "0" */
747 case XK_KP_1: /* "\033Oq" : "1" */
748 case XK_KP_2: /* "\033Or" : "2" */
749 case XK_KP_3: /* "\033Os" : "3" */
750 case XK_KP_4: /* "\033Ot" : "4" */
751 case XK_KP_5: /* "\033Ou" : "5" */
752 case XK_KP_6: /* "\033Ov" : "6" */
753 case XK_KP_7: /* "\033Ow" : "7" */
754 case XK_KP_8: /* "\033Ox" : "8" */
755 case XK_KP_9: /* "\033Oy" : "9" */
756 /* allow shift to override */
757 if (kp)
758 {
759 strcpy (kbuf, "\033Oj");
760 kbuf[2] += (keysym - XK_KP_Multiply);
761 }
762 else
763 {
764 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
765 kbuf[1] = '\0';
766 }
767 break;
768
769 default:
573 { 770 {
574 unsigned int index = keysym - XK_KP_Home; 771 int param = map_function_key (keysym);
575 keysym = kp ? keypadtrans[index] : XK_Home + index; 772 if (param > 0)
773 sprintf (kbuf,"\033[%d~", param);
774 else
775 newlen = 0;
576 } 776 }
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; 777 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 } 778 }
779
780 if (newlen)
781 len = strlen (kbuf);
794 782
795 /* 783 /*
796 * Pass meta for all function keys, if 'meta' option set 784 * Pass meta for all function keys, if 'meta' option set
797 */ 785 */
798#ifdef META8_OPTION 786#ifdef META8_OPTION
1032 } 1020 }
1033 while (row < end_row); 1021 while (row < end_row);
1034 } 1022 }
1035 1023
1036 scr_refresh (); 1024 scr_refresh ();
1037 scrollbar_show (1); 1025 scrollBar.show (1);
1038#ifdef USE_XIM 1026#ifdef USE_XIM
1039 IMSendSpot (); 1027 IMSendSpot ();
1040#endif 1028#endif
1041 } 1029 }
1042 1030
1043 display->flush (); 1031 display->flush ();
1044} 1032}
1045 1033
1046/* checks wether a refresh is requested and starts the refresh timer */ 1034/* checks whether a refresh is requested and starts the refresh timer */
1047void 1035void
1048rxvt_term::refresh_check () 1036rxvt_term::refresh_check ()
1049{ 1037{
1050 if (want_refresh && !flush_ev.is_active ()) 1038 if (want_refresh && !flush_ev.is_active ())
1051 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally 1039 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1078{ 1066{
1079 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1067 if (scr_refresh_rend (RS_Blink, RS_Blink))
1080 { 1068 {
1081 hidden_text = !hidden_text; 1069 hidden_text = !hidden_text;
1082 want_refresh = 1; 1070 want_refresh = 1;
1083 refresh_check (); 1071 refresh_check ();
1084 } 1072 }
1085 else 1073 else
1086 w.stop (); 1074 w.stop ();
1087} 1075}
1088#endif 1076#endif
1089 1077
1090#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1078#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1091void 1079void
1092rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1080rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1093{ 1081{
1094 if ((scrollbar_isUp () || scrollbar_isDn ()) 1082 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1095 && scr_page (scrollbar_isUp () ? UP : DN, 1)) 1083 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1096 { 1084 {
1097 want_refresh = 1; 1085 want_refresh = 1;
1098 refresh_check (); 1086 refresh_check ();
1099 } 1087 }
1100 else 1088 else
1144 { 1132 {
1145 // this should really be sched_yield(), but the linux guys thought 1133 // this should really be sched_yield(), but the linux guys thought
1146 // that giving a process calling sched_yield () less cpu time than 1134 // that giving a process calling sched_yield () less cpu time than
1147 // ones with high nice levels is a useful thing to do. It surely is is 1135 // ones with high nice levels is a useful thing to do. It surely is is
1148 // allowed by the sus... as is returning ENOSYS. 1136 // allowed by the sus... as is returning ENOSYS.
1137 // since the linux guys additionally thought that breaking the only
1138 // known workaround against their unusable sched_yield hack is cool,
1139 // we just nanosleep a bit and hope for the best.
1149 1140
1150 struct timespec ts = { 0, 0 }; 1141 struct timespec ts = { 0, 1000 };
1151 nanosleep (&ts, 0); 1142 nanosleep (&ts, 0);
1152 1143
1153 w.stop (); 1144 w.stop ();
1154 } 1145 }
1155 1146
1205{ 1196{
1206 make_current (); 1197 make_current ();
1207 1198
1208 if (revents & ev::READ) 1199 if (revents & ev::READ)
1209 // loop, but don't allow a single term to monopolize us 1200 // loop, but don't allow a single term to monopolize us
1210 while (pty_fill ()) 1201 for (int i = CBUFCNT; i-- && pty_fill (); )
1211 if (cmd_parse ()) 1202 cmd_parse ();
1212 break;
1213 1203
1214 if (revents & ev::WRITE) 1204 if (revents & ev::WRITE)
1215 pty_write (); 1205 pty_write ();
1206
1207 refresh_check ();
1216} 1208}
1217 1209
1218void 1210void
1219rxvt_term::pointer_unblank () 1211rxvt_term::pointer_unblank ()
1220{ 1212{
1435 && ev.xfocus.mode != NotifyGrab) 1427 && ev.xfocus.mode != NotifyGrab)
1436 focus_out (); 1428 focus_out ();
1437 break; 1429 break;
1438 1430
1439 case ConfigureNotify: 1431 case ConfigureNotify:
1440 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n", 1432 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1441 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y, 1433 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1442 szHint.width, szHint.height); */ 1434 szHint.width, szHint.height);*/
1443 if (ev.xconfigure.window == parent[0]) 1435 if (ev.xconfigure.window == parent[0])
1444 { 1436 {
1445 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1437 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1446 ; 1438 ;
1447 1439
1452 } 1444 }
1453 else 1445 else
1454 { 1446 {
1455#ifdef HAVE_BG_PIXMAP 1447#ifdef HAVE_BG_PIXMAP
1456 if (bgPixmap.window_position_sensitive ()) 1448 if (bgPixmap.window_position_sensitive ())
1449 {
1450 if (mapped)
1457 update_background (); 1451 update_background ();
1452 else
1453 bgPixmap.invalidate ();
1454 }
1458#endif 1455#endif
1459 } 1456 }
1457
1460 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1458 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1461 } 1459 }
1462 break; 1460 break;
1463 1461
1464 case PropertyNotify: 1462 case PropertyNotify:
1468 selection_property (ev.xproperty.window, ev.xproperty.atom); 1466 selection_property (ev.xproperty.window, ev.xproperty.atom);
1469 1467
1470 break; 1468 break;
1471 1469
1472 case SelectionClear: 1470 case SelectionClear:
1473 selection_clear (); 1471 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1474 break; 1472 break;
1475 1473
1476 case SelectionNotify: 1474 case SelectionNotify:
1477 if (selection_wait == Sel_normal) 1475 if (selection_wait == Sel_normal)
1478 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1476 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1481 case SelectionRequest: 1479 case SelectionRequest:
1482 selection_send (ev.xselectionrequest); 1480 selection_send (ev.xselectionrequest);
1483 break; 1481 break;
1484 1482
1485 case MapNotify: 1483 case MapNotify:
1484#ifdef HAVE_BG_PIXMAP
1485 /* This is needed spcifically to fix the case of no window manager or a
1486 * non-reparenting window manager. In those cases we never get first
1487 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1488 * care of multiplicity of ConfigureNotify events arriwing while WM does
1489 * reparenting.
1490 * We should not render background immidiately, as there could be several
1491 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1492 * by scheduling background redraw as soon as we can, but giving a short
1493 * bit of time for ConfigureNotifies to arrive.
1494 * We should render background PRIOR to drawing any text, but AFTER all
1495 * of ConfigureNotifys for the best results.
1496 */
1497 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1498 update_background_ev.start (0.025);
1499#endif
1486 mapped = 1; 1500 mapped = 1;
1487#ifdef TEXT_BLINK 1501#ifdef TEXT_BLINK
1488 text_blink_ev.start (); 1502 text_blink_ev.start ();
1489#endif 1503#endif
1490 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1504 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1526 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1540 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1527 ; 1541 ;
1528 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1542 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1529 ; 1543 ;
1530 1544
1531 if (isScrollbarWindow (ev.xany.window)) 1545 if (scrollBar.state && ev.xany.window == scrollBar.win)
1532 { 1546 {
1533 scrollBar.setIdle (); 1547 scrollBar.state = STATE_IDLE;
1534 scrollbar_show (0); 1548 scrollBar.show (0);
1535 } 1549 }
1536 } 1550 }
1537 break; 1551 break;
1538 1552
1539 case MotionNotify: 1553 case MotionNotify:
1626#ifdef MOUSE_THRESHOLD 1640#ifdef MOUSE_THRESHOLD
1627 } 1641 }
1628#endif 1642#endif
1629 } 1643 }
1630 } 1644 }
1631 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1645 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1632 { 1646 {
1633 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1647 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1634 MotionNotify, &ev)) 1648 MotionNotify, &ev))
1635 ; 1649 ;
1636 1650
1638 &unused_root, &unused_child, 1652 &unused_root, &unused_child,
1639 &unused_root_x, &unused_root_y, 1653 &unused_root_x, &unused_root_y,
1640 &ev.xbutton.x, &ev.xbutton.y, 1654 &ev.xbutton.x, &ev.xbutton.y,
1641 &unused_mask); 1655 &unused_mask);
1642 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1656 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1643 scrollbar_size ()); 1657 scrollBar.size ());
1644 want_refresh = 1; 1658 want_refresh = 1;
1645 scrollbar_show (1); 1659 scrollBar.show (1);
1646 } 1660 }
1647 break; 1661 break;
1648 } 1662 }
1649 1663
1650#if defined(CURSOR_BLINK) 1664#if defined(CURSOR_BLINK)
1675#endif 1689#endif
1676 1690
1677 refresh_check (); 1691 refresh_check ();
1678} 1692}
1679 1693
1694#if ENABLE_FRILLS
1695void
1696rxvt_term::set_urgency (bool enable)
1697{
1698 if (enable == urgency_hint)
1699 return;
1700
1701 if (XWMHints *h = XGetWMHints (dpy, parent[0]))
1702 {
1703 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1704 XSetWMHints (dpy, parent[0], h);
1705 urgency_hint = enable;
1706 }
1707}
1708#endif
1709
1680void 1710void
1681rxvt_term::focus_in () 1711rxvt_term::focus_in ()
1682{ 1712{
1683 if (!focus) 1713 if (!focus)
1684 { 1714 {
1685 focus = 1; 1715 focus = 1;
1686 want_refresh = 1; 1716 want_refresh = 1;
1687
1688 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1689 1717
1690#if USE_XIM 1718#if USE_XIM
1691 if (Input_Context != NULL) 1719 if (Input_Context != NULL)
1692 { 1720 {
1693 IMSetPosition (); 1721 IMSetPosition ();
1705 scr_recolour (); 1733 scr_recolour ();
1706 } 1734 }
1707#endif 1735#endif
1708#if ENABLE_FRILLS 1736#if ENABLE_FRILLS
1709 if (option (Opt_urgentOnBell)) 1737 if (option (Opt_urgentOnBell))
1710 { 1738 set_urgency (0);
1711 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1712 {
1713 h->flags &= ~XUrgencyHint;
1714 XSetWMHints (dpy, parent[0], h);
1715 }
1716 }
1717#endif 1739#endif
1740
1741 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1718 } 1742 }
1719} 1743}
1720 1744
1721void 1745void
1722rxvt_term::focus_out () 1746rxvt_term::focus_out ()
1724 if (focus) 1748 if (focus)
1725 { 1749 {
1726 focus = 0; 1750 focus = 0;
1727 want_refresh = 1; 1751 want_refresh = 1;
1728 1752
1729 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1753#if ENABLE_FRILLS
1730 1754 if (option (Opt_urgentOnBell))
1755 set_urgency (0);
1756#endif
1731#if ENABLE_FRILLS || ISO_14755 1757#if ENABLE_FRILLS || ISO_14755
1732 if (iso14755buf) 1758 if (iso14755buf)
1733 { 1759 {
1734 iso14755buf = 0; 1760 iso14755buf = 0;
1735# if ISO_14755 1761# if ISO_14755
1752 { 1778 {
1753 pix_colors = pix_colors_unfocused; 1779 pix_colors = pix_colors_unfocused;
1754 scr_recolour (); 1780 scr_recolour ();
1755 } 1781 }
1756#endif 1782#endif
1783
1784 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1757 } 1785 }
1758} 1786}
1759 1787
1760void 1788void
1761rxvt_term::update_fade_color (unsigned int idx) 1789rxvt_term::update_fade_color (unsigned int idx)
1792 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1820 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1793 { 1821 {
1794 bgPixmap.set_root_pixmap (); 1822 bgPixmap.set_root_pixmap ();
1795 update_background (); 1823 update_background ();
1796 } 1824 }
1825
1797 break; 1826 break;
1798 } 1827 }
1799# endif 1828# endif
1800 1829
1801 refresh_check (); 1830 refresh_check ();
1919 } 1948 }
1920 1949
1921 /* 1950 /*
1922 * Scrollbar window processing of button press 1951 * Scrollbar window processing of button press
1923 */ 1952 */
1924 if (isScrollbarWindow (ev.window)) 1953 if (scrollBar.state && ev.window == scrollBar.win)
1925 { 1954 {
1926 scrollBar.setIdle (); 1955 page_dirn direction = NO_DIR;
1956
1957 if (scrollBar.upButton (ev.y))
1958 direction = UP; /* up */
1959 else if (scrollBar.dnButton (ev.y))
1960 direction = DN; /* down */
1961
1962 scrollBar.state = STATE_IDLE;
1927 /* 1963 /*
1928 * Rxvt-style scrollbar: 1964 * Rxvt-style scrollbar:
1929 * move up if mouse is above slider 1965 * move up if mouse is above slider
1930 * move dn if mouse is below slider 1966 * move dn if mouse is below slider
1931 * 1967 *
1940 /* 1976 /*
1941 * Mouse report disabled scrollbar: 1977 * Mouse report disabled scrollbar:
1942 * arrow buttons - send up/down 1978 * arrow buttons - send up/down
1943 * click on scrollbar - send pageup/down 1979 * click on scrollbar - send pageup/down
1944 */ 1980 */
1945 if ((scrollBar.style == R_SB_NEXT 1981 if (direction == UP)
1946 && scrollbarnext_upButton (ev.y))
1947 || (scrollBar.style == R_SB_RXVT
1948 && scrollbarrxvt_upButton (ev.y)))
1949 tt_printf ("\033[A"); 1982 tt_printf ("\033[A");
1950 else if ((scrollBar.style == R_SB_NEXT 1983 else if (direction == DN)
1951 && scrollbarnext_dnButton (ev.y))
1952 || (scrollBar.style == R_SB_RXVT
1953 && scrollbarrxvt_dnButton (ev.y)))
1954 tt_printf ("\033[B"); 1984 tt_printf ("\033[B");
1955 else 1985 else
1956 switch (ev.button) 1986 switch (ev.button)
1957 { 1987 {
1958 case Button2: 1988 case Button2:
1966 break; 1996 break;
1967 } 1997 }
1968 } 1998 }
1969 else 1999 else
1970#endif /* NO_SCROLLBAR_REPORT */ 2000#endif /* NO_SCROLLBAR_REPORT */
1971
1972 {
1973 char upordown = 0;
1974
1975 if (scrollBar.style == R_SB_NEXT)
1976 { 2001 {
1977 if (scrollbarnext_upButton (ev.y)) 2002 if (direction != NO_DIR)
1978 upordown = -1; /* up */
1979 else if (scrollbarnext_dnButton (ev.y))
1980 upordown = 1; /* down */
1981 }
1982 else if (scrollBar.style == R_SB_RXVT)
1983 {
1984 if (scrollbarrxvt_upButton (ev.y))
1985 upordown = -1; /* up */
1986 else if (scrollbarrxvt_dnButton (ev.y))
1987 upordown = 1; /* down */
1988 }
1989
1990 if (upordown)
1991 { 2003 {
1992#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2004#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1993 if (!cont_scroll_ev.is_active ()) 2005 if (!cont_scroll_ev.is_active ())
1994 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2006 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1995#endif 2007#endif
1996 if (scr_page (upordown < 0 ? UP : DN, 1)) 2008 if (scr_page (direction, 1))
1997 { 2009 {
1998 if (upordown < 0) 2010 if (direction == UP)
1999 scrollBar.setUp (); 2011 scrollBar.state = STATE_UP;
2000 else 2012 else
2001 scrollBar.setDn (); 2013 scrollBar.state = STATE_DOWN;
2002 } 2014 }
2003 } 2015 }
2004 else 2016 else
2005 switch (ev.button) 2017 switch (ev.button)
2006 { 2018 {
2007 case Button2: 2019 case Button2:
2008 switch (scrollbar_align) 2020 switch (scrollBar.align)
2009 { 2021 {
2010 case R_SB_ALIGN_TOP: 2022 case R_SB_ALIGN_TOP:
2011 csrO = 0; 2023 csrO = 0;
2012 break; 2024 break;
2013 case R_SB_ALIGN_CENTRE: 2025 case R_SB_ALIGN_CENTRE:
2019 } 2031 }
2020 2032
2021 if (scrollBar.style == R_SB_XTERM 2033 if (scrollBar.style == R_SB_XTERM
2022 || scrollbar_above_slider (ev.y) 2034 || scrollbar_above_slider (ev.y)
2023 || scrollbar_below_slider (ev.y)) 2035 || scrollbar_below_slider (ev.y))
2024 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2036 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2025 2037
2026 scrollBar.setMotion (); 2038 scrollBar.state = STATE_MOTION;
2027 break; 2039 break;
2028 2040
2029 case Button1: 2041 case Button1:
2030 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2042 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2031 csrO = ev.y - scrollBar.top; 2043 csrO = ev.y - scrollBar.top;
2032 /* FALLTHROUGH */ 2044 /* FALLTHROUGH */
2033 2045
2034 case Button3: 2046 case Button3:
2035 if (scrollBar.style != R_SB_XTERM) 2047 if (scrollBar.style != R_SB_XTERM)
2045 scr_page (DN, nrow - 1); 2057 scr_page (DN, nrow - 1);
2046# else 2058# else
2047 scr_page (DN, nrow / 4); 2059 scr_page (DN, nrow / 4);
2048# endif 2060# endif
2049 else 2061 else
2050 scrollBar.setMotion (); 2062 scrollBar.state = STATE_MOTION;
2051 } 2063 }
2052 else 2064 else
2053 { 2065 {
2054 scr_page ((ev.button == Button1 ? DN : UP), 2066 scr_page ((ev.button == Button1 ? DN : UP),
2055 (nrow 2067 (nrow
2056 * scrollbar_position (ev.y) 2068 * scrollbar_position (ev.y)
2057 / scrollbar_size ())); 2069 / scrollBar.size ()));
2058 } 2070 }
2059 2071
2060 break; 2072 break;
2061 } 2073 }
2062 } 2074 }
2072 2084
2073 csrO = 0; /* reset csr Offset */ 2085 csrO = 0; /* reset csr Offset */
2074 if (!bypass_keystate) 2086 if (!bypass_keystate)
2075 reportmode = !! (priv_modes & PrivMode_mouse_report); 2087 reportmode = !! (priv_modes & PrivMode_mouse_report);
2076 2088
2077 if (scrollbar_isUpDn ()) 2089 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2078 { 2090 {
2079 scrollBar.setIdle (); 2091 scrollBar.state = STATE_IDLE;
2080 scrollbar_show (0); 2092 scrollBar.show (0);
2081 } 2093 }
2082 2094
2083#ifdef SELECTION_SCROLLING 2095#ifdef SELECTION_SCROLLING
2084 sel_scroll_ev.stop(); 2096 sel_scroll_ev.stop();
2085#endif 2097#endif
2165 2177
2166 if (!slip_wheel_ev.is_active ()) 2178 if (!slip_wheel_ev.is_active ())
2167 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2179 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2168 } 2180 }
2169 else 2181 else
2182# endif
2170 { 2183 {
2171# endif
2172 scr_page (v, i); 2184 scr_page (v, i);
2173 scrollbar_show (1); 2185 scrollBar.show (1);
2174# ifdef MOUSE_SLIP_WHEELING
2175 } 2186 }
2176# endif
2177 } 2187 }
2178 break; 2188 break;
2179#endif 2189#endif
2180 } 2190 }
2181 } 2191 }
2182} 2192}
2183 2193
2184/*}}} */ 2194/*}}} */
2185 2195
2186bool 2196void
2187rxvt_term::cmd_parse () 2197rxvt_term::cmd_parse ()
2188{ 2198{
2189 bool flag = false;
2190 wchar_t ch = NOCHAR; 2199 wchar_t ch = NOCHAR;
2191 char *seq_begin; // remember start of esc-sequence here 2200 char *seq_begin; // remember start of esc-sequence here
2192 2201
2193 for (;;) 2202 for (;;)
2194 { 2203 {
2195 if (ch == NOCHAR) 2204 if (expect_false (ch == NOCHAR))
2196 { 2205 {
2197 seq_begin = cmdbuf_ptr; 2206 seq_begin = cmdbuf_ptr;
2198 ch = next_char (); 2207 ch = next_char ();
2199 2208
2200 if (ch == NOCHAR) 2209 if (ch == NOCHAR)
2201 break; 2210 break;
2202 } 2211 }
2203 2212
2204 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2213 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2205 { 2214 {
2206 if (!seen_input) 2215 if (expect_false (!seen_input))
2207 { 2216 {
2208 seen_input = 1; 2217 seen_input = 1;
2209 // many badly-written programs (e.g. jed) contain a race condition: 2218 // many badly-written programs (e.g. jed) contain a race condition:
2210 // they first read the screensize and then install a SIGWINCH handler. 2219 // they first read the screensize and then install a SIGWINCH handler.
2211 // some window managers resize the window early, and these programs 2220 // some window managers resize the window early, and these programs
2224 wchar_t *str = buf; 2233 wchar_t *str = buf;
2225 wchar_t *eol = str + min (ncol, UBUFSIZ); 2234 wchar_t *eol = str + min (ncol, UBUFSIZ);
2226 2235
2227 for (;;) 2236 for (;;)
2228 { 2237 {
2229 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2238 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2230 break; 2239 break;
2231 2240
2232 *str++ = ch; 2241 *str++ = ch;
2233 2242
2234 if (ch == C0_LF || str >= eol) 2243 if (expect_false (ch == C0_LF || str >= eol))
2235 { 2244 {
2236 if (ch == C0_LF) 2245 if (ch == C0_LF)
2237 nlines++; 2246 nlines++;
2238 2247
2239 refresh_count++; 2248 refresh_count++;
2288 * What the heck we'll cheat and only refresh less than every page-full. 2297 * What the heck we'll cheat and only refresh less than every page-full.
2289 * if skipScroll is enabled. 2298 * if skipScroll is enabled.
2290 */ 2299 */
2291 if (refreshnow) 2300 if (refreshnow)
2292 { 2301 {
2293 flag = true;
2294 scr_refresh (); 2302 scr_refresh ();
2295 want_refresh = 1; 2303 want_refresh = 1;
2296 } 2304 }
2297
2298 } 2305 }
2299 else 2306 else
2300 { 2307 {
2301 try 2308 try
2302 { 2309 {
2310 } 2317 }
2311 2318
2312 ch = NOCHAR; 2319 ch = NOCHAR;
2313 } 2320 }
2314 } 2321 }
2315
2316 refresh_check ();
2317
2318 return flag;
2319} 2322}
2320 2323
2321// read the next character 2324// read the next character
2322wchar_t 2325wchar_t
2323rxvt_term::next_char () NOTHROW 2326rxvt_term::next_char () NOTHROW
2324{ 2327{
2325 while (cmdbuf_ptr < cmdbuf_endp) 2328 while (cmdbuf_ptr < cmdbuf_endp)
2326 { 2329 {
2327 // assume 7-bit to be ascii ALWAYS 2330 // assume 7-bit to be ascii ALWAYS
2328 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2331 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2329 return *cmdbuf_ptr++; 2332 return *cmdbuf_ptr++;
2330 2333
2331 wchar_t wc; 2334 wchar_t wc;
2332 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2335 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2333 2336
2337 cmdbuf_ptr = cmdbuf_endp; 2340 cmdbuf_ptr = cmdbuf_endp;
2338 break; 2341 break;
2339 } 2342 }
2340 2343
2341 if (len == (size_t)-1) 2344 if (len == (size_t)-1)
2345 {
2346 mbstate.reset (); // reset now undefined conversion state
2342 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2347 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2348 }
2343 2349
2344 // assume wchar == unicode 2350 // assume wchar == unicode
2345 cmdbuf_ptr += len; 2351 cmdbuf_ptr += len;
2346 return wc & UNICODE_MASK; 2352 return wc & UNICODE_MASK;
2347 } 2353 }
2391/*----------------------------------------------------------------------*/ 2397/*----------------------------------------------------------------------*/
2392#ifdef PRINTPIPE 2398#ifdef PRINTPIPE
2393FILE * 2399FILE *
2394rxvt_term::popen_printer () 2400rxvt_term::popen_printer ()
2395{ 2401{
2396 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2402 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2397 2403
2398 if (stream == NULL) 2404 if (stream == NULL)
2399 rxvt_warn ("can't open printer pipe, not printing.\n"); 2405 rxvt_warn ("can't open printer pipe, not printing.\n");
2400 2406
2401 return stream; 2407 return stream;
2412 * simulate attached vt100 printer 2418 * simulate attached vt100 printer
2413 */ 2419 */
2414void 2420void
2415rxvt_term::process_print_pipe () 2421rxvt_term::process_print_pipe ()
2416{ 2422{
2417 int done; 2423 FILE *fd = popen_printer ();
2418 FILE *fd;
2419 2424
2420 if ((fd = popen_printer ()) == NULL) 2425 if (!fd)
2421 return; 2426 return;
2422 2427
2423 /* 2428 /*
2424 * Send all input to the printer until either ESC[4i or ESC[?4i 2429 * Send all input to the printer until either ESC[4i or ESC[?4i
2425 * is received. 2430 * is received.
2426 */ 2431 */
2427 for (done = 0; !done;) 2432 for (int done = 0; !done; )
2428 { 2433 {
2429 unsigned char buf[8]; 2434 unsigned char buf[8];
2430 unicode_t ch; 2435 unicode_t ch;
2431 unsigned int i, len; 2436 unsigned int i, len;
2432 2437
2577 break; 2582 break;
2578 case 'Z': /* identify the terminal type */ 2583 case 'Z': /* identify the terminal type */
2579 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2584 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2580 break; 2585 break;
2581 case '<': /* turn off VT52 mode */ 2586 case '<': /* turn off VT52 mode */
2582 PrivMode (0, PrivMode_vt52); 2587 set_privmode (PrivMode_vt52, 0);
2583 break; 2588 break;
2584 case 'F': /* use special graphics character set */ 2589 case 'F': /* use special graphics character set */
2585 case 'G': /* use regular character set */ 2590 case 'G': /* use regular character set */
2586 /* unimplemented */ 2591 /* unimplemented */
2587 break; 2592 break;
2641 scr_forwardindex (); 2646 scr_forwardindex ();
2642 break; 2647 break;
2643#endif 2648#endif
2644 case '=': 2649 case '=':
2645 case '>': 2650 case '>':
2646 PrivMode ((ch == '='), PrivMode_aplKP); 2651 set_privmode (PrivMode_aplKP, ch == '=');
2647 break; 2652 break;
2648 2653
2649 case C1_40: 2654 case C1_40:
2650 cmd_getc (); 2655 cmd_getc ();
2651 break; 2656 break;
2690 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2695 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2691 case C1_SCI: /* ESC Z */ 2696 case C1_SCI: /* ESC Z */
2692 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2697 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2693 break; /* steal obsolete ESC [ c */ 2698 break; /* steal obsolete ESC [ c */
2694 2699
2695 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2700 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2696 case C1_CSI: /* ESC [ */ 2701 case C1_CSI: /* ESC [ */
2697 process_csi_seq (); 2702 process_csi_seq ();
2698 break; 2703 break;
2699 2704
2700 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2705 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2701 case C1_OSC: /* ESC ] */ 2706 case C1_OSC: /* ESC ] */
2702 process_osc_seq (); 2707 process_osc_seq ();
2703 break; 2708 break;
2704 2709
2705 /* 8.3.106: RESET TO INITIAL STATE */ 2710 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2706 case 'c': 2711 case 'c':
2707 mbstate.reset (); 2712 mbstate.reset ();
2708 scr_poweron (); 2713 scr_poweron ();
2709 scrollbar_show (1); 2714 scrollBar.show (1);
2710 break; 2715 break;
2711 2716
2712 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2717 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2713 case 'n': 2718 case 'n':
2714 scr_charset_choose (2); 2719 scr_charset_choose (2);
2765 2770
2766 nargs = 0; 2771 nargs = 0;
2767 2772
2768 priv = 0; 2773 priv = 0;
2769 ch = cmd_getc (); 2774 ch = cmd_getc ();
2770 if (ch >= '<' && ch <= '?') 2775 if ((ch >= '<' && ch <= '?') || ch == '!')
2771 { 2776 {
2772 /* '<' '=' '>' '?' */ 2777 /* '<' '=' '>' '?' '!' */
2773 priv = ch; 2778 priv = ch;
2774 ch = cmd_getc (); 2779 ch = cmd_getc ();
2775 } 2780 }
2776 2781
2777 /* read any numerical arguments */ 2782 /* read any numerical arguments */
2826 // versions. 2831 // versions.
2827 // 2832 //
2828 tt_printf ("\033[>%d;95;0c", 'U'); 2833 tt_printf ("\033[>%d;95;0c", 'U');
2829 } 2834 }
2830 break; 2835 break;
2836
2831 case '?': 2837 case '?':
2832 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2838 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2833 process_terminal_mode (ch, priv, nargs, arg); 2839 process_terminal_mode (ch, priv, nargs, arg);
2834 break; 2840 break;
2841
2842 case '!':
2843 if (ch == CSI_70)
2844 {
2845 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2846 scr_soft_reset ();
2847
2848 static const int pm_h[] = { 7, 25 };
2849 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 };
2850
2851 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h);
2852 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l);
2835 } 2853 }
2854 break;
2855 }
2856
2836 return; 2857 return;
2837 } 2858 }
2838 2859
2839 switch (ch) 2860 switch (ch)
2840 { 2861 {
3269 3290
3270/* 3291/*
3271 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3292 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3272 */ 3293 */
3273void 3294void
3274rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3295rxvt_term::process_xterm_seq (int op, char *str, char resp)
3275{ 3296{
3276 int color; 3297 int color;
3277 char *buf, *name; 3298 char *buf, *name;
3278 bool query = str[0] == '?' && !str[1]; 3299 bool query = str[0] == '?' && !str[1];
3279 int saveop = op; 3300 int saveop = op;
3320 3341
3321 XFree (value); 3342 XFree (value);
3322 } 3343 }
3323 else 3344 else
3324 { 3345 {
3325 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3346 char *eq = strchr (str, '=');
3326 3347
3327 if (eq) 3348 if (eq)
3328 { 3349 {
3329 *eq = 0; 3350 *eq = 0;
3330 set_utf8_property (display->atom (str), eq + 1); 3351 set_utf8_property (display->atom (str), eq + 1);
3351 *buf++ = '\0'; 3372 *buf++ = '\0';
3352 3373
3353 process_color_seq (op, color, name, resp); 3374 process_color_seq (op, color, name, resp);
3354 } 3375 }
3355 break; 3376 break;
3377 case Rxvt_restoreFG:
3356 case XTerm_Color00: 3378 case XTerm_Color00:
3357 process_color_seq (op, Color_fg, str, resp); 3379 process_color_seq (op, Color_fg, str, resp);
3358 break; 3380 break;
3381 case Rxvt_restoreBG:
3359 case XTerm_Color01: 3382 case XTerm_Color01:
3360 process_color_seq (op, Color_bg, str, resp); 3383 process_color_seq (op, Color_bg, str, resp);
3361 break; 3384 break;
3362#ifndef NO_CURSORCOLOR 3385#ifndef NO_CURSORCOLOR
3363 case XTerm_Color_cursor: 3386 case XTerm_Color_cursor:
3384 break; 3407 break;
3385 case URxvt_Color_IT: 3408 case URxvt_Color_IT:
3386 process_color_seq (op, Color_IT, str, resp); 3409 process_color_seq (op, Color_IT, str, resp);
3387 break; 3410 break;
3388#endif 3411#endif
3412 case URxvt_Color_border:
3413 process_color_seq (op, Color_border, str, resp);
3414 break;
3389#if ENABLE_TRANSPARENCY 3415#if ENABLE_TRANSPARENCY
3390 case URxvt_Color_tint: 3416 case URxvt_Color_tint:
3391 process_color_seq (op, Color_tint, str, resp); 3417 process_color_seq (op, Color_tint, str, resp);
3392 { 3418 {
3393 bool changed = false; 3419 bool changed = false;
3420
3394 if (ISSET_PIXCOLOR (Color_tint)) 3421 if (ISSET_PIXCOLOR (Color_tint))
3395 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3422 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3396 else 3423 else
3397 changed = bgPixmap.unset_tint (); 3424 changed = bgPixmap.unset_tint ();
3425
3398 if (changed) 3426 if (changed)
3399 update_background (); 3427 update_background ();
3400 } 3428 }
3401 3429
3402 break; 3430 break;
3406 case Rxvt_Pixmap: 3434 case Rxvt_Pixmap:
3407 if (!strcmp (str, "?")) 3435 if (!strcmp (str, "?"))
3408 { 3436 {
3409 char str[256]; 3437 char str[256];
3410 3438
3411 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3439 sprintf (str, "[%dx%d+%d+%d]",
3412 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3440 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3413 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3441 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3414 process_xterm_seq (XTerm_title, str, CHAR_ST); 3442 process_xterm_seq (XTerm_title, str, CHAR_ST);
3415 } 3443 }
3416 else 3444 else
3425 changed++; 3453 changed++;
3426 str = strchr (str, ';'); 3454 str = strchr (str, ';');
3427 if (str == NULL) 3455 if (str == NULL)
3428 bgPixmap.set_defaultGeometry (); 3456 bgPixmap.set_defaultGeometry ();
3429 } 3457 }
3458
3430 while (str) 3459 while (str)
3431 { 3460 {
3432 str++; 3461 str++;
3433 if (bgPixmap.set_geometry (str)) 3462 if (bgPixmap.set_geometry (str))
3434 changed++; 3463 changed++;
3435 str = strchr (str, ';'); 3464 str = strchr (str, ';');
3436 } 3465 }
3466
3437 if (changed) 3467 if (changed)
3438 update_background (); 3468 update_background ();
3439 } 3469 }
3440 break; 3470 break;
3441#endif 3471#endif
3442
3443 case Rxvt_restoreFG:
3444 set_window_color (Color_fg, str);
3445 break;
3446 case Rxvt_restoreBG:
3447 set_window_color (Color_bg, str);
3448 break;
3449 3472
3450 case XTerm_logfile: 3473 case XTerm_logfile:
3451 // TODO, when secure mode? 3474 // TODO, when secure mode?
3452 break; 3475 break;
3453 3476
3520 break; 3543 break;
3521#endif 3544#endif
3522 3545
3523#if ENABLE_PERL 3546#if ENABLE_PERL
3524 case URxvt_perl: 3547 case URxvt_perl:
3525 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3548 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3526 ; // no responses yet
3527 break; 3549 break;
3528#endif 3550#endif
3529 } 3551 }
3530} 3552}
3531/*----------------------------------------------------------------------*/ 3553/*----------------------------------------------------------------------*/
3554 { 3576 {
3555 if (mode == 'r') 3577 if (mode == 'r')
3556 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3578 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3557 else 3579 else
3558 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3580 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3559 PrivMode (state, bit); 3581 set_privmode (bit, state);
3560 } 3582 }
3561 3583
3562 return state; 3584 return state;
3563} 3585}
3564 3586
3572 static const struct 3594 static const struct
3573 { 3595 {
3574 const int argval; 3596 const int argval;
3575 const unsigned long bit; 3597 const unsigned long bit;
3576 } argtopriv[] = { 3598 } argtopriv[] = {
3577 { 1, PrivMode_aplCUR }, 3599 { 1, PrivMode_aplCUR }, // DECCKM
3578 { 2, PrivMode_vt52 }, 3600 { 2, PrivMode_vt52 },
3579 { 3, PrivMode_132 }, 3601 { 3, PrivMode_132 }, // DECCOLM
3580 { 4, PrivMode_smoothScroll }, 3602 { 4, PrivMode_smoothScroll }, // DECSCLM
3581 { 5, PrivMode_rVideo }, 3603 { 5, PrivMode_rVideo }, // DECSCNM
3582 { 6, PrivMode_relOrigin }, 3604 { 6, PrivMode_relOrigin }, // DECOM
3583 { 7, PrivMode_Autowrap }, 3605 { 7, PrivMode_Autowrap }, // DECAWM
3584 // 8, bi-directional support mode 3606 // 8, auto-repeat keys // DECARM
3585 { 9, PrivMode_MouseX10 }, 3607 { 9, PrivMode_MouseX10 },
3586 // 18, 19 printing-related 3608 // 18 end FF to printer after print screen
3609 // 19 Print screen prints full screen/scorll region
3587 { 25, PrivMode_VisibleCursor }, 3610 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3588#ifdef scrollBar_esc 3611#ifdef scrollBar_esc
3589 { scrollBar_esc, PrivMode_scrollBar }, 3612 { scrollBar_esc, PrivMode_scrollBar },
3590#endif 3613#endif
3591 { 35, PrivMode_ShiftKeys }, // rxvt extension 3614 { 35, PrivMode_ShiftKeys }, // rxvt extension
3615 // 38, tektronix mode // DECTEK
3592 { 40, PrivMode_132OK }, 3616 { 40, PrivMode_132OK },
3593 // 41 xterm more fixes NYI 3617 // 41 xterm more fixes NYI
3594 // 45 margin bell NYI 3618 // 45 margin bell NYI
3595 // 46 start logging 3619 // 46 start logging
3596 { 47, PrivMode_Screen }, 3620 { 47, PrivMode_Screen },
3597 { 66, PrivMode_aplKP }, 3621 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
3598#ifndef NO_BACKSPACE_KEY 3622#ifndef NO_BACKSPACE_KEY
3599 { 67, PrivMode_BackSpace }, 3623 { 67, PrivMode_BackSpace }, // DECBKM
3600#endif 3624#endif
3601 { 1000, PrivMode_MouseX11 }, 3625 { 1000, PrivMode_MouseX11 },
3602 { 1002, PrivMode_MouseBtnEvent }, 3626 { 1002, PrivMode_MouseBtnEvent },
3603 { 1003, PrivMode_MouseAnyEvent }, 3627 { 1003, PrivMode_MouseAnyEvent },
3604 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3628 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3608 // 1037 send DEL for keypad delete NYI 3632 // 1037 send DEL for keypad delete NYI
3609 { 1047, PrivMode_Screen }, 3633 { 1047, PrivMode_Screen },
3610 // 1048 save and restore cursor 3634 // 1048 save and restore cursor
3611 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3635 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3612 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3636 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3637 { 2004, PrivMode_BracketPaste },
3613 }; 3638 };
3614 3639
3615 if (nargs == 0) 3640 if (nargs == 0)
3616 return; 3641 return;
3617 3642
3642 3667
3643 scr_touch (true); 3668 scr_touch (true);
3644 break; 3669 break;
3645#endif 3670#endif
3646 case 1048: /* alternative cursor save */ 3671 case 1048: /* alternative cursor save */
3647 case 1049:
3648 if (option (Opt_secondaryScreen)) 3672 if (option (Opt_secondaryScreen))
3649 if (mode == 0) 3673 if (mode == 0)
3650 scr_cursor (RESTORE); 3674 scr_cursor (RESTORE);
3651 else if (mode == 1) 3675 else if (mode == 1)
3652 scr_cursor (SAVE); 3676 scr_cursor (SAVE);
3661 case 2: /* VT52 mode */ 3685 case 2: /* VT52 mode */
3662 /* oddball mode. should be set regardless of set/reset 3686 /* oddball mode. should be set regardless of set/reset
3663 * parameter. Return from VT52 mode with an ESC < from 3687 * parameter. Return from VT52 mode with an ESC < from
3664 * within VT52 mode 3688 * within VT52 mode
3665 */ 3689 */
3666 PrivMode (1, PrivMode_vt52); 3690 set_privmode (PrivMode_vt52, 1);
3667 break; 3691 break;
3668 case 3: /* 80/132 */ 3692 case 3: /* 80/132 */
3669 if (priv_modes & PrivMode_132OK) 3693 if (priv_modes & PrivMode_132OK)
3670 set_widthheight (((state ? 132 : 80) * fwidth), height); 3694 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3671 break; 3695 break;
3672 case 4: /* smooth scrolling */ 3696 case 4: /* smooth scrolling */
3673 set_option (Opt_jumpScroll, !state); 3697 set_option (Opt_jumpScroll, !state);
3674 break; 3698 break;
3675 case 5: /* reverse video */ 3699 case 5: /* reverse video */
3686 if (state) /* orthogonal */ 3710 if (state) /* orthogonal */
3687 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3711 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3688 break; 3712 break;
3689#ifdef scrollBar_esc 3713#ifdef scrollBar_esc
3690 case scrollBar_esc: 3714 case scrollBar_esc:
3691 if (scrollbar_mapping (state)) 3715 if (scrollBar.map (state))
3692 { 3716 {
3693 resize_all_windows (0, 0, 0); 3717 resize_all_windows (0, 0, 0);
3694 scr_touch (true); 3718 scr_touch (true);
3695 } 3719 }
3696 break; 3720 break;
3717 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3741 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3718 vt_emask_mouse = PointerMotionMask; 3742 vt_emask_mouse = PointerMotionMask;
3719 } 3743 }
3720 else 3744 else
3721 vt_emask_mouse = NoEventMask; 3745 vt_emask_mouse = NoEventMask;
3746
3722 vt_select_input (); 3747 vt_select_input ();
3723 break; 3748 break;
3724 case 1010: /* scroll to bottom on TTY output inhibit */ 3749 case 1010: /* scroll to bottom on TTY output inhibit */
3725 set_option (Opt_scrollTtyOutput, !state); 3750 set_option (Opt_scrollTtyOutput, !state);
3726 break; 3751 break;
3727 case 1011: /* scroll to bottom on key press */ 3752 case 1011: /* scroll to bottom on key press */
3728 set_option (Opt_scrollTtyKeypress, state); 3753 set_option (Opt_scrollTtyKeypress, state);
3729 break; 3754 break;
3730 case 1047: /* secondary screen w/ clearing last */ 3755 case 1047: /* secondary screen w/ clearing last */
3731 if (option (Opt_secondaryScreen)) 3756 if (option (Opt_secondaryScreen))
3732 if (current_screen != PRIMARY) 3757 if (!state)
3733 scr_erase_screen (2); 3758 scr_erase_screen (2);
3759
3734 scr_change_screen (state); 3760 scr_change_screen (state);
3735 break; 3761 break;
3736 case 1049: /* secondary screen w/ clearing first */ 3762 case 1049: /* secondary screen w/ clearing first */
3763 if (option (Opt_secondaryScreen))
3764 if (state)
3765 scr_cursor (SAVE);
3766
3737 scr_change_screen (state); 3767 scr_change_screen (state);
3768
3738 if (option (Opt_secondaryScreen)) 3769 if (option (Opt_secondaryScreen))
3739 if (current_screen != PRIMARY) 3770 if (state)
3740 scr_erase_screen (2); 3771 scr_erase_screen (2);
3772 else
3773 scr_cursor (RESTORE);
3741 break; 3774 break;
3742 default: 3775 default:
3743 break; 3776 break;
3744 } 3777 }
3745 } 3778 }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines