… | |
… | |
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.flags & bgPixmap_t::hasChanged) |
980 | if (bg_flags & BG_NEEDS_REFRESH) |
981 | { |
981 | { |
982 | bgPixmap.flags &= ~bgPixmap_t::hasChanged; |
982 | bg_flags &= ~BG_NEEDS_REFRESH; |
983 | // scr_clear (true); This needs to be researched further! |
|
|
984 | scr_touch (false); |
983 | scr_touch (false); |
985 | } |
984 | } |
986 | #endif |
985 | #endif |
987 | |
986 | |
988 | if (want_refresh) |
987 | if (want_refresh) |
… | |
… | |
1453 | while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) |
1452 | while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) |
1454 | ; |
1453 | ; |
1455 | |
1454 | |
1456 | #ifdef HAVE_BG_PIXMAP |
1455 | #ifdef HAVE_BG_PIXMAP |
1457 | bool moved = false; |
1456 | bool moved = false; |
1458 | if (bgPixmap.window_position_sensitive ()) |
1457 | if (bg_window_position_sensitive ()) |
1459 | { |
1458 | { |
1460 | int x, y; |
1459 | int x, y; |
1461 | if (ev.xconfigure.send_event) |
1460 | if (ev.xconfigure.send_event) |
1462 | { |
1461 | { |
1463 | x = ev.xconfigure.x; |
1462 | x = ev.xconfigure.x; |
1464 | y = ev.xconfigure.y; |
1463 | y = ev.xconfigure.y; |
1465 | } |
1464 | } |
1466 | else |
1465 | else |
1467 | get_window_origin (x, y); |
1466 | get_window_origin (x, y); |
1468 | |
1467 | |
1469 | if (bgPixmap.set_position (x, y) |
1468 | if (bg_set_position (x, y) |
1470 | || (bgPixmap.flags & bgPixmap_t::isInvalid)) |
1469 | || !(bg_flags & BG_IS_VALID)) |
1471 | moved = true; |
1470 | moved = true; |
1472 | } |
1471 | } |
1473 | #endif |
1472 | #endif |
1474 | |
1473 | |
1475 | if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) |
1474 | if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) |
… | |
… | |
1483 | if (moved) |
1482 | if (moved) |
1484 | { |
1483 | { |
1485 | if (mapped) |
1484 | if (mapped) |
1486 | update_background (); |
1485 | update_background (); |
1487 | else |
1486 | else |
1488 | bgPixmap.invalidate (); |
1487 | bg_invalidate (); |
1489 | } |
1488 | } |
1490 | #endif |
1489 | #endif |
1491 | } |
1490 | } |
1492 | |
1491 | |
1493 | HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); |
1492 | HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); |
… | |
… | |
1527 | * by scheduling background redraw as soon as we can, but giving a short |
1526 | * by scheduling background redraw as soon as we can, but giving a short |
1528 | * bit of time for ConfigureNotifies to arrive. |
1527 | * bit of time for ConfigureNotifies to arrive. |
1529 | * We should render background PRIOR to drawing any text, but AFTER all |
1528 | * We should render background PRIOR to drawing any text, but AFTER all |
1530 | * of ConfigureNotifys for the best results. |
1529 | * of ConfigureNotifys for the best results. |
1531 | */ |
1530 | */ |
1532 | if (bgPixmap.flags & bgPixmap_t::isInvalid) |
1531 | if (!(bg_flags & BG_IS_VALID)) |
1533 | update_background_ev.start (0.025); |
1532 | update_background_ev.start (0.025); |
1534 | #endif |
1533 | #endif |
1535 | mapped = 1; |
1534 | mapped = 1; |
1536 | #ifdef TEXT_BLINK |
1535 | #ifdef TEXT_BLINK |
1537 | text_blink_ev.start (); |
1536 | text_blink_ev.start (); |
… | |
… | |
1552 | if (ev.xany.window == vt) |
1551 | if (ev.xany.window == vt) |
1553 | { |
1552 | { |
1554 | do |
1553 | do |
1555 | { |
1554 | { |
1556 | scr_expose (ev.xexpose.x, ev.xexpose.y, |
1555 | scr_expose (ev.xexpose.x, ev.xexpose.y, |
1557 | ev.xexpose.width, ev.xexpose.height, False); |
1556 | ev.xexpose.width, ev.xexpose.height, false); |
1558 | } |
1557 | } |
1559 | while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); |
1558 | while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); |
1560 | |
1559 | |
1561 | ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; |
1560 | ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; |
1562 | |
1561 | |
1563 | while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) |
1562 | while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) |
1564 | { |
1563 | { |
1565 | scr_expose (ev.xexpose.x, ev.xexpose.y, |
1564 | scr_expose (ev.xexpose.x, ev.xexpose.y, |
1566 | ev.xexpose.width, ev.xexpose.height, False); |
1565 | ev.xexpose.width, ev.xexpose.height, false); |
1567 | } |
1566 | } |
1568 | |
1567 | |
1569 | want_refresh = 1; |
1568 | want_refresh = 1; |
1570 | } |
1569 | } |
1571 | else |
1570 | else |
… | |
… | |
1852 | * use the property to determine the pixmap. We use it later on. |
1851 | * use the property to determine the pixmap. We use it later on. |
1853 | */ |
1852 | */ |
1854 | if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] |
1853 | if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] |
1855 | || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) |
1854 | || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) |
1856 | { |
1855 | { |
1857 | bgPixmap.set_root_pixmap (); |
1856 | bg_set_root_pixmap (); |
1858 | update_background (); |
1857 | update_background (); |
1859 | } |
1858 | } |
1860 | |
1859 | |
1861 | break; |
1860 | break; |
1862 | } |
1861 | } |
… | |
… | |
3324 | |
3323 | |
3325 | /* |
3324 | /* |
3326 | * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) |
3325 | * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) |
3327 | */ |
3326 | */ |
3328 | void |
3327 | void |
3329 | rxvt_term::process_xterm_seq (int op, const char *str, char resp) |
3328 | rxvt_term::process_xterm_seq (int op, char *str, char resp) |
3330 | { |
3329 | { |
3331 | int color; |
3330 | int color; |
3332 | char *buf, *name; |
3331 | char *buf, *name; |
3333 | bool query = str[0] == '?' && !str[1]; |
3332 | bool query = str[0] == '?' && !str[1]; |
3334 | int saveop = op; |
3333 | int saveop = op; |
… | |
… | |
3454 | process_color_seq (op, Color_tint, str, resp); |
3453 | process_color_seq (op, Color_tint, str, resp); |
3455 | { |
3454 | { |
3456 | bool changed = false; |
3455 | bool changed = false; |
3457 | |
3456 | |
3458 | if (ISSET_PIXCOLOR (Color_tint)) |
3457 | if (ISSET_PIXCOLOR (Color_tint)) |
3459 | changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); |
3458 | changed = bg_set_tint (pix_colors_focused [Color_tint]); |
3460 | else |
|
|
3461 | changed = bgPixmap.unset_tint (); |
|
|
3462 | |
3459 | |
3463 | if (changed) |
3460 | if (changed) |
3464 | update_background (); |
3461 | update_background (); |
3465 | } |
3462 | } |
3466 | |
3463 | |
… | |
… | |
3472 | if (!strcmp (str, "?")) |
3469 | if (!strcmp (str, "?")) |
3473 | { |
3470 | { |
3474 | char str[256]; |
3471 | char str[256]; |
3475 | |
3472 | |
3476 | sprintf (str, "[%dx%d+%d+%d]", |
3473 | sprintf (str, "[%dx%d+%d+%d]", |
3477 | min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), |
3474 | min (h_scale, 32767), min (v_scale, 32767), |
3478 | min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); |
3475 | min (h_align, 32767), min (v_align, 32767)); |
3479 | process_xterm_seq (XTerm_title, str, CHAR_ST); |
3476 | process_xterm_seq (XTerm_title, str, CHAR_ST); |
3480 | } |
3477 | } |
3481 | else |
3478 | else |
3482 | { |
3479 | { |
3483 | int changed = 0; |
3480 | int changed = 0; |
3484 | |
3481 | |
3485 | if (*str != ';') |
3482 | if (*str != ';') |
3486 | { |
3483 | { |
3487 | if (bgPixmap.set_file (str)) /* change pixmap */ |
3484 | if (bg_set_file (str)) /* change pixmap */ |
3488 | { |
3485 | { |
3489 | changed++; |
3486 | changed++; |
3490 | str = strchr (str, ';'); |
3487 | str = strchr (str, ';'); |
3491 | if (str == NULL) |
3488 | if (str == NULL) |
3492 | bgPixmap.set_defaultGeometry (); |
3489 | bg_set_default_geometry (); |
3493 | else |
3490 | else |
3494 | bgPixmap.set_geometry (str+1); |
3491 | bg_set_geometry (str+1); |
3495 | } |
3492 | } |
3496 | } |
3493 | } |
3497 | else |
3494 | else |
3498 | { |
3495 | { |
3499 | str++; |
3496 | str++; |
3500 | if (bgPixmap.set_geometry (str, true)) |
3497 | if (bg_set_geometry (str, true)) |
3501 | changed++; |
3498 | changed++; |
3502 | } |
3499 | } |
3503 | |
3500 | |
3504 | if (changed) |
3501 | if (changed) |
3505 | { |
3502 | { |
3506 | if (bgPixmap.window_position_sensitive ()) |
3503 | if (bg_window_position_sensitive ()) |
3507 | { |
3504 | { |
3508 | int x, y; |
3505 | int x, y; |
3509 | get_window_origin (x, y); |
3506 | get_window_origin (x, y); |
3510 | bgPixmap.set_position (x, y); |
3507 | bg_set_position (x, y); |
3511 | } |
3508 | } |
3512 | update_background (); |
3509 | update_background (); |
3513 | } |
3510 | } |
3514 | } |
3511 | } |
3515 | break; |
3512 | break; |
… | |
… | |
4047 | |
4044 | |
4048 | data += written; |
4045 | data += written; |
4049 | len -= written; |
4046 | len -= written; |
4050 | } |
4047 | } |
4051 | |
4048 | |
4052 | v_buffer = (char *)realloc (v_buffer, v_buflen + len); |
4049 | v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len); |
4053 | |
4050 | |
4054 | memcpy (v_buffer + v_buflen, data, len); |
4051 | memcpy (v_buffer + v_buflen, data, len); |
4055 | v_buflen += len; |
4052 | v_buflen += len; |
4056 | |
4053 | |
4057 | pty_ev.set (ev::READ | ev::WRITE); |
4054 | pty_ev.set (ev::READ | ev::WRITE); |