| … | |
… | |
| 975 | rxvt_term::flush () |
975 | rxvt_term::flush () |
| 976 | { |
976 | { |
| 977 | flush_ev.stop (); |
977 | flush_ev.stop (); |
| 978 | |
978 | |
| 979 | #ifdef HAVE_BG_PIXMAP |
979 | #ifdef HAVE_BG_PIXMAP |
| 980 | if (bgPixmap.check_clearChanged ()) |
980 | if (bgPixmap.flags & bgPixmap_t::hasChanged) |
| 981 | { |
981 | { |
|
|
982 | bgPixmap.flags &= ~bgPixmap_t::hasChanged; |
| 982 | // scr_clear (true); This needs to be researched further! |
983 | // scr_clear (true); This needs to be researched further! |
| 983 | scr_touch (false); |
984 | scr_touch (false); |
| 984 | } |
985 | } |
| 985 | #endif |
986 | #endif |
| 986 | |
987 | |
| … | |
… | |
| 1430 | && ev.xfocus.mode != NotifyGrab) |
1431 | && ev.xfocus.mode != NotifyGrab) |
| 1431 | focus_out (); |
1432 | focus_out (); |
| 1432 | break; |
1433 | break; |
| 1433 | |
1434 | |
| 1434 | case ConfigureNotify: |
1435 | case ConfigureNotify: |
| 1435 | /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n", |
|
|
| 1436 | ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y, |
|
|
| 1437 | szHint.width, szHint.height);*/ |
|
|
| 1438 | if (ev.xconfigure.window == parent[0]) |
1436 | if (ev.xconfigure.window == parent[0]) |
| 1439 | { |
1437 | { |
| 1440 | while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) |
1438 | while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) |
| 1441 | ; |
1439 | ; |
|
|
1440 | |
|
|
1441 | #ifdef HAVE_BG_PIXMAP |
|
|
1442 | bool moved = false; |
|
|
1443 | if (bgPixmap.window_position_sensitive ()) |
|
|
1444 | { |
|
|
1445 | int x, y; |
|
|
1446 | if (ev.xconfigure.send_event) |
|
|
1447 | { |
|
|
1448 | x = ev.xconfigure.x; |
|
|
1449 | y = ev.xconfigure.y; |
|
|
1450 | } |
|
|
1451 | else |
|
|
1452 | get_window_origin (x, y); |
|
|
1453 | |
|
|
1454 | if (bgPixmap.set_position (x, y) |
|
|
1455 | || (bgPixmap.flags & bgPixmap_t::isInvalid)) |
|
|
1456 | moved = true; |
|
|
1457 | } |
|
|
1458 | #endif |
| 1442 | |
1459 | |
| 1443 | if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) |
1460 | if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) |
| 1444 | { |
1461 | { |
| 1445 | seen_resize = 1; |
1462 | seen_resize = 1; |
| 1446 | resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); |
1463 | resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); |
| 1447 | } |
1464 | } |
| 1448 | else |
1465 | else |
| 1449 | { |
1466 | { |
| 1450 | #ifdef HAVE_BG_PIXMAP |
1467 | #ifdef HAVE_BG_PIXMAP |
| 1451 | if (bgPixmap.window_position_sensitive ()) |
1468 | if (moved) |
| 1452 | { |
1469 | { |
| 1453 | if (mapped) |
1470 | if (mapped) |
| 1454 | update_background (); |
1471 | update_background (); |
| 1455 | else |
1472 | else |
| 1456 | bgPixmap.invalidate (); |
1473 | bgPixmap.invalidate (); |
| … | |
… | |
| 3450 | { |
3467 | { |
| 3451 | int changed = 0; |
3468 | int changed = 0; |
| 3452 | |
3469 | |
| 3453 | if (*str != ';') |
3470 | if (*str != ';') |
| 3454 | { |
3471 | { |
| 3455 | /* reset to default scaling :*/ |
|
|
| 3456 | bgPixmap.unset_geometry (); |
|
|
| 3457 | if (bgPixmap.set_file (str)) /* change pixmap */ |
3472 | if (bgPixmap.set_file (str)) /* change pixmap */ |
|
|
3473 | { |
| 3458 | changed++; |
3474 | changed++; |
| 3459 | str = strchr (str, ';'); |
3475 | str = strchr (str, ';'); |
| 3460 | if (str == NULL) |
3476 | if (str == NULL) |
| 3461 | bgPixmap.set_defaultGeometry (); |
3477 | bgPixmap.set_defaultGeometry (); |
|
|
3478 | else |
|
|
3479 | bgPixmap.set_geometry (str+1); |
|
|
3480 | } |
| 3462 | } |
3481 | } |
| 3463 | |
3482 | else |
| 3464 | while (str) |
|
|
| 3465 | { |
3483 | { |
| 3466 | str++; |
3484 | str++; |
| 3467 | if (bgPixmap.set_geometry (str)) |
3485 | if (bgPixmap.set_geometry (str, true)) |
| 3468 | changed++; |
3486 | changed++; |
| 3469 | str = strchr (str, ';'); |
|
|
| 3470 | } |
3487 | } |
| 3471 | |
3488 | |
| 3472 | if (changed) |
3489 | if (changed) |
|
|
3490 | { |
|
|
3491 | if (bgPixmap.window_position_sensitive ()) |
|
|
3492 | { |
|
|
3493 | int x, y; |
|
|
3494 | get_window_origin (x, y); |
|
|
3495 | bgPixmap.set_position (x, y); |
|
|
3496 | } |
| 3473 | update_background (); |
3497 | update_background (); |
|
|
3498 | } |
| 3474 | } |
3499 | } |
| 3475 | break; |
3500 | break; |
| 3476 | #endif |
3501 | #endif |
| 3477 | |
3502 | |
| 3478 | case XTerm_logfile: |
3503 | case XTerm_logfile: |
