summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--openbox/moveresize.c10
-rw-r--r--openbox/openbox.c4
-rw-r--r--openbox/openbox.h4
3 files changed, 13 insertions, 5 deletions
diff --git a/openbox/moveresize.c b/openbox/moveresize.c
index 77311804..2c9f0cdf 100644
--- a/openbox/moveresize.c
+++ b/openbox/moveresize.c
@@ -95,19 +95,19 @@ void moveresize_start(Client *c, int x, int y, guint b, guint32 cnr)
if (corner == prop_atoms.net_wm_moveresize_size_topleft)
cur = ob_cursors.tl;
else if (corner == prop_atoms.net_wm_moveresize_size_top)
- cur = ob_cursors.tl;
+ cur = ob_cursors.t;
else if (corner == prop_atoms.net_wm_moveresize_size_topright)
cur = ob_cursors.tr;
else if (corner == prop_atoms.net_wm_moveresize_size_right)
- cur = ob_cursors.tr;
+ cur = ob_cursors.r;
else if (corner == prop_atoms.net_wm_moveresize_size_bottomright)
cur = ob_cursors.br;
else if (corner == prop_atoms.net_wm_moveresize_size_bottom)
- cur = ob_cursors.br;
+ cur = ob_cursors.b;
else if (corner == prop_atoms.net_wm_moveresize_size_bottomleft)
cur = ob_cursors.bl;
else if (corner == prop_atoms.net_wm_moveresize_size_left)
- cur = ob_cursors.bl;
+ cur = ob_cursors.l;
else if (corner == prop_atoms.net_wm_moveresize_size_keyboard)
cur = ob_cursors.br;
else if (corner == prop_atoms.net_wm_moveresize_move)
@@ -183,7 +183,7 @@ void moveresize_event(XEvent *e)
button = e->xbutton.button; /* this will end it now */
}
} else if (e->type == ButtonRelease) {
- if (e->xbutton.button == button) {
+ if (!button || e->xbutton.button == button) {
end_moveresize(FALSE);
}
} else if (e->type == MotionNotify) {
diff --git a/openbox/openbox.c b/openbox/openbox.c
index eeb7e0fb..9dd50985 100644
--- a/openbox/openbox.c
+++ b/openbox/openbox.c
@@ -151,6 +151,10 @@ int main(int argc, char **argv)
ob_cursors.tr = XCreateFontCursor(ob_display, XC_top_right_corner);
ob_cursors.bl = XCreateFontCursor(ob_display, XC_bottom_left_corner);
ob_cursors.br = XCreateFontCursor(ob_display, XC_bottom_right_corner);
+ ob_cursors.t = XCreateFontCursor(ob_display, XC_top_side);
+ ob_cursors.r = XCreateFontCursor(ob_display, XC_right_side);
+ ob_cursors.b = XCreateFontCursor(ob_display, XC_bottom_side);
+ ob_cursors.l = XCreateFontCursor(ob_display, XC_left_side);
prop_startup(); /* get atoms values for the display */
extensions_query_all(); /* find which extensions are present */
diff --git a/openbox/openbox.h b/openbox/openbox.h
index 932c3e3e..d747b3f7 100644
--- a/openbox/openbox.h
+++ b/openbox/openbox.h
@@ -41,6 +41,10 @@ typedef struct Cursors {
Cursor br;
Cursor tl;
Cursor tr;
+ Cursor t;
+ Cursor r;
+ Cursor b;
+ Cursor l;
} Cursors;
extern Cursors ob_cursors;