gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2026-02-18 15:35:55 +01:00
Code Issues Projects Releases Wiki Activity

Added (forgotten) release for notifications when destroying a WMList.

Browse Source
This commit is contained in:
dan
2002-11-04 06:07:00 +00:00
parent a4bc7f6a07
commit 5e37991b6c
6 changed files with 1316 additions and 1336 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
WINGs/Tests/wmfile.c
View File

@@ -70,14 +70,15 @@ int main(int argc, char **argv)
extern char *optarg; extern char *optarg;
extern int optind; extern int optind;
WMInitializeApplication("WMFile", &argc, argv);
ProgName = argv[0];
if (!dpy) { if (!dpy) {
puts("could not open display"); puts("could not open display");
exit(1); exit(1);
} }
WMInitializeApplication("WMFile", &argc, argv);
ProgName = argv[0];
while((ch = getopt(argc, argv, "si:ht:")) != -1) while((ch = getopt(argc, argv, "si:ht:")) != -1)
switch(ch) switch(ch)
{ {

2
WINGs/WINGs/WINGs.h
View File

@@ -744,8 +744,6 @@ WMFont* WMEmphasizeFont(WMScreen *scr, WMFont *font);
WMFont* WMUnemphasizeFont(WMScreen *scr, WMFont *font); WMFont* WMUnemphasizeFont(WMScreen *scr, WMFont *font);
WMFont* WMGetFontOfSize(WMScreen *scr, WMFont *font, int size);
/* ....................................................................... */ /* ....................................................................... */
WMPixmap* WMRetainPixmap(WMPixmap *pixmap); WMPixmap* WMRetainPixmap(WMPixmap *pixmap);

69
WINGs/wfont.c
View File

@@ -681,7 +681,6 @@ changeFontProp(char *fname, char *newprop, int which)
WMFont* WMFont*
WMNormalizeFont(WMScreen *scr, WMFont *font) WMNormalizeFont(WMScreen *scr, WMFont *font)
{ {
WMFont *newfont=NULL;
char fname[256]; char fname[256];
if (!scr || !font) if (!scr || !font)
@@ -690,19 +689,16 @@ WMNormalizeFont(WMScreen *scr, WMFont *font)
snprintf(fname, 255, "%s", font->name); snprintf(fname, 255, "%s", font->name);
changeFontProp(fname, "medium", 2); changeFontProp(fname, "medium", 2);
changeFontProp(fname, "r", 3); changeFontProp(fname, "r", 3);
newfont = WMCreateNormalFont(scr, fname); if (font->antialiased)
return WMCreateAAFont(scr, fname);
if (!newfont) else
return NULL; return WMCreateNonAAFont(scr, fname);
return newfont;
} }
WMFont* WMFont*
WMStrengthenFont(WMScreen *scr, WMFont *font) WMStrengthenFont(WMScreen *scr, WMFont *font)
{ {
WMFont *newfont=NULL;
char fname[256]; char fname[256];
if (!scr || !font) if (!scr || !font)
@@ -710,19 +706,16 @@ WMStrengthenFont(WMScreen *scr, WMFont *font)
snprintf(fname, 255, "%s", font->name); snprintf(fname, 255, "%s", font->name);
changeFontProp(fname, "bold", 2); changeFontProp(fname, "bold", 2);
newfont = WMCreateNormalFont(scr, fname); if (font->antialiased)
return WMCreateAAFont(scr, fname);
if (!newfont) else
return NULL; return WMCreateNonAAFont(scr, fname);
return newfont;
} }
WMFont* WMFont*
WMUnstrengthenFont(WMScreen *scr, WMFont *font) WMUnstrengthenFont(WMScreen *scr, WMFont *font)
{ {
WMFont *newfont=NULL;
char fname[256]; char fname[256];
if (!scr || !font) if (!scr || !font)
@@ -730,39 +723,37 @@ WMUnstrengthenFont(WMScreen *scr, WMFont *font)
snprintf(fname, 255, "%s", font->name); snprintf(fname, 255, "%s", font->name);
changeFontProp(fname, "medium", 2); changeFontProp(fname, "medium", 2);
newfont = WMCreateNormalFont(scr, fname); if (font->antialiased)
return WMCreateAAFont(scr, fname);
if (!newfont) else
return NULL; return WMCreateNonAAFont(scr, fname);
return newfont;
} }
WMFont* WMFont*
WMEmphasizeFont(WMScreen *scr, WMFont *font) WMEmphasizeFont(WMScreen *scr, WMFont *font)
{ {
WMFont *newfont=NULL;
char fname[256]; char fname[256];
if (!scr || !font) if (!scr || !font)
return NULL; return NULL;
snprintf(fname, 255, "%s", font->name); snprintf(fname, 255, "%s", font->name);
changeFontProp(fname, "o", 3); if (font->antialiased)
newfont = WMCreateNormalFont(scr, fname); changeFontProp(fname, "i", 3);
else
changeFontProp(fname, "o", 3);
if (!newfont) if (font->antialiased)
return NULL; return WMCreateAAFont(scr, fname);
else
return newfont; return WMCreateNonAAFont(scr, fname);
} }
WMFont* WMFont*
WMUnemphasizeFont(WMScreen *scr, WMFont *font) WMUnemphasizeFont(WMScreen *scr, WMFont *font)
{ {
WMFont *newfont=NULL;
char fname[256]; char fname[256];
if (!scr || !font) if (!scr || !font)
@@ -770,22 +761,10 @@ WMUnemphasizeFont(WMScreen *scr, WMFont *font)
snprintf(fname, 255, "%s", font->name); snprintf(fname, 255, "%s", font->name);
changeFontProp(fname, "r", 3); changeFontProp(fname, "r", 3);
newfont = WMCreateNormalFont(scr, fname); if (font->antialiased)
return WMCreateAAFont(scr, fname);
if (!newfont) else
return NULL; return WMCreateNonAAFont(scr, fname);
return newfont;
}
WMFont*
WMGetFontOfSize(WMScreen *scr, WMFont *font, int size)
{
if(!scr || !font || size<1)
return NULL;
return font;
} }

2
WINGs/wlist.c
View File

@@ -1264,6 +1264,8 @@ destroyList(List *lPtr)
if (lPtr->doubleBuffer) if (lPtr->doubleBuffer)
XFreePixmap(lPtr->view->screen->display, lPtr->doubleBuffer); XFreePixmap(lPtr->view->screen->display, lPtr->doubleBuffer);
WMRemoveNotificationObserver(lPtr);
wfree(lPtr); wfree(lPtr);
} }

2288
src/moveres.c
View File

File diff suppressed because it is too large Load Diff

2
wrlib/Makefile.am
View File

@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = no-dependencies
lib_LTLIBRARIES = libwraster.la lib_LTLIBRARIES = libwraster.la
libwraster_la_LDFLAGS = -version-info 5:0:3 libwraster_la_LDFLAGS = -version-info 3:0:0
bin_SCRIPTS = get-wraster-flags bin_SCRIPTS = get-wraster-flags