jh163888/xrdp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

don't draw xor box unless when dragging unless mouse moves

Browse Source
This commit is contained in:
jsorg71 2004-09-16 01:59:40 +00:00
parent 68e7c74779
commit 2ed9412912
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
xrdp/xrdp_types.h
View File

@ -280,6 +280,7 @@ struct xrdp_wm
int draggingdy; int draggingdy;
int draggingorgx; int draggingorgx;
int draggingorgy; int draggingorgy;
int draggingxorstate;
struct xrdp_bitmap* dragging_window; struct xrdp_bitmap* dragging_window;
/* the down(clicked) button */ /* the down(clicked) button */
struct xrdp_bitmap* button_down; struct xrdp_bitmap* button_down;

17
xrdp/xrdp_wm.c
View File

@ -819,12 +819,14 @@ int xrdp_wm_mouse_move(struct xrdp_wm* self, int x, int y)
xrdp_painter_begin_update(self->painter); xrdp_painter_begin_update(self->painter);
boxx = self->draggingx - self->draggingdx; boxx = self->draggingx - self->draggingdx;
boxy = self->draggingy - self->draggingdy; boxy = self->draggingy - self->draggingdy;
xrdp_wm_xor_pat(self, boxx, boxy, self->draggingcx, self->draggingcy); if (self->draggingxorstate)
xrdp_wm_xor_pat(self, boxx, boxy, self->draggingcx, self->draggingcy);
self->draggingx = x; self->draggingx = x;
self->draggingy = y; self->draggingy = y;
boxx = self->draggingx - self->draggingdx; boxx = self->draggingx - self->draggingdx;
boxy = self->draggingy - self->draggingdy; boxy = self->draggingy - self->draggingdy;
xrdp_wm_xor_pat(self, boxx, boxy, self->draggingcx, self->draggingcy); xrdp_wm_xor_pat(self, boxx, boxy, self->draggingcx, self->draggingcy);
self->draggingxorstate = 1;
xrdp_painter_end_update(self->painter); xrdp_painter_end_update(self->painter);
} }
b = xrdp_wm_at_pos(self->screen, x, y, 0); b = xrdp_wm_at_pos(self->screen, x, y, 0);
@ -888,7 +890,9 @@ int xrdp_wm_mouse_click(struct xrdp_wm* self, int x, int y, int but, int down)
oldx = self->dragging_window->left; oldx = self->dragging_window->left;
oldy = self->dragging_window->top; oldy = self->dragging_window->top;
/* draw xor box one more time */ /* draw xor box one more time */
xrdp_wm_xor_pat(self, newx, newy, self->draggingcx, self->draggingcy); if (self->draggingxorstate)
xrdp_wm_xor_pat(self, newx, newy, self->draggingcx, self->draggingcy);
self->draggingxorstate = 0;
/* move screen to new location */ /* move screen to new location */
xrdp_wm_move_window(self, self->dragging_window, newx - oldx, newy - oldy); xrdp_wm_move_window(self, self->dragging_window, newx - oldx, newy - oldy);
self->dragging_window = 0; self->dragging_window = 0;
@ -922,8 +926,10 @@ int xrdp_wm_mouse_click(struct xrdp_wm* self, int x, int y, int but, int down)
{ {
newx = self->draggingx - self->draggingdx; newx = self->draggingx - self->draggingdx;
newy = self->draggingy - self->draggingdy; newy = self->draggingy - self->draggingdy;
xrdp_wm_xor_pat(self, newx, newy, self->draggingcx, if (self->draggingxorstate)
self->draggingcy); xrdp_wm_xor_pat(self, newx, newy,
self->draggingcx, self->draggingcy);
self->draggingxorstate = 0;
} }
self->dragging = 1; self->dragging = 1;
self->dragging_window = b; self->dragging_window = b;
@ -935,9 +941,6 @@ int xrdp_wm_mouse_click(struct xrdp_wm* self, int x, int y, int but, int down)
self->draggingdy = y - b->top; self->draggingdy = y - b->top;
self->draggingcx = b->width; self->draggingcx = b->width;
self->draggingcy = b->height; self->draggingcy = b->height;
newx = self->draggingx - self->draggingdx;
newy = self->draggingy - self->draggingdy;
xrdp_wm_xor_pat(self, newx, newy, self->draggingcx, self->draggingcy);
} }
} }
} }