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.22 by pcg, Thu Dec 18 13:33:02 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.22 2003/12/18 13:33:02 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>
… …
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 }
… …
887 if (refreshnow) 887 if (refreshnow)
888 { 888 {
889 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 889 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
890 refresh_limit++; 890 refresh_limit++;
891 891
892 rxvt_scr_refresh (this, refresh_type); 892 scr_refresh (refresh_type);
893 } 893 }
894 894
895 } 895 }
896 else 896 else
897 { 897 {
… …
995 if (R->pending_scroll_selection) { 995 if (R->pending_scroll_selection) {
996 quick_timeout = 1; 996 quick_timeout = 1;
997 if (!R->scroll_selection_delay-- 997 if (!R->scroll_selection_delay--
998 && rxvt_scr_page(aR_ R->scroll_selection_dir, 998 && rxvt_scr_page(aR_ R->scroll_selection_dir,
999 R->scroll_selection_lines)) { 999 R->scroll_selection_lines)) {
1000 rxvt_selection_extend(aR_ R->selection_save_x, 1000 R->selection_extend (R->selection_save_x,
1001 R->selection_save_y, R->selection_save_state); 1001 R->selection_save_y, R->selection_save_state);
1002 R->scroll_selection_delay = SCROLLBAR_CONTINUOUS_DELAY; 1002 R->scroll_selection_delay = SCROLLBAR_CONTINUOUS_DELAY;
1003 R->refresh_type |= SMOOTH_REFRESH; 1003 R->refresh_type |= SMOOTH_REFRESH;
1004 R->want_refresh = 1; 1004 R->want_refresh = 1;
1005 } 1005 }
… …
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;
… …
1330 D_SIZE((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1330 D_SIZE((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1331 } while (XCheckTypedWindowEvent(R->Xdisplay, ev->xconfigure.window, 1331 } while (XCheckTypedWindowEvent(R->Xdisplay, ev->xconfigure.window,
1332 ConfigureNotify, ev)); 1332 ConfigureNotify, ev));
1333 if (R->szHint.width != width || R->szHint.height != height) { 1333 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)); 1334 D_SIZE((stderr, "Size: Resizing from: %4d x %4d", R->szHint.width, R->szHint.height));
1335 rxvt_resize_all_windows(aR_ (unsigned int)width, 1335 R->resize_all_windows (width, height, 1);
1336 (unsigned int)height, 1);
1337 } 1336 }
1338#ifdef DEBUG_SIZE 1337#ifdef DEBUG_SIZE
1339 else { 1338 else {
1340 D_SIZE((stderr, "Size: Not resizing")); 1339 D_SIZE((stderr, "Size: Not resizing"));
1341 } 1340 }
… …
1400 1399
1401 case GraphicsExpose: 1400 case GraphicsExpose:
1402 case Expose: 1401 case Expose:
1403 if (ev->xany.window == R->TermWin.vt) { 1402 if (ev->xany.window == R->TermWin.vt) {
1404#ifdef NO_SLOW_LINK_SUPPORT 1403#ifdef NO_SLOW_LINK_SUPPORT
1405 rxvt_scr_expose(aR_ ev->xexpose.x, ev->xexpose.y, 1404 R->scr_expose (ev->xexpose.x, ev->xexpose.y,
1406 ev->xexpose.width, ev->xexpose.height, False); 1405 ev->xexpose.width, ev->xexpose.height, False);
1407#else 1406#else
1408 // don't understand this, so commented it out 1407 // don't understand this, so commented it out
1409 rxvt_scr_expose(aR_ ev->xexpose.x, ev->xexpose.y, 1408 R->scr_expose (ev->xexpose.x, ev->xexpose.y,
1410 ev->xexpose.width, ev->xexpose.height, False); 1409 ev->xexpose.width, ev->xexpose.height, False);
1411 //rxvt_scr_expose(aR_ ev->xexpose.x, 0, 1410 //rxvt_scr_expose(aR_ ev->xexpose.x, 0,
1412 // ev->xexpose.width, R->TermWin.height, False); 1411 // ev->xexpose.width, R->TermWin.height, False);
1413#endif 1412#endif
1414 R->want_refresh = 1; 1413 R->want_refresh = 1;
1415 } else { 1414 } else {
… …
1460 &unused_mask); 1459 &unused_mask);
1461#ifdef MOUSE_THRESHOLD 1460#ifdef MOUSE_THRESHOLD
1462 /* deal with a `jumpy' mouse */ 1461 /* deal with a `jumpy' mouse */
1463 if ((ev->xmotion.time - R->MEvent.time) > MOUSE_THRESHOLD) { 1462 if ((ev->xmotion.time - R->MEvent.time) > MOUSE_THRESHOLD) {
1464#endif 1463#endif
1465 rxvt_selection_extend(aR_ (ev->xbutton.x), (ev->xbutton.y), 1464 R->selection_extend ((ev->xbutton.x), (ev->xbutton.y),
1466 (ev->xbutton.state & Button3Mask) ? 2 : 0); 1465 (ev->xbutton.state & Button3Mask) ? 2 : 0);
1467#ifdef SELECTION_SCROLLING 1466#ifdef SELECTION_SCROLLING
1468 if (ev->xbutton.y<R->TermWin.int_bwidth || 1467 if (ev->xbutton.y<R->TermWin.int_bwidth ||
1469 Pixel2Row(ev->xbutton.y)>(R->TermWin.nrow-1)) { 1468 Pixel2Row(ev->xbutton.y)>(R->TermWin.nrow-1)) {
1470 int dist; 1469 int dist;
… …
1519 &unused_root_x, &unused_root_y, 1518 &unused_root_x, &unused_root_y,
1520 &(ev->xbutton.x), &(ev->xbutton.y), 1519 &(ev->xbutton.x), &(ev->xbutton.y),
1521 &unused_mask); 1520 &unused_mask);
1522 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,
1523 scrollbar_size()); 1522 scrollbar_size());
1524 rxvt_scr_refresh(aR_ R->refresh_type); 1523 R->scr_refresh (R->refresh_type);
1525 R->refresh_limit = 0; 1524 R->refresh_limit = 0;
1526 rxvt_scrollbar_show(aR_ 1); 1525 rxvt_scrollbar_show(aR_ 1);
1527 } 1526 }
1528 break; 1527 break;
1529 } 1528 }
… …
1592 case Button1: 1591 case Button1:
1593 /* allow shift+left click to extend selection */ 1592 /* allow shift+left click to extend selection */
1594 if (ev->state & ShiftMask) 1593 if (ev->state & ShiftMask)
1595 { 1594 {
1596 if (R->MEvent.button == Button1 && clickintime) 1595 if (R->MEvent.button == Button1 && clickintime)
1597 rxvt_selection_rotate (aR_ ev->x, ev->y); 1596 R->selection_rotate (ev->x, ev->y);
1598 else 1597 else
1599 rxvt_selection_extend (aR_ ev->x, ev->y, 1); 1598 R->selection_extend (ev->x, ev->y, 1);
1600 } 1599 }
1601 else 1600 else
1602 { 1601 {
1603 if (R->MEvent.button == Button1 && clickintime) 1602 if (R->MEvent.button == Button1 && clickintime)
1604 R->MEvent.clicks++; 1603 R->MEvent.clicks++;
1605 else 1604 else
1606 R->MEvent.clicks = 1; 1605 R->MEvent.clicks = 1;
1607 1606
1608 rxvt_selection_click (aR_ R->MEvent.clicks, ev->x, ev->y); 1607 R->selection_click (R->MEvent.clicks, ev->x, ev->y);
1609 } 1608 }
1610 1609
1611 R->MEvent.button = Button1; 1610 R->MEvent.button = Button1;
1612 break; 1611 break;
1613 1612
1614 case Button3: 1613 case Button3:
1615 if (R->MEvent.button == Button3 && clickintime) 1614 if (R->MEvent.button == Button3 && clickintime)
1616 rxvt_selection_rotate(aR_ ev->x, ev->y); 1615 R->selection_rotate (ev->x, ev->y);
1617 else 1616 else
1618 rxvt_selection_extend(aR_ ev->x, ev->y, 1); 1617 R->selection_extend (ev->x, ev->y, 1);
1619 R->MEvent.button = Button3; 1618 R->MEvent.button = Button3;
1620 break; 1619 break;
1621 } 1620 }
1622 } 1621 }
1623 R->MEvent.time = ev->time; 1622 R->MEvent.time = ev->time;
… …
1817 * when overriding mouse reporting 1816 * when overriding mouse reporting
1818 */ 1817 */
1819 if (R->PrivateModes & PrivMode_mouse_report 1818 if (R->PrivateModes & PrivMode_mouse_report
1820 && R->bypass_keystate 1819 && R->bypass_keystate
1821 && ev->button == Button1 && R->MEvent.clicks <= 1) 1820 && ev->button == Button1 && R->MEvent.clicks <= 1)
1822 rxvt_selection_extend(aR_ ev->x, ev->y, 0); 1821 R->selection_extend (ev->x, ev->y, 0);
1823 1822
1824 switch (ev->button) { 1823 switch (ev->button) {
1825 case Button1: 1824 case Button1:
1826 case Button3: 1825 case Button3:
1827 rxvt_selection_make(aR_ ev->time); 1826 rxvt_selection_make(aR_ ev->time);
… …
1850 R->mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 1849 R->mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY;
1851 } 1850 }
1852# endif 1851# endif
1853# ifdef JUMP_MOUSE_WHEEL 1852# ifdef JUMP_MOUSE_WHEEL
1854 rxvt_scr_page(aR_ v, i); 1853 rxvt_scr_page(aR_ v, i);
1855 rxvt_scr_refresh(aR_ SMOOTH_REFRESH); 1854 R->scr_refresh (SMOOTH_REFRESH);
1856 rxvt_scrollbar_show(aR_ 1); 1855 rxvt_scrollbar_show(aR_ 1);
1857# else 1856# else
1858 for (; i--;) 1857 while (i--)
1859 { 1858 {
1860 rxvt_scr_page(aR_ v, 1); 1859 rxvt_scr_page(aR_ v, 1);
1861 rxvt_scr_refresh(aR_ SMOOTH_REFRESH); 1860 R->scr_refresh (SMOOTH_REFRESH);
1862 rxvt_scrollbar_show(aR_ 1); 1861 rxvt_scrollbar_show(aR_ 1);
1863 } 1862 }
1864# endif 1863# endif
1865 } 1864 }
1866 break; 1865 break;
… …
2220 break; 2219 break;
2221 case 'I': /* cursor up and scroll down if needed */ 2220 case 'I': /* cursor up and scroll down if needed */
2222 rxvt_scr_index(aR_ DN); 2221 rxvt_scr_index(aR_ DN);
2223 break; 2222 break;
2224 case 'J': /* erase to end of screen */ 2223 case 'J': /* erase to end of screen */
2225 rxvt_scr_erase_screen(aR_ 0); 2224 R->scr_erase_screen (0);
2226 break; 2225 break;
2227 case 'K': /* erase to end of line */ 2226 case 'K': /* erase to end of line */
2228 rxvt_scr_erase_line(aR_ 0); 2227 rxvt_scr_erase_line(aR_ 0);
2229 break; 2228 break;
2230 case 'Y': /* move to specified row and col */ 2229 case 'Y': /* move to specified row and col */
… …
2565 case CSI_CHT: /* 8.3.10: (1) CURSOR FORWARD TABULATION */ 2564 case CSI_CHT: /* 8.3.10: (1) CURSOR FORWARD TABULATION */
2566 rxvt_scr_tab(aR_ arg[0]); 2565 rxvt_scr_tab(aR_ arg[0]);
2567 break; 2566 break;
2568 2567
2569 case CSI_ED: /* 8.3.40: (0) ERASE IN PAGE */ 2568 case CSI_ED: /* 8.3.40: (0) ERASE IN PAGE */
2570 rxvt_scr_erase_screen(aR_ arg[0]); 2569 R->scr_erase_screen (arg[0]);
2571 break; 2570 break;
2572 2571
2573 case CSI_EL: /* 8.3.42: (0) ERASE IN LINE */ 2572 case CSI_EL: /* 8.3.42: (0) ERASE IN LINE */
2574 rxvt_scr_erase_line(aR_ arg[0]); 2573 rxvt_scr_erase_line(aR_ arg[0]);
2575 break; 2574 break;
… …
2745 break; 2744 break;
2746 case 6: /* lower window */ 2745 case 6: /* lower window */
2747 XLowerWindow(R->Xdisplay, R->TermWin.parent[0]); 2746 XLowerWindow(R->Xdisplay, R->TermWin.parent[0]);
2748 break; 2747 break;
2749 case 7: /* refresh window */ 2748 case 7: /* refresh window */
2750 rxvt_scr_touch(aR_ True); 2749 R->scr_touch (true);
2751 break; 2750 break;
2752 case 8: /* set size (chars) */ 2751 case 8: /* set size (chars) */
2753 rxvt_set_widthheight(aR_ (unsigned int)(args[2] * R->TermWin.fwidth), 2752 rxvt_set_widthheight(aR_ (unsigned int)(args[2] * R->TermWin.fwidth),
2754 (unsigned int)(args[1] * R->TermWin.fheight)); 2753 (unsigned int)(args[1] * R->TermWin.fheight));
2755 break; 2754 break;
… …
2966 if (*str != ';') { 2965 if (*str != ';') {
2967#if XPM_BACKGROUND 2966#if XPM_BACKGROUND
2968 rxvt_scale_pixmap(aR_ ""); /* reset to default scaling */ 2967 rxvt_scale_pixmap(aR_ ""); /* reset to default scaling */
2969 rxvt_set_bgPixmap(aR_ str); /* change pixmap */ 2968 rxvt_set_bgPixmap(aR_ str); /* change pixmap */
2970#endif 2969#endif
2971 rxvt_scr_touch(aR_ True); 2970 R->scr_touch (true);
2972 } 2971 }
2973 while ((str = STRCHR(str, ';')) != NULL) { 2972 while ((str = STRCHR(str, ';')) != NULL) {
2974 str++; 2973 str++;
2975#if XPM_BACKGROUND 2974#if XPM_BACKGROUND
2976 changed += rxvt_scale_pixmap(aR_ str); 2975 changed += rxvt_scale_pixmap(aR_ str);
… …
2978 } 2977 }
2979 if (changed) { 2978 if (changed) {
2980#ifdef XPM_BACKGROUND 2979#ifdef XPM_BACKGROUND
2981 rxvt_resize_pixmap(aR); 2980 rxvt_resize_pixmap(aR);
2982#endif 2981#endif
2983 rxvt_scr_touch(aR_ True); 2982 R->scr_touch (true);
2984 } 2983 }
2985 break; 2984 break;
2986 2985
2987 case XTerm_restoreFG: 2986 case XTerm_restoreFG:
2988 rxvt_set_window_color(aR_ Color_fg, str); 2987 rxvt_set_window_color(aR_ Color_fg, str);
… …
3154 break; 3153 break;
3155#endif 3154#endif
3156#ifdef scrollBar_esc 3155#ifdef scrollBar_esc
3157 case scrollBar_esc: 3156 case scrollBar_esc:
3158 if (rxvt_scrollbar_mapping(aR_ state)) { 3157 if (rxvt_scrollbar_mapping(aR_ state)) {
3159 rxvt_resize_all_windows(aR_ 0, 0, 0); 3158 R->resize_all_windows (0, 0, 0);
3160 rxvt_scr_touch(aR_ True); 3159 R->scr_touch (true);
3161 } 3160 }
3162 break; 3161 break;
3163#endif 3162#endif
3164 case 25: /* visible/invisible cursor */ 3163 case 25: /* visible/invisible cursor */
3165 rxvt_scr_cursor_visible(aR_ state); 3164 rxvt_scr_cursor_visible(aR_ state);
… …
3191 else 3190 else
3192 R->Options &= ~Opt_scrollTtyKeypress; 3191 R->Options &= ~Opt_scrollTtyKeypress;
3193 break; 3192 break;
3194 case 1047: /* secondary screen w/ clearing */ 3193 case 1047: /* secondary screen w/ clearing */
3195 if (R->current_screen != PRIMARY) 3194 if (R->current_screen != PRIMARY)
3196 rxvt_scr_erase_screen(aR_ 2); 3195 R->scr_erase_screen (2);
3197 rxvt_scr_change_screen(aR_ state); 3196 rxvt_scr_change_screen(aR_ state);
3198 /* FALLTHROUGH */ 3197 /* FALLTHROUGH */
3199 default: 3198 default:
3200 break; 3199 break;
3201 } 3200 }

Diff Legend

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