debian/cdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix misleading indentation

Browse Source 
Mostly to shut up the compiler, but some real bugs hidden in there.
This commit is contained in:
Patrick Georgi
2025-12-09 21:21:13 +01:00
parent dca08bc5c2
commit ae001c320f
26 changed files with 243 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
cde/programs/dtstyle/Font.c
View File

@@ -641,9 +641,11 @@ changeSampleFontCB(
/* Set the sample System Font string to different Font */
n = 0;
XtSetArg(args[n], XmNfontList, style.xrdb.fontChoice[pos].sysFont); n++;
XtSetArg(args[n], XmNfontList, style.xrdb.fontChoice[pos].sysFont);
n++;
/* string_val = CMPSTR(SYSTEM_MSG);*/
XtSetArg (args[n], XmNlabelString, CMPSTR(SYSTEM_MSG)); n++;
XtSetArg (args[n], XmNlabelString, CMPSTR(SYSTEM_MSG));
n++;
XtSetValues (font.systemLabel, args, n);
/*
@@ -652,8 +654,10 @@ changeSampleFontCB(
*/
n = 0;
if (!font.userTextChanged)
XtSetArg (args[n], XmNvalue, USER_MSG); n++;
XtSetArg(args[n], XmNfontList, style.xrdb.fontChoice[pos].userFont); n++;
XtSetArg (args[n], XmNvalue, USER_MSG);
n++;
XtSetArg(args[n], XmNfontList, style.xrdb.fontChoice[pos].userFont);
n++;
XtSetValues (font.userText, args, n);
XmTextShowPosition(font.userText, 0);
}

2
cde/programs/dtstyle/I18nUtil.h
View File

@@ -66,7 +66,7 @@
#define is_white(c) ((c) == ' ' || (c) == '\t' || (c) == '\n')
#define skip_white(p) while (is_white(*(p))) (p)++
#define cut_field(p) \
for ((p)++; *(p) && !is_white(*(p)); (p)++) ; *(p)++ = 0; skip_white(p)
do { for ((p)++; *(p) && !is_white(*(p)); (p)++) ; *(p)++ = 0; skip_white(p); } while (0)
void start_tag_line(char *fname);

3
cde/programs/dtstyle/Mouse.c
View File

@@ -1566,12 +1566,13 @@ ButtonCB(
}
mouse.dclickChanged = False;
if (mouse.btn2Changed)
if (mouse.btn2Changed) {
if(mouse.function == TRANSFER)
sprintf(enableBtn1Res, enableBtn1TransferString, "button2_transfer");
else
sprintf(enableBtn1Res, enableBtn1TransferString, "True");
_DtAddToResource(style.display,enableBtn1Res);
}
break;