mirror of
https://github.com/X11Libre/xserver.git
synced 2026-09-21 20:26:45 +00:00
Static markup and dead code cull over xkb/.
The former <X11/extensions/XKBsrv.h> has been pulled into the server now as include/xkbsrv.h, and the world updated to look for it in the new place, since it made no sense to define server API in an extension header. Any further work along this line will need to do similar things with XKBgeom.h and friends.
This commit is contained in:
parent
9398d62f27
commit
021fc5cb2c
57 changed files with 1269 additions and 1378 deletions
|
|
@ -36,7 +36,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
|||
#include <X11/extensions/XI.h>
|
||||
#include "inputstr.h"
|
||||
#include "windowstr.h"
|
||||
#include <X11/extensions/XKBsrv.h>
|
||||
#include <xkbsrv.h>
|
||||
#include "xkb.h"
|
||||
|
||||
/***====================================================================***/
|
||||
|
|
@ -331,7 +331,7 @@ Time time = 0;
|
|||
return;
|
||||
}
|
||||
|
||||
void
|
||||
static void
|
||||
XkbSendIndicatorNotify(DeviceIntPtr kbd,int xkbType,xkbIndicatorNotify *pEv)
|
||||
{
|
||||
int initialized;
|
||||
|
|
@ -971,48 +971,6 @@ XkbInterestPtr interest;
|
|||
return NULL;
|
||||
}
|
||||
|
||||
int
|
||||
XkbRemoveClient(DevicePtr inDev,ClientPtr client)
|
||||
{
|
||||
XkbSrvInfoPtr xkbi;
|
||||
DeviceIntPtr dev = (DeviceIntPtr)inDev;
|
||||
XkbInterestPtr interest;
|
||||
unsigned long autoCtrls,autoValues;
|
||||
Bool found;
|
||||
|
||||
found= False;
|
||||
autoCtrls= autoValues= 0;
|
||||
if ( dev->xkb_interest ) {
|
||||
interest = dev->xkb_interest;
|
||||
if (interest && (interest->client==client)){
|
||||
dev->xkb_interest = interest->next;
|
||||
autoCtrls= interest->autoCtrls;
|
||||
autoValues= interest->autoCtrlValues;
|
||||
_XkbFree(interest);
|
||||
found= True;
|
||||
}
|
||||
while ((!found)&&(interest->next)) {
|
||||
if (interest->next->client==client) {
|
||||
XkbInterestPtr victim = interest->next;
|
||||
interest->next = victim->next;
|
||||
autoCtrls= victim->autoCtrls;
|
||||
autoValues= victim->autoCtrlValues;
|
||||
_XkbFree(victim);
|
||||
found= True;
|
||||
}
|
||||
interest = interest->next;
|
||||
}
|
||||
}
|
||||
if (found && autoCtrls && dev->key && dev->key->xkbInfo ) {
|
||||
XkbEventCauseRec cause;
|
||||
|
||||
xkbi= dev->key->xkbInfo;
|
||||
XkbSetCauseXkbReq(&cause,X_kbPerClientFlags,client);
|
||||
XkbEnableDisableControls(xkbi,autoCtrls,autoValues,NULL,&cause);
|
||||
}
|
||||
return found;
|
||||
}
|
||||
|
||||
int
|
||||
XkbRemoveResourceClient(DevicePtr inDev,XID id)
|
||||
{
|
||||
|
|
|
|||
Loading…
Reference in a new issue