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.208 by root, Sun Dec 18 00:59:42 2005 UTC vs.
Revision 1.214 by root, Thu Dec 22 21:56:19 2005 UTC

… …
135rxvt_term::iso14755_54 (int x, int y) 135rxvt_term::iso14755_54 (int x, int y)
136{ 136{
137 x = Pixel2Col (x); 137 x = Pixel2Col (x);
138 y = Pixel2Row (y); 138 y = Pixel2Row (y);
139 139
140 if (x < 0 || x >= ncol 140 if (!IN_RANGE_EXC (x, 0, ncol)
141 || y < 0 || y >= nrow) 141 || !IN_RANGE_EXC (y, 0, nrow))
142 return; 142 return;
143 143
144 for (;;) 144 for (;;)
145 { 145 {
146 const line_t &l = save[y + saveLines - view_start]; 146 const line_t &l = ROW(y - view_start);
147 147
148 text_t t = l.t[x]; 148 text_t t = l.t[x];
149 149
150 if (t != NOCHAR || !x) 150 if (t != NOCHAR || !x)
151 { 151 {
… …
154 break; 154 break;
155 } 155 }
156 156
157 x--; 157 x--;
158 } 158 }
159
160} 159}
161#endif 160#endif
162 161
163#if ENABLE_OVERLAY 162#if ENABLE_OVERLAY
164void 163void
… …
1035{ 1034{
1036 if (mouse_slip_wheel_speed == 0 1035 if (mouse_slip_wheel_speed == 0
1037 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1036 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1038 : scr_page (UP, mouse_slip_wheel_speed)) 1037 : scr_page (UP, mouse_slip_wheel_speed))
1039 { 1038 {
1040 if (view_start == nscrolled || 1039 if (view_start == nsaved ||
1041 view_start == 0) 1040 view_start == 0)
1042 mouse_slip_wheel_speed = 0; 1041 mouse_slip_wheel_speed = 0;
1043 1042
1044 refresh_type |= SMOOTH_REFRESH; 1043 refresh_type |= SMOOTH_REFRESH;
1045 want_refresh = 1; 1044 want_refresh = 1;
… …
1068 if (n > 0) 1067 if (n > 0)
1069 { 1068 {
1070 cmdbuf_endp += n; 1069 cmdbuf_endp += n;
1071 return true; 1070 return true;
1072 } 1071 }
1073 else if (n < 0 && errno != EAGAIN) 1072 else if (n < 0 && errno != EAGAIN && errno != EINTR)
1074 destroy (); 1073 pty_ev.stop ();
1075 1074
1076 return false; 1075 return false;
1077} 1076}
1078 1077
1079void 1078void
… …
1601 } 1600 }
1602 1601
1603 scroll_selection_lines = Pixel2Height (dist) 1602 scroll_selection_lines = Pixel2Height (dist)
1604 / SELECTION_SCROLL_LINE_SPEEDUP 1603 / SELECTION_SCROLL_LINE_SPEEDUP
1605 + 1; 1604 + 1;
1606 MIN_IT (scroll_selection_lines, 1605 min_it (scroll_selection_lines,
1607 SELECTION_SCROLL_MAX_LINES); 1606 SELECTION_SCROLL_MAX_LINES);
1608 } 1607 }
1609 else 1608 else
1610 { 1609 {
1611 /* we are within the text window, so we 1610 /* we are within the text window, so we
… …
2452 nh += sy; 2451 nh += sy;
2453 ny = -sy; 2452 ny = -sy;
2454 sy = 0; 2453 sy = 0;
2455 } 2454 }
2456 2455
2457 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2456 min_it (nw, (unsigned int) (wrootattr.width - sx));
2458 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2457 min_it (nh, (unsigned int) (wrootattr.height - sy));
2459 2458
2460 XSync (disp, False); 2459 XSync (disp, False);
2461 allowedxerror = -1; 2460 allowedxerror = -1;
2462 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2461 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2463 2462
… …
3352 3351
3353 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3352 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3354 arg[0] = -arg[0]; 3353 arg[0] = -arg[0];
3355 /* FALLTHROUGH */ 3354 /* FALLTHROUGH */
3356 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3355 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3357 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3356 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3358 break; 3357 break;
3359 3358
3360 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3359 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3361 tt_write ((const unsigned char *)VT100_ANS, 3360 tt_write ((const unsigned char *)VT100_ANS,
3362 (unsigned int) (sizeof (VT100_ANS) - 1)); 3361 (unsigned int) (sizeof (VT100_ANS) - 1));
… …
4373 } 4372 }
4374 4373
4375 memmove (v_buffer, v_buffer + written, v_buflen); 4374 memmove (v_buffer, v_buffer + written, v_buflen);
4376 } 4375 }
4377 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4376 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4378 // original code just ignores this... 4377 pty_ev.set (EVENT_READ);
4379 destroy ();
4380} 4378}
4381 4379
4382/*----------------------- end-of-file (C source) -----------------------*/ 4380/*----------------------- end-of-file (C source) -----------------------*/
4383 4381

Diff Legend

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