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.17 by pcg, Thu Dec 18 00:29:29 2003 UTC vs.
Revision 1.18 by pcg, Thu Dec 18 02:07:12 2003 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: command.c 2 * File: command.c
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: command.C,v 1.17 2003/12/18 00:29:29 pcg Exp $ 4 * $Id: command.C,v 1.18 2003/12/18 02:07:12 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>
1555 */ 1555 */
1556 if (ev->window == R->TermWin.vt) 1556 if (ev->window == R->TermWin.vt)
1557 { 1557 {
1558#if RXVT_GRAPHICS 1558#if RXVT_GRAPHICS
1559 if (ev->subwindow != None) 1559 if (ev->subwindow != None)
1560 rxvt_Gr_ButtonPress(ev->x, ev->y); 1560 rxvt_Gr_ButtonPress (ev->x, ev->y);
1561 else 1561 else
1562#endif 1562#endif
1563 { 1563 {
1564 clickintime = ev->time - R->MEvent.time < MULTICLICK_TIME; 1564 clickintime = ev->time - R->MEvent.time < MULTICLICK_TIME;
1565 if (reportmode) 1565 if (reportmode)
1830 break; 1830 break;
1831#ifdef MOUSE_WHEEL 1831#ifdef MOUSE_WHEEL
1832 case Button4: 1832 case Button4:
1833 case Button5: 1833 case Button5:
1834 { 1834 {
1835 int i, v; 1835 int i;
1836 page_dirn v;
1836 1837
1837 v = (ev->button == Button4) ? UP : DN; 1838 v = (ev->button == Button4) ? UP : DN;
1838 if (ev->state & ShiftMask) 1839 if (ev->state & ShiftMask)
1839 i = 1; 1840 i = 1;
1840 else if ((R->Options & Opt_mouseWheelScrollPage)) 1841 else if ((R->Options & Opt_mouseWheelScrollPage))
2015 n = 0; 2016 n = 0;
2016 if (pchanged) { 2017 if (pchanged) {
2017 for (; n < (unsigned int)i; n++) { 2018 for (; n < (unsigned int)i; n++) {
2018 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[n], &wattr); 2019 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[n], &wattr);
2019 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"));
2020 if (wattr.depth != rootdepth || wattr.class == InputOnly) { 2021 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) {
2021 n = (int)(sizeof(R->TermWin.parent) / sizeof(Window)) + 1; 2022 n = (int)(sizeof(R->TermWin.parent) / sizeof(Window)) + 1;
2022 break; 2023 break;
2023 } 2024 }
2024 } 2025 }
2025 } 2026 }
3373 } 3374 }
3374 3375
3375 if ((cmd == 'T') && (nargs >= 5)) { 3376 if ((cmd == 'T') && (nargs >= 5)) {
3376 int i, len = args[4]; 3377 int i, len = args[4];
3377 3378
3378 text = rxvt_malloc((len + 1) * sizeof(char)); 3379 text = (unsigned char *)rxvt_malloc((len + 1) * sizeof(char));
3379 3380
3380 if (text != NULL) { 3381 if (text != NULL) {
3381 for (i = 0; i < len; i++) 3382 for (i = 0; i < len; i++)
3382 text[i] = rxvt_cmd_getc(aR); 3383 text[i] = rxvt_cmd_getc(aR);
3383 text[len] = '\0'; 3384 text[len] = '\0';

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines