| … | |
… | |
| 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 | |
| … | |
… | |
| 1491 | if (x != parent_x || y != parent_y) |
1494 | if (x != parent_x || y != parent_y) |
| 1492 | { |
1495 | { |
| 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)); |
|
|
1499 | moved = true; |
| 1496 | } |
1500 | } |
| 1497 | |
|
|
| 1498 | if (bg_set_position (x, y) |
|
|
| 1499 | || !(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; |
| … | |
… | |
| 3488 | { |
3488 | { |
| 3489 | bool changed = false; |
3489 | bool changed = false; |
| 3490 | |
3490 | |
| 3491 | if (*str != ';') |
3491 | if (*str != ';') |
| 3492 | { |
3492 | { |
|
|
3493 | try |
|
|
3494 | { |
| 3493 | if (fimage.set_file_geometry (str)) |
3495 | fimage.set_file_geometry (this, str); |
| 3494 | changed = true; |
3496 | changed = true; |
|
|
3497 | } |
|
|
3498 | catch (const class rxvt_failure_exception &e) |
|
|
3499 | { |
|
|
3500 | } |
| 3495 | } |
3501 | } |
| 3496 | else |
3502 | else |
| 3497 | { |
3503 | { |
| 3498 | str++; |
3504 | str++; |
| 3499 | if (fimage.set_geometry (str, true)) |
3505 | if (fimage.set_geometry (str, true)) |
| … | |
… | |
| 3504 | { |
3510 | { |
| 3505 | if (bg_window_position_sensitive ()) |
3511 | if (bg_window_position_sensitive ()) |
| 3506 | { |
3512 | { |
| 3507 | int x, y; |
3513 | int x, y; |
| 3508 | get_window_origin (x, y); |
3514 | get_window_origin (x, y); |
| 3509 | bg_set_position (x, y); |
3515 | parent_x = x; |
|
|
3516 | parent_y = y; |
| 3510 | } |
3517 | } |
| 3511 | update_background (); |
3518 | update_background (); |
| 3512 | } |
3519 | } |
| 3513 | } |
3520 | } |
| 3514 | break; |
3521 | break; |
