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.171 by root, Wed Dec 1 02:12:18 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{
… …
1217 if (ev.type == KeyPress && hidden_pointer == 0) 1218 if (ev.type == KeyPress && hidden_pointer == 0)
1218 pointer_blank (); 1219 pointer_blank ();
1219 } 1220 }
1220#endif 1221#endif
1221 1222
1222 Window unused_root, unused_child; 1223 Window unused_root, unused_child;
1223 int unused_root_x, unused_root_y; 1224 int unused_root_x, unused_root_y;
1224 unsigned int unused_mask; 1225 unsigned int unused_mask;
1225 1226
1226 switch (ev.type) 1227 switch (ev.type)
1227 { 1228 {
1228 case KeyPress: 1229 case KeyPress:
1229#if ISO_14755 1230#if ISO_14755
… …
1334 0L, 1000000L, 1335 0L, 1000000L,
1335 False, AnyPropertyType, 1336 False, AnyPropertyType,
1336 &ActualType, &ActualFormat, 1337 &ActualType, &ActualFormat,
1337 &Size, &RemainingBytes, 1338 &Size, &RemainingBytes,
1338 &data); 1339 &data);
1339 XChangeProperty (display->display, display->root, 1340 set_string_property (XA_CUT_BUFFER0, data);
1340 XA_CUT_BUFFER0, XA_STRING,
1341 8, PropModeReplace,
1342 data, strlen (data));
1343 XFree (data); 1341 XFree (data);
1344 selection_paste (display->root, XA_CUT_BUFFER0, True); 1342 selection_paste (display->root, XA_CUT_BUFFER0, true);
1345 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1343 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);
1346 } 1344 }
1347#endif /* OFFIX_DND */ 1345#endif /* OFFIX_DND */
1348 break; 1346 break;
1349 1347
… …
1453 resize_all_windows (width, height, 1); 1451 resize_all_windows (width, height, 1);
1454 } 1452 }
1455 1453
1456#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1454#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1457 if (options & Opt_transparent) 1455 if (options & Opt_transparent)
1458 {
1459 check_our_parents (); 1456 check_our_parents ();
1460 if (am_transparent)
1461 want_refresh = want_full_refresh = 1;
1462 }
1463#endif 1457#endif
1464 } 1458 }
1465 break; 1459 break;
1466 1460
1467 case PropertyNotify: 1461 case PropertyNotify:
… …
1475 selection_clear (); 1469 selection_clear ();
1476 break; 1470 break;
1477 1471
1478 case SelectionNotify: 1472 case SelectionNotify:
1479 if (selection_wait == Sel_normal) 1473 if (selection_wait == Sel_normal)
1480 selection_paste (ev.xselection.requestor, 1474 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1481 ev.xselection.property, True);
1482 break; 1475 break;
1483 1476
1484 case SelectionRequest: 1477 case SelectionRequest:
1485 selection_send (ev.xselectionrequest); 1478 selection_send (ev.xselectionrequest);
1486 break; 1479 break;
… …
2416 sy = 0; 2409 sy = 0;
2417 } 2410 }
2418 2411
2419 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2412 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2420 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2413 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2414
2415 XSync (display->display, False);
2421 allowedxerror = -1; 2416 allowedxerror = -1;
2422 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2417 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2423 2418
2424 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2419 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2425 /* XXX: may need a delay here? */ 2420 /* XXX: may need a delay here? */
… …
2471 2466
2472 am_transparent = am_pixmap_trans = 1; 2467 am_transparent = am_pixmap_trans = 1;
2473 } 2468 }
2474 } 2469 }
2475 2470
2476 if (!am_pixmap_trans) 2471 if (am_pixmap_trans)
2472 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
2473 else
2477 { 2474 {
2478 unsigned int n; 2475 unsigned int n;
2479 /* 2476 /*
2480 * InheritPixmap transparency 2477 * InheritPixmap transparency
2481 */ 2478 */
… …
2544 if (scrollBar.win) 2541 if (scrollBar.win)
2545 { 2542 {
2546 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative); 2543 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative);
2547 scrollBar.setIdle (); 2544 scrollBar.setIdle ();
2548 scrollbar_show (0); 2545 scrollbar_show (0);
2546 }
2547
2548 if (am_transparent)
2549 {
2550 want_refresh = want_full_refresh = 1;
2551 if (am_pixmap_trans)
2552 flush ();
2549 } 2553 }
2550 2554
2551 return pchanged; 2555 return pchanged;
2552} 2556}
2553#endif 2557#endif
… …
3513 * ends_how is terminator used. returned input must be free()'d 3517 * ends_how is terminator used. returned input must be free()'d
3514 */ 3518 */
3515unsigned char * 3519unsigned char *
3516rxvt_term::get_to_st (unicode_t &ends_how) 3520rxvt_term::get_to_st (unicode_t &ends_how)
3517{ 3521{
3518 unicode_t seen_esc = 0, ch; 3522 unicode_t ch;
3523 bool seen_esc = false;
3519 unsigned int n = 0; 3524 unsigned int n = 0;
3520 unsigned char *s;
3521 unsigned char string[STRING_MAX]; 3525 wchar_t string[STRING_MAX];
3522 3526
3523 while ((ch = cmd_getc ()) != NOCHAR) 3527 while ((ch = cmd_getc ()) != NOCHAR)
3524 { 3528 {
3525 if (seen_esc) 3529 if (seen_esc)
3526 { 3530 {
… …
3529 else 3533 else
3530 return NULL; 3534 return NULL;
3531 } 3535 }
3532 else if (ch == C0_ESC) 3536 else if (ch == C0_ESC)
3533 { 3537 {
3534 seen_esc = 1; 3538 seen_esc = true;
3535 continue; 3539 continue;
3536 } 3540 }
3537 else if (ch == C0_BEL || ch == CHAR_ST) 3541 else if (ch == C0_BEL || ch == CHAR_ST)
3538 break; 3542 break;
3539 else if (ch < 0x20) 3543 else if (ch < 0x20)
3540 return NULL; /* other control character - exit */ 3544 return NULL; /* other control character - exit */
3541 3545
3542 seen_esc = 0; 3546 seen_esc = false;
3543 3547
3544 if (n >= sizeof (string) - 1) 3548 if (n >= sizeof (string) - 1)
3545 // stop at some sane length 3549 // stop at some sane length
3546 return NULL; 3550 return NULL;
3547 3551
… …
3551 string[n++] = ch; 3555 string[n++] = ch;
3552 } 3556 }
3553 3557
3554 string[n++] = '\0'; 3558 string[n++] = '\0';
3555 3559
3556 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3557 return NULL;
3558
3559 ends_how = (ch == 0x5c ? C0_ESC : ch); 3560 ends_how = (ch == 0x5c ? C0_ESC : ch);
3560 strncpy (s, string, n); 3561
3561 return s; 3562 return (unsigned char *)rxvt_wcstombs (string);
3562} 3563}
3563 3564
3564/*----------------------------------------------------------------------*/ 3565/*----------------------------------------------------------------------*/
3565/* 3566/*
3566 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3567 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
… …
3667 set_title (str); 3668 set_title (str);
3668 break; 3669 break;
3669 case XTerm_property: 3670 case XTerm_property:
3670 if (str[0] == '?') 3671 if (str[0] == '?')
3671 { 3672 {
3672 Atom prop = XInternAtom (display->display, str + 1, True); 3673 Atom prop = display->atom (str + 1);
3673 Atom actual_type; 3674 Atom actual_type;
3674 int actual_format; 3675 int actual_format;
3675 unsigned long nitems; 3676 unsigned long nitems;
3676 unsigned long bytes_after; 3677 unsigned long bytes_after;
3677 unsigned char *value = 0; 3678 unsigned char *value = 0;
… …
3695 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3696 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3696 3697
3697 if (eq) 3698 if (eq)
3698 { 3699 {
3699 *eq = 0; 3700 *eq = 0;
3700 XChangeProperty (display->display, TermWin.parent[0], 3701 set_utf8_property (display->atom (str), eq + 1);
3701 display->atom (str), XA_STRING, 8,
3702 PropModeReplace, (unsigned char *)eq + 1,
3703 strlen (eq + 1));
3704 } 3702 }
3705 else 3703 else
3706 XDeleteProperty (display->display, TermWin.parent[0], 3704 XDeleteProperty (display->display, TermWin.parent[0],
3707 display->atom (str)); 3705 display->atom (str));
3708 } 3706 }
… …
4285 4283
4286/* ---------------------------------------------------------------------- */ 4284/* ---------------------------------------------------------------------- */
4287/* 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,
4288 * or generated by us in response to a query ESC sequence. 4286 * or generated by us in response to a query ESC sequence.
4289 */ 4287 */
4288const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4289
4290void 4290void
4291rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4291rxvt_term::tt_write (const unsigned char *data, unsigned int len)
4292{ 4292{
4293 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));
4294 4296
4295 if (len) 4297 if ((unsigned int)written == len)
4298 return;
4299
4300 data += written;
4301 len -= written;
4296 { 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
4297 if (v_buflen == 0) 4320 if (v_buflen == 0)
4298 { 4321 {
4299 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4300
4301 if ((unsigned int)written == len)
4302 return;
4303
4304 data += written;
4305 len -= written;
4306 }
4307
4308
4309 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4310
4311 memcpy (v_buffer + v_buflen, data, len);
4312 v_buflen += len;
4313 }
4314
4315 for (;;)
4316 {
4317 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4318
4319 if (written > 0)
4320 {
4321 v_buflen -= written;
4322
4323 if (v_buflen == 0)
4324 {
4325 free (v_buffer); 4322 free (v_buffer);
4326 v_buffer = 0; 4323 v_buffer = 0;
4327 v_buflen = 0; 4324 v_buflen = 0;
4328 4325
4329 pty_ev.set (EVENT_READ); 4326 pty_ev.set (EVENT_READ);
4330 return;
4331 }
4332
4333 memmove (v_buffer, v_buffer + written, v_buflen);
4334 }
4335 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4336 // original code just ignores this...
4337 destroy ();
4338 else
4339 {
4340 pty_ev.set (EVENT_READ | EVENT_WRITE);
4341 return; 4327 return;
4342 } 4328 }
4329
4330 memmove (v_buffer, v_buffer + written, v_buflen);
4343 } 4331 }
4332 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4333 // original code just ignores this...
4334 destroy ();
4344} 4335}
4345 4336
4346/*----------------------- end-of-file (C source) -----------------------*/ 4337/*----------------------- end-of-file (C source) -----------------------*/
4347 4338

Diff Legend

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