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.176 by root, Mon Dec 13 01:29:03 2004 UTC vs.
Revision 1.177 by root, Mon Dec 13 07:18:52 2004 UTC

… …
1058rxvt_term::pty_cb (io_watcher &w, short revents) 1058rxvt_term::pty_cb (io_watcher &w, short revents)
1059{ 1059{
1060 SET_R (this); 1060 SET_R (this);
1061 SET_LOCALE (locale); 1061 SET_LOCALE (locale);
1062 1062
1063 if (revents & EVENT_WRITE)
1064 tt_write (0, 0);
1065 else if (revents & EVENT_READ) 1063 if (revents & EVENT_READ)
1066 // loop, but don't allow a single term to monopolize us 1064 // loop, but don't allow a single term to monopolize us
1067 while (pty_fill ()) 1065 while (pty_fill ())
1068 if (cmd_parse ()) 1066 if (cmd_parse ())
1069 break; 1067 break;
1068
1069 if (revents & EVENT_WRITE)
1070 pty_write ();
1070} 1071}
1071 1072
1072void 1073void
1073rxvt_term::pointer_unblank () 1074rxvt_term::pointer_unblank ()
1074{ 1075{
… …
4282 4283
4283/* ---------------------------------------------------------------------- */ 4284/* ---------------------------------------------------------------------- */
4284/* Write data to the pty as typed by the user, pasted with the mouse, 4285/* Write data to the pty as typed by the user, pasted with the mouse,
4285 * or generated by us in response to a query ESC sequence. 4286 * or generated by us in response to a query ESC sequence.
4286 */ 4287 */
4288const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4289
4287void 4290void
4288rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4291rxvt_term::tt_write (const unsigned char *data, unsigned int len)
4289{ 4292{
4290 const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4293 if (v_buflen == 0)
4294 {
4295 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4291 4296
4292 if (len) 4297 if ((unsigned int)written == len)
4298 return;
4299
4300 data += written;
4301 len -= written;
4293 { 4302 }
4303
4304 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4305
4306 memcpy (v_buffer + v_buflen, data, len);
4307 v_buflen += len;
4308
4309 pty_ev.set (EVENT_READ | EVENT_WRITE);
4310}
4311
4312void rxvt_term::pty_write ()
4313{
4314 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4315
4316 if (written > 0)
4317 {
4318 v_buflen -= written;
4319
4294 if (v_buflen == 0) 4320 if (v_buflen == 0)
4295 { 4321 {
4296 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4297
4298 if ((unsigned int)written == len)
4299 return;
4300
4301 data += written;
4302 len -= written;
4303 }
4304
4305
4306 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4307
4308 memcpy (v_buffer + v_buflen, data, len);
4309 v_buflen += len;
4310 }
4311
4312 for (;;)
4313 {
4314 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4315
4316 if (written > 0)
4317 {
4318 v_buflen -= written;
4319
4320 if (v_buflen == 0)
4321 {
4322 free (v_buffer); 4322 free (v_buffer);
4323 v_buffer = 0; 4323 v_buffer = 0;
4324 v_buflen = 0; 4324 v_buflen = 0;
4325 4325
4326 pty_ev.set (EVENT_READ); 4326 pty_ev.set (EVENT_READ);
4327 return;
4328 }
4329
4330 memmove (v_buffer, v_buffer + written, v_buflen);
4331 }
4332 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4333 // original code just ignores this...
4334 destroy ();
4335 else
4336 {
4337 pty_ev.set (EVENT_READ | EVENT_WRITE);
4338 return; 4327 return;
4339 } 4328 }
4329
4330 memmove (v_buffer, v_buffer + written, v_buflen);
4340 } 4331 }
4332 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4333 // original code just ignores this...
4334 destroy ();
4341} 4335}
4342 4336
4343/*----------------------- end-of-file (C source) -----------------------*/ 4337/*----------------------- end-of-file (C source) -----------------------*/
4344 4338

Diff Legend

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