eukara/fteqw
1
0
Fork 0
forked from fte/fteqw
Code Pull requests Activity

Small fixup for the x11 server plugin.

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5827 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2021-05-07 05:41:51 +00:00
parent 176afd6d5d
commit b3dbab4973
2 changed files with 1 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
plugins/xsv/m_x.c
View file

@ -761,7 +761,6 @@ nextmessage:
//Con_Printf("Request %i\n", req->reqType);
// Z_CheckSentinals();
XS_CheckResourceSentinals();
if (!req->length)
{
int rt, data;
@ -779,7 +778,6 @@ nextmessage:
}
else
XRequests[req->reqType](cl, req);
XS_CheckResourceSentinals();
// Z_CheckSentinals();
//Con_Printf("Done request\n");
}
@ -1064,8 +1062,6 @@ void XWindows_Startup(int x11display) //initialise the server socket and do any
system(va("DISPLAY=127.0.0.1:%i /usr/bin/x-terminal-emulator &", x11display));
}
XS_CheckResourceSentinals();
// Menu_Control(MENU_GRAB);
}
@ -1863,7 +1859,6 @@ void X_EvalutateFocus(int movemode)
void XWindows_Draw(void)
{
XS_CheckResourceSentinals();
{
X_EvalutateCursorOwner(NotifyNormal);
}
@ -1899,13 +1894,10 @@ void XWindows_Draw(void)
// Con_DrawNotify();
XWindows_TendToClients();
XS_CheckResourceSentinals();
}
void XWindows_KeyDown(int key)
{
XS_CheckResourceSentinals();
if (!key) //hrm
return;
/*
@ -2007,7 +1999,6 @@ void XWindows_KeyDown(int key)
else if (XS_GetResource(ev.u.keyButtonPointer.child, (void**)&wnd) == x_window)
X_SendInputNotification(&ev, wnd, (ev.u.u.type==ButtonPress)?ButtonPressMask:KeyPressMask);
}
XS_CheckResourceSentinals();
}
void XWindows_Keyup(int key)
{
@ -2016,7 +2007,6 @@ void XWindows_Keyup(int key)
if (key == K_ALT)
altdown = false;
XS_CheckResourceSentinals();
{
xEvent ev;
xwindow_t *wnd;
@ -2110,7 +2100,6 @@ void XWindows_Keyup(int key)
X_SendInputNotification(&ev, wnd, (ev.u.u.type==ButtonRelease)?ButtonReleaseMask:KeyReleaseMask);
}
}
XS_CheckResourceSentinals();
}
/*qboolean QDECL X11_MenuEvent(int eventtype, int param, float mousecursor_x, float mousecursor_y)

24
plugins/xsv/x_res.c
View file

@ -12,7 +12,7 @@ xwindow_t *rootwindow;
xresource_t *resources;
qbyte *xscreen;
qboolean xscreenmodified;
extern qboolean xscreenmodified;
short xscreenwidth;
short xscreenheight;
@ -65,20 +65,6 @@ Atom XS_FindAtom(char *name)
return None;
}
void XS_CheckResourceSentinals(void)
{
/* xresource_t *res;
for (res = resources; res; res = res->next)
{
if (res->restype == x_window)
{
if (((xwindow_t*)res)->buffer)
BZ_CheckSentinals(((xwindow_t*)res)->buffer);
}
}
*/
}
void XS_DestroyResource(xresource_t *res)
{
qboolean nofree = false;
@ -476,8 +462,6 @@ xwindow_t *XS_CreateWindow(int wid, xclient_t *owner, xwindow_t *parent, short x
XS_SetParent(neww, parent);
XS_LinkResource(&neww->res);
XS_CheckResourceSentinals();
return neww;
}
@ -654,8 +638,6 @@ void XS_CreateInitialResources(void)
xscreen = realloc(xscreen, xscreenwidth*4 * xscreenheight);
xscreenmodified = true;
XS_CheckResourceSentinals();
XS_DestroyResourcesOfClient(NULL);
memset(resbuckets, 0, sizeof(resbuckets));
@ -738,8 +720,6 @@ void XS_CreateInitialResources(void)
rootwindow->depth = 24;
rootwindow->mapped = true;
XS_CheckResourceSentinals();
memset(&pm, 0, sizeof(pm));
pm.linked = true;
@ -754,7 +734,5 @@ void XS_CreateInitialResources(void)
XW_ClearArea(rootwindow, 0, 0, rootwindow->width, rootwindow->height);
XS_CheckResourceSentinals();
xrefreshed = true;
}