gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-23 22:52:34 +01:00
Code Issues Projects Releases Wiki Activity

Unused wsmap, begone!

Browse Source 
- held only reference to wnew0, which was the only consumer
of wmalloc0, safe trip both of them.
This commit is contained in:
Tamas TEVESZ
2010-03-15 09:50:35 +01:00
committed by Carlos R. Mafra
parent 4688e1b568
commit 8d0020cf9a
4 changed files with 0 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
WINGs/WINGs/WUtil.h
View File

@@ -237,12 +237,10 @@ char* wexpandpath(char *path);
char* wgethomedir(); char* wgethomedir();
void* wmalloc(size_t size); void* wmalloc(size_t size);
void* wmalloc0(size_t size);
void* wrealloc(void *ptr, size_t newsize); void* wrealloc(void *ptr, size_t newsize);
void wfree(void *ptr); void wfree(void *ptr);
#define wnew(type, count) wmalloc(sizeof(type)*count) #define wnew(type, count) wmalloc(sizeof(type)*count)
#define wnew0(type, count) wmalloc0(sizeof(type)*count)
void wrelease(void *ptr); void wrelease(void *ptr);
void* wretain(void *ptr); void* wretain(void *ptr);

11
WINGs/memory.c
View File

@@ -98,17 +98,6 @@ void *wmalloc(size_t size)
return tmp; return tmp;
} }
void *wmalloc0(size_t size)
{
void *ptr = wmalloc(size);
if (!ptr)
return NULL;
memset(ptr, 0, size);
return ptr;
}
void *wrealloc(void *ptr, size_t newsize) void *wrealloc(void *ptr, size_t newsize)
{ {
void *nptr; void *nptr;

13
src/Makefile.am
View File

@@ -4,12 +4,8 @@ BUILT_SOURCES = wconfig.h
bin_PROGRAMS = wmaker bin_PROGRAMS = wmaker
#noinst_PROGRAMS = wsmap
EXTRA_DIST = EXTRA_DIST =
#wsmap_SOURCES= wsmap.c
wmaker_SOURCES = \ wmaker_SOURCES = \
GNUstep.h \ GNUstep.h \
WindowMaker.h \ WindowMaker.h \
@@ -124,15 +120,6 @@ wmaker_LDADD = \
@INTLIBS@ \ @INTLIBS@ \
@DLLIBS@ @DLLIBS@
#wsmap_LDADD = \
# $(top_builddir)/WINGs/libWINGs.a\
# $(top_builddir)/wrlib/libwraster.la\
# @XLFLAGS@ \
# @XFTLIBS@ \
# @XLIBS@ \
# @INTLIBS@ \
# @DLLIBS@
LIBTOOL = $(SHELL) $(top_srcdir)/libtool $(LIBTOOL_ARG) LIBTOOL = $(SHELL) $(top_srcdir)/libtool $(LIBTOOL_ARG)
.c.o: .c.o:

83
src/wsmap.c
View File

@@ -1,83 +0,0 @@
#include "WindowMaker.h"
#include "window.h"
typedef struct {
WWindow *wwin;
WMLabel *mini;
} WSMWindow;
typedef struct {
WScreen *scr;
WMWindow *win;
WSMWindow *windows;
int windowCount;
int xcount, ycount;
int wswidth, wsheight;
} WWorkspaceMap;
#define WSMAP_DEFAULT_WIDTH 150
static WWorkspaceMap *createWorkspaceMap(WMScreen * scr, int xcount, int ycount)
{
WWorkspaceMap *wsm = wnew0(WWorkspaceMap, 1);
WMRect rect;
//
rect.width = 1024;
rect.height = 768;
wsm->win = WMCreateWindow(scr, "wsmap");
/* find out the ideal size of the mini-workspaces */
wsm->wswidth = WSMAP_DEFAULT_WIDTH;
wsm->wsheight = (wsm->wswidth * rect.height) / rect.width;
// check if it fits screen
wsm->xcount = xcount;
wsm->ycount = ycount;
return wsm;
}
static void handleEvent(WWorkspaceMap * map, XEvent * event)
{
switch (event->type) {
}
}
void wShowWorkspaceMap(WScreen * scr)
{
}
Display *dpy;
int main(int argc, char **argv)
{
WWorkspaceMap *wsmap;
WMScreen *scr;
WMInitializeApplication("WSMap", &argc, argv);
dpy = XOpenDisplay("");
if (!dpy) {
wfatal("cant open display");
exit(0);
}
scr = WMCreateSimpleApplicationScreen(dpy);
wsmap = createWorkspaceMap(scr);
WMRealizeWidget(wsmap->win);
WMMapWidget(wsmap->win);
WMScreenMainLoop(scr);
return 0;
}