Commit db687f71 authored by Peter Hutterer's avatar Peter Hutterer

xkb: sed True -> TRUE and False -> FALSE

Signed-off-by: Peter Hutterer's avatarPeter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Dan Nicholson's avatarDan Nicholson <dbn.lists@gmail.com>
Reviewed-by: Daniel Stone's avatarDaniel Stone <daniel@fooishbar.org>
parent 0ea2b0bd
......@@ -309,11 +309,6 @@ extern _X_EXPORT int DeviceButtonPress,DeviceButtonRelease;
#define Status int
#ifndef True
#define True TRUE
#define False FALSE
#endif
extern _X_EXPORT void XkbUseMsg(
void
);
......
......@@ -315,22 +315,22 @@ XkbFreeKeyboard(XkbDescPtr xkb,unsigned which,Bool freeAll)
if (freeAll)
which= XkbAllComponentsMask;
if (which&XkbClientMapMask)
XkbFreeClientMap(xkb,XkbAllClientInfoMask,True);
XkbFreeClientMap(xkb,XkbAllClientInfoMask,TRUE);
if (which&XkbServerMapMask)
XkbFreeServerMap(xkb,XkbAllServerInfoMask,True);
XkbFreeServerMap(xkb,XkbAllServerInfoMask,TRUE);
if (which&XkbCompatMapMask)
XkbFreeCompatMap(xkb,XkbAllCompatMask,True);
XkbFreeCompatMap(xkb,XkbAllCompatMask,TRUE);
if (which&XkbIndicatorMapMask)
XkbFreeIndicatorMaps(xkb);
if (which&XkbNamesMask)
XkbFreeNames(xkb,XkbAllNamesMask,True);
XkbFreeNames(xkb,XkbAllNamesMask,TRUE);
if ((which&XkbGeometryMask) && (xkb->geom!=NULL)) {
XkbFreeGeometry(xkb->geom,XkbGeomAllMask,True);
XkbFreeGeometry(xkb->geom,XkbGeomAllMask,TRUE);
/* PERHAPS BONGHITS etc */
xkb->geom = NULL;
}
if (which&XkbControlsMask)
XkbFreeControls(xkb,XkbAllControlsMask,True);
XkbFreeControls(xkb,XkbAllControlsMask,TRUE);
if (freeAll)
xfree(xkb);
return;
......
......@@ -218,7 +218,7 @@ _XkbClearOutline(char *outline_in)
XkbOutlinePtr outline= (XkbOutlinePtr)outline_in;
if (outline->points!=NULL)
XkbFreeGeomPoints(outline,0,outline->num_points,True);
XkbFreeGeomPoints(outline,0,outline->num_points,TRUE);
return;
}
......@@ -241,7 +241,7 @@ _XkbClearShape(char *shape_in)
XkbShapePtr shape= (XkbShapePtr)shape_in;
if (shape->outlines)
XkbFreeGeomOutlines(shape,0,shape->num_outlines,True);
XkbFreeGeomOutlines(shape,0,shape->num_outlines,TRUE);
return;
}
......@@ -275,7 +275,7 @@ _XkbClearOverlayRow(char *row_in)
XkbOverlayRowPtr row= (XkbOverlayRowPtr)row_in;
if (row->keys!=NULL)
XkbFreeGeomOverlayKeys(row,0,row->num_keys,True);
XkbFreeGeomOverlayKeys(row,0,row->num_keys,TRUE);
return;
}
......@@ -297,7 +297,7 @@ _XkbClearOverlay(char *overlay_in)
XkbOverlayPtr overlay= (XkbOverlayPtr)overlay_in;
if (overlay->rows!=NULL)
XkbFreeGeomOverlayRows(overlay,0,overlay->num_rows,True);
XkbFreeGeomOverlayRows(overlay,0,overlay->num_rows,TRUE);
return;
}
......@@ -331,7 +331,7 @@ _XkbClearRow(char *row_in)
XkbRowPtr row= (XkbRowPtr)row_in;
if (row->keys!=NULL)
XkbFreeGeomKeys(row,0,row->num_keys,True);
XkbFreeGeomKeys(row,0,row->num_keys,TRUE);
return;
}
......@@ -352,9 +352,9 @@ _XkbClearSection(char *section_in)
XkbSectionPtr section= (XkbSectionPtr)section_in;
if (section->rows!=NULL)
XkbFreeGeomRows(section,0,section->num_rows,True);
XkbFreeGeomRows(section,0,section->num_rows,TRUE);
if (section->doodads!=NULL) {
XkbFreeGeomDoodads(section->doodads,section->num_doodads,True);
XkbFreeGeomDoodads(section->doodads,section->num_doodads,TRUE);
section->doodads= NULL;
}
return;
......@@ -426,20 +426,20 @@ XkbFreeGeometry(XkbGeometryPtr geom,unsigned which,Bool freeMap)
if (freeMap)
which= XkbGeomAllMask;
if ((which&XkbGeomPropertiesMask)&&(geom->properties!=NULL))
XkbFreeGeomProperties(geom,0,geom->num_properties,True);
XkbFreeGeomProperties(geom,0,geom->num_properties,TRUE);
if ((which&XkbGeomColorsMask)&&(geom->colors!=NULL))
XkbFreeGeomColors(geom,0,geom->num_colors,True);
XkbFreeGeomColors(geom,0,geom->num_colors,TRUE);
if ((which&XkbGeomShapesMask)&&(geom->shapes!=NULL))
XkbFreeGeomShapes(geom,0,geom->num_shapes,True);
XkbFreeGeomShapes(geom,0,geom->num_shapes,TRUE);
if ((which&XkbGeomSectionsMask)&&(geom->sections!=NULL))
XkbFreeGeomSections(geom,0,geom->num_sections,True);
XkbFreeGeomSections(geom,0,geom->num_sections,TRUE);
if ((which&XkbGeomDoodadsMask)&&(geom->doodads!= NULL)) {
XkbFreeGeomDoodads(geom->doodads,geom->num_doodads,True);
XkbFreeGeomDoodads(geom->doodads,geom->num_doodads,TRUE);
geom->doodads= NULL;
geom->num_doodads= geom->sz_doodads= 0;
}
if ((which&XkbGeomKeyAliasesMask)&&(geom->key_aliases!=NULL))
XkbFreeGeomKeyAliases(geom,0,geom->num_key_aliases,True);
XkbFreeGeomKeyAliases(geom,0,geom->num_key_aliases,TRUE);
if (freeMap) {
if (geom->label_font!=NULL) {
xfree(geom->label_font);
......@@ -646,7 +646,7 @@ Status rtrn;
}
return Success;
BAIL:
XkbFreeGeometry(geom,XkbGeomAllMask,True);
XkbFreeGeometry(geom,XkbGeomAllMask,TRUE);
xkb->geom= NULL;
return rtrn;
}
......@@ -919,9 +919,9 @@ Bool found;
if (row->row_under>=section->num_rows)
return NULL;
row_under= &section->rows[row->row_under];
for (i=0,found=False;i<row_under->num_keys;i++) {
for (i=0,found=FALSE;i<row_under->num_keys;i++) {
if (strncmp(under,row_under->keys[i].name.name,XkbKeyNameLength)==0) {
found= True;
found= TRUE;
break;
}
}
......
......@@ -187,7 +187,7 @@ BOOL replicated = FALSE;
if (syms[0]==NoSymbol) {
register int n;
Bool found;
for (n=1,found=False;(!found)&&(n<nSyms[i]);n++) {
for (n=1,found=FALSE;(!found)&&(n<nSyms[i]);n++) {
found= (syms[n]!=NoSymbol);
}
if (!found)
......@@ -227,27 +227,27 @@ BOOL replicated = FALSE;
* the core replication.
*/
if (nGroups>1) {
Bool sameType,allOneLevel, canonical = True;
Bool sameType,allOneLevel, canonical = TRUE;
allOneLevel= (xkb->map->types[types_inout[0]].num_levels==1);
for (i=1,sameType=True;(allOneLevel||sameType)&&(i<nGroups);i++) {
for (i=1,sameType=TRUE;(allOneLevel||sameType)&&(i<nGroups);i++) {
sameType=(sameType&&(types_inout[i]==types_inout[XkbGroup1Index]));
if (allOneLevel)
allOneLevel= (xkb->map->types[types_inout[i]].num_levels==1);
if (types_inout[i] > XkbLastRequiredType)
canonical = False;
canonical = FALSE;
}
if (((sameType) || canonical)&&
(!(protected&(XkbExplicitKeyTypesMask&~XkbExplicitKeyType1Mask)))){
register int s;
Bool identical;
for (i=1,identical=True;identical&&(i<nGroups);i++) {
for (i=1,identical=TRUE;identical&&(i<nGroups);i++) {
KeySym *syms;
if (nSyms[i] != nSyms[XkbGroup1Index])
identical = False;
identical = FALSE;
syms= &xkb_syms_rtrn[XKB_OFFSET(i,0)];
for (s=0;identical&&(s<nSyms[i]);s++) {
if (syms[s]!=xkb_syms_rtrn[s])
identical= False;
identical= FALSE;
}
}
if (identical)
......@@ -374,16 +374,16 @@ unsigned changed,tmp;
if ((!xkb)||(!xkb->map)||(!xkb->map->key_sym_map)||
(!xkb->compat)||(!xkb->compat->sym_interpret)||
(key<xkb->min_key_code)||(key>xkb->max_key_code)) {
return False;
return FALSE;
}
if (((!xkb->server)||(!xkb->server->key_acts))&&
(XkbAllocServerMap(xkb,XkbAllServerInfoMask,0)!=Success)) {
return False;
return FALSE;
}
changed= 0; /* keeps track of what has changed in _this_ call */
explicit= xkb->server->explicit[key];
if (explicit&XkbExplicitInterpretMask) /* nothing to do */
return True;
return TRUE;
mods= (xkb->map->modmap?xkb->map->modmap[key]:0);
nSyms= XkbKeyNumSyms(xkb,key);
syms= XkbKeySymsPtr(xkb,key);
......@@ -423,7 +423,7 @@ unsigned changed,tmp;
if (!pActs) {
if (nSyms > IBUF_SIZE)
xfree(interps);
return False;
return FALSE;
}
new_vmodmask= 0;
for (n=0;n<nSyms;n++) {
......@@ -508,7 +508,7 @@ unsigned changed,tmp;
}
if (interps!=ibuf)
xfree(interps);
return True;
return TRUE;
}
Status
......@@ -642,19 +642,19 @@ register int i,bit;
register unsigned mask;
if (xkb==NULL)
return False;
return FALSE;
if (virtual_mask==0) {
*mask_rtrn= 0;
return True;
return TRUE;
}
if (xkb->server==NULL)
return False;
return FALSE;
for (i=mask=0,bit=1;i<XkbNumVirtualMods;i++,bit<<=1) {
if (virtual_mask&bit)
mask|= xkb->server->vmods[i];
}
*mask_rtrn= mask;
return True;
return TRUE;
}
/***====================================================================***/
......@@ -670,7 +670,7 @@ unsigned int tmp;
XkbVirtualModsToReal(xkb,tmp,&tmp);
act->mods.mask= act->mods.real_mods;
act->mods.mask|= tmp;
return True;
return TRUE;
}
break;
case XkbSA_ISOLock:
......@@ -678,11 +678,11 @@ unsigned int tmp;
XkbVirtualModsToReal(xkb,tmp,&tmp);
act->iso.mask= act->iso.real_mods;
act->iso.mask|= tmp;
return True;
return TRUE;
}
break;
}
return False;
return FALSE;
}
static void
......@@ -740,7 +740,7 @@ register int i;
unsigned int checkState = 0;
if ((!xkb) || (!xkb->map) || (changed==0))
return False;
return FALSE;
for (i=0;i<xkb->map->num_types;i++) {
if (xkb->map->types[i].mods.vmods & changed)
XkbUpdateKeyTypeVirtualMods(xkb,&xkb->map->types[i],changed,changes);
......@@ -753,7 +753,7 @@ unsigned int checkState = 0;
xkb->ctrls->internal.mask= newMask;
if (changes) {
changes->ctrls.changed_ctrls|= XkbInternalModsMask;
checkState= True;
checkState= TRUE;
}
}
}
......@@ -765,7 +765,7 @@ unsigned int checkState = 0;
xkb->ctrls->ignore_lock.mask= newMask;
if (changes) {
changes->ctrls.changed_ctrls|= XkbIgnoreLockModsMask;
checkState= True;
checkState= TRUE;
}
}
}
......@@ -781,7 +781,7 @@ unsigned int checkState = 0;
map->mods.mask= newMask;
if (changes) {
changes->indicators.map_changes|= (1<<i);
checkState= True;
checkState= TRUE;
}
}
}
......@@ -798,7 +798,7 @@ unsigned int checkState = 0;
compat->groups[i].mask= newMask;
if (changes) {
changes->compat.changed_groups|= (1<<i);
checkState= True;
checkState= TRUE;
}
}
}
......
......@@ -89,7 +89,7 @@ static char doesPitch = 1;
#define STICKY_UNLOCK "AX_StickyUnlock"
#define BOUNCE_REJECT "AX_BounceKeyReject"
#define MAKE_ATOM(a) MakeAtom(a,sizeof(a)-1,True)
#define MAKE_ATOM(a) MakeAtom(a,sizeof(a)-1,TRUE)
static void
_XkbDDXBeepInitAtoms(void)
......
......@@ -148,7 +148,7 @@ char tmpname[PATH_MAX];
}
in= NULL;
haveDir= True;
haveDir= TRUE;
#ifdef WIN32
strcpy(tmpname, Win32TempDir());
strcat(tmpname, "\\xkb_XXXXXX");
......@@ -160,7 +160,7 @@ char tmpname[PATH_MAX];
in= fopen(buf,"r");
}
if (!in) {
haveDir= False;
haveDir= FALSE;
buf = Xprintf(
"'%s/xkbcomp' '-R%s/%s' -w %ld -l -vlfhpR '%s'" W32_tmparg,
XkbBinDirectory,XkbBaseDirectory,componentDirs[what],(long)
......@@ -175,7 +175,7 @@ char tmpname[PATH_MAX];
in= fopen(buf,"r");
}
if (!in) {
haveDir= False;
haveDir= FALSE;
buf = Xprintf(
"xkbcomp -R%s -w %ld -l -vlfhpR '%s'" W32_tmparg,
componentDirs[what],(long)
......
......@@ -266,7 +266,7 @@ XkbDDXCompileKeymapByNames( XkbDescPtr xkb,
}
if (buf != NULL)
xfree (buf);
return True;
return TRUE;
}
else
LogMessage(X_ERROR, "Error compiling keymap (%s)\n", keymap);
......@@ -286,7 +286,7 @@ XkbDDXCompileKeymapByNames( XkbDescPtr xkb,
nameRtrn[0]= '\0';
if (buf != NULL)
xfree (buf);
return False;
return FALSE;
}
static FILE *
......@@ -386,38 +386,38 @@ Bool complete;
XkbRF_RulesPtr rules;
if (!rules_name)
return False;
return FALSE;
if (strlen(XkbBaseDirectory) + strlen(rules_name) + 8 > PATH_MAX) {
LogMessage(X_ERROR, "XKB: Rules name is too long\n");
return False;
return FALSE;
}
sprintf(buf,"%s/rules/%s", XkbBaseDirectory, rules_name);
file = fopen(buf, "r");
if (!file) {
LogMessage(X_ERROR, "XKB: Couldn't open rules file %s\n", buf);
return False;
return FALSE;
}
rules = XkbRF_Create();
if (!rules) {
LogMessage(X_ERROR, "XKB: Couldn't create rules struct\n");
fclose(file);
return False;
return FALSE;
}
if (!XkbRF_LoadRules(file, rules)) {
LogMessage(X_ERROR, "XKB: Couldn't parse rules file %s\n", rules_name);
fclose(file);
XkbRF_Free(rules,True);
return False;
XkbRF_Free(rules,TRUE);
return FALSE;
}
memset(names, 0, sizeof(*names));
complete = XkbRF_GetComponents(rules,defs,names);
fclose(file);
XkbRF_Free(rules, True);
XkbRF_Free(rules, TRUE);
if (!complete)
LogMessage(X_ERROR, "XKB: Rules returned no components\n");
......
......@@ -113,15 +113,15 @@ GetInputLine(FILE *file,InputLine *line,Bool checkbang)
int ch;
Bool endOfFile,spacePending,slashPending,inComment;
endOfFile= False;
endOfFile= FALSE;
while ((!endOfFile)&&(line->num_line==0)) {
spacePending= slashPending= inComment= False;
spacePending= slashPending= inComment= FALSE;
while (((ch=getc(file))!='\n')&&(ch!=EOF)) {
if (ch=='\\') {
if ((ch=getc(file))==EOF)
break;
if (ch=='\n') {
inComment= False;
inComment= FALSE;
ch= ' ';
line->line_num++;
}
......@@ -130,21 +130,21 @@ Bool endOfFile,spacePending,slashPending,inComment;
continue;
if (ch=='/') {
if (slashPending) {
inComment= True;
slashPending= False;
inComment= TRUE;
slashPending= FALSE;
}
else {
slashPending= True;
slashPending= TRUE;
}
continue;
}
else if (slashPending) {
if (spacePending) {
ADD_CHAR(line,' ');
spacePending= False;
spacePending= FALSE;
}
ADD_CHAR(line,'/');
slashPending= False;
slashPending= FALSE;
}
if (isspace(ch)) {
while (isspace(ch)&&(ch!='\n')&&(ch!=EOF)) {
......@@ -153,13 +153,13 @@ Bool endOfFile,spacePending,slashPending,inComment;
if (ch==EOF)
break;
if ((ch!='\n')&&(line->num_line>0))
spacePending= True;
spacePending= TRUE;
ungetc(ch,file);
}
else {
if (spacePending) {
ADD_CHAR(line,' ');
spacePending= False;
spacePending= FALSE;
}
if (checkbang && ch=='!') {
if (line->num_line!=0) {
......@@ -175,13 +175,13 @@ Bool endOfFile,spacePending,slashPending,inComment;
}
}
if (ch==EOF)
endOfFile= True;
endOfFile= TRUE;
/* else line->num_line++;*/
}
if ((line->num_line==0)&&(endOfFile))
return False;
return FALSE;
ADD_CHAR(line,'\0');
return True;
return TRUE;
}
/***====================================================================***/
......@@ -273,7 +273,7 @@ Bool found;
bzero((char *)remap,sizeof(RemapSpec));
remap->number = len;
while ((tok=_XStrtok(str," ",strtok_buf))!=NULL) {
found= False;
found= FALSE;
str= NULL;
if (strcmp(tok,"=")==0)
continue;
......@@ -294,7 +294,7 @@ Bool found;
} else {
ndx = 0;
}
found= True;
found= TRUE;
if (present&(1<<i)) {
if ((i == LAYOUT && l_ndx_present&(1<<ndx)) ||
(i == VARIANT && v_ndx_present&(1<<ndx)) ) {
......@@ -358,9 +358,9 @@ int want_len= strlen(wanted);
len= strlen(str);
}
if ((len==want_len)&&(strncmp(wanted,str,len)==0))
return True;
return TRUE;
}
return False;
return FALSE;
}
/***====================================================================***/
......@@ -375,7 +375,7 @@ char * str,*tok;
register int nread, i;
FileSpec tmp;
_Xstrtokparams strtok_buf;
Bool append = False;
Bool append = FALSE;
if (line->line[0]=='!') {
if (line->line[1] == '$' ||
......@@ -383,14 +383,14 @@ Bool append = False;
char *gname = strchr(line->line, '$');
char *words = strchr(gname, ' ');
if(!words)
return False;
return FALSE;
*words++ = '\0';
for (; *words; words++) {
if (*words != '=' && *words != ' ')
break;
}
if (*words == '\0')
return False;
return FALSE;
group->name = _XkbDupString(gname);
group->words = _XkbDupString(words);
for (i = 1, words = group->words; *words; words++) {
......@@ -400,17 +400,17 @@ Bool append = False;
}
}
group->number = i;
return True;
return TRUE;
} else {
SetUpRemap(line,remap);
return False;
return FALSE;
}
}
if (remap->num_remap==0) {
DebugF("Must have a mapping before first line of data\n");
DebugF("Illegal line of data ignored\n");
return False;
return FALSE;
}
bzero((char *)&tmp,sizeof(FileSpec));
str= line->line;
......@@ -427,12 +427,12 @@ Bool append = False;
}
tmp.name[remap->remap[nread].word]= tok;
if (*tok == '+' || *tok == '|')
append = True;
append = TRUE;
}
if (nread<remap->num_remap) {
DebugF("Too few words on a line: %s\n", line->line);
DebugF("line ignored\n");
return False;
return FALSE;
}
rule->flags= 0;
......@@ -463,7 +463,7 @@ Bool append = False;
rule->variant_num = remap->remap[i].index;
}
}
return True;
return TRUE;
}
static char *
......@@ -508,7 +508,7 @@ MakeMultiDefs(XkbRF_MultiDefsPtr mdefs, XkbRF_VarDefsPtr defs)
int i;
mdefs->layout[1] = _XkbDupString(defs->layout);
if (mdefs->layout[1] == NULL)
return False;
return FALSE;
squeeze_spaces(mdefs->layout[1]);
p = mdefs->layout[1];
for (i = 2; i <= XkbNumKbdGroups; i++) {
......@@ -532,7 +532,7 @@ MakeMultiDefs(XkbRF_MultiDefsPtr mdefs, XkbRF_VarDefsPtr defs)
int i;
mdefs->variant[1] = _XkbDupString(defs->variant);
if (mdefs->variant[1] == NULL)
return False;
return FALSE;
squeeze_spaces(mdefs->variant[1]);
p = mdefs->variant[1];
for (i = 2; i <= XkbNumKbdGroups; i++) {
......@@ -547,7 +547,7 @@ MakeMultiDefs(XkbRF_MultiDefsPtr mdefs, XkbRF_VarDefsPtr defs)
*p = '\0';
}
}
return True;
return TRUE;
}
static void
......@@ -599,13 +599,13 @@ CheckGroup( XkbRF_RulesPtr rules,
}
}
if (i == rules->num_groups)
return False;
return FALSE;
for (i = 0, p = group->words; i < group->number; i++, p += strlen(p)+1) {
if (! strcmp(p, name)) {
return True;
return TRUE;
}
}
return False;
return FALSE;
}
static int
......@@ -614,13 +614,13 @@ XkbRF_CheckApplyRule( XkbRF_RulePtr rule,
XkbComponentNamesPtr names,
XkbRF_RulesPtr rules)
{
Bool pending = False;
Bool pending = FALSE;
if (rule->model != NULL) {
if(mdefs->model == NULL)
return 0;
if (strcmp(rule->model, "*") == 0) {
pending = True;
pending = TRUE;
} else {
if (rule->model[0] == '$') {
if (!CheckGroup(rules, rule->model, mdefs->model))
......@@ -643,7 +643,7 @@ XkbRF_CheckApplyRule( XkbRF_RulePtr rule,
*mdefs->layout[rule->layout_num] == '\0')
return 0;
if (strcmp(rule->layout, "*") == 0) {
pending = True;
pending = TRUE;
} else {
if (rule->layout[0] == '$') {
if (!CheckGroup(rules, rule->layout,
......@@ -660,7 +660,7 @@ XkbRF_CheckApplyRule( XkbRF_RulePtr rule,
*mdefs->variant[rule->variant_num] == '\0')
return 0;
if (strcmp(rule->variant, "*") == 0) {
pending = True;
pending = TRUE;
} else {
if (rule->variant[0] == '$') {
if (!CheckGroup(rules, rule->variant,
......@@ -911,11 +911,11 @@ XkbRF_RuleRec trule,*rule;
XkbRF_GroupRec tgroup,*group;
if (!(rules && file))
return False;
return FALSE;
bzero((char *)&remap,sizeof(RemapSpec));
bzero((char *)&tgroup,sizeof(XkbRF_GroupRec));
InitInputLine(&line);
while (GetInputLine(file,&line,True)) {
while (GetInputLine(file,&line,TRUE)) {
if (CheckLine(&line,&remap,&trule,&tgroup)) {
if (tgroup.number) {
if ((group= XkbRF_AddGroup(rules))!=NULL) {
......@@ -932,7 +932,7 @@ XkbRF_GroupRec tgroup,*group;
line.num_line= 0;
}
FreeInputLine(&line);
return True;
return TRUE;
}
Bool
......@@ -943,15 +943,15 @@ char buf[PATH_MAX];
Bool ok;
if ((!base)||(!rules))
return False;
return FALSE;
if (locale) {
if (strlen(base)+strlen(locale)+2 > PATH_MAX)
return False;
return FALSE;
sprintf(buf,"%s-%s", base, locale);
}
else {
if (strlen(base)+1 > PATH_MAX)
return False;
return FALSE;
strcpy(buf,base);
}
......@@ -961,7 +961,7 @@ Bool ok;
file= fopen(buf, "r");
}
if (!file)
return False;
return FALSE;
ok= XkbRF_LoadRules(file,rules);
fclose(file);
return ok;
......
This diff is collapsed.
......@@ -161,14 +161,14 @@ XkbSrvLedInfoPtr sli;
old= *ctrls;
ctrls->enabled_ctrls |= (KRGControl&XkbAX_KRGMask);
if (XkbComputeControlsNotify(dev,&old,ctrls,pCN,False))
if (XkbComputeControlsNotify(dev,&old,ctrls,pCN,FALSE))
XkbSendControlsNotify(dev,pCN);
cause.kc= pCN->keycode;
cause.event= pCN->eventType;
cause.mjr= pCN->requestMajor;
cause.mnr= pCN->requestMinor;
sli= XkbFindSrvLedInfo(dev,XkbDfltXIClass,XkbDfltXIId,0);
XkbUpdateIndicators(dev,sli->usesControls,True,NULL,&cause);
XkbUpdateIndicators(dev,sli->usesControls,TRUE,NULL,&cause);
if (XkbAX_NeedFeedback(ctrls,XkbAX_FeatureFBMask))
XkbDDXAccessXBeep(dev,_BEEP_FEATURE_ON,KRGControl);
return;
......@@ -193,14 +193,14 @@ XkbSrvLedInfoPtr sli;
old = *ctrls;
ctrls->enabled_ctrls &= ~XkbAX_KRGMask;
if (XkbComputeControlsNotify(dev,&old,ctrls,pCN,False))
if (XkbComputeControlsNotify(dev,&old,ctrls,pCN,FALSE))
XkbSendControlsNotify(dev,pCN);
cause.kc= pCN->keycode;
cause.event= pCN->eventType;
cause.mjr= pCN->requestMajor;