Rearranged the structure of the WINGs subdirectory.

Created Documentation, Examples and Tests subdirectories.

Run update-autoconf after this update.

WINGs/Examples/.cvsignore

@@ -0,0 +1,3 @@
+Makefile Makefile.in
+.psrc .inslog2 tca.map tca.log
+*.rpt

WINGs/Examples/Makefile.am

@@ -0,0 +1,27 @@
+## automake input file for WINGs - Examples
+
+AUTOMAKE_OPTIONS = no-dependencies
+
+
+noinst_PROGRAMS = connect fontl puzzle
+
+
+LDADD= $(top_builddir)/WINGs/libWINGs.a $(top_builddir)/wrlib/libwraster.la \
+	 @LIBRARY_SEARCH_PATH@ @GFXLIBS@ @XLIBS@ \
+	-lm @LIBPL@
+
+
+fontl_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.a
+
+puzzle_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.a
+
+connect_DEPENDENCIES = $(top_builddir)/WINGs/libWUtil.a
+
+connect_LDADD = $(top_builddir)/WINGs/libWUtil.a @LIBRARY_SEARCH_PATH@ \
+	@NETLIBS@ @LIBPL@
+
+
+INCLUDES = -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib -I$(top_srcdir)/src \
+	-DRESOURCE_PATH=\"$(datadir)/WINGs\" @HEADER_SEARCH_PATH@ -DDEBUG
+
+

WINGs/Examples/connect.c

@@ -0,0 +1,209 @@
+/*
+ *  WINGs connect.c: example how to create a network client using WMConnection
+ * 
+ *  Copyright (c) 1999 Dan Pascu
+ * 
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+
+#include <stdio.h>
+#include <unistd.h>
+#include <string.h>
+
+#include "WINGs.h"
+
+
+
+static int initialized = 0;
+
+
+
+static void didReceiveInput(ConnectionDelegate *self, WMConnection *cPtr);
+
+static void connectionDidDie(ConnectionDelegate *self, WMConnection *cPtr);
+
+static void didInitialize(ConnectionDelegate *self, WMConnection *cPtr);
+
+
+
+static ConnectionDelegate socketDelegate = {
+    NULL,              /* data */
+    NULL,              /* didCatchException */
+    connectionDidDie,  /* didDie */
+    didInitialize,     /* didInitialize */
+    didReceiveInput,   /* didReceiveInput */
+    NULL               /* didTimeout */
+};
+
+
+
+void
+wAbort(Bool foo) /*FOLD00*/
+{
+    exit(1);
+}
+
+
+static char*
+getMessage(WMConnection *cPtr)
+{
+    char *buffer;
+    WMData *aData;
+    int length;
+
+    aData = WMGetConnectionAvailableData(cPtr);
+    if (!aData)
+        return NULL;
+    if ((length=WMGetDataLength(aData))==0) {
+        WMReleaseData(aData);
+        return NULL;
+    }
+
+    buffer = (char*)wmalloc(length+1);
+    WMGetDataBytes(aData, buffer);
+    buffer[length]= '\0';
+    WMReleaseData(aData);
+
+    return buffer;
+}
+
+
+static void
+inputHandler(int fd, int mask, void *clientData)
+{
+    WMConnection *cPtr = (WMConnection*)clientData;
+    WMData *aData;
+    char buf[4096];
+    int n;
+
+    if (!initialized)
+        return;
+
+    n = read(fd, buf, 4096);
+    if (n>0) {
+        aData = WMCreateDataWithBytes(buf, n);
+        WMSendConnectionData(cPtr, aData);
+        WMReleaseData(aData);
+    }
+}
+
+
+static void
+didReceiveInput(ConnectionDelegate *self, WMConnection *cPtr) /*FOLD00*/
+{
+    char *buffer;
+
+    buffer = getMessage(cPtr);
+    if (!buffer) {
+        fprintf(stderr, "Connection closed by peer.\n");
+        exit(0);
+    }
+
+    printf("%s", buffer);
+
+    wfree(buffer);
+}
+
+
+static void
+connectionDidDie(ConnectionDelegate *self, WMConnection *cPtr) /*FOLD00*/
+{
+    WMCloseConnection(cPtr);
+
+    fprintf(stderr, "Connection closed by peer.\n");
+    exit(0);
+}
+
+
+static void
+didInitialize(ConnectionDelegate *self, WMConnection *cPtr)
+{
+    int state = WMGetConnectionState(cPtr);
+    WMHost *host;
+
+    if (state == WCConnected) {
+        host = WMGetHostWithAddress(WMGetConnectionAddress(cPtr));
+        fprintf(stderr, "connected to '%s:%s'\n",
+                host?WMGetHostName(host):WMGetConnectionAddress(cPtr),
+                WMGetConnectionService(cPtr));
+        initialized = 1;
+        if (host)
+            WMReleaseHost(host);
+        return;
+    } else {
+        wsyserrorwithcode(WCErrorCode, "Unable to connect");
+        exit(1);
+    }
+}
+
+
+int
+main(int argc, char **argv) /*FOLD00*/
+{
+    char *ProgName, *host, *port;
+    int i;
+    WMConnection *sPtr;
+
+    wsetabort(wAbort);
+
+    WMInitializeApplication("connect", &argc, argv);
+
+    ProgName = strrchr(argv[0],'/');
+    if (!ProgName)
+        ProgName = argv[0];
+    else
+        ProgName++;
+
+    host = NULL;
+    port = "7000";
+
+    if (argc>1) {
+        for (i=1; i<argc; i++) {
+            if (strcmp(argv[i], "--help")==0 || strcmp(argv[i], "-h")==0) {
+                printf("usage: %s [host [port]]\n\n", ProgName);
+                exit(0);
+            } else {
+                if (!host)
+                    host = argv[i];
+                else
+                    port = argv[i];
+            }
+        }
+    }
+
+    printf("Trying to make connection to '%s:%s'\n",
+           host?host:"localhost", port);
+
+    sPtr = WMCreateConnectionToAddressAndNotify(host, port, NULL);
+    if (!sPtr) {
+        wfatal("could not create connection. exiting");
+        exit(1);
+    }
+
+    WMSetConnectionDelegate(sPtr, &socketDelegate);
+
+    /* watch what user types and send it over the connection */
+    WMAddInputHandler(0, WIReadMask, inputHandler, sPtr);
+
+    while (1) {
+        WHandleEvents();
+    }
+
+    return 0;
+
+}
+
+

WINGs/Examples/fontl.c

@@ -0,0 +1,104 @@
+/*
+ * WINGs demo: font lister
+ * 
+ *  Copyright (c) 1998 Alfredo K. Kojima
+ * 
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
+ *  USA.
+ */
+
+
+
+
+#include <stdlib.h>
+#include <stdio.h>
+#include "WINGs.h"
+#include "WUtil.h"
+
+void
+wAbort()
+{
+    exit(0);
+}
+
+void show(WMWidget *self, void *data)
+{
+    char buf[60];
+    void *d;
+    WMLabel *l = (WMLabel*)data;
+    d = WMGetHangedData(self);
+    sprintf(buf, "%i -  0x%x - 0%o", (int)d, (int)d, (int)d);
+    WMSetLabelText(l, buf);
+}
+
+void quit(WMWidget *self, void *data)
+{
+    exit(0);
+}
+
+
+int
+main(int argc, char **argv)
+{
+    Display *dpy;
+    WMWindow *win;
+    WMScreen *scr;
+    WMButton *lab, *l0=NULL;
+    WMLabel *pos;
+    int x, y, c;
+    char buf[20];
+
+    WMInitializeApplication("FontView", &argc, argv);
+
+    dpy = XOpenDisplay("");
+    if (!dpy) {
+	wfatal("cant open display");
+	exit(0);
+    }
+    
+    scr = WMCreateSimpleApplicationScreen(dpy);
+
+    win = WMCreateWindow(scr, "main");
+    WMResizeWidget(win, 20*33, 20+20*9);
+    WMSetWindowTitle(win, "Font Chars");
+    WMSetWindowCloseAction(win, quit, NULL);
+    pos = WMCreateLabel(win);
+    WMResizeWidget(pos, 20*33, 20);
+    WMMoveWidget(pos, 10, 5);
+
+    c = 0;
+    for (y=0; y<8; y++) {
+	for (x=0; x<32; x++, c++) {
+	    lab = WMCreateCustomButton(win, WBBStateLightMask);
+	    WMResizeWidget(lab, 20, 20);
+	    WMMoveWidget(lab, 10+x*20, 30+y*20);
+	    sprintf(buf, "%c", c);
+	    WMSetButtonText(lab, buf);
+	    WMSetButtonAction(lab, show, pos);
+	    WMHangData(lab, (void*)c);
+	    if (c>0) {
+		WMGroupButtons(l0, lab);
+	    } else {
+		l0 = lab;
+	    }
+	}
+    }
+    WMRealizeWidget(win);
+    WMMapSubwidgets(win);
+    WMMapWidget(win);
+    WMScreenMainLoop(scr);
+    return 0;   
+}
+

WINGs/Examples/puzzle.c

@@ -0,0 +1,241 @@
+
+
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <WINGs.h>
+
+
+
+#define MAX_SIZE 	10*10
+
+
+WMWindow *win;
+WMButton *Button[MAX_SIZE];
+char Map[MAX_SIZE];
+int Size = 4;
+int MoveCount;
+
+#define MAP(x,y)  Map[(x)+(y)*Size]
+
+int WinSize = 120;
+
+
+Bool CheckWin(void)
+{
+    int i;
+ 
+    for (i = 0; i < Size*Size-1; i++) {
+	if (Map[i] != i)
+	    return False;
+    }
+    
+    return True;
+}
+
+
+void MoveButton(int button, int x, int y)
+{
+    WMMoveWidget(Button[button], x*(WinSize/Size), y*(WinSize/Size));
+}
+
+
+Bool SlideButton(int button)
+{
+    int x, y, done = 0;
+    
+    /* locate the button */
+    for (y = 0; y < Size; y++) {
+	for (x = 0; x < Size; x++) {
+	    if (MAP(x,y) == button) {
+		done = 1;
+		break;
+	    }
+	}
+	if (done)
+	    break;
+    }
+        
+    if (x > 0 && MAP(x-1, y) < 0) {
+	MAP(x,y) = -1;
+	MoveButton(button, x-1, y);
+	MAP(x-1,y) = button;
+    } else if (x < Size-1 && MAP(x+1, y) < 0) {
+	MAP(x,y) = -1;
+	MoveButton(button, x+1, y);
+	MAP(x+1,y) = button;
+    } else if (y > 0 && MAP(x, y-1) < 0) {
+	MAP(x,y) = -1;
+	MoveButton(button, x, y-1);
+	MAP(x,y-1) = button;
+    } else if (y < Size-1 && MAP(x, y+1) < 0) {
+	MAP(x,y) = -1;
+	MoveButton(button, x, y+1);
+	MAP(x,y+1) = button;
+    } else {
+	return False;
+    }
+    return True;
+}
+
+
+#define SWAP(a,b) {int tmp; tmp=a; a=b; b=tmp;}
+
+void ResetGame(void)
+{
+    int i, x, y, ox, oy;
+    
+    
+    MoveCount = 0;
+    
+    for (i = 0; i < Size*Size-1; i++) {
+	Map[i] = i;
+    }
+    Map[i] = -1;
+    ox = x = Size-1;
+    oy = y = Size-1;
+    for (i = 0; i < 1000; i++) {
+	int ok;
+	ok = 1;
+	switch (rand()%4) {
+	 case 0:
+	    if (x > 0) x--; else ok = 0;
+	    break;
+	 case 2:
+	    if (x < Size-1) x++; else ok = 0;
+	    break;
+	 case 1:
+	    if (y > 0) y--; else ok = 0;
+	    break;
+	 case 3:
+	    if (y < Size-1) y++; else ok = 0;
+	    break;
+	}
+	if (ok) {
+	    MoveButton(MAP(x,y), ox, oy);
+
+	    SWAP(MAP(ox, oy), MAP(x, y));
+	    
+	    while (XPending(WMScreenDisplay(WMWidgetScreen(win)))) {
+		XEvent ev;
+		WMNextEvent(WMScreenDisplay(WMWidgetScreen(win)), &ev);
+		WMHandleEvent(&ev);
+	    }
+	    ox = x;
+	    oy = y;
+	}
+    }
+}
+
+
+void buttonClick(WMWidget *w, void *ptr)
+{
+    char buffer[300];
+
+    if (SlideButton((int)ptr)) {
+	MoveCount++;
+
+	if (CheckWin()) {
+	    sprintf(buffer, "You finished the game in %i moves.", MoveCount);
+
+	    if (WMRunAlertPanel(WMWidgetScreen(w), win, "You Won!", buffer,
+				"Wee!", "Gah! Lemme retry!", NULL) == WAPRDefault) {
+		exit(0);
+	    }
+	    
+	    ResetGame();
+	}
+    }
+}
+
+
+static void resizeObserver(void *self, WMNotification *notif)
+{
+    WMSize size = WMGetViewSize(WMWidgetView(win));
+    int x, y;
+    
+    WinSize = size.width;
+    for (y = 0; y < Size; y++) {
+	for (x = 0; x < Size; x++) {
+	    if (MAP(x,y) >= 0) {
+		WMResizeWidget(Button[(int)MAP(x,y)],
+			       WinSize/Size, WinSize/Size);
+		WMMoveWidget(Button[(int)MAP(x,y)],
+			     x*(WinSize/Size), y*(WinSize/Size));
+	    }
+	}
+    }
+
+}
+
+
+int main(int argc, char **argv)
+{
+    Display *dpy;
+    WMScreen *scr;
+    int x, y, i;
+    
+    WMInitializeApplication("Puzzle", &argc, argv);
+
+    
+    dpy = XOpenDisplay("");
+    if (!dpy) {
+	printf("could not open display\n");
+	exit(1);
+    }
+    
+    scr = WMCreateScreen(dpy, DefaultScreen(dpy));
+    
+    win = WMCreateWindow(scr, "puzzle");
+    WMResizeWidget(win, WinSize, WinSize);
+    WMSetWindowTitle(win, "zuPzel");
+    WMSetWindowMinSize(win, 80, 80);
+    WMSetWindowAspectRatio(win, 2, 2, 2, 2);
+    WMSetWindowResizeIncrements(win, Size, Size);
+    WMSetViewNotifySizeChanges(WMWidgetView(win), True);
+    WMAddNotificationObserver(resizeObserver, NULL,
+			      WMViewSizeDidChangeNotification,
+			      WMWidgetView(win));
+			      
+			      
+    
+    for (i = y = 0; y < Size && i < Size*Size-1; y++) {
+	for (x = 0; x < Size && i < Size*Size-1; x++) {
+	    char buf[32];
+	    WMColor *color;
+	    RColor col;
+	    RHSVColor hsv;
+	    
+	    hsv.hue = i*360/(Size*Size-1);
+	    hsv.saturation = 120;
+	    hsv.value = 200;
+	    
+	    RHSVtoRGB(&hsv, &col);
+
+	    color = WMCreateRGBColor(scr, col.red<<8, col.green<<8,
+				     col.blue<<8, False);
+
+	    MAP(x,y) = i;
+	    Button[i] = WMCreateButton(win, WBTMomentaryLight);
+	    WMSetWidgetBackgroundColor(Button[i], color);
+	    WMReleaseColor(color);
+	    WMSetButtonAction(Button[i], buttonClick, (void*)i);
+	    WMResizeWidget(Button[i], WinSize/Size, WinSize/Size);
+	    WMMoveWidget(Button[i], x*(WinSize/Size), y*(WinSize/Size));
+	    sprintf(buf, "%i", i+1);
+	    WMSetButtonText(Button[i], buf);
+	    WMSetButtonTextAlignment(Button[i], WACenter);
+	    i++;
+	}
+    }
+        
+    WMMapSubwidgets(win);
+    WMMapWidget(win);
+    WMRealizeWidget(win);
+    
+    ResetGame();
+
+    WMScreenMainLoop(scr);
+    
+    return 0;
+}