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.21 by pcg, Thu Dec 18 08:06:46 2003 UTC vs.
Revision 1.26 by pcg, Wed Dec 24 06:26:52 2003 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: command.c 2 * File: command.c
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: command.C,v 1.21 2003/12/18 08:06:46 pcg Exp $ 4 * $Id: command.C,v 1.26 2003/12/24 06:26:52 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{
… …
887 if (refreshnow) 883 if (refreshnow)
888 { 884 {
889 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 885 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
890 refresh_limit++; 886 refresh_limit++;
891 887
892 rxvt_scr_refresh (this, refresh_type); 888 scr_refresh (refresh_type);
893 } 889 }
894 890
895 } 891 }
896 else 892 else
897 { 893 {
… …
995 if (R->pending_scroll_selection) { 991 if (R->pending_scroll_selection) {
996 quick_timeout = 1; 992 quick_timeout = 1;
997 if (!R->scroll_selection_delay-- 993 if (!R->scroll_selection_delay--
998 && rxvt_scr_page(aR_ R->scroll_selection_dir, 994 && rxvt_scr_page(aR_ R->scroll_selection_dir,
999 R->scroll_selection_lines)) { 995 R->scroll_selection_lines)) {
1000 rxvt_selection_extend(aR_ R->selection_save_x, 996 R->selection_extend (R->selection_save_x,
1001 R->selection_save_y, R->selection_save_state); 997 R->selection_save_y, R->selection_save_state);
1002 R->scroll_selection_delay = SCROLLBAR_CONTINUOUS_DELAY; 998 R->scroll_selection_delay = SCROLLBAR_CONTINUOUS_DELAY;
1003 R->refresh_type |= SMOOTH_REFRESH; 999 R->refresh_type |= SMOOTH_REFRESH;
1004 R->want_refresh = 1; 1000 R->want_refresh = 1;
1005 } 1001 }
… …
1069 int button_number, key_state = 0; 1065 int button_number, key_state = 0;
1070 int x, y; 1066 int x, y;
1071 1067
1072 x = ev->x; 1068 x = ev->x;
1073 y = ev->y; 1069 y = ev->y;
1074 rxvt_pixel_position(aR_ &x, &y); 1070 R->pixel_position (&x, &y);
1075 1071
1076 if (R->MEvent.button == AnyButton) { 1072 if (R->MEvent.button == AnyButton) {
1077 button_number = 3; 1073 button_number = 3;
1078 } else { 1074 } else {
1079 button_number = R->MEvent.button - Button1; 1075 button_number = R->MEvent.button - Button1;
… …
1330 D_SIZE((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1326 D_SIZE((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1331 } while (XCheckTypedWindowEvent(R->Xdisplay, ev->xconfigure.window, 1327 } while (XCheckTypedWindowEvent(R->Xdisplay, ev->xconfigure.window,
1332 ConfigureNotify, ev)); 1328 ConfigureNotify, ev));
1333 if (R->szHint.width != width || R->szHint.height != height) { 1329 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)); 1330 D_SIZE((stderr, "Size: Resizing from: %4d x %4d", R->szHint.width, R->szHint.height));
1335 rxvt_resize_all_windows(aR_ (unsigned int)width, 1331 R->resize_all_windows (width, height, 1);
1336 (unsigned int)height, 1);
1337 } 1332 }
1338#ifdef DEBUG_SIZE 1333#ifdef DEBUG_SIZE
1339 else { 1334 else {
1340 D_SIZE((stderr, "Size: Not resizing")); 1335 D_SIZE((stderr, "Size: Not resizing"));
1341 } 1336 }
… …
1400 1395
1401 case GraphicsExpose: 1396 case GraphicsExpose:
1402 case Expose: 1397 case Expose:
1403 if (ev->xany.window == R->TermWin.vt) { 1398 if (ev->xany.window == R->TermWin.vt) {
1404#ifdef NO_SLOW_LINK_SUPPORT 1399#ifdef NO_SLOW_LINK_SUPPORT
1405 rxvt_scr_expose(aR_ ev->xexpose.x, ev->xexpose.y, 1400 R->scr_expose (ev->xexpose.x, ev->xexpose.y,
1406 ev->xexpose.width, ev->xexpose.height, False); 1401 ev->xexpose.width, ev->xexpose.height, False);
1407#else 1402#else
1408 // don't understand this, so commented it out 1403 // don't understand this, so commented it out
1409 rxvt_scr_expose(aR_ ev->xexpose.x, ev->xexpose.y, 1404 R->scr_expose (ev->xexpose.x, ev->xexpose.y,
1410 ev->xexpose.width, ev->xexpose.height, False); 1405 ev->xexpose.width, ev->xexpose.height, False);
1411 //rxvt_scr_expose(aR_ ev->xexpose.x, 0, 1406 //rxvt_scr_expose(aR_ ev->xexpose.x, 0,
1412 // ev->xexpose.width, R->TermWin.height, False); 1407 // ev->xexpose.width, R->TermWin.height, False);
1413#endif 1408#endif
1414 R->want_refresh = 1; 1409 R->want_refresh = 1;
1415 } else { 1410 } else {
… …
1460 &unused_mask); 1455 &unused_mask);
1461#ifdef MOUSE_THRESHOLD 1456#ifdef MOUSE_THRESHOLD
1462 /* deal with a `jumpy' mouse */ 1457 /* deal with a `jumpy' mouse */
1463 if ((ev->xmotion.time - R->MEvent.time) > MOUSE_THRESHOLD) { 1458 if ((ev->xmotion.time - R->MEvent.time) > MOUSE_THRESHOLD) {
1464#endif 1459#endif
1465 rxvt_selection_extend(aR_ (ev->xbutton.x), (ev->xbutton.y), 1460 R->selection_extend ((ev->xbutton.x), (ev->xbutton.y),
1466 (ev->xbutton.state & Button3Mask) ? 2 : 0); 1461 (ev->xbutton.state & Button3Mask) ? 2 : 0);
1467#ifdef SELECTION_SCROLLING 1462#ifdef SELECTION_SCROLLING
1468 if (ev->xbutton.y<R->TermWin.int_bwidth || 1463 if (ev->xbutton.y<R->TermWin.int_bwidth ||
1469 Pixel2Row(ev->xbutton.y)>(R->TermWin.nrow-1)) { 1464 Pixel2Row(ev->xbutton.y)>(R->TermWin.nrow-1)) {
1470 int dist; 1465 int dist;
… …
1519 &unused_root_x, &unused_root_y, 1514 &unused_root_x, &unused_root_y,
1520 &(ev->xbutton.x), &(ev->xbutton.y), 1515 &(ev->xbutton.x), &(ev->xbutton.y),
1521 &unused_mask); 1516 &unused_mask);
1522 rxvt_scr_move_to(aR_ scrollbar_position(ev->xbutton.y) - R->csrO, 1517 rxvt_scr_move_to(aR_ scrollbar_position(ev->xbutton.y) - R->csrO,
1523 scrollbar_size()); 1518 scrollbar_size());
1524 rxvt_scr_refresh(aR_ R->refresh_type); 1519 R->scr_refresh (R->refresh_type);
1525 R->refresh_limit = 0; 1520 R->refresh_limit = 0;
1526 rxvt_scrollbar_show(aR_ 1); 1521 rxvt_scrollbar_show(aR_ 1);
1527 } 1522 }
1528 break; 1523 break;
1529 } 1524 }
… …
1531 1526
1532/* INTPROTO */ 1527/* INTPROTO */
1533void 1528void
1534rxvt_button_press(pR_ XButtonEvent *ev) 1529rxvt_button_press(pR_ XButtonEvent *ev)
1535{ 1530{
1536 int reportmode = 0, clickintime; 1531 int reportmode = 0, clickintime;
1537 1532
1538 R->bypass_keystate = ev->state & (R->ModMetaMask | ShiftMask); 1533 R->bypass_keystate = ev->state & (R->ModMetaMask | ShiftMask);
1539 if (!R->bypass_keystate) 1534 if (!R->bypass_keystate)
1540 reportmode = !!(R->PrivateModes & PrivMode_mouse_report); 1535 reportmode = !!(R->PrivateModes & PrivMode_mouse_report);
1541/* 1536/*
… …
1589 R->MEvent.clicks = 0; 1584 R->MEvent.clicks = 0;
1590 switch (ev->button) 1585 switch (ev->button)
1591 { 1586 {
1592 case Button1: 1587 case Button1:
1593 /* allow shift+left click to extend selection */ 1588 /* allow shift+left click to extend selection */
1594 if (ev->state & ShiftMask) 1589 if (ev->state & ShiftMask && !(R->PrivateModes & PrivMode_mouse_report))
1595 { 1590 {
1596 if (R->MEvent.button == Button1 && clickintime) 1591 if (R->MEvent.button == Button1 && clickintime)
1597 rxvt_selection_rotate (aR_ ev->x, ev->y); 1592 R->selection_rotate (ev->x, ev->y);
1598 else 1593 else
1599 rxvt_selection_extend (aR_ ev->x, ev->y, 1); 1594 R->selection_extend (ev->x, ev->y, 1);
1600 } 1595 }
1601 else 1596 else
1602 { 1597 {
1603 if (R->MEvent.button == Button1 && clickintime) 1598 if (R->MEvent.button == Button1 && clickintime)
1604 R->MEvent.clicks++; 1599 R->MEvent.clicks++;
1605 else 1600 else
1606 R->MEvent.clicks = 1; 1601 R->MEvent.clicks = 1;
1607 1602
1608 rxvt_selection_click (aR_ R->MEvent.clicks, ev->x, ev->y); 1603 R->selection_click (R->MEvent.clicks, ev->x, ev->y);
1609 } 1604 }
1610 1605
1611 R->MEvent.button = Button1; 1606 R->MEvent.button = Button1;
1612 break; 1607 break;
1613 1608
1614 case Button3: 1609 case Button3:
1615 if (R->MEvent.button == Button3 && clickintime) 1610 if (R->MEvent.button == Button3 && clickintime)
1616 rxvt_selection_rotate(aR_ ev->x, ev->y); 1611 R->selection_rotate (ev->x, ev->y);
1617 else 1612 else
1618 rxvt_selection_extend(aR_ ev->x, ev->y, 1); 1613 R->selection_extend (ev->x, ev->y, 1);
1619 R->MEvent.button = Button3; 1614 R->MEvent.button = Button3;
1620 break; 1615 break;
1621 } 1616 }
1622 } 1617 }
1623 R->MEvent.time = ev->time; 1618 R->MEvent.time = ev->time;
… …
1817 * when overriding mouse reporting 1812 * when overriding mouse reporting
1818 */ 1813 */
1819 if (R->PrivateModes & PrivMode_mouse_report 1814 if (R->PrivateModes & PrivMode_mouse_report
1820 && R->bypass_keystate 1815 && R->bypass_keystate
1821 && ev->button == Button1 && R->MEvent.clicks <= 1) 1816 && ev->button == Button1 && R->MEvent.clicks <= 1)
1822 rxvt_selection_extend(aR_ ev->x, ev->y, 0); 1817 R->selection_extend (ev->x, ev->y, 0);
1823 1818
1824 switch (ev->button) { 1819 switch (ev->button) {
1825 case Button1: 1820 case Button1:
1826 case Button3: 1821 case Button3:
1827 rxvt_selection_make(aR_ ev->time); 1822 rxvt_selection_make(aR_ ev->time);
… …
1850 R->mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 1845 R->mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY;
1851 } 1846 }
1852# endif 1847# endif
1853# ifdef JUMP_MOUSE_WHEEL 1848# ifdef JUMP_MOUSE_WHEEL
1854 rxvt_scr_page(aR_ v, i); 1849 rxvt_scr_page(aR_ v, i);
1855 rxvt_scr_refresh(aR_ SMOOTH_REFRESH); 1850 R->scr_refresh (SMOOTH_REFRESH);
1856 rxvt_scrollbar_show(aR_ 1); 1851 rxvt_scrollbar_show(aR_ 1);
1857# else 1852# else
1858 for (; i--;) 1853 while (i--)
1859 { 1854 {
1860 rxvt_scr_page(aR_ v, 1); 1855 rxvt_scr_page(aR_ v, 1);
1861 rxvt_scr_refresh(aR_ SMOOTH_REFRESH); 1856 R->scr_refresh (SMOOTH_REFRESH);
1862 rxvt_scrollbar_show(aR_ 1); 1857 rxvt_scrollbar_show(aR_ 1);
1863 } 1858 }
1864# endif 1859# endif
1865 } 1860 }
1866 break; 1861 break;
… …
2220 break; 2215 break;
2221 case 'I': /* cursor up and scroll down if needed */ 2216 case 'I': /* cursor up and scroll down if needed */
2222 rxvt_scr_index(aR_ DN); 2217 rxvt_scr_index(aR_ DN);
2223 break; 2218 break;
2224 case 'J': /* erase to end of screen */ 2219 case 'J': /* erase to end of screen */
2225 rxvt_scr_erase_screen(aR_ 0); 2220 R->scr_erase_screen (0);
2226 break; 2221 break;
2227 case 'K': /* erase to end of line */ 2222 case 'K': /* erase to end of line */
2228 rxvt_scr_erase_line(aR_ 0); 2223 rxvt_scr_erase_line(aR_ 0);
2229 break; 2224 break;
2230 case 'Y': /* move to specified row and col */ 2225 case 'Y': /* move to specified row and col */
… …
2565 case CSI_CHT: /* 8.3.10: (1) CURSOR FORWARD TABULATION */ 2560 case CSI_CHT: /* 8.3.10: (1) CURSOR FORWARD TABULATION */
2566 rxvt_scr_tab(aR_ arg[0]); 2561 rxvt_scr_tab(aR_ arg[0]);
2567 break; 2562 break;
2568 2563
2569 case CSI_ED: /* 8.3.40: (0) ERASE IN PAGE */ 2564 case CSI_ED: /* 8.3.40: (0) ERASE IN PAGE */
2570 rxvt_scr_erase_screen(aR_ arg[0]); 2565 R->scr_erase_screen (arg[0]);
2571 break; 2566 break;
2572 2567
2573 case CSI_EL: /* 8.3.42: (0) ERASE IN LINE */ 2568 case CSI_EL: /* 8.3.42: (0) ERASE IN LINE */
2574 rxvt_scr_erase_line(aR_ arg[0]); 2569 rxvt_scr_erase_line(aR_ arg[0]);
2575 break; 2570 break;
… …
2745 break; 2740 break;
2746 case 6: /* lower window */ 2741 case 6: /* lower window */
2747 XLowerWindow(R->Xdisplay, R->TermWin.parent[0]); 2742 XLowerWindow(R->Xdisplay, R->TermWin.parent[0]);
2748 break; 2743 break;
2749 case 7: /* refresh window */ 2744 case 7: /* refresh window */
2750 rxvt_scr_touch(aR_ True); 2745 R->scr_touch (true);
2751 break; 2746 break;
2752 case 8: /* set size (chars) */ 2747 case 8: /* set size (chars) */
2753 rxvt_set_widthheight(aR_ (unsigned int)(args[2] * R->TermWin.fwidth), 2748 rxvt_set_widthheight(aR_ (unsigned int)(args[2] * R->TermWin.fwidth),
2754 (unsigned int)(args[1] * R->TermWin.fheight)); 2749 (unsigned int)(args[1] * R->TermWin.fheight));
2755 break; 2750 break;
… …
2966 if (*str != ';') { 2961 if (*str != ';') {
2967#if XPM_BACKGROUND 2962#if XPM_BACKGROUND
2968 rxvt_scale_pixmap(aR_ ""); /* reset to default scaling */ 2963 rxvt_scale_pixmap(aR_ ""); /* reset to default scaling */
2969 rxvt_set_bgPixmap(aR_ str); /* change pixmap */ 2964 rxvt_set_bgPixmap(aR_ str); /* change pixmap */
2970#endif 2965#endif
2971 rxvt_scr_touch(aR_ True); 2966 R->scr_touch (true);
2972 } 2967 }
2973 while ((str = STRCHR(str, ';')) != NULL) { 2968 while ((str = STRCHR(str, ';')) != NULL) {
2974 str++; 2969 str++;
2975#if XPM_BACKGROUND 2970#if XPM_BACKGROUND
2976 changed += rxvt_scale_pixmap(aR_ str); 2971 changed += rxvt_scale_pixmap(aR_ str);
… …
2978 } 2973 }
2979 if (changed) { 2974 if (changed) {
2980#ifdef XPM_BACKGROUND 2975#ifdef XPM_BACKGROUND
2981 rxvt_resize_pixmap(aR); 2976 rxvt_resize_pixmap(aR);
2982#endif 2977#endif
2983 rxvt_scr_touch(aR_ True); 2978 R->scr_touch (true);
2984 } 2979 }
2985 break; 2980 break;
2986 2981
2987 case XTerm_restoreFG: 2982 case XTerm_restoreFG:
2988 rxvt_set_window_color(aR_ Color_fg, str); 2983 rxvt_set_window_color(aR_ Color_fg, str);
… …
3154 break; 3149 break;
3155#endif 3150#endif
3156#ifdef scrollBar_esc 3151#ifdef scrollBar_esc
3157 case scrollBar_esc: 3152 case scrollBar_esc:
3158 if (rxvt_scrollbar_mapping(aR_ state)) { 3153 if (rxvt_scrollbar_mapping(aR_ state)) {
3159 rxvt_resize_all_windows(aR_ 0, 0, 0); 3154 R->resize_all_windows (0, 0, 0);
3160 rxvt_scr_touch(aR_ True); 3155 R->scr_touch (true);
3161 } 3156 }
3162 break; 3157 break;
3163#endif 3158#endif
3164 case 25: /* visible/invisible cursor */ 3159 case 25: /* visible/invisible cursor */
3165 rxvt_scr_cursor_visible(aR_ state); 3160 rxvt_scr_cursor_visible(aR_ state);
… …
3191 else 3186 else
3192 R->Options &= ~Opt_scrollTtyKeypress; 3187 R->Options &= ~Opt_scrollTtyKeypress;
3193 break; 3188 break;
3194 case 1047: /* secondary screen w/ clearing */ 3189 case 1047: /* secondary screen w/ clearing */
3195 if (R->current_screen != PRIMARY) 3190 if (R->current_screen != PRIMARY)
3196 rxvt_scr_erase_screen(aR_ 2); 3191 R->scr_erase_screen (2);
3197 rxvt_scr_change_screen(aR_ state); 3192 rxvt_scr_change_screen(aR_ state);
3198 /* FALLTHROUGH */ 3193 /* FALLTHROUGH */
3199 default: 3194 default:
3200 break; 3195 break;
3201 } 3196 }

Diff Legend

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