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.20 by pcg, Thu Dec 18 07:31:18 2003 UTC vs.
Revision 1.27 by pcg, Tue Dec 30 01:35:58 2003 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: command.c 2 * File: command.c
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: command.C,v 1.20 2003/12/18 07:31:18 pcg Exp $ 4 * $Id: command.C,v 1.27 2003/12/30 01:35:58 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>
… …
64 KeySym keysym; 64 KeySym keysym;
65#ifdef DEBUG_CMD 65#ifdef DEBUG_CMD
66 static int debug_key = 1; /* accessible by a debugger only */ 66 static int debug_key = 1; /* accessible by a debugger only */
67#endif 67#endif
68 int valid_keysym; 68 int valid_keysym;
69 unsigned char *kbuf = R->kbuf; 69 unsigned char kbuf[KBUFSZ];
70 70
71/* 71/*
72 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 72 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
73 * escape sequence to toggle the Keypad. 73 * escape sequence to toggle the Keypad.
74 * 74 *
… …
90 if (R->Input_Context) 90 if (R->Input_Context)
91 { 91 {
92 Status status_return; 92 Status status_return;
93 93
94#ifdef X_HAVE_UTF8_STRING 94#ifdef X_HAVE_UTF8_STRING
95 if (R->enc_utf8) 95 if (R->enc_utf8 && 0)
96 len = Xutf8LookupString (R->Input_Context, ev, (char *)kbuf, 96 len = Xutf8LookupString (R->Input_Context, ev, (char *)kbuf,
97 KBUFSZ, &keysym, &status_return); 97 KBUFSZ, &keysym, &status_return);
98 else 98 else
99#endif 99#endif
100 { 100 {
… …
635 for (i = 0, p = kbuf; i < len; i++, p++) 635 for (i = 0, p = kbuf; i < len; i++, p++)
636 fprintf(stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p); 636 fprintf(stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
637 fprintf(stderr, "'\n"); 637 fprintf(stderr, "'\n");
638 } 638 }
639#endif /* DEBUG_CMD */ 639#endif /* DEBUG_CMD */
640 R->tt_write(kbuf, (unsigned int)len); 640 R->tt_write (kbuf, (unsigned int)len);
641} 641}
642/*}}} */ 642/*}}} */
643 643
644#if (MENUBAR_MAX) 644#if (MENUBAR_MAX)
645/*{{{ rxvt_cmd_write(), rxvt_cmd_getc() */ 645/*{{{ rxvt_cmd_write(), rxvt_cmd_getc() */
… …
679{ 679{
680#ifdef TRANSPARENT 680#ifdef TRANSPARENT
681 if (want_full_refresh) 681 if (want_full_refresh)
682 { 682 {
683 want_full_refresh = 0; 683 want_full_refresh = 0;
684 rxvt_scr_clear (this); 684 scr_clear ();
685 rxvt_scr_touch (this, False); 685 scr_touch (false);
686 want_refresh = 1; 686 want_refresh = 1;
687 } 687 }
688#endif 688#endif
689 689
690 if (want_refresh) 690 if (want_refresh)
691 { 691 {
692 rxvt_scr_refresh (this, refresh_type); 692 scr_refresh (refresh_type);
693 rxvt_scrollbar_show (this, 1); 693 rxvt_scrollbar_show (this, 1);
694#ifdef USE_XIM 694#ifdef USE_XIM
695 rxvt_IMSendSpot (this); 695 rxvt_IMSendSpot (this);
696#endif 696#endif
697 } 697 }
698 698
699 XFlush (Xdisplay); 699 XFlush (Xdisplay);
700#if 0
701 if (XPending (Xdisplay)) process_x_events ();
702 if (XPending (Xdisplay)) process_x_events ();
703#endif
704} 700}
705 701
706void 702void
707rxvt_term::check_cb (check_watcher &w) 703rxvt_term::check_cb (check_watcher &w)
708{ 704{
… …
756 rxvt_process_x_event (this, &xev); 752 rxvt_process_x_event (this, &xev);
757 } 753 }
758 while (XPending (Xdisplay)); 754 while (XPending (Xdisplay));
759} 755}
760 756
757#ifdef CURSOR_BLINK
761void 758void
762rxvt_term::blink_cb (time_watcher &w) 759rxvt_term::blink_cb (time_watcher &w)
763{ 760{
764 w.at += BLINK_INTERVAL; 761 w.at += BLINK_INTERVAL;
765 hidden_cursor = !hidden_cursor; 762 hidden_cursor = !hidden_cursor;
766 want_refresh = 1; 763 want_refresh = 1;
767} 764}
765#endif
768 766
769void 767void
770rxvt_term::x_cb (io_watcher &w, short revents) 768rxvt_term::x_cb (io_watcher &w, short revents)
771{ 769{
772 SET_R (this); 770 SET_R (this);
… …
887 if (refreshnow) 885 if (refreshnow)
888 { 886 {
889 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 887 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
890 refresh_limit++; 888 refresh_limit++;
891 889
892 rxvt_scr_refresh (this, refresh_type); 890 scr_refresh (refresh_type);
893 } 891 }
894 892
895 } 893 }
896 else 894 else
897 { 895 {
… …
995 if (R->pending_scroll_selection) { 993 if (R->pending_scroll_selection) {
996 quick_timeout = 1; 994 quick_timeout = 1;
997 if (!R->scroll_selection_delay-- 995 if (!R->scroll_selection_delay--
998 && rxvt_scr_page(aR_ R->scroll_selection_dir, 996 && rxvt_scr_page(aR_ R->scroll_selection_dir,
999 R->scroll_selection_lines)) { 997 R->scroll_selection_lines)) {
1000 rxvt_selection_extend(aR_ R->selection_save_x, 998 R->selection_extend (R->selection_save_x,
1001 R->selection_save_y, R->selection_save_state); 999 R->selection_save_y, R->selection_save_state);
1002 R->scroll_selection_delay = SCROLLBAR_CONTINUOUS_DELAY; 1000 R->scroll_selection_delay = SCROLLBAR_CONTINUOUS_DELAY;
1003 R->refresh_type |= SMOOTH_REFRESH; 1001 R->refresh_type |= SMOOTH_REFRESH;
1004 R->want_refresh = 1; 1002 R->want_refresh = 1;
1005 } 1003 }
… …
1069 int button_number, key_state = 0; 1067 int button_number, key_state = 0;
1070 int x, y; 1068 int x, y;
1071 1069
1072 x = ev->x; 1070 x = ev->x;
1073 y = ev->y; 1071 y = ev->y;
1074 rxvt_pixel_position(aR_ &x, &y); 1072 R->pixel_position (&x, &y);
1075 1073
1076 if (R->MEvent.button == AnyButton) { 1074 if (R->MEvent.button == AnyButton) {
1077 button_number = 3; 1075 button_number = 3;
1078 } else { 1076 } else {
1079 button_number = R->MEvent.button - Button1; 1077 button_number = R->MEvent.button - Button1;
… …
1330 D_SIZE((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1328 D_SIZE((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1331 } while (XCheckTypedWindowEvent(R->Xdisplay, ev->xconfigure.window, 1329 } while (XCheckTypedWindowEvent(R->Xdisplay, ev->xconfigure.window,
1332 ConfigureNotify, ev)); 1330 ConfigureNotify, ev));
1333 if (R->szHint.width != width || R->szHint.height != height) { 1331 if (R->szHint.width != width || R->szHint.height != height) {
1334 D_SIZE((stderr, "Size: Resizing from: %4d x %4d", R->szHint.width, R->szHint.height)); 1332 D_SIZE((stderr, "Size: Resizing from: %4d x %4d", R->szHint.width, R->szHint.height));
1335 rxvt_resize_all_windows(aR_ (unsigned int)width, 1333 R->resize_all_windows (width, height, 1);
1336 (unsigned int)height, 1);
1337 } 1334 }
1338#ifdef DEBUG_SIZE 1335#ifdef DEBUG_SIZE
1339 else { 1336 else {
1340 D_SIZE((stderr, "Size: Not resizing")); 1337 D_SIZE((stderr, "Size: Not resizing"));
1341 } 1338 }
… …
1400 1397
1401 case GraphicsExpose: 1398 case GraphicsExpose:
1402 case Expose: 1399 case Expose:
1403 if (ev->xany.window == R->TermWin.vt) { 1400 if (ev->xany.window == R->TermWin.vt) {
1404#ifdef NO_SLOW_LINK_SUPPORT 1401#ifdef NO_SLOW_LINK_SUPPORT
1405 rxvt_scr_expose(aR_ ev->xexpose.x, ev->xexpose.y, 1402 R->scr_expose (ev->xexpose.x, ev->xexpose.y,
1406 ev->xexpose.width, ev->xexpose.height, False); 1403 ev->xexpose.width, ev->xexpose.height, False);
1407#else 1404#else
1408 // don't understand this, so commented it out 1405 // don't understand this, so commented it out
1409 rxvt_scr_expose(aR_ ev->xexpose.x, ev->xexpose.y, 1406 R->scr_expose (ev->xexpose.x, ev->xexpose.y,
1410 ev->xexpose.width, ev->xexpose.height, False); 1407 ev->xexpose.width, ev->xexpose.height, False);
1411 //rxvt_scr_expose(aR_ ev->xexpose.x, 0, 1408 //rxvt_scr_expose(aR_ ev->xexpose.x, 0,
1412 // ev->xexpose.width, R->TermWin.height, False); 1409 // ev->xexpose.width, R->TermWin.height, False);
1413#endif 1410#endif
1414 R->want_refresh = 1; 1411 R->want_refresh = 1;
1415 } else { 1412 } else {
… …
1460 &unused_mask); 1457 &unused_mask);
1461#ifdef MOUSE_THRESHOLD 1458#ifdef MOUSE_THRESHOLD
1462 /* deal with a `jumpy' mouse */ 1459 /* deal with a `jumpy' mouse */
1463 if ((ev->xmotion.time - R->MEvent.time) > MOUSE_THRESHOLD) { 1460 if ((ev->xmotion.time - R->MEvent.time) > MOUSE_THRESHOLD) {
1464#endif 1461#endif
1465 rxvt_selection_extend(aR_ (ev->xbutton.x), (ev->xbutton.y), 1462 R->selection_extend ((ev->xbutton.x), (ev->xbutton.y),
1466 (ev->xbutton.state & Button3Mask) ? 2 : 0); 1463 (ev->xbutton.state & Button3Mask) ? 2 : 0);
1467#ifdef SELECTION_SCROLLING 1464#ifdef SELECTION_SCROLLING
1468 if (ev->xbutton.y<R->TermWin.int_bwidth || 1465 if (ev->xbutton.y<R->TermWin.int_bwidth ||
1469 Pixel2Row(ev->xbutton.y)>(R->TermWin.nrow-1)) { 1466 Pixel2Row(ev->xbutton.y)>(R->TermWin.nrow-1)) {
1470 int dist; 1467 int dist;
… …
1519 &unused_root_x, &unused_root_y, 1516 &unused_root_x, &unused_root_y,
1520 &(ev->xbutton.x), &(ev->xbutton.y), 1517 &(ev->xbutton.x), &(ev->xbutton.y),
1521 &unused_mask); 1518 &unused_mask);
1522 rxvt_scr_move_to(aR_ scrollbar_position(ev->xbutton.y) - R->csrO, 1519 rxvt_scr_move_to(aR_ scrollbar_position(ev->xbutton.y) - R->csrO,
1523 scrollbar_size()); 1520 scrollbar_size());
1524 rxvt_scr_refresh(aR_ R->refresh_type); 1521 R->scr_refresh (R->refresh_type);
1525 R->refresh_limit = 0; 1522 R->refresh_limit = 0;
1526 rxvt_scrollbar_show(aR_ 1); 1523 rxvt_scrollbar_show(aR_ 1);
1527 } 1524 }
1528 break; 1525 break;
1529 } 1526 }
… …
1531 1528
1532/* INTPROTO */ 1529/* INTPROTO */
1533void 1530void
1534rxvt_button_press(pR_ XButtonEvent *ev) 1531rxvt_button_press(pR_ XButtonEvent *ev)
1535{ 1532{
1536 int reportmode = 0, clickintime; 1533 int reportmode = 0, clickintime;
1537 1534
1538 R->bypass_keystate = ev->state & (R->ModMetaMask | ShiftMask); 1535 R->bypass_keystate = ev->state & (R->ModMetaMask | ShiftMask);
1539 if (!R->bypass_keystate) 1536 if (!R->bypass_keystate)
1540 reportmode = !!(R->PrivateModes & PrivMode_mouse_report); 1537 reportmode = !!(R->PrivateModes & PrivMode_mouse_report);
1541/* 1538/*
… …
1588 if (ev->button != R->MEvent.button) 1585 if (ev->button != R->MEvent.button)
1589 R->MEvent.clicks = 0; 1586 R->MEvent.clicks = 0;
1590 switch (ev->button) 1587 switch (ev->button)
1591 { 1588 {
1592 case Button1: 1589 case Button1:
1590 /* allow shift+left click to extend selection */
1591 if (ev->state & ShiftMask && !(R->PrivateModes & PrivMode_mouse_report))
1592 {
1593 if (R->MEvent.button == Button1 && clickintime) 1593 if (R->MEvent.button == Button1 && clickintime)
1594 R->selection_rotate (ev->x, ev->y);
1594 R->MEvent.clicks++; 1595 else
1596 R->selection_extend (ev->x, ev->y, 1);
1597 }
1595 else 1598 else
1599 {
1600 if (R->MEvent.button == Button1 && clickintime)
1601 R->MEvent.clicks++;
1602 else
1596 R->MEvent.clicks = 1; 1603 R->MEvent.clicks = 1;
1604
1597 rxvt_selection_click(aR_ R->MEvent.clicks, ev->x, ev->y); 1605 R->selection_click (R->MEvent.clicks, ev->x, ev->y);
1606 }
1607
1598 R->MEvent.button = Button1; 1608 R->MEvent.button = Button1;
1599 break; 1609 break;
1600 1610
1601 case Button3: 1611 case Button3:
1602 if (R->MEvent.button == Button3 && clickintime) 1612 if (R->MEvent.button == Button3 && clickintime)
1603 rxvt_selection_rotate(aR_ ev->x, ev->y); 1613 R->selection_rotate (ev->x, ev->y);
1604 else 1614 else
1605 rxvt_selection_extend(aR_ ev->x, ev->y, 1); 1615 R->selection_extend (ev->x, ev->y, 1);
1606 R->MEvent.button = Button3; 1616 R->MEvent.button = Button3;
1607 break; 1617 break;
1608 } 1618 }
1609 } 1619 }
1610 R->MEvent.time = ev->time; 1620 R->MEvent.time = ev->time;
… …
1804 * when overriding mouse reporting 1814 * when overriding mouse reporting
1805 */ 1815 */
1806 if (R->PrivateModes & PrivMode_mouse_report 1816 if (R->PrivateModes & PrivMode_mouse_report
1807 && R->bypass_keystate 1817 && R->bypass_keystate
1808 && ev->button == Button1 && R->MEvent.clicks <= 1) 1818 && ev->button == Button1 && R->MEvent.clicks <= 1)
1809 rxvt_selection_extend(aR_ ev->x, ev->y, 0); 1819 R->selection_extend (ev->x, ev->y, 0);
1810 1820
1811 switch (ev->button) { 1821 switch (ev->button) {
1812 case Button1: 1822 case Button1:
1813 case Button3: 1823 case Button3:
1814 rxvt_selection_make(aR_ ev->time); 1824 rxvt_selection_make(aR_ ev->time);
… …
1837 R->mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 1847 R->mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY;
1838 } 1848 }
1839# endif 1849# endif
1840# ifdef JUMP_MOUSE_WHEEL 1850# ifdef JUMP_MOUSE_WHEEL
1841 rxvt_scr_page(aR_ v, i); 1851 rxvt_scr_page(aR_ v, i);
1842 rxvt_scr_refresh(aR_ SMOOTH_REFRESH); 1852 R->scr_refresh (SMOOTH_REFRESH);
1843 rxvt_scrollbar_show(aR_ 1); 1853 rxvt_scrollbar_show(aR_ 1);
1844# else 1854# else
1845 for (; i--;) 1855 while (i--)
1846 { 1856 {
1847 rxvt_scr_page(aR_ v, 1); 1857 rxvt_scr_page(aR_ v, 1);
1848 rxvt_scr_refresh(aR_ SMOOTH_REFRESH); 1858 R->scr_refresh (SMOOTH_REFRESH);
1849 rxvt_scrollbar_show(aR_ 1); 1859 rxvt_scrollbar_show(aR_ 1);
1850 } 1860 }
1851# endif 1861# endif
1852 } 1862 }
1853 break; 1863 break;
… …
2207 break; 2217 break;
2208 case 'I': /* cursor up and scroll down if needed */ 2218 case 'I': /* cursor up and scroll down if needed */
2209 rxvt_scr_index(aR_ DN); 2219 rxvt_scr_index(aR_ DN);
2210 break; 2220 break;
2211 case 'J': /* erase to end of screen */ 2221 case 'J': /* erase to end of screen */
2212 rxvt_scr_erase_screen(aR_ 0); 2222 R->scr_erase_screen (0);
2213 break; 2223 break;
2214 case 'K': /* erase to end of line */ 2224 case 'K': /* erase to end of line */
2215 rxvt_scr_erase_line(aR_ 0); 2225 rxvt_scr_erase_line(aR_ 0);
2216 break; 2226 break;
2217 case 'Y': /* move to specified row and col */ 2227 case 'Y': /* move to specified row and col */
… …
2552 case CSI_CHT: /* 8.3.10: (1) CURSOR FORWARD TABULATION */ 2562 case CSI_CHT: /* 8.3.10: (1) CURSOR FORWARD TABULATION */
2553 rxvt_scr_tab(aR_ arg[0]); 2563 rxvt_scr_tab(aR_ arg[0]);
2554 break; 2564 break;
2555 2565
2556 case CSI_ED: /* 8.3.40: (0) ERASE IN PAGE */ 2566 case CSI_ED: /* 8.3.40: (0) ERASE IN PAGE */
2557 rxvt_scr_erase_screen(aR_ arg[0]); 2567 R->scr_erase_screen (arg[0]);
2558 break; 2568 break;
2559 2569
2560 case CSI_EL: /* 8.3.42: (0) ERASE IN LINE */ 2570 case CSI_EL: /* 8.3.42: (0) ERASE IN LINE */
2561 rxvt_scr_erase_line(aR_ arg[0]); 2571 rxvt_scr_erase_line(aR_ arg[0]);
2562 break; 2572 break;
… …
2732 break; 2742 break;
2733 case 6: /* lower window */ 2743 case 6: /* lower window */
2734 XLowerWindow(R->Xdisplay, R->TermWin.parent[0]); 2744 XLowerWindow(R->Xdisplay, R->TermWin.parent[0]);
2735 break; 2745 break;
2736 case 7: /* refresh window */ 2746 case 7: /* refresh window */
2737 rxvt_scr_touch(aR_ True); 2747 R->scr_touch (true);
2738 break; 2748 break;
2739 case 8: /* set size (chars) */ 2749 case 8: /* set size (chars) */
2740 rxvt_set_widthheight(aR_ (unsigned int)(args[2] * R->TermWin.fwidth), 2750 rxvt_set_widthheight(aR_ (unsigned int)(args[2] * R->TermWin.fwidth),
2741 (unsigned int)(args[1] * R->TermWin.fheight)); 2751 (unsigned int)(args[1] * R->TermWin.fheight));
2742 break; 2752 break;
… …
2953 if (*str != ';') { 2963 if (*str != ';') {
2954#if XPM_BACKGROUND 2964#if XPM_BACKGROUND
2955 rxvt_scale_pixmap(aR_ ""); /* reset to default scaling */ 2965 rxvt_scale_pixmap(aR_ ""); /* reset to default scaling */
2956 rxvt_set_bgPixmap(aR_ str); /* change pixmap */ 2966 rxvt_set_bgPixmap(aR_ str); /* change pixmap */
2957#endif 2967#endif
2958 rxvt_scr_touch(aR_ True); 2968 R->scr_touch (true);
2959 } 2969 }
2960 while ((str = STRCHR(str, ';')) != NULL) { 2970 while ((str = STRCHR(str, ';')) != NULL) {
2961 str++; 2971 str++;
2962#if XPM_BACKGROUND 2972#if XPM_BACKGROUND
2963 changed += rxvt_scale_pixmap(aR_ str); 2973 changed += rxvt_scale_pixmap(aR_ str);
… …
2965 } 2975 }
2966 if (changed) { 2976 if (changed) {
2967#ifdef XPM_BACKGROUND 2977#ifdef XPM_BACKGROUND
2968 rxvt_resize_pixmap(aR); 2978 rxvt_resize_pixmap(aR);
2969#endif 2979#endif
2970 rxvt_scr_touch(aR_ True); 2980 R->scr_touch (true);
2971 } 2981 }
2972 break; 2982 break;
2973 2983
2974 case XTerm_restoreFG: 2984 case XTerm_restoreFG:
2975 rxvt_set_window_color(aR_ Color_fg, str); 2985 rxvt_set_window_color(aR_ Color_fg, str);
… …
3141 break; 3151 break;
3142#endif 3152#endif
3143#ifdef scrollBar_esc 3153#ifdef scrollBar_esc
3144 case scrollBar_esc: 3154 case scrollBar_esc:
3145 if (rxvt_scrollbar_mapping(aR_ state)) { 3155 if (rxvt_scrollbar_mapping(aR_ state)) {
3146 rxvt_resize_all_windows(aR_ 0, 0, 0); 3156 R->resize_all_windows (0, 0, 0);
3147 rxvt_scr_touch(aR_ True); 3157 R->scr_touch (true);
3148 } 3158 }
3149 break; 3159 break;
3150#endif 3160#endif
3151 case 25: /* visible/invisible cursor */ 3161 case 25: /* visible/invisible cursor */
3152 rxvt_scr_cursor_visible(aR_ state); 3162 rxvt_scr_cursor_visible(aR_ state);
… …
3178 else 3188 else
3179 R->Options &= ~Opt_scrollTtyKeypress; 3189 R->Options &= ~Opt_scrollTtyKeypress;
3180 break; 3190 break;
3181 case 1047: /* secondary screen w/ clearing */ 3191 case 1047: /* secondary screen w/ clearing */
3182 if (R->current_screen != PRIMARY) 3192 if (R->current_screen != PRIMARY)
3183 rxvt_scr_erase_screen(aR_ 2); 3193 R->scr_erase_screen (2);
3184 rxvt_scr_change_screen(aR_ state); 3194 rxvt_scr_change_screen(aR_ state);
3185 /* FALLTHROUGH */ 3195 /* FALLTHROUGH */
3186 default: 3196 default:
3187 break; 3197 break;
3188 } 3198 }

Diff Legend

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