mirror of
https://github.com/9fans/plan9port.git
synced 2025-01-12 11:10:07 +00:00
parent
40d787ab12
commit
1f799495e4
5 changed files with 28 additions and 13 deletions
|
@ -55,10 +55,7 @@ gfx_replacescreenimage(Client *c, Memimage *m)
|
|||
_freememimage(om);
|
||||
}
|
||||
qunlock(&c->drawlk);
|
||||
|
||||
qlock(&c->eventlk);
|
||||
c->mouse.resized = 1;
|
||||
qunlock(&c->eventlk);
|
||||
gfx_mouseresized(c);
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
|
@ -187,6 +187,7 @@ void gfx_keystroke(Client*, int);
|
|||
void gfx_main(void);
|
||||
void gfx_mousetrack(Client*, int, int, int, uint);
|
||||
void gfx_replacescreenimage(Client*, Memimage*);
|
||||
void gfx_mouseresized(Client*);
|
||||
void gfx_started(void);
|
||||
|
||||
// rpc_* routines are called on the RPC thread,
|
||||
|
|
|
@ -518,7 +518,6 @@ rpc_resizeimg(Client *c)
|
|||
- (void)resizeimg {
|
||||
[self initimg];
|
||||
gfx_replacescreenimage(self.client, self.img);
|
||||
[self sendmouse:0];
|
||||
}
|
||||
|
||||
- (void)windowDidResize:(NSNotification *)notification {
|
||||
|
|
|
@ -394,12 +394,30 @@ matchmouse(Client *c)
|
|||
}
|
||||
}
|
||||
|
||||
void
|
||||
gfx_mouseresized(Client *c)
|
||||
{
|
||||
gfx_mousetrack(c, -1, -1, -1, -1);
|
||||
}
|
||||
|
||||
void
|
||||
gfx_mousetrack(Client *c, int x, int y, int b, uint ms)
|
||||
{
|
||||
Mouse *m;
|
||||
|
||||
qlock(&c->eventlk);
|
||||
if(x == -1 && y == -1 && b == -1 && ms == -1) {
|
||||
Mouse *copy;
|
||||
// repeat last mouse event for resize
|
||||
if(c->mouse.ri == 0)
|
||||
copy = &c->mouse.m[nelem(c->mouse.m)-1];
|
||||
else
|
||||
copy = &c->mouse.m[c->mouse.ri-1];
|
||||
x = copy->xy.x;
|
||||
y = copy->xy.y;
|
||||
b = copy->buttons;
|
||||
ms = copy->msec;
|
||||
}
|
||||
if(x < c->mouserect.min.x)
|
||||
x = c->mouserect.min.x;
|
||||
if(x > c->mouserect.max.x)
|
||||
|
|
|
@ -44,7 +44,7 @@ static Xwin*
|
|||
newxwin(Client *c)
|
||||
{
|
||||
Xwin *w;
|
||||
|
||||
|
||||
w = mallocz(sizeof *w, 1);
|
||||
if(w == nil)
|
||||
sysfatal("out of memory");
|
||||
|
@ -59,7 +59,7 @@ static Xwin*
|
|||
findxwin(XDrawable d)
|
||||
{
|
||||
Xwin *w, **l;
|
||||
|
||||
|
||||
for(l=&_x.windows; (w=*l) != nil; l=&w->next) {
|
||||
if(w->drawable == d) {
|
||||
/* move to front */
|
||||
|
@ -658,7 +658,7 @@ xattach(Client *client, char *label, char *winsize)
|
|||
_x.losefocus = XInternAtom(_x.display, "_9WM_LOSE_FOCUS", False);
|
||||
_x.wmprotos = XInternAtom(_x.display, "WM_PROTOCOLS", False);
|
||||
}
|
||||
|
||||
|
||||
atoms[0] = _x.takefocus;
|
||||
atoms[1] = _x.losefocus;
|
||||
XChangeProperty(_x.display, w->drawable, _x.wmprotos, XA_ATOM, 32,
|
||||
|
@ -700,7 +700,7 @@ xattach(Client *client, char *label, char *winsize)
|
|||
_x.gcsimplesrc = xgc(w->screenpm, FillStippled, -1);
|
||||
_x.gczero = xgc(w->screenpm, -1, -1);
|
||||
_x.gcreplsrc = xgc(w->screenpm, FillTiled, -1);
|
||||
|
||||
|
||||
pmid = XCreatePixmap(_x.display, w->drawable, 1, 1, 1);
|
||||
_x.gcfill0 = xgc(pmid, FillSolid, 0);
|
||||
_x.gccopy0 = xgc(pmid, -1, -1);
|
||||
|
@ -729,7 +729,7 @@ rpc_setlabel(Client *client, char *label)
|
|||
{
|
||||
Xwin *w = (Xwin*)client->view;
|
||||
XTextProperty name;
|
||||
|
||||
|
||||
/*
|
||||
* Label and other properties required by ICCCCM.
|
||||
*/
|
||||
|
@ -1032,7 +1032,7 @@ _xreplacescreenimage(Client *client)
|
|||
XDrawable pixmap;
|
||||
Rectangle r;
|
||||
Xwin *w;
|
||||
|
||||
|
||||
w = (Xwin*)client->view;
|
||||
r = w->newscreenr;
|
||||
pixmap = XCreatePixmap(_x.display, w->drawable, Dx(r), Dy(r), _x.depth);
|
||||
|
@ -1527,7 +1527,7 @@ __xputsnarf(char *data)
|
|||
{
|
||||
XButtonEvent e;
|
||||
Xwin *w;
|
||||
|
||||
|
||||
if(strlen(data) >= SnarfSize)
|
||||
return;
|
||||
qlock(&clip.lk);
|
||||
|
@ -1730,7 +1730,7 @@ rpc_bouncemouse(Client *c, Mouse m)
|
|||
Xwin *w = (Xwin*)c->view;
|
||||
XButtonEvent e;
|
||||
XWindow dw;
|
||||
|
||||
|
||||
xlock();
|
||||
e.type = ButtonPress;
|
||||
e.state = 0;
|
||||
|
|
Loading…
Reference in a new issue