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

5
cde/programs/dtfile/Desktop.c
View File

@@ -4111,17 +4111,18 @@ WorkSpaceRemoved (
for(k=0;
k<desktop_data->workspaceData[new_index]->files_selected;k++)
{
/* Adjust the selectedDTWindows of current to accommadate the old list */
/* Adjust the selectedDTWindows of current to accommodate the old list */
if(desktop_data->workspaceData[new_index]->
selectedDTWindows[k] == desktop_data->desktopWindows[i])
{
desktop_data->workspaceData[new_index]->
selectedDTWindows[k] = NULL;
for(;k<desktop_data->workspaceData[new_index]->files_selected;k++)
for(;k<desktop_data->workspaceData[new_index]->files_selected;k++) {
desktop_data->workspaceData[new_index]->
selectedDTWindows[k] = desktop_data->
workspaceData[new_index]-> selectedDTWindows[k+1];
desktop_data->workspaceData[new_index]->files_selected--;
}
break;
}
}

60
cde/programs/dtfile/File.c
View File

@@ -5706,23 +5706,30 @@ UpdateOneFileIcon(
/* Build the rest of the arg list and either create or reuse the widget. */
XtSetArg (args[n], XmNstring, icon_label); n++;
XtSetArg (args[n], XmNstring, icon_label);
n++;
argi_imageName = n;
if (pixmapData)
XtSetArg (args[n], XmNimageName, pixmapData->iconFileName);
else
XtSetArg (args[n], XmNimageName, NULL);
n++;
XtSetArg (args[n], XmNmaxPixmapWidth, layout_data->pixmap_width); n++;
XtSetArg (args[n], XmNmaxPixmapHeight, layout_data->pixmap_height); n++;
XtSetArg (args[n], XmNuserData, directory_set); n++;
XtSetArg (args[n], XmNunderline, False); n++;
XtSetArg (args[n], XmNfillMode, XmFILL_TRANSPARENT); n++;
XtSetArg (args[n], XmNmaxPixmapWidth, layout_data->pixmap_width);
n++;
XtSetArg (args[n], XmNmaxPixmapHeight, layout_data->pixmap_height);
n++;
XtSetArg (args[n], XmNuserData, directory_set);
n++;
XtSetArg (args[n], XmNunderline, False);
n++;
XtSetArg (args[n], XmNfillMode, XmFILL_TRANSPARENT);
n++;
if (file_mgr_data->view == BY_NAME_AND_ICON &&
file_mgr_data->show_type != MULTIPLE_DIRECTORY)
XtSetArg (args[n], XmNpixmapPosition, XmPIXMAP_TOP);
else
XtSetArg (args[n], XmNpixmapPosition, XmPIXMAP_LEFT); n++;
XtSetArg (args[n], XmNpixmapPosition, XmPIXMAP_LEFT);
n++;
/* See if we can re-use the same or some other icon gadget */
if (file_view_data->widget)
@@ -5738,7 +5745,8 @@ UpdateOneFileIcon(
/* reuse the icon gadget */
if (icon_widget != file_view_data->widget || file_mgr_data->newSize)
{
XtSetArg (args[n], XmNdropSiteOperations, XmDROP_NOOP);n++;
XtSetArg (args[n], XmNdropSiteOperations, XmDROP_NOOP);
n++;
XtRemoveAllCallbacks(icon_widget, XmNdropCallback);
file_view_data->registered = False;
}
@@ -5766,25 +5774,34 @@ UpdateOneFileIcon(
else
{
/* create a new or duplicate an existing widget */
XtSetArg (args[n], XmNshadowThickness, 2); n++;
XtSetArg (args[n], XmNdropSiteOperations, XmDROP_NOOP);n++;
XtSetArg (args[n], XmNfontList, user_font); n++;
XtSetArg (args[n], XmNshadowThickness, 2);
n++;
XtSetArg (args[n], XmNdropSiteOperations, XmDROP_NOOP);
n++;
XtSetArg (args[n], XmNfontList, user_font);
n++;
if( keybdFocusPolicy == XmEXPLICIT)
{
XtSetArg (args[n], XmNtraversalOn, True); n++;
XtSetArg (args[n], XmNtraversalOn, True);
n++;
}
else
{
XtSetArg (args[n], XmNtraversalOn, False); n++;
XtSetArg (args[n], XmNhighlightThickness, 0); n++;
XtSetArg (args[n], XmNtraversalOn, False);
n++;
XtSetArg (args[n], XmNhighlightThickness, 0);
n++;
}
XtSetArg (args[n], XmNborderType, DtNON_RECTANGLE); n++;
XtSetArg (args[n], XmNborderType, DtNON_RECTANGLE);
n++;
if (layout_data->dup_icon_widget == NULL)
{
#ifdef HARDCODED_ICON_MARGINS
XtSetArg (args[n], XmNmarginWidth, 0); n++;
XtSetArg (args[n], XmNmarginHeight, 0); n++;
XtSetArg (args[n], XmNmarginWidth, 0);
n++;
XtSetArg (args[n], XmNmarginHeight, 0);
n++;
#endif
XtSetArg (args[n], XmNx, -999); n++;
XtSetArg (args[n], XmNy, -999); n++;
@@ -5815,9 +5832,12 @@ UpdateOneFileIcon(
icon_widget->core.y = -999;
/* make sure colors, drop operations, and clipping are right */
XtSetArg(args[i], XmNdropSiteOperations, XmDROP_NOOP); i++;
XtSetArg(args[i], XmNmaxPixmapWidth, layout_data->pixmap_width); i++;
XtSetArg(args[i], XmNmaxPixmapHeight, layout_data->pixmap_height); i++;
XtSetArg(args[i], XmNdropSiteOperations, XmDROP_NOOP);
i++;
XtSetArg(args[i], XmNmaxPixmapWidth, layout_data->pixmap_width);
i++;
XtSetArg(args[i], XmNmaxPixmapHeight, layout_data->pixmap_height);
i++;
XtSetValues (icon_widget, args, i);
}
XtAddCallback(icon_widget, XmNhelpCallback,

3
cde/programs/dtfile/FileDialog.c
View File

@@ -1887,7 +1887,8 @@ FileTypePreview(
if (pixmapData)
XtSetArg (args[n], XmNimageName, pixmapData->iconFileName);
else
XtSetArg (args[n], XmNimageName, NULL); n++;
XtSetArg (args[n], XmNimageName, NULL);
n++;
XtSetValues (call_struct->file_type_widget, args, n);
_DtCheckAndFreePixmapData(file_type,

117
cde/programs/dtfile/Filter.c
View File

@@ -914,67 +914,96 @@ SetValues(
LARGE);
n = 0;
XtSetArg (args[n], XmNstring, icon_label); n++;
XtSetArg (args[n], XmNstring, icon_label);
n++;
if (pixmapData)
XtSetArg (args[n], XmNimageName, pixmapData->iconFileName);
else
XtSetArg (args[n], XmNimageName, NULL); n++;
XtSetArg (args[n], XmNunderline, False); n++;
XtSetArg (args[n], XmNimageName, NULL);
n++;
XtSetArg (args[n], XmNunderline, False);
n++;
XtSetArg (args[n], XmNpixmapPosition, XmPIXMAP_TOP); n++;
XtSetArg (args[n], XmNbehavior, XmICON_BUTTON); n++;
XtSetArg (args[n], XmNfillMode, XmFILL_PARENT); n++;
XtSetArg (args[n], XmNpixmapPosition, XmPIXMAP_TOP);
n++;
XtSetArg (args[n], XmNbehavior, XmICON_BUTTON);
n++;
XtSetArg (args[n], XmNfillMode, XmFILL_PARENT);
n++;
XtSetArg (args[n], XmNforeground, foreground_color); n++;
XtSetArg (args[n], XmNarmColor, white_pixel); n++;
XtSetArg (args[n], XmNforeground, foreground_color);
n++;
XtSetArg (args[n], XmNarmColor, white_pixel);
n++;
if (background_color == white_pixel)
{
XtSetArg (args[n], XmNbackground, white_pixel); n++;
XtSetArg (args[n], XmNpixmapBackground, white_pixel); n++;
XtSetArg (args[n], XmNpixmapForeground, black_pixel); n++;
XtSetArg (args[n], XmNbackground, white_pixel);
n++;
XtSetArg (args[n], XmNpixmapBackground, white_pixel);
n++;
XtSetArg (args[n], XmNpixmapForeground, black_pixel);
n++;
}
else if (background_color == black_pixel)
{
XtSetArg (args[n], XmNbackground, black_pixel); n++;
XtSetArg (args[n], XmNpixmapBackground, white_pixel); n++;
XtSetArg (args[n], XmNpixmapForeground, black_pixel); n++;
XtSetArg (args[n], XmNbackground, black_pixel);
n++;
XtSetArg (args[n], XmNpixmapBackground, white_pixel);
n++;
XtSetArg (args[n], XmNpixmapForeground, black_pixel);
n++;
}
else
{
XtSetArg (args[n], XmNbackground, background_color); n++;
XtSetArg (args[n], XmNpixmapBackground, pixmap_background); n++;
XtSetArg (args[n], XmNpixmapForeground, pixmap_foreground); n++;
XtSetArg (args[n], XmNbackground, background_color);
n++;
XtSetArg (args[n], XmNpixmapBackground, pixmap_background);
n++;
XtSetArg (args[n], XmNpixmapForeground, pixmap_foreground);
n++;
}
if (i - count < num_children)
{
icon_widget = mgr->composite.children[i - count];
XtSetArg (args[n], XmNx, x); n++;
XtSetArg (args[n], XmNy, 5); n++;
XtSetArg (args[n], XmNuserData, user_data); n++;
XtSetArg (args[n], XmNx, x);
n++;
XtSetArg (args[n], XmNy, 5);
n++;
XtSetArg (args[n], XmNuserData, user_data);
n++;
XtSetValues(icon_widget, args, n);
XtRemoveAllCallbacks (icon_widget, XmNcallback);
}
else
{
XtSetArg (args[n], XmNx, x); n++;
XtSetArg (args[n], XmNy, 5); n++;
XtSetArg (args[n], XmNshadowThickness, 2); n++;
XtSetArg (args[n], XmNfontList, user_font); n++;
XtSetArg (args[n], XmNx, x);
n++;
XtSetArg (args[n], XmNy, 5);
n++;
XtSetArg (args[n], XmNshadowThickness, 2);
n++;
XtSetArg (args[n], XmNfontList, user_font);
n++;
if(keybdFocusPolicy == XmEXPLICIT)
{
XtSetArg (args[n], XmNtraversalOn, True); n++;
XtSetArg (args[n], XmNtraversalOn, True);
n++;
}
else
{
XtSetArg (args[n], XmNtraversalOn, False); n++;
XtSetArg (args[n], XmNhighlightThickness, 0); n++;
XtSetArg (args[n], XmNtraversalOn, False);
n++;
XtSetArg (args[n], XmNhighlightThickness, 0);
n++;
}
XtSetArg (args[n], XmNborderType, DtNON_RECTANGLE); n++;
XtSetArg (args[n], XmNborderType, DtNON_RECTANGLE);
n++;
if (mgr->composite.num_children == 0)
{
XtSetArg (args[n], XmNuserData, user_data); n++;
XtSetArg (args[n], XmNuserData, user_data);
n++;
icon_widget= _DtCreateIcon ((Widget)mgr, "icon", args, n);
}
else
@@ -984,8 +1013,10 @@ SetValues(
(XmString)args[0].value, (String)args[1].value,
(XtPointer)user_data, (Boolean)args[2].value);
n = 0;
XtSetArg (args[n], XmNx, x); n++;
XtSetArg (args[n], XmNy, 5); n++;
XtSetArg (args[n], XmNx, x);
n++;
XtSetArg (args[n], XmNy, 5);
n++;
XtSetValues(icon_widget, args, n);
}
XtAddCallback(icon_widget, XmNhelpCallback,
@@ -1020,18 +1051,25 @@ SetValues(
/* Draw the selected icon as selected */
if (background_color == white_pixel)
{
XtSetArg (args[n], XmNbackground, black_pixel); n++;
XtSetArg (args[n], XmNforeground, white_pixel); n++;
XtSetArg (args[n], XmNbackground, black_pixel);
n++;
XtSetArg (args[n], XmNforeground, white_pixel);
n++;
}
else
{
XtSetArg (args[n], XmNbackground, white_pixel); n++;
XtSetArg (args[n], XmNforeground, black_pixel); n++;
XtSetArg (args[n], XmNbackground, white_pixel);
n++;
XtSetArg (args[n], XmNforeground, black_pixel);
n++;
}
XtSetArg (args[n], XmNpixmapBackground, white_pixel); n++;
XtSetArg (args[n], XmNpixmapForeground, black_pixel); n++;
XtSetArg (args[n], XmNarmColor, white_pixel); n++;
XtSetArg (args[n], XmNpixmapBackground, white_pixel);
n++;
XtSetArg (args[n], XmNpixmapForeground, black_pixel);
n++;
XtSetArg (args[n], XmNarmColor, white_pixel);
n++;
XtSetValues(icon_widget, args, n);
}
}
@@ -1054,7 +1092,8 @@ SetValues(
{
n = 0;
XtSetArg(args[n], XmNy,
5 + (max - mgr->composite.children[i]->core.height)); n++;
5 + (max - mgr->composite.children[i]->core.height));
n++;
XtSetValues(mgr->composite.children[i], args, n);
}
}