Skip to content
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

Use display refresh rate for animations #122

Open
wants to merge 12 commits into
base: main
Choose a base branch
from
Open

Use display refresh rate for animations #122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
8dea2c5
update theme to the "sunset" color palette
SaphiraKai Jan 11, 2022
a0ad334
Merge branch 'instantOS:main' into main
SaphiraKai Jan 11, 2022
6314d3a
fix Ubuntu Light font
SaphiraKai Jan 11, 2022
4978a3c
Merge branch 'instantOS:main' into main
SaphiraKai Mar 28, 2022
b4966c7
add support for arbitrary refresh rates in animations
SaphiraKai Mar 28, 2022
964699f
Revert "fix Ubuntu Light font"
SaphiraKai Mar 28, 2022
9b33b8f
Revert "update theme to the "sunset" color palette"
SaphiraKai Mar 28, 2022
c36a812
Merge branch 'main' into arbitrary-refresh-rate
SaphiraKai Mar 28, 2022
356437f
undo change to frame count halving
SaphiraKai Mar 28, 2022
bf54562
fix the frame halving because I typed the wrong character
SaphiraKai Mar 28, 2022
3ae11a8
remove my comment styling '?' for consistency
SaphiraKai Mar 28, 2022
87968c0
Merge branch 'instantOS:main' into arbitrary-refresh-rate
SaphiraKai Sep 25, 2022
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
5 changes: 4 additions & 1 deletion config.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ X11LIB = /usr/X11R6/lib
XINERAMALIBS = -lXinerama
XINERAMAFLAGS = -DXINERAMA

# XRandR
XRANDRLIBS = -lXrandr

# freetype
FREETYPELIBS = -lfontconfig -lXft
FREETYPEINC = /usr/include/freetype2
Expand All @@ -23,7 +26,7 @@ FREETYPEINC = /usr/include/freetype2

# includes and libs
INCS = -I${X11INC} -I${FREETYPEINC}
LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS} -lm
LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${XRANDRLIBS} ${FREETYPELIBS} -lm

# flags
CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_POSIX_C_SOURCE=200809L -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
Expand Down
11 changes: 10 additions & 1 deletion instantwm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
#include <X11/X.h>
#include <X11/Xlib.h>
#include <X11/Xresource.h>
#include <X11/extensions/Xrandr.h>
#include <errno.h>
#include <locale.h>
#include <math.h>
Expand Down Expand Up @@ -448,11 +449,19 @@ void animateclient(Client *c, int x, int y, int w, int h, int frames,
width = w ? w : c->w;
height = h ? h : c->h;

XRRScreenConfiguration *conf = XRRGetScreenInfo(dpy, RootWindow(dpy, 0));
short refresh_rate = XRRConfigCurrentRate(conf);

// scale the framerate properly for !=60Hz displays
frames = frames * (refresh_rate / 60);
double usecs = (1 / (double)refresh_rate) * 1000000;

// halve frames if enough events are queried
frames = frames / 1 + (XEventsQueued(dpy, QueuedAlready) > 50);

// No animation if even more events are queried
if (!frames || XEventsQueued(dpy, QueuedAlready) > 100) {
usecs = 0;
if (resetpos)
resize(c, c->x, c->y, width, height, 0);
else
Expand Down Expand Up @@ -487,7 +496,7 @@ void animateclient(Client *c, int x, int y, int w, int h, int frames,
oldy + easeOutCubic(((double)time / frames)) * (y - oldy),
width, height, 1);
time++;
usleep(15000);
usleep(usecs);
}
}
}
Expand Down