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.522 by sf-exg, Mon Jun 11 14:45:53 2012 UTC vs.
Revision 1.525 by sf-exg, Wed Aug 15 19:41:49 2012 UTC

1467 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1467 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1468 ; 1468 ;
1469 1469
1470 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE); 1470 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1471 1471
1472 bool moved = false;
1472#ifdef HAVE_BG_PIXMAP 1473#ifdef HAVE_BG_PIXMAP
1473 if (bg_window_position_sensitive ()) 1474 if (bg_window_position_sensitive ())
1475 {
1474 want_position_change = true; 1476 want_position_change = true;
1477 if (!(bg_flags & BG_IS_VALID))
1478 moved = true;
1479 }
1475#endif 1480#endif
1476
1477 bool moved = false;
1478 1481
1479 if (want_position_change) 1482 if (want_position_change)
1480 { 1483 {
1481 int x, y; 1484 int x, y;
1482 1485
1493 parent_x = x; 1496 parent_x = x;
1494 parent_y = y; 1497 parent_y = y;
1495 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END)); 1498 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1496 moved = true; 1499 moved = true;
1497 } 1500 }
1498
1499 if (!(bg_flags & BG_IS_VALID))
1500 moved = true;
1501 } 1501 }
1502 1502
1503 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1503 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1504 { 1504 {
1505 seen_resize = 1; 1505 seen_resize = 1;
2387 } 2387 }
2388 2388
2389 if (len == (size_t)-1) 2389 if (len == (size_t)-1)
2390 { 2390 {
2391 mbstate.reset (); // reset now undefined conversion state 2391 mbstate.reset (); // reset now undefined conversion state
2392 // a -1 might indicate that a previous incomplete char is invalid (previous return -2)
2393 // in which case we "erroneously" return the next byte which might be valid.
2392 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2394 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2393 } 2395 }
2394 2396
2395 // assume wchar == unicode 2397 // assume wchar == unicode
2396 cmdbuf_ptr += len; 2398 cmdbuf_ptr += len;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines