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.389 by ayin, Mon Dec 31 13:50:56 2007 UTC vs.
Revision 1.413 by ayin, Sun Feb 17 12:11:56 2008 UTC

… …
279 } 279 }
280 280
281 iso14755buf = 0; 281 iso14755buf = 0;
282} 282}
283 283
284int 284static int
285rxvt_term::hex_keyval (XKeyEvent &ev) 285hex_keyval (XKeyEvent &ev)
286{ 286{
287 // check wether this event corresponds to a hex digit 287 // check wether this event corresponds to a hex digit
288 // if the modifiers had not been pressed. 288 // if the modifiers had not been pressed.
289 for (int index = 0; index < 8; index++) 289 for (int index = 0; index < 8; index++)
290 { 290 {
… …
298 298
299 return -1; 299 return -1;
300} 300}
301#endif 301#endif
302 302
303static inline KeySym
304translate_keypad (KeySym keysym, bool kp)
305{
306#ifdef XK_KP_Home
307 static const KeySym keypadtrans[] = {
308 XK_KP_7, // XK_KP_Home
309 XK_KP_4, // XK_KP_Left
310 XK_KP_8, // XK_KP_Up
311 XK_KP_6, // XK_KP_Right
312 XK_KP_2, // XK_KP_Down
313# ifndef UNSHIFTED_SCROLLKEYS
314 XK_KP_9, // XK_KP_Prior
315 XK_KP_3, // XK_KP_Next
316# else
317 XK_Prior,
318 XK_Next,
319# endif
320 XK_KP_1, // XK_KP_End
321 XK_KP_5, // XK_KP_Begin
322 };
323
324 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
325 {
326 unsigned int index = keysym - XK_KP_Home;
327 keysym = kp ? keypadtrans[index] : XK_Home + index;
328 }
329 else if (keysym == XK_KP_Insert)
330 keysym = kp ? XK_KP_0 : XK_Insert;
331# ifndef NO_DELETE_KEY
332 else if (keysym == XK_KP_Delete)
333 keysym = kp ? XK_KP_Decimal : XK_Delete;
334# endif
335#endif
336 return keysym;
337}
338
339static inline int
340map_function_key (KeySym keysym)
341{
342 int param = 0;
343
344 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
345 {
346 param = 11 + keysym - XK_F1;
347 if (keysym >= XK_F17)
348 param += 4;
349 else if (keysym >= XK_F15)
350 param += 3;
351 else if (keysym >= XK_F11)
352 param += 2;
353 else if (keysym >= XK_F6)
354 param += 1;
355 }
356 else
357 switch (keysym)
358 {
359 case XK_Find:
360 param = 1;
361 break;
362 case XK_Insert:
363 param = 2;
364 break;
365#ifdef DXK_Remove
366 case DXK_Remove:
367#endif
368 case XK_Execute:
369 param = 3;
370 break;
371 case XK_Select:
372 param = 4;
373 break;
374#ifndef UNSHIFTED_SCROLLKEYS
375 case XK_Prior:
376 param = 5;
377 break;
378 case XK_Next:
379 param = 6;
380 break;
381 case XK_Home:
382 param = 7;
383 break;
384 case XK_End:
385 param = 8;
386 break;
387#endif
388 case XK_Help:
389 param = 28;
390 break;
391 case XK_Menu:
392 param = 29;
393 break;
394 }
395 return param;
396}
397
303void 398void
304rxvt_term::key_press (XKeyEvent &ev) 399rxvt_term::key_press (XKeyEvent &ev)
305{ 400{
306 int ctrl, meta, shft, len; 401 int ctrl, meta, shft, len;
307 unsigned int newlen;
308 KeySym keysym; 402 KeySym keysym;
309 int valid_keysym; 403 int valid_keysym;
310 char kbuf[KBUFSZ]; 404 char kbuf[KBUFSZ];
311 405
312#if ISO_14755 406#if ISO_14755
… …
325 meta = ev.state & ModMetaMask; 419 meta = ev.state & ModMetaMask;
326 420
327 if (numlock_state || (ev.state & ModNumLockMask)) 421 if (numlock_state || (ev.state & ModNumLockMask))
328 { 422 {
329 numlock_state = (ev.state & ModNumLockMask); 423 numlock_state = (ev.state & ModNumLockMask);
330 PrivMode ((!numlock_state), PrivMode_aplKP); 424 set_privmode (PrivMode_aplKP, !numlock_state);
331 } 425 }
332 426
333 kbuf[0] = 0; 427 kbuf[0] = 0;
334 428
335#ifdef USE_XIM 429#ifdef USE_XIM
… …
547 } 641 }
548#endif 642#endif
549 643
550 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 644 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
551 { 645 {
646 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
647 unsigned int newlen = 1;
648
649 switch (translate_keypad (keysym, kp))
552 { 650 {
553 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; 651#ifndef NO_BACKSPACE_KEY
554 newlen = 1; 652 case XK_BackSpace:
555#ifdef XK_KP_Home 653 if (priv_modes & PrivMode_HaveBackSpace)
556 static const KeySym keypadtrans[] = { 654 {
557 XK_KP_7, // XK_KP_Home 655 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
558 XK_KP_4, // XK_KP_Left 656 ^ !!ctrl) ? '\b' : '\177';
559 XK_KP_8, // XK_KP_Up 657 kbuf[1] = '\0';
560 XK_KP_6, // XK_KP_Right
561 XK_KP_2, // XK_KP_Down
562#ifndef UNSHIFTED_SCROLLKEYS
563 XK_KP_9, // XK_KP_Prior
564 XK_KP_3, // XK_KP_Next
565#else
566 XK_Prior,
567 XK_Next,
568#endif
569 XK_KP_1, // XK_KP_End
570 XK_KP_5, // XK_KP_Begin
571 }; 658 }
659 else
660 strcpy (kbuf, rs[Rs_backspace_key]);
661 break;
662#endif
663#ifndef NO_DELETE_KEY
664 case XK_Delete:
665 strcpy (kbuf, rs[Rs_delete_key]);
666 break;
667#endif
668 case XK_Tab:
669 if (shft)
670 strcpy (kbuf, "\033[Z");
671 else
672 {
673#ifdef CTRL_TAB_MAKES_META
674 if (ctrl)
675 meta = 1;
676#endif
677#ifdef MOD4_TAB_MAKES_META
678 if (ev.state & Mod4Mask)
679 meta = 1;
680#endif
681 newlen = 0;
682 }
683 break;
572 684
573 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin)) 685 case XK_Up: /* "\033[A" */
686 case XK_Down: /* "\033[B" */
687 case XK_Right: /* "\033[C" */
688 case XK_Left: /* "\033[D" */
689 strcpy (kbuf, "\033[Z");
690 kbuf[2] = "DACB"[keysym - XK_Left];
691 /* do Shift first */
692 if (shft)
693 kbuf[2] = "dacb"[keysym - XK_Left];
694 else if (ctrl)
695 {
696 kbuf[1] = 'O';
697 kbuf[2] = "dacb"[keysym - XK_Left];
698 }
699 else if (priv_modes & PrivMode_aplCUR)
700 kbuf[1] = 'O';
701 break;
702
703 case XK_KP_Enter:
704 /* allow shift to override */
705 if (kp)
706 {
707 strcpy (kbuf, "\033OM");
708 break;
709 }
710
711 /* FALLTHROUGH */
712
713 case XK_Return:
714 if (priv_modes & PrivMode_LFNL)
715 {
716 kbuf[0] = '\015';
717 kbuf[1] = '\012';
718 kbuf[2] = '\0';
719 }
720 else
721 {
722 kbuf[0] = '\015';
723 kbuf[1] = '\0';
724 }
725 break;
726
727 case XK_KP_F1: /* "\033OP" */
728 case XK_KP_F2: /* "\033OQ" */
729 case XK_KP_F3: /* "\033OR" */
730 case XK_KP_F4: /* "\033OS" */
731 strcpy (kbuf, "\033OP");
732 kbuf[2] += (keysym - XK_KP_F1);
733 break;
734
735 case XK_KP_Multiply: /* "\033Oj" : "*" */
736 case XK_KP_Add: /* "\033Ok" : "+" */
737 case XK_KP_Separator: /* "\033Ol" : "," */
738 case XK_KP_Subtract: /* "\033Om" : "-" */
739 case XK_KP_Decimal: /* "\033On" : "." */
740 case XK_KP_Divide: /* "\033Oo" : "/" */
741 case XK_KP_0: /* "\033Op" : "0" */
742 case XK_KP_1: /* "\033Oq" : "1" */
743 case XK_KP_2: /* "\033Or" : "2" */
744 case XK_KP_3: /* "\033Os" : "3" */
745 case XK_KP_4: /* "\033Ot" : "4" */
746 case XK_KP_5: /* "\033Ou" : "5" */
747 case XK_KP_6: /* "\033Ov" : "6" */
748 case XK_KP_7: /* "\033Ow" : "7" */
749 case XK_KP_8: /* "\033Ox" : "8" */
750 case XK_KP_9: /* "\033Oy" : "9" */
751 /* allow shift to override */
752 if (kp)
753 {
754 strcpy (kbuf, "\033Oj");
755 kbuf[2] += (keysym - XK_KP_Multiply);
756 }
757 else
758 {
759 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
760 kbuf[1] = '\0';
761 }
762 break;
763
764 default:
574 { 765 {
575 unsigned int index = keysym - XK_KP_Home; 766 int param = map_function_key (keysym);
576 keysym = kp ? keypadtrans[index] : XK_Home + index; 767 if (param > 0)
768 sprintf (kbuf,"\033[%d~", param);
769 else
770 newlen = 0;
577 } 771 }
578 else if (keysym == XK_KP_Insert)
579 keysym = kp ? XK_KP_0 : XK_Insert;
580#ifndef NO_DELETE_KEY
581 else if (keysym == XK_KP_Delete)
582 keysym = kp ? XK_KP_Decimal : XK_Delete;
583#endif
584#endif
585 switch (keysym)
586 {
587#ifndef NO_BACKSPACE_KEY
588 case XK_BackSpace:
589 if (priv_modes & PrivMode_HaveBackSpace)
590 {
591 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
592 ^ !!ctrl) ? '\b' : '\177';
593 kbuf[1] = '\0';
594 }
595 else
596 strcpy (kbuf, rs[Rs_backspace_key]);
597 break; 772 break;
598#endif
599#ifndef NO_DELETE_KEY
600 case XK_Delete:
601 strcpy (kbuf, rs[Rs_delete_key]);
602 break;
603#endif
604 case XK_Tab:
605 if (shft)
606 strcpy (kbuf, "\033[Z");
607 else
608 {
609#ifdef CTRL_TAB_MAKES_META
610 if (ctrl)
611 meta = 1;
612#endif
613#ifdef MOD4_TAB_MAKES_META
614 if (ev.state & Mod4Mask)
615 meta = 1;
616#endif
617 newlen = 0;
618 }
619 break;
620
621 case XK_Up: /* "\033[A" */
622 case XK_Down: /* "\033[B" */
623 case XK_Right: /* "\033[C" */
624 case XK_Left: /* "\033[D" */
625 strcpy (kbuf, "\033[Z");
626 kbuf[2] = "DACB"[keysym - XK_Left];
627 /* do Shift first */
628 if (shft)
629 kbuf[2] = "dacb"[keysym - XK_Left];
630 else if (ctrl)
631 {
632 kbuf[1] = 'O';
633 kbuf[2] = "dacb"[keysym - XK_Left];
634 }
635 else if (priv_modes & PrivMode_aplCUR)
636 kbuf[1] = 'O';
637 break;
638
639#ifndef UNSHIFTED_SCROLLKEYS
640 case XK_Prior:
641 strcpy (kbuf, "\033[5~");
642 break;
643 case XK_Next:
644 strcpy (kbuf, "\033[6~");
645 break;
646#endif
647 case XK_KP_Enter:
648 /* allow shift to override */
649 if (kp)
650 {
651 strcpy (kbuf, "\033OM");
652 break;
653 }
654
655 /* FALLTHROUGH */
656
657 case XK_Return:
658 if (priv_modes & PrivMode_LFNL)
659 {
660 kbuf[0] = '\015';
661 kbuf[1] = '\012';
662 kbuf[2] = '\0';
663 }
664 else
665 {
666 kbuf[0] = '\015';
667 kbuf[1] = '\0';
668 }
669 break;
670
671 case XK_KP_F1: /* "\033OP" */
672 case XK_KP_F2: /* "\033OQ" */
673 case XK_KP_F3: /* "\033OR" */
674 case XK_KP_F4: /* "\033OS" */
675 strcpy (kbuf, "\033OP");
676 kbuf[2] += (keysym - XK_KP_F1);
677 break;
678
679 case XK_KP_Multiply: /* "\033Oj" : "*" */
680 case XK_KP_Add: /* "\033Ok" : "+" */
681 case XK_KP_Separator: /* "\033Ol" : "," */
682 case XK_KP_Subtract: /* "\033Om" : "-" */
683 case XK_KP_Decimal: /* "\033On" : "." */
684 case XK_KP_Divide: /* "\033Oo" : "/" */
685 case XK_KP_0: /* "\033Op" : "0" */
686 case XK_KP_1: /* "\033Oq" : "1" */
687 case XK_KP_2: /* "\033Or" : "2" */
688 case XK_KP_3: /* "\033Os" : "3" */
689 case XK_KP_4: /* "\033Ot" : "4" */
690 case XK_KP_5: /* "\033Ou" : "5" */
691 case XK_KP_6: /* "\033Ov" : "6" */
692 case XK_KP_7: /* "\033Ow" : "7" */
693 case XK_KP_8: /* "\033Ox" : "8" */
694 case XK_KP_9: /* "\033Oy" : "9" */
695 /* allow shift to override */
696 if (kp)
697 {
698 strcpy (kbuf, "\033Oj");
699 kbuf[2] += (keysym - XK_KP_Multiply);
700 }
701 else
702 {
703 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
704 kbuf[1] = '\0';
705 }
706 break;
707
708 case XK_Find:
709 strcpy (kbuf, "\033[1~");
710 break;
711
712 case XK_Insert:
713 strcpy (kbuf, "\033[2~");
714 break;
715#ifdef DXK_Remove /* support for DEC remove like key */
716 case DXK_Remove:
717 /* FALLTHROUGH */
718#endif
719 case XK_Execute:
720 strcpy (kbuf, "\033[3~");
721 break;
722 case XK_Select:
723 strcpy (kbuf, "\033[4~");
724 break;
725 case XK_End:
726 strcpy (kbuf, KS_END);
727 break;
728 case XK_Home:
729 strcpy (kbuf, KS_HOME);
730 break;
731
732#define FKEY(n, fkey) \
733 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
734
735 case XK_F1: /* "\033[11~" */
736 case XK_F2: /* "\033[12~" */
737 case XK_F3: /* "\033[13~" */
738 case XK_F4: /* "\033[14~" */
739 case XK_F5: /* "\033[15~" */
740 FKEY (11, XK_F1);
741 break;
742 case XK_F6: /* "\033[17~" */
743 case XK_F7: /* "\033[18~" */
744 case XK_F8: /* "\033[19~" */
745 case XK_F9: /* "\033[20~" */
746 case XK_F10: /* "\033[21~" */
747 FKEY (17, XK_F6);
748 break;
749 case XK_F11: /* "\033[23~" */
750 case XK_F12: /* "\033[24~" */
751 case XK_F13: /* "\033[25~" */
752 case XK_F14: /* "\033[26~" */
753 FKEY (23, XK_F11);
754 break;
755 case XK_F15: /* "\033[28~" */
756 case XK_F16: /* "\033[29~" */
757 FKEY (28, XK_F15);
758 break;
759 case XK_Help: /* "\033[28~" */
760 FKEY (28, XK_Help);
761 break;
762 case XK_Menu: /* "\033[29~" */
763 FKEY (29, XK_Menu);
764 break;
765 case XK_F17: /* "\033[31~" */
766 case XK_F18: /* "\033[32~" */
767 case XK_F19: /* "\033[33~" */
768 case XK_F20: /* "\033[34~" */
769 case XK_F21: /* "\033[35~" */
770 case XK_F22: /* "\033[36~" */
771 case XK_F23: /* "\033[37~" */
772 case XK_F24: /* "\033[38~" */
773 case XK_F25: /* "\033[39~" */
774 case XK_F26: /* "\033[40~" */
775 case XK_F27: /* "\033[41~" */
776 case XK_F28: /* "\033[42~" */
777 case XK_F29: /* "\033[43~" */
778 case XK_F30: /* "\033[44~" */
779 case XK_F31: /* "\033[45~" */
780 case XK_F32: /* "\033[46~" */
781 case XK_F33: /* "\033[47~" */
782 case XK_F34: /* "\033[48~" */
783 case XK_F35: /* "\033[49~" */
784 FKEY (31, XK_F17);
785 break;
786#undef FKEY
787 default:
788 newlen = 0;
789 break;
790 }
791
792 if (newlen)
793 len = strlen (kbuf);
794 } 773 }
774
775 if (newlen)
776 len = strlen (kbuf);
795 777
796 /* 778 /*
797 * Pass meta for all function keys, if 'meta' option set 779 * Pass meta for all function keys, if 'meta' option set
798 */ 780 */
799#ifdef META8_OPTION 781#ifdef META8_OPTION
… …
1079{ 1061{
1080 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1062 if (scr_refresh_rend (RS_Blink, RS_Blink))
1081 { 1063 {
1082 hidden_text = !hidden_text; 1064 hidden_text = !hidden_text;
1083 want_refresh = 1; 1065 want_refresh = 1;
1084 refresh_check (); 1066 refresh_check ();
1085 } 1067 }
1086 else 1068 else
1087 w.stop (); 1069 w.stop ();
1088} 1070}
1089#endif 1071#endif
1090 1072
1091#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1073#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1092void 1074void
1093rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1075rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1094{ 1076{
1095 if ((scrollbar_isUp () || scrollbar_isDn ()) 1077 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1096 && scr_page (scrollbar_isUp () ? UP : DN, 1)) 1078 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1097 { 1079 {
1098 want_refresh = 1; 1080 want_refresh = 1;
1099 refresh_check (); 1081 refresh_check ();
1100 } 1082 }
1101 else 1083 else
… …
1438 && ev.xfocus.mode != NotifyGrab) 1420 && ev.xfocus.mode != NotifyGrab)
1439 focus_out (); 1421 focus_out ();
1440 break; 1422 break;
1441 1423
1442 case ConfigureNotify: 1424 case ConfigureNotify:
1443 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n", 1425 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1444 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y, 1426 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1445 szHint.width, szHint.height); */ 1427 szHint.width, szHint.height);*/
1446 if (ev.xconfigure.window == parent[0]) 1428 if (ev.xconfigure.window == parent[0])
1447 { 1429 {
1448 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1430 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1449 ; 1431 ;
1450 1432
… …
1455 } 1437 }
1456 else 1438 else
1457 { 1439 {
1458#ifdef HAVE_BG_PIXMAP 1440#ifdef HAVE_BG_PIXMAP
1459 if (bgPixmap.window_position_sensitive ()) 1441 if (bgPixmap.window_position_sensitive ())
1442 {
1443 if (mapped)
1460 update_background (); 1444 update_background ();
1445 else
1446 bgPixmap.invalidate ();
1447 }
1461#endif 1448#endif
1462 } 1449 }
1463 1450
1464 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1451 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1465 } 1452 }
… …
1485 case SelectionRequest: 1472 case SelectionRequest:
1486 selection_send (ev.xselectionrequest); 1473 selection_send (ev.xselectionrequest);
1487 break; 1474 break;
1488 1475
1489 case MapNotify: 1476 case MapNotify:
1477#ifdef HAVE_BG_PIXMAP
1478 /* This is needed spcifically to fix the case of no window manager or a
1479 * non-reparenting window manager. In those cases we never get first
1480 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1481 * care of multiplicity of ConfigureNotify events arriwing while WM does
1482 * reparenting.
1483 * We should not render background immidiately, as there could be several
1484 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1485 * by scheduling background redraw as soon as we can, but giving a short
1486 * bit of time for ConfigureNotifies to arrive.
1487 * We should render background PRIOR to drawing any text, but AFTER all
1488 * of ConfigureNotifys for the best results.
1489 */
1490 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1491 update_background_ev.start (0.025);
1492#endif
1490 mapped = 1; 1493 mapped = 1;
1491#ifdef TEXT_BLINK 1494#ifdef TEXT_BLINK
1492 text_blink_ev.start (); 1495 text_blink_ev.start ();
1493#endif 1496#endif
1494 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1497 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
… …
1532 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1535 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1533 ; 1536 ;
1534 1537
1535 if (scrollBar.state && ev.xany.window == scrollBar.win) 1538 if (scrollBar.state && ev.xany.window == scrollBar.win)
1536 { 1539 {
1537 scrollBar.setIdle (); 1540 scrollBar.state = STATE_IDLE;
1538 scrollbar_show (0); 1541 scrollbar_show (0);
1539 } 1542 }
1540 } 1543 }
1541 break; 1544 break;
1542 1545
… …
1630#ifdef MOUSE_THRESHOLD 1633#ifdef MOUSE_THRESHOLD
1631 } 1634 }
1632#endif 1635#endif
1633 } 1636 }
1634 } 1637 }
1635 else if (scrollbar_isMotion () && ev.xany.window == scrollBar.win) 1638 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1636 { 1639 {
1637 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1640 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1638 MotionNotify, &ev)) 1641 MotionNotify, &ev))
1639 ; 1642 ;
1640 1643
… …
1642 &unused_root, &unused_child, 1645 &unused_root, &unused_child,
1643 &unused_root_x, &unused_root_y, 1646 &unused_root_x, &unused_root_y,
1644 &ev.xbutton.x, &ev.xbutton.y, 1647 &ev.xbutton.x, &ev.xbutton.y,
1645 &unused_mask); 1648 &unused_mask);
1646 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1649 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1647 scrollbar_size ()); 1650 scrollBar.size ());
1648 want_refresh = 1; 1651 want_refresh = 1;
1649 scrollbar_show (1); 1652 scrollbar_show (1);
1650 } 1653 }
1651 break; 1654 break;
1652 } 1655 }
… …
1926 /* 1929 /*
1927 * Scrollbar window processing of button press 1930 * Scrollbar window processing of button press
1928 */ 1931 */
1929 if (scrollBar.state && ev.window == scrollBar.win) 1932 if (scrollBar.state && ev.window == scrollBar.win)
1930 { 1933 {
1931 scrollBar.setIdle (); 1934 page_dirn direction = NO_DIR;
1935
1936 if (scrollBar.upButton (ev.y))
1937 direction = UP; /* up */
1938 else if (scrollBar.dnButton (ev.y))
1939 direction = DN; /* down */
1940
1941 scrollBar.state = STATE_IDLE;
1932 /* 1942 /*
1933 * Rxvt-style scrollbar: 1943 * Rxvt-style scrollbar:
1934 * move up if mouse is above slider 1944 * move up if mouse is above slider
1935 * move dn if mouse is below slider 1945 * move dn if mouse is below slider
1936 * 1946 *
… …
1945 /* 1955 /*
1946 * Mouse report disabled scrollbar: 1956 * Mouse report disabled scrollbar:
1947 * arrow buttons - send up/down 1957 * arrow buttons - send up/down
1948 * click on scrollbar - send pageup/down 1958 * click on scrollbar - send pageup/down
1949 */ 1959 */
1950 if ((scrollBar.style == R_SB_NEXT 1960 if (direction == UP)
1951 && scrollbarnext_upButton (ev.y))
1952 || (scrollBar.style == R_SB_RXVT
1953 && scrollbarrxvt_upButton (ev.y)))
1954 tt_printf ("\033[A"); 1961 tt_printf ("\033[A");
1955 else if ((scrollBar.style == R_SB_NEXT 1962 else if (direction == DN)
1956 && scrollbarnext_dnButton (ev.y))
1957 || (scrollBar.style == R_SB_RXVT
1958 && scrollbarrxvt_dnButton (ev.y)))
1959 tt_printf ("\033[B"); 1963 tt_printf ("\033[B");
1960 else 1964 else
1961 switch (ev.button) 1965 switch (ev.button)
1962 { 1966 {
1963 case Button2: 1967 case Button2:
… …
1971 break; 1975 break;
1972 } 1976 }
1973 } 1977 }
1974 else 1978 else
1975#endif /* NO_SCROLLBAR_REPORT */ 1979#endif /* NO_SCROLLBAR_REPORT */
1976
1977 {
1978 char upordown = 0;
1979
1980 if (scrollBar.style == R_SB_NEXT)
1981 { 1980 {
1982 if (scrollbarnext_upButton (ev.y)) 1981 if (direction != NO_DIR)
1983 upordown = -1; /* up */
1984 else if (scrollbarnext_dnButton (ev.y))
1985 upordown = 1; /* down */
1986 }
1987 else if (scrollBar.style == R_SB_RXVT)
1988 {
1989 if (scrollbarrxvt_upButton (ev.y))
1990 upordown = -1; /* up */
1991 else if (scrollbarrxvt_dnButton (ev.y))
1992 upordown = 1; /* down */
1993 }
1994
1995 if (upordown)
1996 { 1982 {
1997#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1983#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1998 if (!cont_scroll_ev.is_active ()) 1984 if (!cont_scroll_ev.is_active ())
1999 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 1985 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2000#endif 1986#endif
2001 if (scr_page (upordown < 0 ? UP : DN, 1)) 1987 if (scr_page (direction, 1))
2002 { 1988 {
2003 if (upordown < 0) 1989 if (direction == UP)
2004 scrollBar.setUp (); 1990 scrollBar.state = STATE_UP;
2005 else 1991 else
2006 scrollBar.setDn (); 1992 scrollBar.state = STATE_DOWN;
2007 } 1993 }
2008 } 1994 }
2009 else 1995 else
2010 switch (ev.button) 1996 switch (ev.button)
2011 { 1997 {
… …
2024 } 2010 }
2025 2011
2026 if (scrollBar.style == R_SB_XTERM 2012 if (scrollBar.style == R_SB_XTERM
2027 || scrollbar_above_slider (ev.y) 2013 || scrollbar_above_slider (ev.y)
2028 || scrollbar_below_slider (ev.y)) 2014 || scrollbar_below_slider (ev.y))
2029 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2015 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2030 2016
2031 scrollBar.setMotion (); 2017 scrollBar.state = STATE_MOTION;
2032 break; 2018 break;
2033 2019
2034 case Button1: 2020 case Button1:
2035 if (scrollBar.align == R_SB_ALIGN_CENTRE) 2021 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2036 csrO = ev.y - scrollBar.top; 2022 csrO = ev.y - scrollBar.top;
… …
2050 scr_page (DN, nrow - 1); 2036 scr_page (DN, nrow - 1);
2051# else 2037# else
2052 scr_page (DN, nrow / 4); 2038 scr_page (DN, nrow / 4);
2053# endif 2039# endif
2054 else 2040 else
2055 scrollBar.setMotion (); 2041 scrollBar.state = STATE_MOTION;
2056 } 2042 }
2057 else 2043 else
2058 { 2044 {
2059 scr_page ((ev.button == Button1 ? DN : UP), 2045 scr_page ((ev.button == Button1 ? DN : UP),
2060 (nrow 2046 (nrow
2061 * scrollbar_position (ev.y) 2047 * scrollbar_position (ev.y)
2062 / scrollbar_size ())); 2048 / scrollBar.size ()));
2063 } 2049 }
2064 2050
2065 break; 2051 break;
2066 } 2052 }
2067 } 2053 }
… …
2077 2063
2078 csrO = 0; /* reset csr Offset */ 2064 csrO = 0; /* reset csr Offset */
2079 if (!bypass_keystate) 2065 if (!bypass_keystate)
2080 reportmode = !! (priv_modes & PrivMode_mouse_report); 2066 reportmode = !! (priv_modes & PrivMode_mouse_report);
2081 2067
2082 if (scrollbar_isUpDn ()) 2068 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2083 { 2069 {
2084 scrollBar.setIdle (); 2070 scrollBar.state = STATE_IDLE;
2085 scrollbar_show (0); 2071 scrollbar_show (0);
2086 } 2072 }
2087 2073
2088#ifdef SELECTION_SCROLLING 2074#ifdef SELECTION_SCROLLING
2089 sel_scroll_ev.stop(); 2075 sel_scroll_ev.stop();
… …
2170 2156
2171 if (!slip_wheel_ev.is_active ()) 2157 if (!slip_wheel_ev.is_active ())
2172 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2158 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2173 } 2159 }
2174 else 2160 else
2161# endif
2175 { 2162 {
2176# endif
2177 scr_page (v, i); 2163 scr_page (v, i);
2178 scrollbar_show (1); 2164 scrollbar_show (1);
2179# ifdef MOUSE_SLIP_WHEELING
2180 } 2165 }
2181# endif
2182 } 2166 }
2183 break; 2167 break;
2184#endif 2168#endif
2185 } 2169 }
2186 } 2170 }
… …
2580 break; 2564 break;
2581 case 'Z': /* identify the terminal type */ 2565 case 'Z': /* identify the terminal type */
2582 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2566 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2583 break; 2567 break;
2584 case '<': /* turn off VT52 mode */ 2568 case '<': /* turn off VT52 mode */
2585 PrivMode (0, PrivMode_vt52); 2569 set_privmode (PrivMode_vt52, 0);
2586 break; 2570 break;
2587 case 'F': /* use special graphics character set */ 2571 case 'F': /* use special graphics character set */
2588 case 'G': /* use regular character set */ 2572 case 'G': /* use regular character set */
2589 /* unimplemented */ 2573 /* unimplemented */
2590 break; 2574 break;
… …
2644 scr_forwardindex (); 2628 scr_forwardindex ();
2645 break; 2629 break;
2646#endif 2630#endif
2647 case '=': 2631 case '=':
2648 case '>': 2632 case '>':
2649 PrivMode ((ch == '='), PrivMode_aplKP); 2633 set_privmode (PrivMode_aplKP, ch == '=');
2650 break; 2634 break;
2651 2635
2652 case C1_40: 2636 case C1_40:
2653 cmd_getc (); 2637 cmd_getc ();
2654 break; 2638 break;
… …
2829 // versions. 2813 // versions.
2830 // 2814 //
2831 tt_printf ("\033[>%d;95;0c", 'U'); 2815 tt_printf ("\033[>%d;95;0c", 'U');
2832 } 2816 }
2833 break; 2817 break;
2818
2834 case '?': 2819 case '?':
2835 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2820 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2836 process_terminal_mode (ch, priv, nargs, arg); 2821 process_terminal_mode (ch, priv, nargs, arg);
2837 break; 2822 break;
2838 } 2823 }
… …
3354 *buf++ = '\0'; 3339 *buf++ = '\0';
3355 3340
3356 process_color_seq (op, color, name, resp); 3341 process_color_seq (op, color, name, resp);
3357 } 3342 }
3358 break; 3343 break;
3344 case Rxvt_restoreFG:
3359 case XTerm_Color00: 3345 case XTerm_Color00:
3360 process_color_seq (op, Color_fg, str, resp); 3346 process_color_seq (op, Color_fg, str, resp);
3361 break; 3347 break;
3348 case Rxvt_restoreBG:
3362 case XTerm_Color01: 3349 case XTerm_Color01:
3363 process_color_seq (op, Color_bg, str, resp); 3350 process_color_seq (op, Color_bg, str, resp);
3364 break; 3351 break;
3365#ifndef NO_CURSORCOLOR 3352#ifndef NO_CURSORCOLOR
3366 case XTerm_Color_cursor: 3353 case XTerm_Color_cursor:
… …
3444 if (changed) 3431 if (changed)
3445 update_background (); 3432 update_background ();
3446 } 3433 }
3447 break; 3434 break;
3448#endif 3435#endif
3449
3450 case Rxvt_restoreFG:
3451 set_window_color (Color_fg, str);
3452 break;
3453 case Rxvt_restoreBG:
3454 set_window_color (Color_bg, str);
3455 break;
3456 3436
3457 case XTerm_logfile: 3437 case XTerm_logfile:
3458 // TODO, when secure mode? 3438 // TODO, when secure mode?
3459 break; 3439 break;
3460 3440
… …
3561 { 3541 {
3562 if (mode == 'r') 3542 if (mode == 'r')
3563 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3543 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3564 else 3544 else
3565 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3545 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3566 PrivMode (state, bit); 3546 set_privmode (bit, state);
3567 } 3547 }
3568 3548
3569 return state; 3549 return state;
3570} 3550}
3571 3551
… …
3615 // 1037 send DEL for keypad delete NYI 3595 // 1037 send DEL for keypad delete NYI
3616 { 1047, PrivMode_Screen }, 3596 { 1047, PrivMode_Screen },
3617 // 1048 save and restore cursor 3597 // 1048 save and restore cursor
3618 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3598 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3619 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3599 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3600 { 2004, PrivMode_BracketPaste },
3620 }; 3601 };
3621 3602
3622 if (nargs == 0) 3603 if (nargs == 0)
3623 return; 3604 return;
3624 3605
… …
3668 case 2: /* VT52 mode */ 3649 case 2: /* VT52 mode */
3669 /* oddball mode. should be set regardless of set/reset 3650 /* oddball mode. should be set regardless of set/reset
3670 * parameter. Return from VT52 mode with an ESC < from 3651 * parameter. Return from VT52 mode with an ESC < from
3671 * within VT52 mode 3652 * within VT52 mode
3672 */ 3653 */
3673 PrivMode (1, PrivMode_vt52); 3654 set_privmode (PrivMode_vt52, 1);
3674 break; 3655 break;
3675 case 3: /* 80/132 */ 3656 case 3: /* 80/132 */
3676 if (priv_modes & PrivMode_132OK) 3657 if (priv_modes & PrivMode_132OK)
3658 {
3659 scr_poweron ();
3677 set_widthheight (((state ? 132 : 80) * fwidth), height); 3660 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight);
3661 }
3678 break; 3662 break;
3679 case 4: /* smooth scrolling */ 3663 case 4: /* smooth scrolling */
3680 set_option (Opt_jumpScroll, !state); 3664 set_option (Opt_jumpScroll, !state);
3681 break; 3665 break;
3682 case 5: /* reverse video */ 3666 case 5: /* reverse video */

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines