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

Drop using {open,close}pixel() in favor of setting input shape to a 0x0 rect #49

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Drop using {open,close}pixel() in favor of setting input shape to a 0x0 rect #49

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
024fc8f
Set input shape to 0x0 to passthrough mouse
jabashque Feb 23, 2020
88aba24
Remove {open,close}pixel(), var mouseinfo, type mouseinfo_t
jabashque Feb 23, 2020
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
67 changes: 4 additions & 63 deletions keynav.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,11 +80,6 @@ typedef struct wininfo {
int curviewport;
} wininfo_t;

typedef struct mouseinfo {
int x;
int y;
} mouseinfo_t;

typedef struct viewport {
int x;
int y;
Expand All @@ -96,7 +91,6 @@ typedef struct viewport {
} viewport_t;

static wininfo_t wininfo;
static mouseinfo_t mouseinfo;
static viewport_t *viewports;
static int nviewports = 0;
static int xinerama = 0;
Expand Down Expand Up @@ -191,8 +185,6 @@ void sighup(int sig);
void restart();
void recordings_save(const char *filename);
void parse_recordings(const char *filename);
void openpixel(Display *dpy, Window zone, mouseinfo_t *mouseinfo);
void closepixel(Display *dpy, Window zone, mouseinfo_t *mouseinfo);

typedef struct dispatch {
char *command;
Expand Down Expand Up @@ -983,6 +975,9 @@ void cmd_start(char *args) {
/* Tell the window manager not to manage us */
winattr.override_redirect = 1;
XChangeWindowAttributes(dpy, zone, CWOverrideRedirect, &winattr);
/* Set the input shape to be nothing so that the mouse can still
* click/scroll if on the grid */
XShapeCombineRectangles(dpy, zone, ShapeInput, 0, 0, NULL, 0, ShapeSet, 0);

XSelectInput(dpy, zone, StructureNotifyMask | ExposureMask
| PointerMotionMask | LeaveWindowMask );
Expand Down Expand Up @@ -1175,21 +1170,7 @@ void cmd_warp(char *args) {
x = wininfo.x + wininfo.w / 2;
y = wininfo.y + wininfo.h / 2;

if (mouseinfo.x != -1 && mouseinfo.y != -1) {
closepixel(dpy, zone, &mouseinfo);
}

/* Open pixels hould be relative to the window coordinates,
* not screen coordinates. */
mouseinfo.x = x - wininfo.x;
mouseinfo.y = y - wininfo.y;
openpixel(dpy, zone, &mouseinfo);

xdo_move_mouse(xdo, x, y, viewports[wininfo.curviewport].screen_num);
xdo_wait_for_mouse_move_to(xdo, x, y);

/* TODO(sissel): do we need to open again? */
openpixel(dpy, zone, &mouseinfo);
}

void cmd_click(char *args) {
Expand Down Expand Up @@ -1978,36 +1959,6 @@ void parse_recordings(const char *filename) {
fclose(fp);
}

void openpixel(Display *dpy, Window zone, mouseinfo_t *mouseinfo) {
XRectangle rect;
if (mouseinfo->x == -1 && mouseinfo->y == -1) {
return;
}

rect.x = mouseinfo->x;
rect.y = mouseinfo->y;
rect.width = 1;
rect.height = 1;

XShapeCombineRectangles(dpy, zone, ShapeBounding, 0, 0, &rect, 1,
ShapeSubtract, 0);
} /* void openpixel */

void closepixel(Display *dpy, Window zone, mouseinfo_t *mouseinfo) {
XRectangle rect;
if (mouseinfo->x == -1 && mouseinfo->y == -1) {
return;
}

rect.x = mouseinfo->x;
rect.y = mouseinfo->y;
rect.width = 1;
rect.height = 1;

XShapeCombineRectangles(dpy, zone, ShapeBounding, 0, 0, &rect, 1,
ShapeUnion, 0);
} /* void closepixel */

int main(int argc, char **argv) {
char *pcDisplay;
int ret;
Expand Down Expand Up @@ -2096,17 +2047,6 @@ int main(int argc, char **argv) {
}
break;

case MotionNotify:
if (zone) {
if (mouseinfo.x != -1 && mouseinfo.y != -1) {
closepixel(dpy, zone, &mouseinfo);
}
mouseinfo.x = e.xmotion.x;
mouseinfo.y = e.xmotion.y;
openpixel(dpy, zone, &mouseinfo);
}
break;

// Ignorable events.
case GraphicsExpose:
case NoExpose:
Expand All @@ -2115,6 +2055,7 @@ int main(int argc, char **argv) {
case DestroyNotify: // window was destroyed
case UnmapNotify: // window was unmapped (hidden)
case MappingNotify: // when keyboard mapping changes
case MotionNotify: // when mouse movement is detected
break;
default:
if (e.type == xrandr_event_base + RRScreenChangeNotify) {
Expand Down