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.513 by sf-exg, Thu May 31 05:53:46 2012 UTC vs.
Revision 1.515 by root, Tue Jun 5 11:00:40 2012 UTC

421 ctrl = ev.state & ControlMask; 421 ctrl = ev.state & ControlMask;
422 meta = ev.state & ModMetaMask; 422 meta = ev.state & ModMetaMask;
423 423
424 kbuf[0] = 0; 424 kbuf[0] = 0;
425 425
426#ifdef USE_XIM 426#if USE_XIM
427 if (Input_Context) 427 if (Input_Context)
428 { 428 {
429 Status status_return; 429 Status status_return;
430 430
431#if 0 431#if 0
987 while (row < end_row); 987 while (row < end_row);
988 } 988 }
989 989
990 scr_refresh (); 990 scr_refresh ();
991 scrollBar.show (1); 991 scrollBar.show (1);
992#ifdef USE_XIM 992#if USE_XIM
993 im_send_spot (); 993 im_send_spot ();
994#endif 994#endif
995 } 995 }
996 996
997 display->flush (); 997 display->flush ();
1461 if (ev.xconfigure.window == parent) 1461 if (ev.xconfigure.window == parent)
1462 { 1462 {
1463 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1463 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1464 ; 1464 ;
1465 1465
1466 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1467
1466#ifdef HAVE_BG_PIXMAP 1468#ifdef HAVE_BG_PIXMAP
1469 if (bg_window_position_sensitive ())
1470 want_position_change = true;
1471#endif
1472
1467 bool moved = false; 1473 bool moved = false;
1468 if (bg_window_position_sensitive ()) 1474
1475 if (want_position_change)
1469 { 1476 {
1470 int x, y; 1477 int x, y;
1478
1471 if (ev.xconfigure.send_event) 1479 if (ev.xconfigure.send_event)
1472 { 1480 {
1473 x = ev.xconfigure.x; 1481 x = ev.xconfigure.x;
1474 y = ev.xconfigure.y; 1482 y = ev.xconfigure.y;
1475 } 1483 }
1476 else 1484 else
1477 get_window_origin (x, y); 1485 get_window_origin (x, y);
1478 1486
1487 if (x != parent_x || y != parent_y)
1488 {
1489 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1490 parent_x = x;
1491 parent_y = y;
1492 }
1493
1479 if (bg_set_position (x, y) 1494 if (bg_set_position (x, y)
1480 || !(bg_flags & BG_IS_VALID)) 1495 || !(bg_flags & BG_IS_VALID))
1481 moved = true; 1496 moved = true;
1482 } 1497 }
1483#endif
1484 1498
1485 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1499 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1486 { 1500 {
1487 seen_resize = 1; 1501 seen_resize = 1;
1488 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1502 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines