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.16 by pcg, Wed Dec 17 09:00:35 2003 UTC vs.
Revision 1.20 by pcg, Thu Dec 18 07:31:18 2003 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: command.c 2 * File: command.c
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: command.C,v 1.16 2003/12/17 09:00:35 pcg Exp $ 4 * $Id: command.C,v 1.20 2003/12/18 07:31:18 pcg Exp $
5 * 5 *
6 * All portions of code are copyright by their respective author/s. 6 * All portions of code are copyright by their respective author/s.
7 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 7 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
8 * - original version 8 * - original version
9 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 9 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
… …
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#include <wchar.h>
54
53/*----------------------------------------------------------------------*/ 55/*----------------------------------------------------------------------*/
54 56
55/*{{{ Convert the keypress event into a string */ 57/*{{{ Convert the keypress event into a string */
56/* INTPROTO */ 58/* INTPROTO */
57void 59void
… …
88 if (R->Input_Context) 90 if (R->Input_Context)
89 { 91 {
90 Status status_return; 92 Status status_return;
91 93
92#ifdef X_HAVE_UTF8_STRING 94#ifdef X_HAVE_UTF8_STRING
95 if (R->enc_utf8)
93 len = Xutf8LookupString(R->Input_Context, ev, (char *)kbuf, 96 len = Xutf8LookupString (R->Input_Context, ev, (char *)kbuf,
94 KBUFSZ, &keysym, &status_return); 97 KBUFSZ, &keysym, &status_return);
95#else 98 else
99#endif
100 {
101 wchar_t wkbuf[KBUFSZ + 1];
102
103 // the XOpenIM manpage lies about hardcoding the locale
104 // at the point of XOpenIM, so temporarily switch locales
105 if (R->rs[Rs_imLocale])
106 SET_LOCALE (R->rs[Rs_imLocale]);
107 // assume wchar_t == unicode or better
96 len = XmbLookupString(R->Input_Context, ev, (char *)kbuf, 108 len = XwcLookupString (R->Input_Context, ev, wkbuf,
97 KBUFSZ, &keysym, &status_return); 109 KBUFSZ, &keysym, &status_return);
98#endif 110 if (R->rs[Rs_imLocale])
111 SET_LOCALE (R->locale);
112
113 if (status_return == XLookupChars
114 || status_return == XLookupBoth)
115 {
116 wkbuf[len] = 0;
117 len = wcstombs ((char *)kbuf, wkbuf, KBUFSZ);
118 if (len < 0)
119 len = 0;
120 }
121 else
122 len = 0;
123 }
124
99 valid_keysym = ((status_return == XLookupKeySym) 125 valid_keysym = status_return == XLookupKeySym
100 || (status_return == XLookupBoth)); 126 || status_return == XLookupBoth;
101 } 127 }
102 else 128 else
103#endif 129#endif
104 { 130 {
105 len = XLookupString(ev, (char *)kbuf, KBUFSZ, &keysym, &R->compose); 131 len = XLookupString (ev, (char *)kbuf, KBUFSZ, &keysym, &R->compose);
106 valid_keysym = !len; 132 valid_keysym = !len;
107 } 133 }
108 134
109 if (valid_keysym) 135 if (valid_keysym)
110 { 136 {
… …
679 705
680void 706void
681rxvt_term::check_cb (check_watcher &w) 707rxvt_term::check_cb (check_watcher &w)
682{ 708{
683 SET_R (this); 709 SET_R (this);
710 SET_LOCALE (locale);
684 711
685 flush (); 712 flush ();
686} 713}
687 714
688void 715void
… …
732} 759}
733 760
734void 761void
735rxvt_term::blink_cb (time_watcher &w) 762rxvt_term::blink_cb (time_watcher &w)
736{ 763{
737 SET_R (this);
738
739 w.at += BLINK_INTERVAL; 764 w.at += BLINK_INTERVAL;
740 hidden_cursor = !hidden_cursor; 765 hidden_cursor = !hidden_cursor;
741 want_refresh = 1; 766 want_refresh = 1;
742} 767}
743 768
744void 769void
745rxvt_term::x_cb (io_watcher &w, short revents) 770rxvt_term::x_cb (io_watcher &w, short revents)
746{ 771{
747 SET_R (this); 772 SET_R (this);
773 SET_LOCALE (locale);
748 774
749 process_x_events (); 775 process_x_events ();
750} 776}
751 777
752bool 778bool
… …
773 799
774void 800void
775rxvt_term::pty_cb (io_watcher &w, short revents) 801rxvt_term::pty_cb (io_watcher &w, short revents)
776{ 802{
777 SET_R (this); 803 SET_R (this);
804 SET_LOCALE (locale);
778 805
779 if (revents & EVENT_WRITE) 806 if (revents & EVENT_WRITE)
780 tt_write (0, 0); 807 tt_write (0, 0);
781 else if (revents & EVENT_READ) 808 else if (revents & EVENT_READ)
782 { 809 {
… …
890// read the next character, currently handles UTF-8 917// read the next character, currently handles UTF-8
891// will probably handle all sorts of other stuff in the future 918// will probably handle all sorts of other stuff in the future
892uint32_t 919uint32_t
893rxvt_term::next_char () 920rxvt_term::next_char ()
894{ 921{
895 struct mbstate &s = mbstate;
896
897 while (cmdbuf_ptr < cmdbuf_endp) 922 while (cmdbuf_ptr < cmdbuf_endp)
898 { 923 {
899 uint8_t ch = *cmdbuf_ptr; 924 if (*cmdbuf_ptr < 0x80) // assume < 0x80 to be ascii ALWAYS (all shift-states etc.) uh-oh
900
901 if (s.cnt)
902 {
903 if ((ch & 0xc0) == 0x80)
904 {
905 cmdbuf_ptr++;
906
907 /* continuation */
908 s.reg = (s.reg << 6) | (ch & 0x7f);
909
910 if (--s.cnt == 0 && s.reg >= 128) /* if !inrange then corruption or Racking */
911 return s.reg;
912
913 continue;
914 }
915 else
916 {
917 s.cnt = 0;
918 return s.orig; /* the _occasional_ non-utf-8 character may slip through... */
919 }
920 }
921
922 if ((ch & 0xc0) == 0xc0)
923 {
924 cmdbuf_ptr++; 925 return *cmdbuf_ptr++;
925 926
926 /* first byte */ 927 wchar_t wc;
927 s.orig = ch; /* for broken encodings */ 928 int len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, &mbstate.mbs);
928 s.reg = ch; 929
929 if ((ch & 0xe0) == 0xc0) { s.reg &= 0x1f; s.cnt = 1; } 930 if (len == (size_t)-2)
930 if ((ch & 0xf0) == 0xe0) { s.reg &= 0x0f; s.cnt = 2; } 931 return NOCHAR;
931 if ((ch & 0xf8) == 0xf0) { s.reg &= 0x07; s.cnt = 3; } 932
932 if ((ch & 0xfc) == 0xf8) { s.reg &= 0x03; s.cnt = 4; } 933 if (len == (size_t)-1)
933 if ((ch & 0xfe) == 0xfc) { s.reg &= 0x01; s.cnt = 5; } 934 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
934 } 935
935 else 936 // assume wchar == unicode
936 { 937 cmdbuf_ptr += len;
937 cmdbuf_ptr++; /* _occasional_ non-utf8 may slip through... */
938 return ch; 938 return wc;
939 }
940 } 939 }
941 940
942 return NOCHAR; 941 return NOCHAR;
943} 942}
944 943
… …
1026 1025
1027void 1026void
1028rxvt_term::pointer_unblank () 1027rxvt_term::pointer_unblank ()
1029{ 1028{
1030 XDefineCursor (Xdisplay, TermWin.vt, TermWin_cursor); 1029 XDefineCursor (Xdisplay, TermWin.vt, TermWin_cursor);
1031 rxvt_recolour_cursor (this); 1030 recolour_cursor ();
1032 1031
1033#ifdef POINTER_BLANK 1032#ifdef POINTER_BLANK
1034 hidden_pointer = 0; 1033 hidden_pointer = 0;
1035 1034
1036 if (Options & Opt_pointerBlank) 1035 if (Options & Opt_pointerBlank)
… …
1055 1054
1056void 1055void
1057rxvt_term::pointer_cb (time_watcher &w) 1056rxvt_term::pointer_cb (time_watcher &w)
1058{ 1057{
1059 SET_R (this); 1058 SET_R (this);
1059 SET_LOCALE (locale);
1060 1060
1061 pointer_blank (); 1061 pointer_blank ();
1062} 1062}
1063#endif 1063#endif
1064 1064
… …
1420 &unused_xevent)) ; 1420 &unused_xevent)) ;
1421 while (XCheckTypedWindowEvent(R->Xdisplay, ev->xany.window, 1421 while (XCheckTypedWindowEvent(R->Xdisplay, ev->xany.window,
1422 GraphicsExpose, 1422 GraphicsExpose,
1423 &unused_xevent)) ; 1423 &unused_xevent)) ;
1424 if (isScrollbarWindow(ev->xany.window)) { 1424 if (isScrollbarWindow(ev->xany.window)) {
1425 scrollbar_setIdle(); 1425 R->scrollBar.setIdle();
1426 rxvt_scrollbar_show(aR_ 0); 1426 rxvt_scrollbar_show(aR_ 0);
1427 } 1427 }
1428#ifdef MENUBAR 1428#ifdef MENUBAR
1429 if (menubar_visible(aR) && isMenuBarWindow(ev->xany.window)) 1429 if (menubar_visible(aR) && isMenuBarWindow(ev->xany.window))
1430 rxvt_menubar_expose(aR); 1430 rxvt_menubar_expose(aR);
… …
1543 */ 1543 */
1544 if (ev->window == R->TermWin.vt) 1544 if (ev->window == R->TermWin.vt)
1545 { 1545 {
1546#if RXVT_GRAPHICS 1546#if RXVT_GRAPHICS
1547 if (ev->subwindow != None) 1547 if (ev->subwindow != None)
1548 rxvt_Gr_ButtonPress(ev->x, ev->y); 1548 rxvt_Gr_ButtonPress (ev->x, ev->y);
1549 else 1549 else
1550#endif 1550#endif
1551 { 1551 {
1552 clickintime = ev->time - R->MEvent.time < MULTICLICK_TIME; 1552 clickintime = ev->time - R->MEvent.time < MULTICLICK_TIME;
1553 if (reportmode) 1553 if (reportmode)
… …
1615/* 1615/*
1616 * Scrollbar window processing of button press 1616 * Scrollbar window processing of button press
1617 */ 1617 */
1618 if (isScrollbarWindow(ev->window)) 1618 if (isScrollbarWindow(ev->window))
1619 { 1619 {
1620 scrollbar_setIdle(); 1620 R->scrollBar.setIdle ();
1621 /* 1621 /*
1622 * Rxvt-style scrollbar: 1622 * Rxvt-style scrollbar:
1623 * move up if mouse is above slider 1623 * move up if mouse is above slider
1624 * move dn if mouse is below slider 1624 * move dn if mouse is below slider
1625 * 1625 *
… …
1678#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1678#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1679 R->scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1679 R->scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY;
1680#endif 1680#endif
1681 if (rxvt_scr_page(aR_ upordown < 0 ? UP : DN, 1)) { 1681 if (rxvt_scr_page(aR_ upordown < 0 ? UP : DN, 1)) {
1682 if (upordown < 0) 1682 if (upordown < 0)
1683 scrollbar_setUp(); 1683 R->scrollBar.setUp ();
1684 else 1684 else
1685 scrollbar_setDn(); 1685 R->scrollBar.setDn ();
1686 } 1686 }
1687 } else 1687 } else
1688 switch (ev->button) { 1688 switch (ev->button) {
1689 case Button2: 1689 case Button2:
1690 switch (R->scrollbar_align) { 1690 switch (R->scrollbar_align) {
… …
1702 || scrollbar_above_slider(ev->y) 1702 || scrollbar_above_slider(ev->y)
1703 || scrollbar_below_slider(ev->y)) 1703 || scrollbar_below_slider(ev->y))
1704 rxvt_scr_move_to(aR_ 1704 rxvt_scr_move_to(aR_
1705 scrollbar_position(ev->y) - R->csrO, 1705 scrollbar_position(ev->y) - R->csrO,
1706 scrollbar_size()); 1706 scrollbar_size());
1707 scrollbar_setMotion(); 1707 R->scrollBar.setMotion ();
1708 break; 1708 break;
1709 1709
1710 case Button1: 1710 case Button1:
1711 if (R->scrollbar_align == R_SB_ALIGN_CENTRE) 1711 if (R->scrollbar_align == R_SB_ALIGN_CENTRE)
1712 R->csrO = ev->y - R->scrollBar.top; 1712 R->csrO = ev->y - R->scrollBar.top;
… …
1725 rxvt_scr_page(aR_ DN, R->TermWin.nrow - 1); 1725 rxvt_scr_page(aR_ DN, R->TermWin.nrow - 1);
1726# else 1726# else
1727 rxvt_scr_page(aR_ DN, R->TermWin.nrow / 4); 1727 rxvt_scr_page(aR_ DN, R->TermWin.nrow / 4);
1728# endif 1728# endif
1729 else 1729 else
1730 scrollbar_setMotion(); 1730 R->scrollBar.setMotion ();
1731 } else { 1731 } else {
1732 rxvt_scr_page(aR_ (ev->button == Button1 ? DN : UP), 1732 rxvt_scr_page(aR_ (ev->button == Button1 ? DN : UP),
1733 (R->TermWin.nrow 1733 (R->TermWin.nrow
1734 * scrollbar_position(ev->y) 1734 * scrollbar_position(ev->y)
1735 / scrollbar_size())); 1735 / scrollbar_size()));
… …
1757 R->csrO = 0; /* reset csr Offset */ 1757 R->csrO = 0; /* reset csr Offset */
1758 if (!R->bypass_keystate) 1758 if (!R->bypass_keystate)
1759 reportmode = !!(R->PrivateModes & PrivMode_mouse_report); 1759 reportmode = !!(R->PrivateModes & PrivMode_mouse_report);
1760 1760
1761 if (scrollbar_isUpDn()) { 1761 if (scrollbar_isUpDn()) {
1762 scrollbar_setIdle(); 1762 R->scrollBar.setIdle ();
1763 rxvt_scrollbar_show(aR_ 0); 1763 rxvt_scrollbar_show(aR_ 0);
1764#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1764#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1765 R->refresh_type &= ~SMOOTH_REFRESH; 1765 R->refresh_type &= ~SMOOTH_REFRESH;
1766#endif 1766#endif
1767 } 1767 }
… …
1818 break; 1818 break;
1819#ifdef MOUSE_WHEEL 1819#ifdef MOUSE_WHEEL
1820 case Button4: 1820 case Button4:
1821 case Button5: 1821 case Button5:
1822 { 1822 {
1823 int i, v; 1823 int i;
1824 page_dirn v;
1824 1825
1825 v = (ev->button == Button4) ? UP : DN; 1826 v = (ev->button == Button4) ? UP : DN;
1826 if (ev->state & ShiftMask) 1827 if (ev->state & ShiftMask)
1827 i = 1; 1828 i = 1;
1828 else if ((R->Options & Opt_mouseWheelScrollPage)) 1829 else if ((R->Options & Opt_mouseWheelScrollPage))
… …
2003 n = 0; 2004 n = 0;
2004 if (pchanged) { 2005 if (pchanged) {
2005 for (; n < (unsigned int)i; n++) { 2006 for (; n < (unsigned int)i; n++) {
2006 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[n], &wattr); 2007 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[n], &wattr);
2007 D_X((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL")); 2008 D_X((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2008 if (wattr.depth != rootdepth || wattr.class == InputOnly) { 2009 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) {
2009 n = (int)(sizeof(R->TermWin.parent) / sizeof(Window)) + 1; 2010 n = (int)(sizeof(R->TermWin.parent) / sizeof(Window)) + 1;
2010 break; 2011 break;
2011 } 2012 }
2012 } 2013 }
2013 } 2014 }
… …
3361 } 3362 }
3362 3363
3363 if ((cmd == 'T') && (nargs >= 5)) { 3364 if ((cmd == 'T') && (nargs >= 5)) {
3364 int i, len = args[4]; 3365 int i, len = args[4];
3365 3366
3366 text = rxvt_malloc((len + 1) * sizeof(char)); 3367 text = (unsigned char *)rxvt_malloc((len + 1) * sizeof(char));
3367 3368
3368 if (text != NULL) { 3369 if (text != NULL) {
3369 for (i = 0; i < len; i++) 3370 for (i = 0; i < len; i++)
3370 text[i] = rxvt_cmd_getc(aR); 3371 text[i] = rxvt_cmd_getc(aR);
3371 text[len] = '\0'; 3372 text[len] = '\0';

Diff Legend

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