diff options
| author | Dennis Real <github@tildepipe.org> | 2013-02-14 17:02:16 +0100 |
|---|---|---|
| committer | Dennis Real <github@tildepipe.org> | 2013-02-14 17:02:16 +0100 |
| commit | 08faff479023efff6380061d81362073f679cd34 (patch) | |
| tree | a462195afe9a6e2e2249f070c12ff6d1ff60d65c /src/winwidget.c | |
| parent | 353578ebc130f53547996ab87f5b3795c1360f3f (diff) | |
| parent | 43a7d315ae6952e096ae3a0351273c5639377870 (diff) | |
Merge branch 'master' of git://github.com/derf/feh
Diffstat (limited to 'src/winwidget.c')
| -rw-r--r-- | src/winwidget.c | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/src/winwidget.c b/src/winwidget.c index 2f543df..ada4c02 100644 --- a/src/winwidget.c +++ b/src/winwidget.c @@ -780,23 +780,28 @@ void winwidget_move(winwidget winwid, int x, int y) void winwidget_resize(winwidget winwid, int w, int h) { - Window ignored_window; XWindowAttributes attributes; - int tc_x, tc_y; + int tc_x, tc_y, px, py; int scr_width = scr->width; int scr_height = scr->height; + /* discarded */ + Window dw; + int di, i; + unsigned int du; + XGetWindowAttributes(disp, winwid->win, &attributes); #ifdef HAVE_LIBXINERAMA if (opt.xinerama && xinerama_screens) { - int i; xinerama_screen = 0; + XQueryPointer(disp, root, &dw, &dw, &px, &py, &di, &di, &du); for (i = 0; i < num_xinerama_screens; i++) { - if (XY_IN_RECT(attributes.x, attributes.y, + if (XY_IN_RECT(px, py, xinerama_screens[i].x_org, xinerama_screens[i].y_org, - xinerama_screens[i].width, xinerama_screens[i].height)) { + xinerama_screens[i].width, + xinerama_screens[i].height)) { xinerama_screen = i; break; } @@ -828,7 +833,7 @@ void winwidget_resize(winwidget winwid, int w, int h) XTranslateCoordinates(disp, winwid->win, attributes.root, -attributes.border_width - attributes.x, - -attributes.border_width - attributes.y, &tc_x, &tc_y, &ignored_window); + -attributes.border_width - attributes.y, &tc_x, &tc_y, &dw); winwid->x = tc_x; winwid->y = tc_y; XMoveResizeWindow(disp, winwid->win, tc_x, tc_y, winwid->w, winwid->h); |