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.176 by root, Mon Dec 13 01:29:03 2004 UTC

… …
1217 if (ev.type == KeyPress && hidden_pointer == 0) 1217 if (ev.type == KeyPress && hidden_pointer == 0)
1218 pointer_blank (); 1218 pointer_blank ();
1219 } 1219 }
1220#endif 1220#endif
1221 1221
1222 Window unused_root, unused_child; 1222 Window unused_root, unused_child;
1223 int unused_root_x, unused_root_y; 1223 int unused_root_x, unused_root_y;
1224 unsigned int unused_mask; 1224 unsigned int unused_mask;
1225 1225
1226 switch (ev.type) 1226 switch (ev.type)
1227 { 1227 {
1228 case KeyPress: 1228 case KeyPress:
1229#if ISO_14755 1229#if ISO_14755
… …
1334 0L, 1000000L, 1334 0L, 1000000L,
1335 False, AnyPropertyType, 1335 False, AnyPropertyType,
1336 &ActualType, &ActualFormat, 1336 &ActualType, &ActualFormat,
1337 &Size, &RemainingBytes, 1337 &Size, &RemainingBytes,
1338 &data); 1338 &data);
1339 XChangeProperty (display->display, display->root, 1339 set_string_property (XA_CUT_BUFFER0, data);
1340 XA_CUT_BUFFER0, XA_STRING,
1341 8, PropModeReplace,
1342 data, strlen (data));
1343 XFree (data); 1340 XFree (data);
1344 selection_paste (display->root, XA_CUT_BUFFER0, True); 1341 selection_paste (display->root, XA_CUT_BUFFER0, true);
1345 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1342 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);
1346 } 1343 }
1347#endif /* OFFIX_DND */ 1344#endif /* OFFIX_DND */
1348 break; 1345 break;
1349 1346
… …
1453 resize_all_windows (width, height, 1); 1450 resize_all_windows (width, height, 1);
1454 } 1451 }
1455 1452
1456#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1453#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1457 if (options & Opt_transparent) 1454 if (options & Opt_transparent)
1458 {
1459 check_our_parents (); 1455 check_our_parents ();
1460 if (am_transparent)
1461 want_refresh = want_full_refresh = 1;
1462 }
1463#endif 1456#endif
1464 } 1457 }
1465 break; 1458 break;
1466 1459
1467 case PropertyNotify: 1460 case PropertyNotify:
… …
1475 selection_clear (); 1468 selection_clear ();
1476 break; 1469 break;
1477 1470
1478 case SelectionNotify: 1471 case SelectionNotify:
1479 if (selection_wait == Sel_normal) 1472 if (selection_wait == Sel_normal)
1480 selection_paste (ev.xselection.requestor, 1473 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1481 ev.xselection.property, True);
1482 break; 1474 break;
1483 1475
1484 case SelectionRequest: 1476 case SelectionRequest:
1485 selection_send (ev.xselectionrequest); 1477 selection_send (ev.xselectionrequest);
1486 break; 1478 break;
… …
2416 sy = 0; 2408 sy = 0;
2417 } 2409 }
2418 2410
2419 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2411 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2420 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2412 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2413
2414 XSync (display->display, False);
2421 allowedxerror = -1; 2415 allowedxerror = -1;
2422 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2416 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2423 2417
2424 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2418 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2425 /* XXX: may need a delay here? */ 2419 /* XXX: may need a delay here? */
… …
2471 2465
2472 am_transparent = am_pixmap_trans = 1; 2466 am_transparent = am_pixmap_trans = 1;
2473 } 2467 }
2474 } 2468 }
2475 2469
2476 if (!am_pixmap_trans) 2470 if (am_pixmap_trans)
2471 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
2472 else
2477 { 2473 {
2478 unsigned int n; 2474 unsigned int n;
2479 /* 2475 /*
2480 * InheritPixmap transparency 2476 * InheritPixmap transparency
2481 */ 2477 */
… …
2544 if (scrollBar.win) 2540 if (scrollBar.win)
2545 { 2541 {
2546 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative); 2542 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative);
2547 scrollBar.setIdle (); 2543 scrollBar.setIdle ();
2548 scrollbar_show (0); 2544 scrollbar_show (0);
2545 }
2546
2547 if (am_transparent)
2548 {
2549 want_refresh = want_full_refresh = 1;
2550 if (am_pixmap_trans)
2551 flush ();
2549 } 2552 }
2550 2553
2551 return pchanged; 2554 return pchanged;
2552} 2555}
2553#endif 2556#endif
… …
3513 * ends_how is terminator used. returned input must be free()'d 3516 * ends_how is terminator used. returned input must be free()'d
3514 */ 3517 */
3515unsigned char * 3518unsigned char *
3516rxvt_term::get_to_st (unicode_t &ends_how) 3519rxvt_term::get_to_st (unicode_t &ends_how)
3517{ 3520{
3518 unicode_t seen_esc = 0, ch; 3521 unicode_t ch;
3522 bool seen_esc = false;
3519 unsigned int n = 0; 3523 unsigned int n = 0;
3520 unsigned char *s;
3521 unsigned char string[STRING_MAX]; 3524 wchar_t string[STRING_MAX];
3522 3525
3523 while ((ch = cmd_getc ()) != NOCHAR) 3526 while ((ch = cmd_getc ()) != NOCHAR)
3524 { 3527 {
3525 if (seen_esc) 3528 if (seen_esc)
3526 { 3529 {
… …
3529 else 3532 else
3530 return NULL; 3533 return NULL;
3531 } 3534 }
3532 else if (ch == C0_ESC) 3535 else if (ch == C0_ESC)
3533 { 3536 {
3534 seen_esc = 1; 3537 seen_esc = true;
3535 continue; 3538 continue;
3536 } 3539 }
3537 else if (ch == C0_BEL || ch == CHAR_ST) 3540 else if (ch == C0_BEL || ch == CHAR_ST)
3538 break; 3541 break;
3539 else if (ch < 0x20) 3542 else if (ch < 0x20)
3540 return NULL; /* other control character - exit */ 3543 return NULL; /* other control character - exit */
3541 3544
3542 seen_esc = 0; 3545 seen_esc = false;
3543 3546
3544 if (n >= sizeof (string) - 1) 3547 if (n >= sizeof (string) - 1)
3545 // stop at some sane length 3548 // stop at some sane length
3546 return NULL; 3549 return NULL;
3547 3550
… …
3551 string[n++] = ch; 3554 string[n++] = ch;
3552 } 3555 }
3553 3556
3554 string[n++] = '\0'; 3557 string[n++] = '\0';
3555 3558
3556 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3557 return NULL;
3558
3559 ends_how = (ch == 0x5c ? C0_ESC : ch); 3559 ends_how = (ch == 0x5c ? C0_ESC : ch);
3560 strncpy (s, string, n); 3560
3561 return s; 3561 return (unsigned char *)rxvt_wcstombs (string);
3562} 3562}
3563 3563
3564/*----------------------------------------------------------------------*/ 3564/*----------------------------------------------------------------------*/
3565/* 3565/*
3566 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3566 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
… …
3667 set_title (str); 3667 set_title (str);
3668 break; 3668 break;
3669 case XTerm_property: 3669 case XTerm_property:
3670 if (str[0] == '?') 3670 if (str[0] == '?')
3671 { 3671 {
3672 Atom prop = XInternAtom (display->display, str + 1, True); 3672 Atom prop = display->atom (str + 1);
3673 Atom actual_type; 3673 Atom actual_type;
3674 int actual_format; 3674 int actual_format;
3675 unsigned long nitems; 3675 unsigned long nitems;
3676 unsigned long bytes_after; 3676 unsigned long bytes_after;
3677 unsigned char *value = 0; 3677 unsigned char *value = 0;
… …
3695 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3695 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3696 3696
3697 if (eq) 3697 if (eq)
3698 { 3698 {
3699 *eq = 0; 3699 *eq = 0;
3700 XChangeProperty (display->display, TermWin.parent[0], 3700 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 } 3701 }
3705 else 3702 else
3706 XDeleteProperty (display->display, TermWin.parent[0], 3703 XDeleteProperty (display->display, TermWin.parent[0],
3707 display->atom (str)); 3704 display->atom (str));
3708 } 3705 }

Diff Legend

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