Skip to content

Commit 9eabc3a

Browse files
KeithDHedgerKeithDHedger
committed
see changelogs
1 parent 4530672 commit 9eabc3a

19 files changed

+125
-72
lines changed

‎LFSApplications/LFSApplications/app/apps.local

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,10 @@ if [[ $1 = "conf" ]];then
1010
popd
1111
fi
1212

13-
LD_LIBRARY_PATH="../../../LFSToolKit/LFSToolKit/app/.libs" ./$@
13+
if [[ $USEVALGRIND -eq 1 ]];then
14+
VALGRIND="valgrind --leak-check=full"
15+
else
16+
VALGRIND=
17+
fi
18+
19+
LD_LIBRARY_PATH="../../../LFSToolKit/LFSToolKit/app/.libs" $VALGRIND $@

‎LFSApplications/LFSApplications/src/lfsfontselect.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,10 +114,12 @@ int main(int argc, char **argv)
114114
fd=fontdialog->LFSTK_getFontData(false);
115115
if(fd->isValid==true)
116116
if(useDetail==false)
117-
printf("fontString=%s\n",fd->fontString);
117+
printf("fontString=%s\n",fd->fontString.c_str());
118118
else
119-
printf("Font String:%s\nFont:%s\nSize:%i\nBold:%s\nItalic:%s\n",fd->fontString,fd->fontName,fd->fontSize,bools[fd->bold],bools[fd->italic]);
119+
printf("Font String:%s\nFont:%s\nSize:%i\nBold:%s\nItalic:%s\n",fd->fontString.c_str(),fd->fontName.c_str(),fd->fontSize,bools[fd->bold],bools[fd->italic]);
120120

121121
delete apc;
122+
cairo_debug_reset_static_data();
123+
122124
return(0);
123125
}

‎LFSApplications/LFSApplications/src/lfsmimeeditor.cpp

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,9 @@ void setMimeTypesList(char *filepath)
8787
{
8888
listit.label=strdup(buffer);
8989
listit.imageType=NOTHUMB;
90-
if(listit.label[strlen(listit.label)-1]==';')
91-
listit.label[strlen(listit.label)-1]=0;
92-
char *ptr=strchr(listit.label,'=');
90+
if(listit.label[listit.label.length()-1]==';')
91+
listit.label[listit.label.length()-1]=0;
92+
char *ptr=strchr((char*)listit.label.c_str(),'=');
9393
*ptr=0;
9494
ptr++;
9595
listit.userData=ptr;
@@ -137,10 +137,10 @@ void reWriteMimeFile(void)
137137
{
138138
if(j!=mimeList->currentItem)
139139
{
140-
ptr=mimeList->listDataArray->at(j).label;
141-
ptr+=strlen(mimeList->listDataArray->at(j).label);
140+
ptr=(char*)mimeList->listDataArray->at(j).label.c_str();
141+
ptr+=mimeList->listDataArray->at(j).label.length();
142142
ptr++;
143-
fprintf(file,"%s=%s;\n",mimeList->listDataArray->at(j).label,ptr);
143+
fprintf(file,"%s=%s;\n",mimeList->listDataArray->at(j).label.c_str(),ptr);
144144
}
145145
}
146146

@@ -175,10 +175,10 @@ bool doUpdate(void *p,void* ud)
175175
}
176176
else
177177
{
178-
ptr=mimeList->listDataArray->at(j).label;
179-
ptr+=strlen(mimeList->listDataArray->at(j).label);
178+
ptr=(char*)mimeList->listDataArray->at(j).label.c_str();
179+
ptr+=mimeList->listDataArray->at(j).label.length();
180180
ptr++;
181-
fprintf(file,"%s=%s;\n",mimeList->listDataArray->at(j).label,ptr);
181+
fprintf(file,"%s=%s;\n",mimeList->listDataArray->at(j).label.c_str(),ptr);
182182
}
183183
}
184184
fprintf(file,"%s=%s.desktop;\n",editLine->LFSTK_getCStr(),appLine->LFSTK_getCStr());
@@ -199,7 +199,7 @@ bool doUpdate(void *p,void* ud)
199199
bool doInsert(void *p,void* ud)
200200
{
201201
char *command;
202-
const char *data=mimeList->listDataArray->at(mimeList->currentItem).label;
202+
const char *data=mimeList->listDataArray->at(mimeList->currentItem).label.c_str();
203203

204204
asprintf(&command,"sed -i 's@\\(%s.*\\)@\\1\\n%s=Custom.desktop@' \"%s\"",data,data,mimeTypesFile);
205205
system(command);
@@ -234,7 +234,7 @@ bool doDelete(void *p,void* ud)
234234
bool doApply(void *p,void* ud)
235235
{
236236
char *command;
237-
const char *data=mimeList->listDataArray->at(mimeList->currentItem).label;
237+
const char *data=mimeList->listDataArray->at(mimeList->currentItem).label.c_str();
238238

239239
asprintf(&command,"cp \"%s\" \"%s/.config\"",mimeTypesFile,getenv("HOME"));
240240
system(command);

‎LFSDock/LFSDock/src/desktopSwitcher.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@ bool deskSwitcherEnterCB(LFSTK_gadgetClass*p,void* ud)
5050
for(int j=0;j<deskNames.size();j++)
5151
{
5252
label=deskNames.at(j);
53-
ls.label=strdup((char*)label.c_str());
53+
ls.label=label;
5454
ls.imageType=NOTHUMB;
55-
ls.data.imagePath=NULL;
55+
ls.imagePath;
5656
ls.userData=USERDATA(DESKTOPSWITCHER);
5757
popActionList->LFSTK_appendToList(ls);
5858
}

‎LFSDock/LFSDock/src/launchers.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ bool launcherEnterCB(LFSTK_gadgetClass*p,void* ud)
3939

4040
setGadgetPosition(p,true);
4141
popActionList->LFSTK_freeList();
42-
ls.label=strdup((char*)lds.name.c_str());
42+
ls.label=lds.name;
4343
ls.imageType=NOTHUMB;
44-
ls.data.imagePath=NULL;
44+
ls.imagePath;
4545
ls.userData=USERDATA(p);
4646

4747
popActionList->LFSTK_appendToList(ls);

‎LFSDock/LFSDock/src/taskBar.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ bool taskSwitcherEnterCB(LFSTK_gadgetClass*p,void* ud)
4848
label=filltasks.at(d).taskName;
4949
ls.label=strdup((char*)label.c_str());
5050
ls.imageType=NOTHUMB;
51-
ls.data.imagePath=NULL;
51+
ls.imagePath;
5252
ls.userData=USERDATA(filltasks.at(d).winid);
5353
popActionList->LFSTK_appendToList(ls);
5454

@@ -57,7 +57,7 @@ bool taskSwitcherEnterCB(LFSTK_gadgetClass*p,void* ud)
5757
label=filltasks.at(d).tasks.at(j).taskName;
5858
ls.label=strdup((char*)label.c_str());
5959
ls.imageType=NOTHUMB;
60-
ls.data.imagePath=NULL;
60+
ls.imagePath;
6161
ls.userData=USERDATA(filltasks.at(d).tasks.at(j).winid);
6262
popActionList->LFSTK_appendToList(ls);
6363
}

‎LFSToolKit/ChangeLog

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
0.6.0
2+
Fixed calendar example.
3+
Fixed minor faults.
4+
Fixed leak in listgadget.
25
Removing old 'c' code ...
36
Removing old 'c' code ...
47
Added small utility class for static functions.

‎LFSToolKit/LFSToolKit/lfstk/LFSTKFileDialog.cpp

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -71,54 +71,54 @@ void LFSTK_fileDialogClass::getFileList(void)
7171
this->fileListGadget->LFSTK_freeList();
7272
for(int j=0;j<this->fileListCnt;j++)
7373
{
74-
ls.label=strdup(this->fc->data.at(j).name.c_str());
74+
ls.label=this->fc->data.at(j).name.c_str();
7575
ls.imageType=CAIROTHUMB;
7676
switch(this->fc->data.at(j).fileType)
7777
{
7878
case FOLDERTYPE:
79-
ls.data.surface=this->folderImage;
79+
ls.surface=this->folderImage;
8080
break;
8181

8282
case FILETYPE:
83-
if((strcasestr(ls.label,".jpg")!=NULL) || (strcasestr(ls.label,".png")!=NULL))
83+
if((LFSTK_UtilityClass::LFSTK_strStr(ls.label,".jpg",true).length()>0) || (LFSTK_UtilityClass::LFSTK_strStr(ls.label,".png",true).length()>0))
8484
{
8585
if(this->useThumbs==true)
8686
{
8787
ls.imageType=FILETHUMB;
88-
ls.data.imagePath=strdup(this->fc->data.at(j).path.c_str());
88+
ls.imagePath=this->fc->data.at(j).path;
8989
}
9090
else
91-
ls.data.surface=this->imageImage;
91+
ls.surface=this->imageImage;
9292
}
9393
else
94-
ls.data.surface=this->fileImage;
94+
ls.surface=this->fileImage;
9595
break;
9696

9797
case FOLDERLINKTYPE:
98-
ls.data.surface=this->folderImageLink;
98+
ls.surface=this->folderImageLink;
9999
break;
100100

101101
case FILELINKTYPE:
102-
if((strcasestr(ls.label,".jpg")!=NULL) || (strcasestr(ls.label,".png")!=NULL))
102+
if((LFSTK_UtilityClass::LFSTK_strStr(ls.label,".jpg",true).length()>0) || (LFSTK_UtilityClass::LFSTK_strStr(ls.label,".png",true).length()>0))
103103
{
104104
if(this->useThumbs==true)
105105
{
106106
ls.imageType=FILETHUMB;
107-
ls.data.imagePath=strdup(this->fc->data.at(j).path.c_str());
107+
ls.imagePath=this->fc->data.at(j).path;
108108
}
109109
else
110-
ls.data.surface=this->imageImageLink;
110+
ls.surface=this->imageImageLink;
111111
}
112112
else
113-
ls.data.surface=this->fileImageLink;
113+
ls.surface=this->fileImageLink;
114114
break;
115115

116116
case BROKENLINKTYPE:
117-
ls.data.surface=this->brokenLink;
117+
ls.surface=this->brokenLink;
118118
break;
119119

120120
default:
121-
ls.data.surface=this->fileImage;
121+
ls.surface=this->fileImage;
122122
break;
123123
}
124124
fileListGadget->LFSTK_appendToList(ls);

‎LFSToolKit/LFSToolKit/lfstk/LFSTKFontDialog.cpp

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -129,18 +129,20 @@ void LFSTK_fontDialogClass::loadFontStrings(void)
129129
/*
130130
* Private parse fontstring.
131131
*/
132-
void LFSTK_fontDialogClass::parseFontString(std::string fontstr)
132+
void LFSTK_fontDialogClass::parseFontString(std::string fontstr)//TODO//
133133
{
134134
std::vector<std::string> tokenstrings;
135135

136136
tokenstrings=LFSTK_UtilityClass::LFSTK_strTok(fontstr,":");
137137

138-
this->fontlist->LFSTK_findByLabel(tokenstrings.at(0).c_str());
139-
this->boldcheck->LFSTK_setValue(tokenstrings.at(2).c_str());
140-
this->italiccheck->LFSTK_setValue(tokenstrings.at(3).c_str());
141-
this->fontsize->LFSTK_setBuffer(tokenstrings.at(1).substr(5,(tokenstrings.at(1).length()-5)).c_str());
142-
this->LFSTK_getFontData(true);
143-
138+
if(tokenstrings.size()>3)
139+
{
140+
this->fontlist->LFSTK_findByLabel(tokenstrings.at(0).c_str());
141+
this->boldcheck->LFSTK_setValue(tokenstrings.at(2).c_str());
142+
this->italiccheck->LFSTK_setValue(tokenstrings.at(3).c_str());
143+
this->fontsize->LFSTK_setBuffer(tokenstrings.at(1).substr(5,(tokenstrings.at(1).length()-5)).c_str());
144+
this->LFSTK_getFontData(true);
145+
}
144146
return;
145147
}
146148

@@ -230,7 +232,7 @@ void LFSTK_fontDialogClass::buildDialog(void)
230232

231233
for(int j=0;j<this->maxFonts;j++)
232234
{
233-
ls.label=strdup(this->fontsAZV.at(j).c_str());
235+
ls.label=this->fontsAZV.at(j);
234236
ls.imageType=NOTHUMB;
235237
fontlist->LFSTK_appendToList(ls);
236238
}

‎LFSToolKit/LFSToolKit/lfstk/LFSTKGadget.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -959,6 +959,7 @@ void LFSTK_gadgetClass::LFSTK_setCairoFontData(void)
959959
this->fontName=tokenstrings.at(0);
960960

961961
cairo_save(this->cr);
962+
//fprintf(stderr,"fontString=>>%s<< his->fontName.c_str()=>>%s<< slant=%i weight=%i sixe=%i \n",this->fontString.c_str(),this->fontName.c_str(),this->slant,this->weight,this->fontSize);
962963
cairo_select_font_face(this->cr,this->fontName.c_str(),this->slant,this->weight);
963964
cairo_set_font_size(this->cr,this->fontSize);
964965
cairo_font_extents(this->cr,&this->fontExtents);

‎LFSToolKit/LFSToolKit/lfstk/LFSTKGlobals.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
#include <vector>
3232
#include <iomanip>
3333
#include <filesystem>
34+
#include <algorithm>
3435

3536
#include <dirent.h>
3637

@@ -47,7 +48,7 @@
4748
#include <experimental/filesystem>
4849

4950

50-
#define COPYRITE "Copyright © 2013-2023 K.D.Hedger"
51+
#define COPYRITE "Copyright © 2013-2024 K.D.Hedger"
5152
#define PERSONAL "[email protected]"
5253
#define MYWEBSITE "https://keithdhedger.github.io/"
5354

‎LFSToolKit/LFSToolKit/lfstk/LFSTKImage.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,9 @@ LFSTK_imageClass::LFSTK_imageClass(LFSTK_windowClass* parentwc,const char* image
129129
this->ml->gadget=this;
130130
this->ml->type=IMAGEGADGET;
131131
this->wc->LFSTK_addMappedListener(this->window,ml);
132+
if(imagepath!=NULL)
133+
this->LFSTK_setImageFromPath(std::string(imagepath),gravity,scale);
132134

133-
this->LFSTK_setImageFromPath(imagepath,gravity,scale);
134135
this->useTile=this->wc->useTile;
135136
this->gadgetDetails={&this->wc->windowColourNames[NORMALCOLOUR],BEVELNONE,NOINDICATOR,NORMALCOLOUR,0,false,{0,0,w,h},{0,0,0,0},false,false,false};
136137

‎LFSToolKit/LFSToolKit/lfstk/LFSTKLib.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1181,8 +1181,8 @@ void LFSTK_lib::LFSTK_getFileInfo(const char* path,fileInformation* info)
11811181
file=g_file_new_for_path(path);
11821182
file_info=g_file_query_info(file,"standard::*",G_FILE_QUERY_INFO_NONE,NULL,&error);
11831183
th=g_file_info_get_content_type(file_info);
1184-
g_clear_object(&file);
11851184
g_clear_object(&file_info);
1185+
g_clear_object(&file);
11861186
if(th.length()!=0)
11871187
info->mimeType=th;
11881188
else

‎LFSToolKit/LFSToolKit/lfstk/LFSTKListGadget.cpp

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ void LFSTK_listGadgetClass::LFSTK_setListFromFile(const char *filepath,bool incl
141141
{
142142
if(strlen(buffer)>0)
143143
{
144-
ls.label=strdup(buffer);
144+
ls.label=buffer;
145145
ls.userData=USERDATA(userdata);
146146
this->LFSTK_appendToList(ls);
147147
}
@@ -191,9 +191,9 @@ void LFSTK_listGadgetClass::LFSTK_updateList(void)
191191
this->labelsArray->at(j)->LFSTK_setLabelGravity(MENU);
192192
this->listDataArray->at(j+this->listOffset).listPos=j;
193193
if(this->listDataArray->at(j+this->listOffset).imageType==CAIROTHUMB)
194-
this->labelsArray->at(j)->LFSTK_setImageFromSurface(this->listDataArray->at(j+this->listOffset).data.surface,MENU,true);
194+
this->labelsArray->at(j)->LFSTK_setImageFromSurface(this->listDataArray->at(j+this->listOffset).surface,MENU,true);
195195
if(this->listDataArray->at(j+this->listOffset).imageType==FILETHUMB)
196-
this->labelsArray->at(j)->LFSTK_setImageFromPath(this->listDataArray->at(j+this->listOffset).data.imagePath,MENU,true);
196+
this->labelsArray->at(j)->LFSTK_setImageFromPath(this->listDataArray->at(j+this->listOffset).imagePath,MENU,true);
197197
this->labelsArray->at(j)->LFSTK_showGadget();
198198
this->labelsArray->at(j)->LFSTK_clearWindow();
199199
}
@@ -353,11 +353,11 @@ void LFSTK_listGadgetClass::freeList(void)
353353
{
354354
for(int j=0;j<this->listDataArray->size();j++)
355355
{
356-
freeAndNull(&this->listDataArray->at(j).label);
357-
if((this->listDataArray->at(j).imageType==CAIROTHUMB) && (this->listDataArray->at(j).data.surface!=NULL) && (this->freeCairoImages==true))
358-
cairo_surface_destroy(this->listDataArray->at(j).data.surface);
359-
if((this->listDataArray->at(j).imageType==FILETHUMB) && (this->listDataArray->at(j).data.imagePath!=NULL))
360-
freeAndNull(&this->listDataArray->at(j).data.imagePath);
356+
//freeAndNull(&this->listDataArray->at(j).label);
357+
if((this->listDataArray->at(j).imageType==CAIROTHUMB) && (this->listDataArray->at(j).surface!=NULL) && (this->freeCairoImages==true))
358+
cairo_surface_destroy(this->listDataArray->at(j).surface);
359+
//if((this->listDataArray->at(j).imageType==FILETHUMB) && (this->listDataArray->at(j).imagePath.length()>0))
360+
// freeAndNull(&this->listDataArray->at(j).imagePath);
361361
}
362362
this->listDataArray->clear();
363363
}
@@ -374,10 +374,10 @@ void LFSTK_listGadgetClass::LFSTK_freeList(void)
374374
* Get selected label.
375375
* \return const char *label;
376376
*/
377-
const char *LFSTK_listGadgetClass::LFSTK_getSelectedLabel(void)
377+
const char *LFSTK_listGadgetClass::LFSTK_getSelectedLabel(void)//TODO//
378378
{
379379
if(this->listDataArray->size()>this->currentItem)
380-
return(this->listDataArray->at(this->currentItem).label);
380+
return(this->listDataArray->at(this->currentItem).label.c_str());
381381

382382
return("");
383383
}
@@ -387,12 +387,12 @@ const char *LFSTK_listGadgetClass::LFSTK_getSelectedLabel(void)
387387
* \param int Index.
388388
* \return const char *label;
389389
*/
390-
const char *LFSTK_listGadgetClass::LFSTK_getLabelAtIndex(int index)
390+
const char *LFSTK_listGadgetClass::LFSTK_getLabelAtIndex(int index)//TODO//
391391
{
392392
if((index>this->listDataArray->size()-1) || (index<0))
393393
return(NULL);
394394

395-
return(this->listDataArray->at(index).label);
395+
return(this->listDataArray->at(index).label.c_str());
396396
}
397397

398398
/**
@@ -508,7 +508,9 @@ int LFSTK_listGadgetClass::LFSTK_findByLabel(const char *needle,bool select)
508508
{
509509
for(int j=0;j<this->listDataArray->size();j++)
510510
{
511-
if(strcmp(this->listDataArray->at(j).label,needle)==0)
511+
//if(strcmp(this->listDataArray->at(j).label,needle)==0)//TODO//
512+
//if(strcmp(this->listDataArray->at(j).label.c_str(),needle)==0)
513+
if(this->listDataArray->at(j).label.compare(needle)==0)
512514
{
513515
if(select==true)
514516
this->LFSTK_selectByIndex(j);

‎LFSToolKit/LFSToolKit/lfstk/LFSTKListGadget.h

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,12 @@ enum {NOTHUMB=0,CAIROTHUMB,FILETHUMB};
3434

3535
struct listLabelStruct
3636
{
37-
char *label;
38-
int imageType;
39-
void *userData;
40-
int listPos;
41-
union imageData
42-
{
43-
char *imagePath=NULL;
44-
cairo_surface_t *surface;
45-
} data;
37+
std::string label;
38+
int imageType;
39+
void *userData;
40+
int listPos;
41+
std::string imagePath;
42+
cairo_surface_t *surface;
4643
};
4744

4845
/**

0 commit comments

Comments
 (0)