Skip to content

fix: calm down winwatch and assure its full repaint #748

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
markvanatten wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: calm down winwatch and assure its full repaint #748

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 49 additions & 16 deletions src/cmd/rio/winwatch.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,9 @@ int sortlabels;
int showwmnames;
extern Font *font;
Image *lightblue;

Image *backbuffer = nil;
vlong last = 0;
vlong now;

enum {
PAD = 3,
Expand Down Expand Up @@ -276,7 +278,7 @@ refreshwin(void)
}

void
drawnowin(int i)
drawnowin(Image *dst, int i)
{
Rectangle r;

Expand All @@ -286,17 +288,17 @@ drawnowin(int i)
Pt(MARGIN + (PAD + Dx(r)) * (i / rows),
MARGIN + (PAD + Dy(r)) * (i % rows))),
screen->r.min);
draw(screen, insetrect(r, -1), lightblue, nil, ZP);
draw(dst, insetrect(r, -1), lightblue, nil, ZP);
}

void
drawwin(int i)
drawwin(Image *dst, int i)
{
draw(screen, win[i].r, lightblue, nil, ZP);
_string(screen, addpt(win[i].r.min, Pt(2, 0)), display->black, ZP,
draw(dst, win[i].r, lightblue, nil, ZP);
_string(dst, addpt(win[i].r.min, Pt(2, 0)), display->black, ZP,
font, win[i].label, nil, strlen(win[i].label),
win[i].r, nil, ZP, SoverD);
border(screen, win[i].r, 1, display->black, ZP);
border(dst, win[i].r, 1, display->black, ZP);
win[i].dirty = 0;
}

Expand Down Expand Up @@ -336,17 +338,39 @@ redraw(Image *screen, int all)
int i;

all |= geometry();
if(all)
draw(screen, screen->r, lightblue, nil, ZP);

/* 1. Allocate/Resize buffer only if screen size changes */
if(backbuffer == nil || Dx(backbuffer->r) != Dx(screen->r) || Dy(backbuffer->r) != Dy(screen->r)){
if(backbuffer)
freeimage(backbuffer);

/* Create buffer with the same coordinates as the screen */
backbuffer = allocimage(display, screen->r, screen->chan, 0, DWhite);
if(backbuffer == nil)
return;
}

/* 2. Paint background on the off-screen buffer */
draw(backbuffer, backbuffer->r, lightblue, nil, ZP);

/* 3. Draw all items onto the buffer */
for(i=0; i<nwin; i++)
if(all || win[i].dirty)
drawwin(i);
if(!all)
for (; i<onwin; i++)
drawnowin(i);
drawwin(backbuffer, i);

for (; i<onwin; i++)
drawnowin(backbuffer, i);

/* 4. Atomic Copy to Screen (The Fix) */
/* We use backbuffer->r.min as the source point, ensuring alignment */
draw(screen, screen->r, backbuffer, nil, backbuffer->r.min);

/* 5. Force the update to the X server immediately */
flushimage(display, 1);

onwin = nwin;
}


void
eresized(int new)
{
Expand Down Expand Up @@ -483,9 +507,18 @@ main(int argc, char **argv)
case Emouse:
if(e.mouse.buttons)
click(e.mouse);
/* fall through */
default: /* Etimer */

/* Rate-limited fallthrough */
now = nsec();
/* If less than 200ms (200,000,000ns) has passed, skip refresh */
if(now - last < 200*1000000LL)
break;
/* Otherwise, fall through to refresh */

default: /* Etimer */
last = nsec();
refreshwin();
/* Always redraw. It is cheap now, with the buffered drawing and the limited rate. */
redraw(screen, 0);
break;
}
Expand Down