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.14 by pcg, Mon Dec 8 23:14:40 2003 UTC vs.
Revision 1.23 by pcg, Thu Dec 18 14:11:47 2003 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: command.c 2 * File: command.c
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: command.C,v 1.14 2003/12/08 23:14:40 pcg Exp $ 4 * $Id: command.C,v 1.23 2003/12/18 14:11:47 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 && 0)
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 {
… …
609 for (i = 0, p = kbuf; i < len; i++, p++) 635 for (i = 0, p = kbuf; i < len; i++, p++)
610 fprintf(stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p); 636 fprintf(stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
611 fprintf(stderr, "'\n"); 637 fprintf(stderr, "'\n");
612 } 638 }
613#endif /* DEBUG_CMD */ 639#endif /* DEBUG_CMD */
614 R->tt_write(kbuf, (unsigned int)len); 640 R->tt_write (kbuf, (unsigned int)len);
615} 641}
616/*}}} */ 642/*}}} */
617 643
618#if (MENUBAR_MAX) 644#if (MENUBAR_MAX)
619/*{{{ rxvt_cmd_write(), rxvt_cmd_getc() */ 645/*{{{ rxvt_cmd_write(), rxvt_cmd_getc() */
… …
653{ 679{
654#ifdef TRANSPARENT 680#ifdef TRANSPARENT
655 if (want_full_refresh) 681 if (want_full_refresh)
656 { 682 {
657 want_full_refresh = 0; 683 want_full_refresh = 0;
658 rxvt_scr_clear (this); 684 scr_clear ();
659 rxvt_scr_touch (this, False); 685 scr_touch (false);
660 want_refresh = 1; 686 want_refresh = 1;
661 } 687 }
662#endif 688#endif
663 689
664 if (want_refresh) 690 if (want_refresh)
665 { 691 {
666 rxvt_scr_refresh (this, refresh_type); 692 scr_refresh (refresh_type);
667 rxvt_scrollbar_show (this, 1); 693 rxvt_scrollbar_show (this, 1);
668#ifdef USE_XIM 694#ifdef USE_XIM
669 rxvt_IMSendSpot (this); 695 rxvt_IMSendSpot (this);
670#endif 696#endif
671 } 697 }
… …
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 {
… …
860 if (refreshnow) 887 if (refreshnow)
861 { 888 {
862 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 889 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
863 refresh_limit++; 890 refresh_limit++;
864 891
865 rxvt_scr_refresh (this, refresh_type); 892 scr_refresh (refresh_type);
866 } 893 }
867 894
868 } 895 }
869 else 896 else
870 { 897 {
… …
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
… …
996 if (R->pending_scroll_selection) { 995 if (R->pending_scroll_selection) {
997 quick_timeout = 1; 996 quick_timeout = 1;
998 if (!R->scroll_selection_delay-- 997 if (!R->scroll_selection_delay--
999 && rxvt_scr_page(aR_ R->scroll_selection_dir, 998 && rxvt_scr_page(aR_ R->scroll_selection_dir,
1000 R->scroll_selection_lines)) { 999 R->scroll_selection_lines)) {
1001 rxvt_selection_extend(aR_ R->selection_save_x, 1000 R->selection_extend (R->selection_save_x,
1002 R->selection_save_y, R->selection_save_state); 1001 R->selection_save_y, R->selection_save_state);
1003 R->scroll_selection_delay = SCROLLBAR_CONTINUOUS_DELAY; 1002 R->scroll_selection_delay = SCROLLBAR_CONTINUOUS_DELAY;
1004 R->refresh_type |= SMOOTH_REFRESH; 1003 R->refresh_type |= SMOOTH_REFRESH;
1005 R->want_refresh = 1; 1004 R->want_refresh = 1;
1006 } 1005 }
… …
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
… …
1069 int button_number, key_state = 0; 1069 int button_number, key_state = 0;
1070 int x, y; 1070 int x, y;
1071 1071
1072 x = ev->x; 1072 x = ev->x;
1073 y = ev->y; 1073 y = ev->y;
1074 rxvt_pixel_position(aR_ &x, &y); 1074 R->pixel_position (&x, &y);
1075 1075
1076 if (R->MEvent.button == AnyButton) { 1076 if (R->MEvent.button == AnyButton) {
1077 button_number = 3; 1077 button_number = 3;
1078 } else { 1078 } else {
1079 button_number = R->MEvent.button - Button1; 1079 button_number = R->MEvent.button - Button1;
… …
1146{ 1146{
1147 int i, want_timeout; 1147 int i, want_timeout;
1148 Window unused_root, unused_child; 1148 Window unused_root, unused_child;
1149 int unused_root_x, unused_root_y; 1149 int unused_root_x, unused_root_y;
1150 unsigned int unused_mask; 1150 unsigned int unused_mask;
1151 struct timeval tp;
1152 1151
1153#ifdef DEBUG_X 1152#ifdef DEBUG_X
1154 const char *const eventnames[] = 1153 const char *const eventnames[] =
1155 { /* mason - this matches my system */ 1154 { /* mason - this matches my system */
1156 "", 1155 "",
… …
1187 "SelectionNotify", 1186 "SelectionNotify",
1188 "ColormapNotify", 1187 "ColormapNotify",
1189 "ClientMessage", 1188 "ClientMessage",
1190 "MappingNotify" 1189 "MappingNotify"
1191 }; 1190 };
1191#endif
1192
1193#ifdef DEBUG_X
1194 struct timeval tp;
1192 struct tm *ltt; 1195 struct tm *ltt;
1193#endif
1194
1195 /*
1196 * check if we need to get the time for any timeouts
1197 */
1198
1199 for (i = NUM_TIMEOUTS; i--; )
1200 if (R->timeout[i].tv_sec) {
1201 want_timeout = 1;
1202 break;
1203 }
1204
1205#ifndef DEBUG_X
1206 if (want_timeout)
1207#endif
1208 (void)gettimeofday(&tp, NULL); 1196 (void)gettimeofday(&tp, NULL);
1209
1210#ifdef DEBUG_X
1211 ltt = localtime(&(tp.tv_sec)); 1197 ltt = localtime(&(tp.tv_sec));
1212 D_X((stderr, "Event: %-16s %-7s %08lx (%4d-%02d-%02d %02d:%02d:%02d.%.6ld) %s %lu", eventnames[ev->type], (ev->xany.window == R->TermWin.parent[0] ? "parent" : (ev->xany.window == R->TermWin.vt ? "vt" : (ev->xany.window == R->scrollBar.win ? "scroll" : (ev->xany.window == R->menuBar.win ? "menubar" : "UNKNOWN")))), (ev->xany.window == R->TermWin.parent[0] ? R->TermWin.parent[0] : (ev->xany.window == R->TermWin.vt ? R->TermWin.vt : (ev->xany.window == R->scrollBar.win ? R->scrollBar.win : (ev->xany.window == R->menuBar.win ? R->menuBar.win : 0)))), ltt->tm_year + 1900, ltt->tm_mon + 1, ltt->tm_mday, ltt->tm_hour, ltt->tm_min, ltt->tm_sec, tp.tv_usec, ev->xany.send_event ? "S" : " ", ev->xany.serial)); 1198 D_X((stderr, "Event: %-16s %-7s %08lx (%4d-%02d-%02d %02d:%02d:%02d.%.6ld) %s %lu", eventnames[ev->type], (ev->xany.window == R->TermWin.parent[0] ? "parent" : (ev->xany.window == R->TermWin.vt ? "vt" : (ev->xany.window == R->scrollBar.win ? "scroll" : (ev->xany.window == R->menuBar.win ? "menubar" : "UNKNOWN")))), (ev->xany.window == R->TermWin.parent[0] ? R->TermWin.parent[0] : (ev->xany.window == R->TermWin.vt ? R->TermWin.vt : (ev->xany.window == R->scrollBar.win ? R->scrollBar.win : (ev->xany.window == R->menuBar.win ? R->menuBar.win : 0)))), ltt->tm_year + 1900, ltt->tm_mon + 1, ltt->tm_mday, ltt->tm_hour, ltt->tm_min, ltt->tm_sec, tp.tv_usec, ev->xany.send_event ? "S" : " ", ev->xany.serial));
1213#endif 1199#endif
1214
1215 /* X event timeouts */
1216 if (want_timeout)
1217 for (i = NUM_TIMEOUTS; i--; ) {
1218 if (R->timeout[i].tv_sec == 0)
1219 continue;
1220 if ((tp.tv_sec < R->timeout[i].tv_sec)
1221 || (tp.tv_sec == R->timeout[i].tv_sec
1222 && tp.tv_usec < R->timeout[i].tv_usec))
1223 continue;
1224 R->timeout[i].tv_sec = 0;
1225 switch(i) {
1226 case TIMEOUT_INCR:
1227 rxvt_print_error("data loss: timeout on INCR selection paste");
1228 R->selection_wait = Sel_none;
1229 break;
1230 default:
1231 break;
1232 }
1233 }
1234 1200
1235 switch (ev->type) { 1201 switch (ev->type) {
1236 case KeyPress: 1202 case KeyPress:
1237 rxvt_lookup_key(aR_ (XKeyEvent *)ev); 1203 rxvt_lookup_key(aR_ (XKeyEvent *)ev);
1238 break; 1204 break;
… …
1364 D_SIZE((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1330 D_SIZE((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1365 } while (XCheckTypedWindowEvent(R->Xdisplay, ev->xconfigure.window, 1331 } while (XCheckTypedWindowEvent(R->Xdisplay, ev->xconfigure.window,
1366 ConfigureNotify, ev)); 1332 ConfigureNotify, ev));
1367 if (R->szHint.width != width || R->szHint.height != height) { 1333 if (R->szHint.width != width || R->szHint.height != height) {
1368 D_SIZE((stderr, "Size: Resizing from: %4d x %4d", R->szHint.width, R->szHint.height)); 1334 D_SIZE((stderr, "Size: Resizing from: %4d x %4d", R->szHint.width, R->szHint.height));
1369 rxvt_resize_all_windows(aR_ (unsigned int)width, 1335 R->resize_all_windows (width, height, 1);
1370 (unsigned int)height, 1);
1371 } 1336 }
1372#ifdef DEBUG_SIZE 1337#ifdef DEBUG_SIZE
1373 else { 1338 else {
1374 D_SIZE((stderr, "Size: Not resizing")); 1339 D_SIZE((stderr, "Size: Not resizing"));
1375 } 1340 }
… …
1434 1399
1435 case GraphicsExpose: 1400 case GraphicsExpose:
1436 case Expose: 1401 case Expose:
1437 if (ev->xany.window == R->TermWin.vt) { 1402 if (ev->xany.window == R->TermWin.vt) {
1438#ifdef NO_SLOW_LINK_SUPPORT 1403#ifdef NO_SLOW_LINK_SUPPORT
1439 rxvt_scr_expose(aR_ ev->xexpose.x, ev->xexpose.y, 1404 R->scr_expose (ev->xexpose.x, ev->xexpose.y,
1440 ev->xexpose.width, ev->xexpose.height, False); 1405 ev->xexpose.width, ev->xexpose.height, False);
1441#else 1406#else
1442 // don't understand this, so commented it out 1407 // don't understand this, so commented it out
1443 rxvt_scr_expose(aR_ ev->xexpose.x, ev->xexpose.y, 1408 R->scr_expose (ev->xexpose.x, ev->xexpose.y,
1444 ev->xexpose.width, ev->xexpose.height, False); 1409 ev->xexpose.width, ev->xexpose.height, False);
1445 //rxvt_scr_expose(aR_ ev->xexpose.x, 0, 1410 //rxvt_scr_expose(aR_ ev->xexpose.x, 0,
1446 // ev->xexpose.width, R->TermWin.height, False); 1411 // ev->xexpose.width, R->TermWin.height, False);
1447#endif 1412#endif
1448 R->want_refresh = 1; 1413 R->want_refresh = 1;
1449 } else { 1414 } else {
… …
1454 &unused_xevent)) ; 1419 &unused_xevent)) ;
1455 while (XCheckTypedWindowEvent(R->Xdisplay, ev->xany.window, 1420 while (XCheckTypedWindowEvent(R->Xdisplay, ev->xany.window,
1456 GraphicsExpose, 1421 GraphicsExpose,
1457 &unused_xevent)) ; 1422 &unused_xevent)) ;
1458 if (isScrollbarWindow(ev->xany.window)) { 1423 if (isScrollbarWindow(ev->xany.window)) {
1459 scrollbar_setIdle(); 1424 R->scrollBar.setIdle();
1460 rxvt_scrollbar_show(aR_ 0); 1425 rxvt_scrollbar_show(aR_ 0);
1461 } 1426 }
1462#ifdef MENUBAR 1427#ifdef MENUBAR
1463 if (menubar_visible(aR) && isMenuBarWindow(ev->xany.window)) 1428 if (menubar_visible(aR) && isMenuBarWindow(ev->xany.window))
1464 rxvt_menubar_expose(aR); 1429 rxvt_menubar_expose(aR);
… …
1494 &unused_mask); 1459 &unused_mask);
1495#ifdef MOUSE_THRESHOLD 1460#ifdef MOUSE_THRESHOLD
1496 /* deal with a `jumpy' mouse */ 1461 /* deal with a `jumpy' mouse */
1497 if ((ev->xmotion.time - R->MEvent.time) > MOUSE_THRESHOLD) { 1462 if ((ev->xmotion.time - R->MEvent.time) > MOUSE_THRESHOLD) {
1498#endif 1463#endif
1499 rxvt_selection_extend(aR_ (ev->xbutton.x), (ev->xbutton.y), 1464 R->selection_extend ((ev->xbutton.x), (ev->xbutton.y),
1500 (ev->xbutton.state & Button3Mask) ? 2 : 0); 1465 (ev->xbutton.state & Button3Mask) ? 2 : 0);
1501#ifdef SELECTION_SCROLLING 1466#ifdef SELECTION_SCROLLING
1502 if (ev->xbutton.y<R->TermWin.int_bwidth || 1467 if (ev->xbutton.y<R->TermWin.int_bwidth ||
1503 Pixel2Row(ev->xbutton.y)>(R->TermWin.nrow-1)) { 1468 Pixel2Row(ev->xbutton.y)>(R->TermWin.nrow-1)) {
1504 int dist; 1469 int dist;
… …
1553 &unused_root_x, &unused_root_y, 1518 &unused_root_x, &unused_root_y,
1554 &(ev->xbutton.x), &(ev->xbutton.y), 1519 &(ev->xbutton.x), &(ev->xbutton.y),
1555 &unused_mask); 1520 &unused_mask);
1556 rxvt_scr_move_to(aR_ scrollbar_position(ev->xbutton.y) - R->csrO, 1521 rxvt_scr_move_to(aR_ scrollbar_position(ev->xbutton.y) - R->csrO,
1557 scrollbar_size()); 1522 scrollbar_size());
1558 rxvt_scr_refresh(aR_ R->refresh_type); 1523 R->scr_refresh (R->refresh_type);
1559 R->refresh_limit = 0; 1524 R->refresh_limit = 0;
1560 rxvt_scrollbar_show(aR_ 1); 1525 rxvt_scrollbar_show(aR_ 1);
1561 } 1526 }
1562 break; 1527 break;
1563 } 1528 }
… …
1577 */ 1542 */
1578 if (ev->window == R->TermWin.vt) 1543 if (ev->window == R->TermWin.vt)
1579 { 1544 {
1580#if RXVT_GRAPHICS 1545#if RXVT_GRAPHICS
1581 if (ev->subwindow != None) 1546 if (ev->subwindow != None)
1582 rxvt_Gr_ButtonPress(ev->x, ev->y); 1547 rxvt_Gr_ButtonPress (ev->x, ev->y);
1583 else 1548 else
1584#endif 1549#endif
1585 { 1550 {
1586 clickintime = ev->time - R->MEvent.time < MULTICLICK_TIME; 1551 clickintime = ev->time - R->MEvent.time < MULTICLICK_TIME;
1587 if (reportmode) 1552 if (reportmode)
… …
1622 if (ev->button != R->MEvent.button) 1587 if (ev->button != R->MEvent.button)
1623 R->MEvent.clicks = 0; 1588 R->MEvent.clicks = 0;
1624 switch (ev->button) 1589 switch (ev->button)
1625 { 1590 {
1626 case Button1: 1591 case Button1:
1592 /* allow shift+left click to extend selection */
1593 if (ev->state & ShiftMask)
1594 {
1627 if (R->MEvent.button == Button1 && clickintime) 1595 if (R->MEvent.button == Button1 && clickintime)
1596 R->selection_rotate (ev->x, ev->y);
1628 R->MEvent.clicks++; 1597 else
1598 R->selection_extend (ev->x, ev->y, 1);
1599 }
1629 else 1600 else
1601 {
1602 if (R->MEvent.button == Button1 && clickintime)
1603 R->MEvent.clicks++;
1604 else
1630 R->MEvent.clicks = 1; 1605 R->MEvent.clicks = 1;
1606
1631 rxvt_selection_click(aR_ R->MEvent.clicks, ev->x, ev->y); 1607 R->selection_click (R->MEvent.clicks, ev->x, ev->y);
1608 }
1609
1632 R->MEvent.button = Button1; 1610 R->MEvent.button = Button1;
1633 break; 1611 break;
1634 1612
1635 case Button3: 1613 case Button3:
1636 if (R->MEvent.button == Button3 && clickintime) 1614 if (R->MEvent.button == Button3 && clickintime)
1637 rxvt_selection_rotate(aR_ ev->x, ev->y); 1615 R->selection_rotate (ev->x, ev->y);
1638 else 1616 else
1639 rxvt_selection_extend(aR_ ev->x, ev->y, 1); 1617 R->selection_extend (ev->x, ev->y, 1);
1640 R->MEvent.button = Button3; 1618 R->MEvent.button = Button3;
1641 break; 1619 break;
1642 } 1620 }
1643 } 1621 }
1644 R->MEvent.time = ev->time; 1622 R->MEvent.time = ev->time;
… …
1649/* 1627/*
1650 * Scrollbar window processing of button press 1628 * Scrollbar window processing of button press
1651 */ 1629 */
1652 if (isScrollbarWindow(ev->window)) 1630 if (isScrollbarWindow(ev->window))
1653 { 1631 {
1654 scrollbar_setIdle(); 1632 R->scrollBar.setIdle ();
1655 /* 1633 /*
1656 * Rxvt-style scrollbar: 1634 * Rxvt-style scrollbar:
1657 * move up if mouse is above slider 1635 * move up if mouse is above slider
1658 * move dn if mouse is below slider 1636 * move dn if mouse is below slider
1659 * 1637 *
… …
1712#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1690#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1713 R->scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1691 R->scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY;
1714#endif 1692#endif
1715 if (rxvt_scr_page(aR_ upordown < 0 ? UP : DN, 1)) { 1693 if (rxvt_scr_page(aR_ upordown < 0 ? UP : DN, 1)) {
1716 if (upordown < 0) 1694 if (upordown < 0)
1717 scrollbar_setUp(); 1695 R->scrollBar.setUp ();
1718 else 1696 else
1719 scrollbar_setDn(); 1697 R->scrollBar.setDn ();
1720 } 1698 }
1721 } else 1699 } else
1722 switch (ev->button) { 1700 switch (ev->button) {
1723 case Button2: 1701 case Button2:
1724 switch (R->scrollbar_align) { 1702 switch (R->scrollbar_align) {
… …
1736 || scrollbar_above_slider(ev->y) 1714 || scrollbar_above_slider(ev->y)
1737 || scrollbar_below_slider(ev->y)) 1715 || scrollbar_below_slider(ev->y))
1738 rxvt_scr_move_to(aR_ 1716 rxvt_scr_move_to(aR_
1739 scrollbar_position(ev->y) - R->csrO, 1717 scrollbar_position(ev->y) - R->csrO,
1740 scrollbar_size()); 1718 scrollbar_size());
1741 scrollbar_setMotion(); 1719 R->scrollBar.setMotion ();
1742 break; 1720 break;
1743 1721
1744 case Button1: 1722 case Button1:
1745 if (R->scrollbar_align == R_SB_ALIGN_CENTRE) 1723 if (R->scrollbar_align == R_SB_ALIGN_CENTRE)
1746 R->csrO = ev->y - R->scrollBar.top; 1724 R->csrO = ev->y - R->scrollBar.top;
… …
1759 rxvt_scr_page(aR_ DN, R->TermWin.nrow - 1); 1737 rxvt_scr_page(aR_ DN, R->TermWin.nrow - 1);
1760# else 1738# else
1761 rxvt_scr_page(aR_ DN, R->TermWin.nrow / 4); 1739 rxvt_scr_page(aR_ DN, R->TermWin.nrow / 4);
1762# endif 1740# endif
1763 else 1741 else
1764 scrollbar_setMotion(); 1742 R->scrollBar.setMotion ();
1765 } else { 1743 } else {
1766 rxvt_scr_page(aR_ (ev->button == Button1 ? DN : UP), 1744 rxvt_scr_page(aR_ (ev->button == Button1 ? DN : UP),
1767 (R->TermWin.nrow 1745 (R->TermWin.nrow
1768 * scrollbar_position(ev->y) 1746 * scrollbar_position(ev->y)
1769 / scrollbar_size())); 1747 / scrollbar_size()));
… …
1791 R->csrO = 0; /* reset csr Offset */ 1769 R->csrO = 0; /* reset csr Offset */
1792 if (!R->bypass_keystate) 1770 if (!R->bypass_keystate)
1793 reportmode = !!(R->PrivateModes & PrivMode_mouse_report); 1771 reportmode = !!(R->PrivateModes & PrivMode_mouse_report);
1794 1772
1795 if (scrollbar_isUpDn()) { 1773 if (scrollbar_isUpDn()) {
1796 scrollbar_setIdle(); 1774 R->scrollBar.setIdle ();
1797 rxvt_scrollbar_show(aR_ 0); 1775 rxvt_scrollbar_show(aR_ 0);
1798#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1776#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1799 R->refresh_type &= ~SMOOTH_REFRESH; 1777 R->refresh_type &= ~SMOOTH_REFRESH;
1800#endif 1778#endif
1801 } 1779 }
… …
1838 * when overriding mouse reporting 1816 * when overriding mouse reporting
1839 */ 1817 */
1840 if (R->PrivateModes & PrivMode_mouse_report 1818 if (R->PrivateModes & PrivMode_mouse_report
1841 && R->bypass_keystate 1819 && R->bypass_keystate
1842 && ev->button == Button1 && R->MEvent.clicks <= 1) 1820 && ev->button == Button1 && R->MEvent.clicks <= 1)
1843 rxvt_selection_extend(aR_ ev->x, ev->y, 0); 1821 R->selection_extend (ev->x, ev->y, 0);
1844 1822
1845 switch (ev->button) { 1823 switch (ev->button) {
1846 case Button1: 1824 case Button1:
1847 case Button3: 1825 case Button3:
1848 rxvt_selection_make(aR_ ev->time); 1826 rxvt_selection_make(aR_ ev->time);
… …
1852 break; 1830 break;
1853#ifdef MOUSE_WHEEL 1831#ifdef MOUSE_WHEEL
1854 case Button4: 1832 case Button4:
1855 case Button5: 1833 case Button5:
1856 { 1834 {
1857 int i, v; 1835 int i;
1836 page_dirn v;
1858 1837
1859 v = (ev->button == Button4) ? UP : DN; 1838 v = (ev->button == Button4) ? UP : DN;
1860 if (ev->state & ShiftMask) 1839 if (ev->state & ShiftMask)
1861 i = 1; 1840 i = 1;
1862 else if ((R->Options & Opt_mouseWheelScrollPage)) 1841 else if ((R->Options & Opt_mouseWheelScrollPage))
… …
1870 R->mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 1849 R->mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY;
1871 } 1850 }
1872# endif 1851# endif
1873# ifdef JUMP_MOUSE_WHEEL 1852# ifdef JUMP_MOUSE_WHEEL
1874 rxvt_scr_page(aR_ v, i); 1853 rxvt_scr_page(aR_ v, i);
1875 rxvt_scr_refresh(aR_ SMOOTH_REFRESH); 1854 R->scr_refresh (SMOOTH_REFRESH);
1876 rxvt_scrollbar_show(aR_ 1); 1855 rxvt_scrollbar_show(aR_ 1);
1877# else 1856# else
1878 for (; i--;) 1857 while (i--)
1879 { 1858 {
1880 rxvt_scr_page(aR_ v, 1); 1859 rxvt_scr_page(aR_ v, 1);
1881 rxvt_scr_refresh(aR_ SMOOTH_REFRESH); 1860 R->scr_refresh (SMOOTH_REFRESH);
1882 rxvt_scrollbar_show(aR_ 1); 1861 rxvt_scrollbar_show(aR_ 1);
1883 } 1862 }
1884# endif 1863# endif
1885 } 1864 }
1886 break; 1865 break;
… …
2037 n = 0; 2016 n = 0;
2038 if (pchanged) { 2017 if (pchanged) {
2039 for (; n < (unsigned int)i; n++) { 2018 for (; n < (unsigned int)i; n++) {
2040 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[n], &wattr); 2019 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[n], &wattr);
2041 D_X((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL")); 2020 D_X((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2042 if (wattr.depth != rootdepth || wattr.class == InputOnly) { 2021 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) {
2043 n = (int)(sizeof(R->TermWin.parent) / sizeof(Window)) + 1; 2022 n = (int)(sizeof(R->TermWin.parent) / sizeof(Window)) + 1;
2044 break; 2023 break;
2045 } 2024 }
2046 } 2025 }
2047 } 2026 }
… …
2240 break; 2219 break;
2241 case 'I': /* cursor up and scroll down if needed */ 2220 case 'I': /* cursor up and scroll down if needed */
2242 rxvt_scr_index(aR_ DN); 2221 rxvt_scr_index(aR_ DN);
2243 break; 2222 break;
2244 case 'J': /* erase to end of screen */ 2223 case 'J': /* erase to end of screen */
2245 rxvt_scr_erase_screen(aR_ 0); 2224 R->scr_erase_screen (0);
2246 break; 2225 break;
2247 case 'K': /* erase to end of line */ 2226 case 'K': /* erase to end of line */
2248 rxvt_scr_erase_line(aR_ 0); 2227 rxvt_scr_erase_line(aR_ 0);
2249 break; 2228 break;
2250 case 'Y': /* move to specified row and col */ 2229 case 'Y': /* move to specified row and col */
… …
2585 case CSI_CHT: /* 8.3.10: (1) CURSOR FORWARD TABULATION */ 2564 case CSI_CHT: /* 8.3.10: (1) CURSOR FORWARD TABULATION */
2586 rxvt_scr_tab(aR_ arg[0]); 2565 rxvt_scr_tab(aR_ arg[0]);
2587 break; 2566 break;
2588 2567
2589 case CSI_ED: /* 8.3.40: (0) ERASE IN PAGE */ 2568 case CSI_ED: /* 8.3.40: (0) ERASE IN PAGE */
2590 rxvt_scr_erase_screen(aR_ arg[0]); 2569 R->scr_erase_screen (arg[0]);
2591 break; 2570 break;
2592 2571
2593 case CSI_EL: /* 8.3.42: (0) ERASE IN LINE */ 2572 case CSI_EL: /* 8.3.42: (0) ERASE IN LINE */
2594 rxvt_scr_erase_line(aR_ arg[0]); 2573 rxvt_scr_erase_line(aR_ arg[0]);
2595 break; 2574 break;
… …
2616 2595
2617 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 2596 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2618 arg[0] = -arg[0]; 2597 arg[0] = -arg[0];
2619 /* FALLTHROUGH */ 2598 /* FALLTHROUGH */
2620 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2599 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2621 rxvt_scroll_text(aR_ R->screen.tscroll, R->screen.bscroll, arg[0], 0); 2600 R->scr_scroll_text (R->screen.tscroll, R->screen.bscroll, arg[0], 0);
2622 break; 2601 break;
2623 2602
2624 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2603 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2625 R->tt_write((const unsigned char *)VT100_ANS, 2604 R->tt_write((const unsigned char *)VT100_ANS,
2626 (unsigned int)(sizeof(VT100_ANS) - 1)); 2605 (unsigned int)(sizeof(VT100_ANS) - 1));
… …
2765 break; 2744 break;
2766 case 6: /* lower window */ 2745 case 6: /* lower window */
2767 XLowerWindow(R->Xdisplay, R->TermWin.parent[0]); 2746 XLowerWindow(R->Xdisplay, R->TermWin.parent[0]);
2768 break; 2747 break;
2769 case 7: /* refresh window */ 2748 case 7: /* refresh window */
2770 rxvt_scr_touch(aR_ True); 2749 R->scr_touch (true);
2771 break; 2750 break;
2772 case 8: /* set size (chars) */ 2751 case 8: /* set size (chars) */
2773 rxvt_set_widthheight(aR_ (unsigned int)(args[2] * R->TermWin.fwidth), 2752 rxvt_set_widthheight(aR_ (unsigned int)(args[2] * R->TermWin.fwidth),
2774 (unsigned int)(args[1] * R->TermWin.fheight)); 2753 (unsigned int)(args[1] * R->TermWin.fheight));
2775 break; 2754 break;
… …
2986 if (*str != ';') { 2965 if (*str != ';') {
2987#if XPM_BACKGROUND 2966#if XPM_BACKGROUND
2988 rxvt_scale_pixmap(aR_ ""); /* reset to default scaling */ 2967 rxvt_scale_pixmap(aR_ ""); /* reset to default scaling */
2989 rxvt_set_bgPixmap(aR_ str); /* change pixmap */ 2968 rxvt_set_bgPixmap(aR_ str); /* change pixmap */
2990#endif 2969#endif
2991 rxvt_scr_touch(aR_ True); 2970 R->scr_touch (true);
2992 } 2971 }
2993 while ((str = STRCHR(str, ';')) != NULL) { 2972 while ((str = STRCHR(str, ';')) != NULL) {
2994 str++; 2973 str++;
2995#if XPM_BACKGROUND 2974#if XPM_BACKGROUND
2996 changed += rxvt_scale_pixmap(aR_ str); 2975 changed += rxvt_scale_pixmap(aR_ str);
… …
2998 } 2977 }
2999 if (changed) { 2978 if (changed) {
3000#ifdef XPM_BACKGROUND 2979#ifdef XPM_BACKGROUND
3001 rxvt_resize_pixmap(aR); 2980 rxvt_resize_pixmap(aR);
3002#endif 2981#endif
3003 rxvt_scr_touch(aR_ True); 2982 R->scr_touch (true);
3004 } 2983 }
3005 break; 2984 break;
3006 2985
3007 case XTerm_restoreFG: 2986 case XTerm_restoreFG:
3008 rxvt_set_window_color(aR_ Color_fg, str); 2987 rxvt_set_window_color(aR_ Color_fg, str);
… …
3174 break; 3153 break;
3175#endif 3154#endif
3176#ifdef scrollBar_esc 3155#ifdef scrollBar_esc
3177 case scrollBar_esc: 3156 case scrollBar_esc:
3178 if (rxvt_scrollbar_mapping(aR_ state)) { 3157 if (rxvt_scrollbar_mapping(aR_ state)) {
3179 rxvt_resize_all_windows(aR_ 0, 0, 0); 3158 R->resize_all_windows (0, 0, 0);
3180 rxvt_scr_touch(aR_ True); 3159 R->scr_touch (true);
3181 } 3160 }
3182 break; 3161 break;
3183#endif 3162#endif
3184 case 25: /* visible/invisible cursor */ 3163 case 25: /* visible/invisible cursor */
3185 rxvt_scr_cursor_visible(aR_ state); 3164 rxvt_scr_cursor_visible(aR_ state);
… …
3211 else 3190 else
3212 R->Options &= ~Opt_scrollTtyKeypress; 3191 R->Options &= ~Opt_scrollTtyKeypress;
3213 break; 3192 break;
3214 case 1047: /* secondary screen w/ clearing */ 3193 case 1047: /* secondary screen w/ clearing */
3215 if (R->current_screen != PRIMARY) 3194 if (R->current_screen != PRIMARY)
3216 rxvt_scr_erase_screen(aR_ 2); 3195 R->scr_erase_screen (2);
3217 rxvt_scr_change_screen(aR_ state); 3196 rxvt_scr_change_screen(aR_ state);
3218 /* FALLTHROUGH */ 3197 /* FALLTHROUGH */
3219 default: 3198 default:
3220 break; 3199 break;
3221 } 3200 }
… …
3395 } 3374 }
3396 3375
3397 if ((cmd == 'T') && (nargs >= 5)) { 3376 if ((cmd == 'T') && (nargs >= 5)) {
3398 int i, len = args[4]; 3377 int i, len = args[4];
3399 3378
3400 text = rxvt_malloc((len + 1) * sizeof(char)); 3379 text = (unsigned char *)rxvt_malloc((len + 1) * sizeof(char));
3401 3380
3402 if (text != NULL) { 3381 if (text != NULL) {
3403 for (i = 0; i < len; i++) 3382 for (i = 0; i < len; i++)
3404 text[i] = rxvt_cmd_getc(aR); 3383 text[i] = rxvt_cmd_getc(aR);
3405 text[len] = '\0'; 3384 text[len] = '\0';

Diff Legend

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