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.500 by sf-exg, Thu Nov 24 11:28:51 2011 UTC vs.
Revision 1.504 by sf-exg, Mon Jan 9 21:12:08 2012 UTC

779 len = strlen (kbuf); 779 len = strlen (kbuf);
780 780
781 if (len > 0) 781 if (len > 0)
782 { 782 {
783 /* 783 /*
784 * Pass meta for all function keys, if 'meta' option set
785 */
786#ifdef META8_OPTION
787 if (meta && (meta_char == 0x80))
788 kbuf[len - 1] |= 0x80;
789#endif
790
791 /*
792 * pass Shift/Control indicators for function keys ending with `~' 784 * pass Shift/Control indicators for function keys ending with `~'
793 * 785 *
794 * eg, 786 * eg,
795 * Prior = "ESC[5~" 787 * Prior = "ESC[5~"
796 * Shift+Prior = "ESC[5$" 788 * Shift+Prior = "ESC[5$"
797 * Ctrl+Prior = "ESC[5^" 789 * Ctrl+Prior = "ESC[5^"
798 * Ctrl+Shift+Prior = "ESC[5@" 790 * Ctrl+Shift+Prior = "ESC[5@"
799 */ 791 */
800 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~') 792 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
801 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~')); 793 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
794
795 /*
796 * Pass meta for all function keys, if 'meta' option set
797 */
798#ifdef META8_OPTION
799 if (meta && (meta_char == 0x80))
800 kbuf[len - 1] |= 0x80;
801#endif
802 } 802 }
803 803
804 } 804 }
805 else if (ctrl && keysym == XK_minus) 805 else if (ctrl && keysym == XK_minus)
806 { 806 {
1634 dist = int_bwidth - ev.xbutton.y; 1634 dist = int_bwidth - ev.xbutton.y;
1635 } 1635 }
1636 else 1636 else
1637 { 1637 {
1638 scroll_selection_dir = DN; 1638 scroll_selection_dir = DN;
1639 dist = ev.xbutton.y - (int_bwidth + height); 1639 dist = ev.xbutton.y - (int_bwidth + vt_height);
1640 } 1640 }
1641 1641
1642 scroll_selection_lines = Pixel2Height (dist) 1642 scroll_selection_lines = Pixel2Height (dist)
1643 / SELECTION_SCROLL_LINE_SPEEDUP 1643 / SELECTION_SCROLL_LINE_SPEEDUP
1644 + 1; 1644 + 1;
2163 case Button3: 2163 case Button3:
2164 selection_make (ev.time); 2164 selection_make (ev.time);
2165 break; 2165 break;
2166 2166
2167 case Button2: 2167 case Button2:
2168 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2168 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2169 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2169 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2170 break; 2170 break;
2171 2171
2172#ifdef MOUSE_WHEEL 2172#ifdef MOUSE_WHEEL
2173 case Button4: 2173 case Button4:
3134 break; 3134 break;
3135 3135
3136 //case 9: NYI, TODO, restore maximized window or maximize window 3136 //case 9: NYI, TODO, restore maximized window or maximize window
3137 default: 3137 default:
3138 if (args[0] >= 24) /* set height (chars) */ 3138 if (args[0] >= 24) /* set height (chars) */
3139 set_widthheight ((unsigned int)width, 3139 set_widthheight ((unsigned int)vt_width,
3140 (unsigned int) (args[1] * fheight)); 3140 (unsigned int) (args[1] * fheight));
3141 break; 3141 break;
3142 3142
3143 /* 3143 /*
3144 * reports - some output format copied from XTerm 3144 * reports - some output format copied from XTerm

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines