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

Jump to bottom

selectionEdgeDestroy: misc cleanups #304

Merged
merged 3 commits into from
May 26, 2023
Merged

selectionEdgeDestroy: misc cleanups #304

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
904c29f
selectionEdgeDestroy: bugfix + misc cleanups
N-R-K May 21, 2023
9334ca0
selectionEdgeDestroy: workaround compositor issues
N-R-K May 25, 2023
23ce12a
selectionEdgeDestroy: wait for both destroy and unmap event
N-R-K May 26, 2023
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
52 changes: 19 additions & 33 deletions src/selection_edge.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
Part of the code comes from the scrot.c file and maintains its authorship.
*/

#include <errno.h>
#include <stdlib.h>
#include <time.h>

Expand All @@ -50,9 +51,6 @@ struct SelectionEdge {
XClassHint *classHint;
};

static void waitUnmapWindowNotify(void);
static Bool xeventUnmap(Display *, XEvent *, XPointer);

void selectionEdgeCreate(void)
{
struct Selection *const sel = *selectionGet();
Expand Down Expand Up @@ -130,38 +128,26 @@ void selectionEdgeDestroy(void)
const struct Selection *const sel = *selectionGet();
struct SelectionEdge *pe = sel->edge;

if (pe->wndDraw != 0) {
waitUnmapWindowNotify();
XFree(pe->classHint);
if (pe->wndDraw != None) {
XSelectInput(disp, pe->wndDraw, StructureNotifyMask);
XDestroyWindow(disp, pe->wndDraw);
}

free(pe);
}

static void waitUnmapWindowNotify(void)
{
const struct Selection *const sel = *selectionGet();
const struct SelectionEdge *const pe = sel->edge;
XEvent ev;

XSelectInput(disp, pe->wndDraw, StructureNotifyMask);

XUnmapWindow(disp, pe->wndDraw);
bool is_unmapped = false, is_destroyed = false;
for (XEvent ev; !(is_unmapped && is_destroyed);) {
XNextEvent(disp, &ev);
if (ev.type == DestroyNotify && ev.xdestroywindow.window == pe->wndDraw)
is_destroyed = true;
if (ev.type == UnmapNotify && ev.xunmap.window == pe->wndDraw)
is_unmapped = true;
}
/* HACK: although we recived a DestroyNotify event, the frame still
* might not have been updated. a compositor might also buffer frames
* adding latency. so wait a bit for the screen to update and the
* selection borders to go away. */
struct timespec t = { .tv_nsec = 80 * 1000L * 1000L };
while (nanosleep(&t, &t) < 0 && errno == EINTR);

struct timespec delay = {0, 80000000L}; // 80ms

for (short i = 0; i < 30; ++i) {
if (XCheckIfEvent(disp, &ev, &xeventUnmap, (XPointer) & (pe->wndDraw)))
break;
nanosleep(&delay, NULL);
XFree(pe->classHint);
}
}


static Bool xeventUnmap(Display *dpy, XEvent *ev, XPointer arg)
{
(void)dpy; // unused
Window *win = (Window *)arg;
return (ev->xunmap.window == *win);
free(pe);
}