… | |
… | |
1491 | if (x != parent_x || y != parent_y) |
1491 | if (x != parent_x || y != parent_y) |
1492 | { |
1492 | { |
1493 | parent_x = x; |
1493 | parent_x = x; |
1494 | parent_y = y; |
1494 | parent_y = y; |
1495 | HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END)); |
1495 | HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END)); |
|
|
1496 | moved = true; |
1496 | } |
1497 | } |
1497 | |
1498 | |
1498 | if (bg_set_position (x, y) |
|
|
1499 | || !(bg_flags & BG_IS_VALID)) |
1499 | if (!(bg_flags & BG_IS_VALID)) |
1500 | moved = true; |
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 | { |
… | |
… | |
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; |