… | |
… | |
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; |
… | |
… | |
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 incomplet char is invalid (previous return -2) |
|
|
2393 | // in which case we "errornously" 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; |
… | |
… | |
3488 | { |
3490 | { |
3489 | bool changed = false; |
3491 | bool changed = false; |
3490 | |
3492 | |
3491 | if (*str != ';') |
3493 | if (*str != ';') |
3492 | { |
3494 | { |
|
|
3495 | try |
|
|
3496 | { |
3493 | if (fimage.set_file_geometry (this, str)) |
3497 | fimage.set_file_geometry (this, str); |
3494 | changed = true; |
3498 | changed = true; |
|
|
3499 | } |
|
|
3500 | catch (const class rxvt_failure_exception &e) |
|
|
3501 | { |
|
|
3502 | } |
3495 | } |
3503 | } |
3496 | else |
3504 | else |
3497 | { |
3505 | { |
3498 | str++; |
3506 | str++; |
3499 | if (fimage.set_geometry (str, true)) |
3507 | if (fimage.set_geometry (str, true)) |
… | |
… | |
3504 | { |
3512 | { |
3505 | if (bg_window_position_sensitive ()) |
3513 | if (bg_window_position_sensitive ()) |
3506 | { |
3514 | { |
3507 | int x, y; |
3515 | int x, y; |
3508 | get_window_origin (x, y); |
3516 | get_window_origin (x, y); |
3509 | bg_set_position (x, y); |
3517 | parent_x = x; |
|
|
3518 | parent_y = y; |
3510 | } |
3519 | } |
3511 | update_background (); |
3520 | update_background (); |
3512 | } |
3521 | } |
3513 | } |
3522 | } |
3514 | break; |
3523 | break; |