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.17 by pcg, Thu Dec 18 00:29:29 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.17 2003/12/18 00:29:29 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
96 wchar_t wkbuf[KBUFSZ + 1]; 99#endif
97
98 // assume wchar_t == unicode or better
99 len = XwcLookupString (R->Input_Context, ev, wkbuf,
100 KBUFSZ, &keysym, &status_return);
101
102 if (status_return == XLookupChars
103 || status_return == XLookupBoth)
104 { 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
108 len = XwcLookupString (R->Input_Context, ev, wkbuf,
109 KBUFSZ, &keysym, &status_return);
110 if (R->rs[Rs_imLocale])
111 SET_LOCALE (R->locale);
112
113 if (status_return == XLookupChars
114 || status_return == XLookupBoth)
115 {
105 wkbuf[len] = 0; 116 wkbuf[len] = 0;
106 len = wcstombs ((char *)kbuf, wkbuf, KBUFSZ); 117 len = wcstombs ((char *)kbuf, wkbuf, KBUFSZ);
118 if (len < 0)
119 len = 0;
120 }
121 else
122 len = 0;
107 } 123 }
108 else 124
109 len = 0;
110#endif
111 valid_keysym = status_return == XLookupKeySym 125 valid_keysym = status_return == XLookupKeySym
112 || status_return == XLookupBoth; 126 || status_return == XLookupBoth;
113 } 127 }
114 else 128 else
115#endif 129#endif
… …
691 705
692void 706void
693rxvt_term::check_cb (check_watcher &w) 707rxvt_term::check_cb (check_watcher &w)
694{ 708{
695 SET_R (this); 709 SET_R (this);
710 SET_LOCALE (locale);
696 711
697 flush (); 712 flush ();
698} 713}
699 714
700void 715void
… …
744} 759}
745 760
746void 761void
747rxvt_term::blink_cb (time_watcher &w) 762rxvt_term::blink_cb (time_watcher &w)
748{ 763{
749 SET_R (this);
750
751 w.at += BLINK_INTERVAL; 764 w.at += BLINK_INTERVAL;
752 hidden_cursor = !hidden_cursor; 765 hidden_cursor = !hidden_cursor;
753 want_refresh = 1; 766 want_refresh = 1;
754} 767}
755 768
756void 769void
757rxvt_term::x_cb (io_watcher &w, short revents) 770rxvt_term::x_cb (io_watcher &w, short revents)
758{ 771{
759 SET_R (this); 772 SET_R (this);
773 SET_LOCALE (locale);
760 774
761 process_x_events (); 775 process_x_events ();
762} 776}
763 777
764bool 778bool
… …
785 799
786void 800void
787rxvt_term::pty_cb (io_watcher &w, short revents) 801rxvt_term::pty_cb (io_watcher &w, short revents)
788{ 802{
789 SET_R (this); 803 SET_R (this);
804 SET_LOCALE (locale);
790 805
791 if (revents & EVENT_WRITE) 806 if (revents & EVENT_WRITE)
792 tt_write (0, 0); 807 tt_write (0, 0);
793 else if (revents & EVENT_READ) 808 else if (revents & EVENT_READ)
794 { 809 {
… …
902// read the next character, currently handles UTF-8 917// read the next character, currently handles UTF-8
903// will probably handle all sorts of other stuff in the future 918// will probably handle all sorts of other stuff in the future
904uint32_t 919uint32_t
905rxvt_term::next_char () 920rxvt_term::next_char ()
906{ 921{
907 struct mbstate &s = mbstate;
908
909 while (cmdbuf_ptr < cmdbuf_endp) 922 while (cmdbuf_ptr < cmdbuf_endp)
910 { 923 {
911 uint8_t ch = *cmdbuf_ptr; 924 if (*cmdbuf_ptr < 0x80) // assume < 0x80 to be ascii ALWAYS (all shift-states etc.) uh-oh
912
913 if (s.cnt)
914 {
915 if ((ch & 0xc0) == 0x80)
916 {
917 cmdbuf_ptr++;
918
919 /* continuation */
920 s.reg = (s.reg << 6) | (ch & 0x7f);
921
922 if (--s.cnt == 0 && s.reg >= 128) /* if !inrange then corruption or Racking */
923 return s.reg;
924
925 continue;
926 }
927 else
928 {
929 s.cnt = 0;
930 return s.orig; /* the _occasional_ non-utf-8 character may slip through... */
931 }
932 }
933
934 if ((ch & 0xc0) == 0xc0)
935 {
936 cmdbuf_ptr++; 925 return *cmdbuf_ptr++;
937 926
938 /* first byte */ 927 wchar_t wc;
939 s.orig = ch; /* for broken encodings */ 928 int len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, &mbstate.mbs);
940 s.reg = ch; 929
941 if ((ch & 0xe0) == 0xc0) { s.reg &= 0x1f; s.cnt = 1; } 930 if (len == (size_t)-2)
942 if ((ch & 0xf0) == 0xe0) { s.reg &= 0x0f; s.cnt = 2; } 931 return NOCHAR;
943 if ((ch & 0xf8) == 0xf0) { s.reg &= 0x07; s.cnt = 3; } 932
944 if ((ch & 0xfc) == 0xf8) { s.reg &= 0x03; s.cnt = 4; } 933 if (len == (size_t)-1)
945 if ((ch & 0xfe) == 0xfc) { s.reg &= 0x01; s.cnt = 5; } 934 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
946 } 935
947 else 936 // assume wchar == unicode
948 { 937 cmdbuf_ptr += len;
949 cmdbuf_ptr++; /* _occasional_ non-utf8 may slip through... */
950 return ch; 938 return wc;
951 }
952 } 939 }
953 940
954 return NOCHAR; 941 return NOCHAR;
955} 942}
956 943
… …
1038 1025
1039void 1026void
1040rxvt_term::pointer_unblank () 1027rxvt_term::pointer_unblank ()
1041{ 1028{
1042 XDefineCursor (Xdisplay, TermWin.vt, TermWin_cursor); 1029 XDefineCursor (Xdisplay, TermWin.vt, TermWin_cursor);
1043 rxvt_recolour_cursor (this); 1030 recolour_cursor ();
1044 1031
1045#ifdef POINTER_BLANK 1032#ifdef POINTER_BLANK
1046 hidden_pointer = 0; 1033 hidden_pointer = 0;
1047 1034
1048 if (Options & Opt_pointerBlank) 1035 if (Options & Opt_pointerBlank)
… …
1067 1054
1068void 1055void
1069rxvt_term::pointer_cb (time_watcher &w) 1056rxvt_term::pointer_cb (time_watcher &w)
1070{ 1057{
1071 SET_R (this); 1058 SET_R (this);
1059 SET_LOCALE (locale);
1072 1060
1073 pointer_blank (); 1061 pointer_blank ();
1074} 1062}
1075#endif 1063#endif
1076 1064
… …
1432 &unused_xevent)) ; 1420 &unused_xevent)) ;
1433 while (XCheckTypedWindowEvent(R->Xdisplay, ev->xany.window, 1421 while (XCheckTypedWindowEvent(R->Xdisplay, ev->xany.window,
1434 GraphicsExpose, 1422 GraphicsExpose,
1435 &unused_xevent)) ; 1423 &unused_xevent)) ;
1436 if (isScrollbarWindow(ev->xany.window)) { 1424 if (isScrollbarWindow(ev->xany.window)) {
1437 scrollbar_setIdle(); 1425 R->scrollBar.setIdle();
1438 rxvt_scrollbar_show(aR_ 0); 1426 rxvt_scrollbar_show(aR_ 0);
1439 } 1427 }
1440#ifdef MENUBAR 1428#ifdef MENUBAR
1441 if (menubar_visible(aR) && isMenuBarWindow(ev->xany.window)) 1429 if (menubar_visible(aR) && isMenuBarWindow(ev->xany.window))
1442 rxvt_menubar_expose(aR); 1430 rxvt_menubar_expose(aR);
… …
1555 */ 1543 */
1556 if (ev->window == R->TermWin.vt) 1544 if (ev->window == R->TermWin.vt)
1557 { 1545 {
1558#if RXVT_GRAPHICS 1546#if RXVT_GRAPHICS
1559 if (ev->subwindow != None) 1547 if (ev->subwindow != None)
1560 rxvt_Gr_ButtonPress(ev->x, ev->y); 1548 rxvt_Gr_ButtonPress (ev->x, ev->y);
1561 else 1549 else
1562#endif 1550#endif
1563 { 1551 {
1564 clickintime = ev->time - R->MEvent.time < MULTICLICK_TIME; 1552 clickintime = ev->time - R->MEvent.time < MULTICLICK_TIME;
1565 if (reportmode) 1553 if (reportmode)
… …
1627/* 1615/*
1628 * Scrollbar window processing of button press 1616 * Scrollbar window processing of button press
1629 */ 1617 */
1630 if (isScrollbarWindow(ev->window)) 1618 if (isScrollbarWindow(ev->window))
1631 { 1619 {
1632 scrollbar_setIdle(); 1620 R->scrollBar.setIdle ();
1633 /* 1621 /*
1634 * Rxvt-style scrollbar: 1622 * Rxvt-style scrollbar:
1635 * move up if mouse is above slider 1623 * move up if mouse is above slider
1636 * move dn if mouse is below slider 1624 * move dn if mouse is below slider
1637 * 1625 *
… …
1690#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1678#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1691 R->scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1679 R->scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY;
1692#endif 1680#endif
1693 if (rxvt_scr_page(aR_ upordown < 0 ? UP : DN, 1)) { 1681 if (rxvt_scr_page(aR_ upordown < 0 ? UP : DN, 1)) {
1694 if (upordown < 0) 1682 if (upordown < 0)
1695 scrollbar_setUp(); 1683 R->scrollBar.setUp ();
1696 else 1684 else
1697 scrollbar_setDn(); 1685 R->scrollBar.setDn ();
1698 } 1686 }
1699 } else 1687 } else
1700 switch (ev->button) { 1688 switch (ev->button) {
1701 case Button2: 1689 case Button2:
1702 switch (R->scrollbar_align) { 1690 switch (R->scrollbar_align) {
… …
1714 || scrollbar_above_slider(ev->y) 1702 || scrollbar_above_slider(ev->y)
1715 || scrollbar_below_slider(ev->y)) 1703 || scrollbar_below_slider(ev->y))
1716 rxvt_scr_move_to(aR_ 1704 rxvt_scr_move_to(aR_
1717 scrollbar_position(ev->y) - R->csrO, 1705 scrollbar_position(ev->y) - R->csrO,
1718 scrollbar_size()); 1706 scrollbar_size());
1719 scrollbar_setMotion(); 1707 R->scrollBar.setMotion ();
1720 break; 1708 break;
1721 1709
1722 case Button1: 1710 case Button1:
1723 if (R->scrollbar_align == R_SB_ALIGN_CENTRE) 1711 if (R->scrollbar_align == R_SB_ALIGN_CENTRE)
1724 R->csrO = ev->y - R->scrollBar.top; 1712 R->csrO = ev->y - R->scrollBar.top;
… …
1737 rxvt_scr_page(aR_ DN, R->TermWin.nrow - 1); 1725 rxvt_scr_page(aR_ DN, R->TermWin.nrow - 1);
1738# else 1726# else
1739 rxvt_scr_page(aR_ DN, R->TermWin.nrow / 4); 1727 rxvt_scr_page(aR_ DN, R->TermWin.nrow / 4);
1740# endif 1728# endif
1741 else 1729 else
1742 scrollbar_setMotion(); 1730 R->scrollBar.setMotion ();
1743 } else { 1731 } else {
1744 rxvt_scr_page(aR_ (ev->button == Button1 ? DN : UP), 1732 rxvt_scr_page(aR_ (ev->button == Button1 ? DN : UP),
1745 (R->TermWin.nrow 1733 (R->TermWin.nrow
1746 * scrollbar_position(ev->y) 1734 * scrollbar_position(ev->y)
1747 / scrollbar_size())); 1735 / scrollbar_size()));
… …
1769 R->csrO = 0; /* reset csr Offset */ 1757 R->csrO = 0; /* reset csr Offset */
1770 if (!R->bypass_keystate) 1758 if (!R->bypass_keystate)
1771 reportmode = !!(R->PrivateModes & PrivMode_mouse_report); 1759 reportmode = !!(R->PrivateModes & PrivMode_mouse_report);
1772 1760
1773 if (scrollbar_isUpDn()) { 1761 if (scrollbar_isUpDn()) {
1774 scrollbar_setIdle(); 1762 R->scrollBar.setIdle ();
1775 rxvt_scrollbar_show(aR_ 0); 1763 rxvt_scrollbar_show(aR_ 0);
1776#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1764#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1777 R->refresh_type &= ~SMOOTH_REFRESH; 1765 R->refresh_type &= ~SMOOTH_REFRESH;
1778#endif 1766#endif
1779 } 1767 }
… …
1830 break; 1818 break;
1831#ifdef MOUSE_WHEEL 1819#ifdef MOUSE_WHEEL
1832 case Button4: 1820 case Button4:
1833 case Button5: 1821 case Button5:
1834 { 1822 {
1835 int i, v; 1823 int i;
1824 page_dirn v;
1836 1825
1837 v = (ev->button == Button4) ? UP : DN; 1826 v = (ev->button == Button4) ? UP : DN;
1838 if (ev->state & ShiftMask) 1827 if (ev->state & ShiftMask)
1839 i = 1; 1828 i = 1;
1840 else if ((R->Options & Opt_mouseWheelScrollPage)) 1829 else if ((R->Options & Opt_mouseWheelScrollPage))
… …
2015 n = 0; 2004 n = 0;
2016 if (pchanged) { 2005 if (pchanged) {
2017 for (; n < (unsigned int)i; n++) { 2006 for (; n < (unsigned int)i; n++) {
2018 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[n], &wattr); 2007 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[n], &wattr);
2019 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"));
2020 if (wattr.depth != rootdepth || wattr.class == InputOnly) { 2009 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) {
2021 n = (int)(sizeof(R->TermWin.parent) / sizeof(Window)) + 1; 2010 n = (int)(sizeof(R->TermWin.parent) / sizeof(Window)) + 1;
2022 break; 2011 break;
2023 } 2012 }
2024 } 2013 }
2025 } 2014 }
… …
3373 } 3362 }
3374 3363
3375 if ((cmd == 'T') && (nargs >= 5)) { 3364 if ((cmd == 'T') && (nargs >= 5)) {
3376 int i, len = args[4]; 3365 int i, len = args[4];
3377 3366
3378 text = rxvt_malloc((len + 1) * sizeof(char)); 3367 text = (unsigned char *)rxvt_malloc((len + 1) * sizeof(char));
3379 3368
3380 if (text != NULL) { 3369 if (text != NULL) {
3381 for (i = 0; i < len; i++) 3370 for (i = 0; i < len; i++)
3382 text[i] = rxvt_cmd_getc(aR); 3371 text[i] = rxvt_cmd_getc(aR);
3383 text[len] = '\0'; 3372 text[len] = '\0';

Diff Legend

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