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.179 by root, Wed Dec 15 05:39:08 2004 UTC vs.
Revision 1.191 by root, Wed Jan 26 07:08:15 2005 UTC

… …
48#include "../config.h" /* NECESSARY */ 48#include "../config.h" /* NECESSARY */
49#include "rxvt.h" /* NECESSARY */ 49#include "rxvt.h" /* NECESSARY */
50#include "version.h" 50#include "version.h"
51#include "command.h" 51#include "command.h"
52 52
53#ifdef KEYSYM_RESOURCE
54# include "keyboard.h"
55#endif
56
53#include <wchar.h> 57#include <cwchar>
54#include <signal.h> 58#include <csignal>
55 59
56/*----------------------------------------------------------------------*/ 60/*----------------------------------------------------------------------*/
57 61
58#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 62#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
59 63
… …
344 valid_keysym = keysym != NoSymbol; 348 valid_keysym = keysym != NoSymbol;
345 } 349 }
346 350
347 if (valid_keysym) 351 if (valid_keysym)
348 { 352 {
353#ifdef KEYSYM_RESOURCE
354 if (keyboard->dispatch (this, keysym, ev.state))
355 return;
356#endif
357
349 if (TermWin.saveLines) 358 if (TermWin.saveLines)
350 { 359 {
351#ifdef UNSHIFTED_SCROLLKEYS 360#ifdef UNSHIFTED_SCROLLKEYS
352 if (!ctrl && !meta) 361 if (!ctrl && !meta)
353#else 362#else
… …
487 } 496 }
488#endif 497#endif
489 498
490 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 499 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
491 { 500 {
492#ifdef KEYSYM_RESOURCE
493 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
494 {
495 unsigned int l;
496 const unsigned char *kbuf0;
497
498 kbuf0 = (Keysym_map[keysym & 0xFF]);
499 l = (unsigned int)*kbuf0++;
500
501 /* escape prefix */
502 if (meta
503# ifdef META8_OPTION
504 && meta_char == C0_ESC
505# endif
506 )
507 {
508 const unsigned char ch = C0_ESC;
509 tt_write (&ch, 1);
510 }
511
512 tt_write (kbuf0, l);
513 return;
514 }
515 else
516#endif
517 { 501 {
518 newlen = 1; 502 newlen = 1;
519 switch (keysym) 503 switch (keysym)
520 { 504 {
521#ifndef NO_BACKSPACE_KEY 505#ifndef NO_BACKSPACE_KEY
… …
788#undef FKEY 772#undef FKEY
789 default: 773 default:
790 newlen = 0; 774 newlen = 0;
791 break; 775 break;
792 } 776 }
777
793 if (newlen) 778 if (newlen)
794 len = strlen (kbuf); 779 len = strlen (kbuf);
795 } 780 }
796 781
797 /* 782 /*
… …
805 } 790 }
806 else if (ctrl && keysym == XK_minus) 791 else if (ctrl && keysym == XK_minus)
807 { 792 {
808 len = 1; 793 len = 1;
809 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 794 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
795 }
796 else if (keysym == XK_ISO_Left_Tab)
797 {
798 strcpy (kbuf, "\033[Z");
799 len = 3;
810 } 800 }
811 else 801 else
812 { 802 {
813#ifdef META8_OPTION 803#ifdef META8_OPTION
814 /* set 8-bit on */ 804 /* set 8-bit on */
… …
873#endif /* DEBUG_CMD */ 863#endif /* DEBUG_CMD */
874 tt_write (kbuf, (unsigned int)len); 864 tt_write (kbuf, (unsigned int)len);
875} 865}
876/*}}} */ 866/*}}} */
877 867
878#if (MENUBAR_MAX) 868#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)
879/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 869/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
880/* attempt to `write' count to the input buffer */ 870/* attempt to `write' count to the input buffer */
881unsigned int 871unsigned int
882rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 872rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
883{ 873{
… …
906 896
907 cmd_parse (); 897 cmd_parse ();
908 898
909 return 0; 899 return 0;
910} 900}
911#endif /* MENUBAR_MAX */ 901#endif
912 902
913void 903void
914rxvt_term::flush () 904rxvt_term::flush ()
915{ 905{
916 flush_ev.stop (); 906 flush_ev.stop ();
… …
1017{ 1007{
1018 if (mouse_slip_wheel_speed == 0 1008 if (mouse_slip_wheel_speed == 0
1019 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1009 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1020 : scr_page (UP, mouse_slip_wheel_speed)) 1010 : scr_page (UP, mouse_slip_wheel_speed))
1021 { 1011 {
1012 if (TermWin.view_start == TermWin.nscrolled ||
1013 TermWin.view_start == 0)
1014 mouse_slip_wheel_speed = 0;
1015
1022 refresh_type |= SMOOTH_REFRESH; 1016 refresh_type |= SMOOTH_REFRESH;
1023 want_refresh = 1; 1017 want_refresh = 1;
1024 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1018 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1025 } 1019 }
1026} 1020}
… …
1089rxvt_term::pointer_blank () 1083rxvt_term::pointer_blank ()
1090{ 1084{
1091 if (! (options & Opt_pointerBlank)) 1085 if (! (options & Opt_pointerBlank))
1092 return; 1086 return;
1093 1087
1094 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1088 XDefineCursor (display->display, TermWin.vt, display->blank_cursor);
1095 XFlush (display->display); 1089 XFlush (display->display);
1096 1090
1097 hidden_pointer = 1; 1091 hidden_pointer = 1;
1098} 1092}
1099 1093
… …
1751 { 1745 {
1752 case Button1: 1746 case Button1:
1753 /* allow meta + click to select rectangular areas */ 1747 /* allow meta + click to select rectangular areas */
1754 /* should be done in screen.C */ 1748 /* should be done in screen.C */
1755#if ENABLE_FRILLS 1749#if ENABLE_FRILLS
1756 selection.rect = !! (ev.state & ModMetaMask); 1750 selection.rect = !!(ev.state & ModMetaMask);
1757#else 1751#else
1758 selection.rect = false; 1752 selection.rect = false;
1759#endif 1753#endif
1760 1754
1761 /* allow shift+left click to extend selection */ 1755 /* allow shift+left click to extend selection */
… …
2707 if (len == (size_t)-1) 2701 if (len == (size_t)-1)
2708 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2702 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2709 2703
2710 // assume wchar == unicode 2704 // assume wchar == unicode
2711 cmdbuf_ptr += len; 2705 cmdbuf_ptr += len;
2712 return wc; 2706 return wc & UNICODE_MASK;
2713 } 2707 }
2714 2708
2715 return NOCHAR; 2709 return NOCHAR;
2716} 2710}
2717 2711
… …
3782 { 3776 {
3783 str++; 3777 str++;
3784#if XPM_BACKGROUND 3778#if XPM_BACKGROUND
3785 changed += scale_pixmap (str); 3779 changed += scale_pixmap (str);
3786#endif 3780#endif
3787
3788 } 3781 }
3782
3789 if (changed) 3783 if (changed)
3790 { 3784 {
3791#ifdef XPM_BACKGROUND 3785#ifdef XPM_BACKGROUND
3792 resize_pixmap (); 3786 resize_pixmap ();
3793#endif 3787#endif
… …
3834 if (query) 3828 if (query)
3835 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp); 3829 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp);
3836 else 3830 else
3837 { 3831 {
3838 set_locale (str); 3832 set_locale (str);
3833 pty.set_utf8_mode (enc_utf8);
3839# ifdef USE_XIM 3834# ifdef USE_XIM
3840 im_cb (); 3835 im_cb ();
3841# endif 3836# endif
3842 } 3837 }
3843 break; 3838 break;

Diff Legend

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