From 2a52ce354437b0ae95fa5346d86780030a982b75 Mon Sep 17 00:00:00 2001 From: Tamas TEVESZ Date: Wed, 17 Mar 2010 17:58:43 +0100 Subject: [PATCH] Remove unneeded files WINGs/puzzle.c is an example, and is actually also in WINGs/Examples/ wmsetup was actually equivalent to a slightly braindead true(1) --- WINGs/puzzle.c | 232 ---------------------------------- util/Makefile.am | 8 +- util/wmsetup.c | 376 ------------------------------------------------------- 3 files changed, 1 insertion(+), 615 deletions(-) delete mode 100644 WINGs/puzzle.c delete mode 100644 util/wmsetup.c diff --git a/WINGs/puzzle.c b/WINGs/puzzle.c deleted file mode 100644 index a625cfdd..00000000 --- a/WINGs/puzzle.c +++ /dev/null @@ -1,232 +0,0 @@ - -#include -#include -#include - -#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 < 5; 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; -} diff --git a/util/Makefile.am b/util/Makefile.am index f266bfa6..b21ba179 100644 --- a/util/Makefile.am +++ b/util/Makefile.am @@ -5,7 +5,7 @@ AUTOMAKE_OPTIONS = no-dependencies pkgdatadir = $(datadir)/@PACKAGE@ bin_PROGRAMS = wxcopy wxpaste wdwrite wdread getstyle setstyle convertfonts \ - seticons geticonset wmsetbg wmsetup wmagnify wmgenmenu + seticons geticonset wmsetbg wmagnify wmgenmenu bin_SCRIPTS = wmaker.inst wm-oldmenu2new wkdemenu.pl @@ -51,12 +51,6 @@ wmagnify_LDADD = \ $(top_builddir)/wrlib/libwraster.la \ @XFTLIBS@ @INTLIBS@ @DLLIBS@ -wmsetup_LDADD = \ - $(top_builddir)/WINGs/libWINGs.la \ - $(top_builddir)/WINGs/libWUtil.la \ - $(top_builddir)/wrlib/libwraster.la \ - @XFTLIBS@ @INTLIBS@ @DLLIBS@ - wmsetbg_LDADD = \ $(top_builddir)/WINGs/libWINGs.la \ $(top_builddir)/WINGs/libWUtil.la \ diff --git a/util/wmsetup.c b/util/wmsetup.c deleted file mode 100644 index 243bd372..00000000 --- a/util/wmsetup.c +++ /dev/null @@ -1,376 +0,0 @@ -/* wmsetup.c- create wmaker config file dir structure and copy default - * config files. - * - * Copyright (c) 2000-2003 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., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -#if 1 -int main() -{ - return 0; -} -#else -#define PROG_VERSION "wmsetup 0.0 (Window Maker)" - -#include -#include -#include - -#include -#include -#include - -#include - -#include "../src/config.h" - -char *RequiredDirectories[] = { - "/Defaults", - "/Library", - "/Library/Icons", - "/Library/WindowMaker", - "/Library/WindowMaker/Backgrounds", - "/Library/WindowMaker/IconSets", - "/Library/WindowMaker/Pixmaps", - "/Library/WindowMaker/CachedPixmaps", - "/Library/WindowMaker/SoundSets", - "/Library/WindowMaker/Sounds", - "/Library/WindowMaker/Styles", - "/Library/WindowMaker/Themes", - "/Library/WindowMaker/WPrefs", - NULL -}; - -char *RequiredFiles[] = { - "/Defaults/WindowMaker", - "/Defaults/WMWindowAttributes", - NULL -}; - -WMScreen *scr; - -#define wlog wwarning - -#if 0 -void wlog(const char *msg, ...) -{ - va_list args; - char buf[MAXLINE]; - - va_start(args, msg); - - vsprintf(buf, msg, args); - puts(buf); - - va_end(args); -} -#endif - -void alert(const char *msg, ...) -{ - va_list args; - char buffer[2048]; - - va_start(args, msg); - - vsprintf(buf, msg, args); - - WMRunAlertPanel(scr, NULL, _("Error"), buffer, _("OK"), NULL, NULL); - - va_end(args); -} - -Bool ask(char *title, char *yes, char *no, const char *msg, ...) -{ - va_list args; - char buffer[2048]; - - va_start(args, msg); - - vsprintf(buf, msg, args); - - WMRunAlertPanel(scr, NULL, title, buffer, yes, no, NULL); - - va_end(args); -} - -char *renameName(char *path) -{ - char *buf = wmalloc(strlen(path) + 8); - int i; - - sprintf(buf, "%s~", path); - - if (access(buf, F_OK) < 0) { - return buf; - } - - for (i = 0; i < 10; i++) { - sprintf(buf, "%s~%i", path, i); - - if (access(buf, F_OK) < 0) { - return buf; - } - } - - sprintf(buf, "%s~", path); - - return buf; -} - -void showFileError(int error, Bool directory, char *path) -{ - switch (error) { - case EACCESS: - if (directory) { - alert(_("The directory %s needs to be fully accessible, but is\n" - "not. Make sure all of it's parent directories have\n" - "read and execute permissions set."), path); - } else { - alert(_("The file %s needs to be fully accessible, but is not.\n" - "Make sure it has read and write permissions set and\n" - "all of it's parent directories have read and execute\n" "permissions."), path); - } - break; - - case EROFS: - alert(_("The %s %s is in a read-only file system, but it needs to be\n" - "writable. Start wmaker with the --static command line option."), - directory ? _("directory") : _("file"), path); - break; - - default: - alert(_("An error occurred while accessing the %s %s. Please make sure\n" - "it exists and is accessible.\n%s"), - directory ? _("directory") : _("file"), path, wstrerror(error)); - break; - } -} - -Bool checkDir(char *path, Bool fatal) -{ - if (access(path, F_OK) < 0) { - if (mkdir(path, 0775) < 0) { - alert(_("could not create directory %s\n%s"), path, wstrerror(errno)); - return False; - } else { - wlog(_("created directory %s"), path); - } - } - - if (access(path, R_OK | W_OK | X_OK) == 0) { - return True; - } - wsyserror("bad access to directory %s", path); - - if (!fatal) { - struct stat buf; - - if (stat(path, &buf) < 0) { - alert(_("The directory %s could not be stat()ed. Please make sure\n" - "it exists and is accessible."), path); - return False; - } - - if (!S_ISDIR(buf)) { - char *newName = renameName(path); - - if (ask(_("Rename"), _("OK"), _("Cancel"), - _("A directory named %s needs to be created but a file with\n" - "the same name already exists. The file will be renamed to\n" - "%s and the directory will be created."), path, newName)) { - - if (rename(path, newName) < 0) { - alert(_("Could not rename %s to %s:%s"), path, newName, wstrerror(errno)); - } - } - wfree(newName); - - return False; - } - if (!(buf.st_mode & S_IRWXU)) { - if (chmod(path, (buf.st_mode & 00077) | 7) < 0) { - return False; - } - } - - return checkDir(path, True); - } - - showFileError(errno, True, path); - - return False; -} - -Bool checkFile(char *path) -{ - if (access(path, F_OK | R_OK | W_OK) == 0) { - return True; - } - - showFileError(errno, False, path); - - return False; -} - -Bool checkCurrentSetup(char *home) -{ - char path[1024]; - char *p; - - if (!checkDir(home, False)) { - wlog("couldnt make directory %s", home); - return False; - } - - for (p = RequiredDirectories; p != NULL; p++) { - sprintf(path, "%s%s", home, p); - if (!checkDir(p, False)) { - wlog("couldnt make directory %s", p); - return False; - } - } - - for (p = RequiredFiles; p != NULL; p++) { - sprintf(path, "%s%s", home, p); - if (!checkFile(p, False)) { - return False; - } - } - - return True; -} - -Bool copyAllFiles(char *gsdir) -{ - FILE *f; - char path[2048]; - char file[256]; - char target[2048]; - - /* copy misc data files */ - - sprintf(path, "%s/USER_FILES", DATADIR); - - f = fopen(path, "rb"); - while (!feof(f)) { - if (!fgets(file, 255, f)) { - break; - } - sprintf(path, "%s/%s", DATADIR, file); - sprintf(target, "%s/Library/WindowMaker/%s", gsdir, file); - if (!copyFile(path, target)) { - return False; - } - } - fclose(f); - - /* copy auto{start,finish} scripts */ - - /* select and copy menu */ - - /* copy Defaults stuff */ - - sprintf(path, "%s/USER_FILES", ETCDIR); - - f = fopen(path, "rb"); - while (!feof(f)) { - if (!fgets(path, 255, f)) { - break; - } - sprintf(path, "%s/%s", ETCDIR, file); - sprintf(target, "%s/Defaults/%s", gsdir, file); - if (!copyFile(path, target)) { - return False; - } - } - fclose(f); - - /* setup .xinitrc */ - -} - -void showFinishSplash(char *gsdir) -{ -#if 0 - WMWindow *win; - - win = WMCreateWindow(scr, "finished"); -#endif -} - -int main(int argc, char **argv) -{ - Display *dpy; - char *gsdir; - int i; - - for (i = 1; i < argc; i++) { - if (strcmp(argv[i], "-display") == 0) { - i++; - if (i >= argc) { - wwarning(_("too few arguments for %s"), argv[i - 1]); - exit(0); - } - DisplayName = argv[i]; - } else if (strcmp(argv[i], "-version") == 0 || strcmp(argv[i], "--version") == 0) { - puts(PROG_VERSION); - exit(0); - } - } - - WMInitializeApplication("WMSetup", &argc, argv); - - dpy = XOpenDisplay(""); - if (!dpy) { - printf("could not open display\n"); - exit(1); - } - - scr = WMCreateScreen(dpy, DefaultScreen(dpy)); - - gsdir = wusergnusteppath(); - - /* check directory structure and copy files */ - if (access(gsdir, F_OK) != 0) { - if (!ask(_("Window Maker"), _("OK"), _("Cancel"), - _("Window Maker will create a directory named %s, where\n" - "it will store it's configuration files and other data."), gsdir)) { - alert(_("Window Maker will be started in 'static' mode, where\n" - "it will use default configuration and will not write\n" - "any information to disk.")); - return 1; - } - } - - if (checkCurrentSetup(gsdir)) { - printf(_("%s: wmaker configuration files already installed\n"), argv[0]); - return 0; - } - - if (!copyAllFiles(gsdir)) { - alert(_("An error occurred while doing user specific setup of\n" - "Window Maker. It will be started in 'static' mode, where\n" - "the default configuration will be used and it will not write\n" - "any information to disk.")); - return 1; - } - - showFinishSplash(gsdir); - - return 0; -} -#endif -- 2.11.4.GIT