From 38a3b251be85741a24ee175ad23310342510c11e Mon Sep 17 00:00:00 2001 From: Doug Torrance Date: Mon, 27 Feb 2017 22:22:01 -0500 Subject: [PATCH] washerdryer: Use wmgeneral from libdockapp. --- washerdryer/washerDryer/Makefile | 7 +- washerdryer/washerDryer/washerDryer.c | 4 +- washerdryer/wmgeneral/list.c | 165 ------------- washerdryer/wmgeneral/list.h | 61 ----- washerdryer/wmgeneral/misc.c | 229 ------------------ washerdryer/wmgeneral/misc.h | 9 - washerdryer/wmgeneral/wmgeneral.c | 444 ---------------------------------- washerdryer/wmgeneral/wmgeneral.h | 62 ----- 8 files changed, 4 insertions(+), 977 deletions(-) delete mode 100644 washerdryer/wmgeneral/list.c delete mode 100644 washerdryer/wmgeneral/list.h delete mode 100644 washerdryer/wmgeneral/misc.c delete mode 100644 washerdryer/wmgeneral/misc.h delete mode 100644 washerdryer/wmgeneral/wmgeneral.c delete mode 100644 washerdryer/wmgeneral/wmgeneral.h diff --git a/washerdryer/washerDryer/Makefile b/washerdryer/washerDryer/Makefile index 7a56308..3bf32a7 100644 --- a/washerdryer/washerDryer/Makefile +++ b/washerdryer/washerDryer/Makefile @@ -1,10 +1,7 @@ LIBDIR = -L/usr/X11R6/lib -L/usr/lib -L/opt/gnome/lib -LIBS = -lXpm -lXext -lX11 `pkg-config gtk+-2.0 --libs` +LIBS = -lXpm -lXext -lX11 `pkg-config gtk+-2.0 --libs` -ldockapp CFLAGS = `pkg-config gtk+-2.0 --cflags` -OBJS = washerDryer.o \ - ../wmgeneral/wmgeneral.o \ - ../wmgeneral/misc.o \ - ../wmgeneral/list.o +OBJS = washerDryer.o .c.o: cc -c -O2 -Wall $< -o $*.o $(CFLAGS) diff --git a/washerdryer/washerDryer/washerDryer.c b/washerdryer/washerDryer/washerDryer.c index 607b007..de4160d 100644 --- a/washerdryer/washerDryer/washerDryer.c +++ b/washerdryer/washerDryer/washerDryer.c @@ -6,8 +6,8 @@ #include #include -#include "../wmgeneral/wmgeneral.h" -#include "../wmgeneral/misc.h" +#include +#include #include "wdryer.xpm" #define CHAR_WIDTH 5 diff --git a/washerdryer/wmgeneral/list.c b/washerdryer/wmgeneral/list.c deleted file mode 100644 index ba1434a..0000000 --- a/washerdryer/wmgeneral/list.c +++ /dev/null @@ -1,165 +0,0 @@ -/* Generic single linked list to keep various information - Copyright (C) 1993, 1994 Free Software Foundation, Inc. - - - Author: Kresten Krab Thorup - - Many modifications by Alfredo K. Kojima - - - This file is part of GNU CC. - - GNU CC 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, or (at your option) - any later version. - - GNU CC 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 GNU CC; see the file COPYING. If not, write to - the Free Software Foundation, 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ - -/* As a special exception, if you link this library with files compiled with - GCC to produce an executable, this does not cause the resulting executable - to be covered by the GNU General Public License. This exception does not - however invalidate any other reasons why the executable file might be - covered by the GNU General Public License. */ - -#include "list.h" -#ifdef HAVE_SYS_TYPES_H -#include -#endif -#include - -/* Return a cons cell produced from (head . tail) */ - -INLINE LinkedList * list_cons (void *head, LinkedList * tail) -{ - LinkedList *cell; - - cell = (LinkedList *) malloc (sizeof (LinkedList)); - cell->head = head; - cell->tail = tail; - return cell; -} - -/* Return the length of a list, list_length(NULL) returns zero */ - -INLINE int list_length (LinkedList * list) -{ - int i = 0; - while (list) - { - i += 1; - list = list->tail; - } - return i; -} - -/* Return the Nth element of LIST, where N count from zero. If N - larger than the list length, NULL is returned */ - -INLINE void * list_nth (int index, LinkedList * list) -{ - while (index-- != 0) - { - if (list->tail) - list = list->tail; - else - return 0; - } - return list->head; -} - -/* Remove the element at the head by replacing it by its successor */ - -INLINE void list_remove_head (LinkedList ** list) -{ - if (!*list) - return; - if ((*list)->tail) - { - LinkedList *tail = (*list)->tail; /* fetch next */ - *(*list) = *tail; /* copy next to list head */ - free (tail); /* free next */ - } - else - /* only one element in list */ - { - free (*list); - (*list) = 0; - } -} - - -/* Remove the element with `car' set to ELEMENT */ -/* - INLINE void - list_remove_elem(LinkedList** list, void* elem) - { - while (*list) - { - if ((*list)->head == elem) - list_remove_head(list); - *list = (*list ? (*list)->tail : NULL); - } - } */ - -INLINE LinkedList * list_remove_elem (LinkedList * list, void *elem) -{ - LinkedList *tmp; - - if (list) - { - if (list->head == elem) - { - tmp = list->tail; - free (list); - return tmp; - } - list->tail = list_remove_elem (list->tail, elem); - return list; - } - return NULL; -} - - -/* Return element that has ELEM as car */ - -INLINE LinkedList * list_find (LinkedList * list, void *elem) -{ - while (list) - { - if (list->head == elem) - return list; - list = list->tail; - } - return NULL; -} - -/* Free list (backwards recursive) */ - -INLINE void list_free (LinkedList * list) -{ - if (list) - { - list_free (list->tail); - free (list); - } -} - -/* Map FUNCTION over all elements in LIST */ - -INLINE void list_mapcar (LinkedList * list, void (*function) (void *)) -{ - while (list) - { - (*function) (list->head); - list = list->tail; - } -} diff --git a/washerdryer/wmgeneral/list.h b/washerdryer/wmgeneral/list.h deleted file mode 100644 index 3271d65..0000000 --- a/washerdryer/wmgeneral/list.h +++ /dev/null @@ -1,61 +0,0 @@ -/* Generic single linked list to keep various information - Copyright (C) 1993, 1994 Free Software Foundation, Inc. - - Author: Kresten Krab Thorup - - This file is part of GNU CC. - - GNU CC 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, or (at your option) - any later version. - - GNU CC 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 GNU CC; see the file COPYING. If not, write to - the Free Software Foundation, 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ - -/* As a special exception, if you link this library with files compiled with - GCC to produce an executable, this does not cause the resulting executable - to be covered by the GNU General Public License. This exception does not - however invalidate any other reasons why the executable file might be - covered by the GNU General Public License. */ - -#ifndef __LIST_H_ -#define __LIST_H_ - -#if defined(__GNUC__) && !defined(__STRICT_ANSI__) -#define INLINE inline -#else -#define INLINE -#endif - -typedef struct LinkedList - { - void *head; - struct LinkedList *tail; - } -LinkedList; - -INLINE LinkedList *list_cons (void *head, LinkedList * tail); - -INLINE int list_length (LinkedList * list); - -INLINE void *list_nth (int index, LinkedList * list); - -INLINE void list_remove_head (LinkedList ** list); - -INLINE LinkedList *list_remove_elem (LinkedList * list, void *elem); - -INLINE void list_mapcar (LinkedList * list, void (*function) (void *)); - -INLINE LinkedList *list_find (LinkedList * list, void *elem); - -INLINE void list_free (LinkedList * list); - -#endif diff --git a/washerdryer/wmgeneral/misc.c b/washerdryer/wmgeneral/misc.c deleted file mode 100644 index d917917..0000000 --- a/washerdryer/wmgeneral/misc.c +++ /dev/null @@ -1,229 +0,0 @@ -/* dock.c- built-in Dock module for WindowMaker - - * WindowMaker window manager - * - * Copyright (c) 1997 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. - */ - -#include -#include -#include "list.h" -#include "misc.h" - -/* - *---------------------------------------------------------------------- - * parse_command-- - * Divides a command line into a argv/argc pair. - *---------------------------------------------------------------------- - */ -#define PRC_ALPHA 0 -#define PRC_BLANK 1 -#define PRC_ESCAPE 2 -#define PRC_DQUOTE 3 -#define PRC_EOS 4 -#define PRC_SQUOTE 5 - -typedef struct - { - short nstate; - short output; - } -DFA; - - -static DFA mtable[9][6] = -{ - { - {3, 1}, - {0, 0}, - {4, 0}, - {1, 0}, - {8, 0}, - {6, 0}}, - { - {1, 1}, - {1, 1}, - {2, 0}, - {3, 0}, - {5, 0}, - {1, 1}}, - { - {1, 1}, - {1, 1}, - {1, 1}, - {1, 1}, - {5, 0}, - {1, 1}}, - { - {3, 1}, - {5, 0}, - {4, 0}, - {1, 0}, - {5, 0}, - {6, 0}}, - { - {3, 1}, - {3, 1}, - {3, 1}, - {3, 1}, - {5, 0}, - {3, 1}}, - { - {-1, -1}, - {0, 0}, - {0, 0}, - {0, 0}, - {0, 0}, - {0, 0}}, /* final state */ - { - {6, 1}, - {6, 1}, - {7, 0}, - {6, 1}, - {5, 0}, - {3, 0}}, - { - {6, 1}, - {6, 1}, - {6, 1}, - {6, 1}, - {5, 0}, - {6, 1}}, - { - {-1, -1}, - {0, 0}, - {0, 0}, - {0, 0}, - {0, 0}, - {0, 0}}, /* final state */ -}; - -char * next_token (char *word, char **next) -{ - char *ptr; - char *ret, *t; - int state, ctype; - - t = ret = malloc (strlen (word) + 1); - ptr = word; - - state = 0; - *t = 0; - while (1) - { - if (*ptr == 0) - ctype = PRC_EOS; - else if (*ptr == '\\') - ctype = PRC_ESCAPE; - else if (*ptr == '"') - ctype = PRC_DQUOTE; - else if (*ptr == '\'') - ctype = PRC_SQUOTE; - else if (*ptr == ' ' || *ptr == '\t') - ctype = PRC_BLANK; - else - ctype = PRC_ALPHA; - - if (mtable[state][ctype].output) - { - *t = *ptr; - t++; - *t = 0; - } - state = mtable[state][ctype].nstate; - ptr++; - if (mtable[state][0].output < 0) - { - break; - } - } - - if (*ret == 0) - t = NULL; - else - t = strdup (ret); - - free (ret); - - if (ctype == PRC_EOS) - *next = NULL; - else - *next = ptr; - - return t; -} - - -extern void parse_command (char *command, char ***argv, int *argc) -{ - LinkedList *list = NULL; - char *token, *line; - int count, i; - - line = command; - do - { - token = next_token (line, &line); - if (token) - { - list = list_cons (token, list); - } - } - while (token != NULL && line != NULL); - - count = list_length (list); - *argv = malloc (sizeof (char *) * count); - i = count; - while (list != NULL) - { - (*argv)[--i] = list->head; - list_remove_head (&list); - } - *argc = count; -} - -extern pid_t execCommand (char *command) -{ - pid_t pid; - char **argv; - int argc; - - parse_command (command, &argv, &argc); - - if (argv == NULL) - { - return 0; - } - - if ((pid = fork ()) == 0) - { - char **args; - int i; - - args = malloc (sizeof (char *) * (argc + 1)); - if (!args) - exit (10); - for (i = 0; i < argc; i++) - { - args[i] = argv[i]; - } - args[argc] = NULL; - execvp (argv[0], args); - exit (10); - } - return pid; -} diff --git a/washerdryer/wmgeneral/misc.h b/washerdryer/wmgeneral/misc.h deleted file mode 100644 index ce3321e..0000000 --- a/washerdryer/wmgeneral/misc.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef __MISC_H -#define __MISC_H - -#include - -extern void parse_command (char *, char ***, int *); - -extern pid_t execCommand (char *); -#endif /* __MISC_H */ diff --git a/washerdryer/wmgeneral/wmgeneral.c b/washerdryer/wmgeneral/wmgeneral.c deleted file mode 100644 index de11505..0000000 --- a/washerdryer/wmgeneral/wmgeneral.c +++ /dev/null @@ -1,444 +0,0 @@ -/* - Best viewed with vim5, using ts=4 - - wmgeneral was taken from wmppp. - - It has a lot of routines which most of the wm* programs use. - - ------------------------------------------------------------ - - Author: Martijn Pieterse (pieterse@xs4all.nl) - - --- - CHANGES: - --- - 14/09/1998 (Dave Clark, clarkd@skyia.com) - * Updated createXBMfromXPM routine - * Now supports >256 colors - 11/09/1998 (Martijn Pieterse, pieterse@xs4all.nl) - * Removed a bug from parse_rcfile. You could - not use "start" in a command if a label was - also start. - * Changed the needed geometry string. - We don't use window size, and don't support - negative positions. - 03/09/1998 (Martijn Pieterse, pieterse@xs4all.nl) - * Added parse_rcfile2 - 02/09/1998 (Martijn Pieterse, pieterse@xs4all.nl) - * Added -geometry support (untested) - 28/08/1998 (Martijn Pieterse, pieterse@xs4all.nl) - * Added createXBMfromXPM routine - * Saves a lot of work with changing xpm's. - 02/05/1998 (Martijn Pieterse, pieterse@xs4all.nl) - * changed the read_rc_file to parse_rcfile, as suggested by Marcelo E. Magallon - * debugged the parse_rc file. - 30/04/1998 (Martijn Pieterse, pieterse@xs4all.nl) - * Ripped similar code from all the wm* programs, - and put them in a single file. - - */ - -#include -#include -#include -#include -#include -#include - -#include -#include -#include - -#include "wmgeneral.h" - -/*****************/ - /* X11 Variables */ -/*****************/ - -Window Root; -int screen; -int x_fd; -int d_depth; -XSizeHints mysizehints; -XWMHints mywmhints; -Pixel back_pix, fore_pix; -char *Geometry = ""; -Window iconwin, win; -GC NormalGC; -XpmIcon wmgen; -Pixmap pixmask; - -/*****************/ - /* Mouse Regions */ -/*****************/ - -typedef struct - { - int enable; - int top; - int bottom; - int left; - int right; - } -MOUSE_REGION; - -MOUSE_REGION mouse_region[MAX_MOUSE_REGION]; - -/***********************/ - /* Function Prototypes */ -/***********************/ - -static void GetXPM (XpmIcon *, char **); -static Pixel GetColor (char *); -void RedrawWindow (void); -void AddMouseRegion (int, int, int, int, int); -int CheckMouseRegion (int, int); - -/*******************************************************************************\ -|* GetXPM *| -\*******************************************************************************/ - -static void GetXPM (XpmIcon * wmgen, char *pixmap_bytes[]) -{ - - XWindowAttributes attributes; - int err; - - /* For the colormap */ - XGetWindowAttributes (display, Root, &attributes); - - wmgen->attributes.valuemask |= (XpmReturnPixels | XpmReturnExtensions); - - err = XpmCreatePixmapFromData (display, Root, pixmap_bytes, &(wmgen->pixmap), - &(wmgen->mask), &(wmgen->attributes)); - - if (err != XpmSuccess) - { - fprintf (stderr, "Not enough free colorcells.\n"); - exit (1); - } -} - -/*******************************************************************************\ -|* GetColor *| -\*******************************************************************************/ - -static Pixel GetColor (char *name) -{ - - XColor color; - XWindowAttributes attributes; - - XGetWindowAttributes (display, Root, &attributes); - - color.pixel = 0; - if (!XParseColor (display, attributes.colormap, name, &color)) - { - fprintf (stderr, "wm.app: can't parse %s.\n", name); - } - else if (!XAllocColor (display, attributes.colormap, &color)) - { - fprintf (stderr, "wm.app: can't allocate %s.\n", name); - } - return color.pixel; -} - -/*******************************************************************************\ -|* flush_expose *| -\*******************************************************************************/ - -static int flush_expose (Window w) -{ - - XEvent dummy; - int i = 0; - - while (XCheckTypedWindowEvent (display, w, Expose, &dummy)) - i++; - - return i; -} - -/*******************************************************************************\ -|* RedrawWindow *| -\*******************************************************************************/ - -void RedrawWindow (void) -{ - - flush_expose (iconwin); - XCopyArea (display, wmgen.pixmap, iconwin, NormalGC, - 0, 0, wmgen.attributes.width, wmgen.attributes.height, 0, 0); - flush_expose (win); - XCopyArea (display, wmgen.pixmap, win, NormalGC, - 0, 0, wmgen.attributes.width, wmgen.attributes.height, 0, 0); -} - -/*******************************************************************************\ -|* RedrawWindowXY *| -\*******************************************************************************/ - -void RedrawWindowXY (int x, int y) -{ - - flush_expose (iconwin); - XCopyArea (display, wmgen.pixmap, iconwin, NormalGC, - x, y, wmgen.attributes.width, wmgen.attributes.height, 0, 0); - flush_expose (win); - XCopyArea (display, wmgen.pixmap, win, NormalGC, - x, y, wmgen.attributes.width, wmgen.attributes.height, 0, 0); -} - -/*******************************************************************************\ -|* AddMouseRegion *| -\*******************************************************************************/ - -void AddMouseRegion (int index, int left, int top, int right, int bottom) -{ - - if (index < MAX_MOUSE_REGION) - { - mouse_region[index].enable = 1; - mouse_region[index].top = top; - mouse_region[index].left = left; - mouse_region[index].bottom = bottom; - mouse_region[index].right = right; - } -} - -/*******************************************************************************\ -|* CheckMouseRegion *| -\*******************************************************************************/ - -int CheckMouseRegion (int x, int y) -{ - - int i; - int found; - - found = 0; - - for (i = 0; i < MAX_MOUSE_REGION && !found; i++) - { - if (mouse_region[i].enable && - x <= mouse_region[i].right && - x >= mouse_region[i].left && - y <= mouse_region[i].bottom && - y >= mouse_region[i].top) - found = 1; - } - if (!found) - return -1; - return (i - 1); -} - -/*******************************************************************************\ -|* createXBMfromXPM *| -\*******************************************************************************/ -void createXBMfromXPM (char *xbm, char **xpm, int sx, int sy) -{ - - int i, j, k; - int width, height, numcol, depth; - int zero = 0; - unsigned char bwrite; - int bcount; - int curpixel; - - sscanf (*xpm, "%d %d %d %d", &width, &height, &numcol, &depth); - - - for (k = 0; k != depth; k++) - { - zero <<= 8; - zero |= xpm[1][k]; - } - - for (i = numcol + 1; i < numcol + sy + 1; i++) - { - bcount = 0; - bwrite = 0; - for (j = 0; j < sx * depth; j += depth) - { - bwrite >>= 1; - - curpixel = 0; - for (k = 0; k != depth; k++) - { - curpixel <<= 8; - curpixel |= xpm[i][j + k]; - } - - if (curpixel != zero) - { - bwrite += 128; - } - bcount++; - if (bcount == 8) - { - *xbm = bwrite; - xbm++; - bcount = 0; - bwrite = 0; - } - } - } -} - -/*******************************************************************************\ -|* copyXPMArea *| -\*******************************************************************************/ - -void copyXPMArea (int x, int y, int sx, int sy, int dx, int dy) -{ - - XCopyArea (display, wmgen.pixmap, wmgen.pixmap, NormalGC, x, y, sx, sy, dx, dy); - -} - -/*******************************************************************************\ -|* copyXBMArea *| -\*******************************************************************************/ - -void copyXBMArea (int x, int y, int sx, int sy, int dx, int dy) -{ - - XCopyArea (display, wmgen.mask, wmgen.pixmap, NormalGC, x, y, sx, sy, dx, dy); -} - - -/*******************************************************************************\ -|* setMaskXY *| -\*******************************************************************************/ - -void setMaskXY (int x, int y) -{ - - XShapeCombineMask (display, win, ShapeBounding, x, y, pixmask, ShapeSet); - XShapeCombineMask (display, iconwin, ShapeBounding, x, y, pixmask, ShapeSet); -} - -/*******************************************************************************\ -|* openXwindow *| -\*******************************************************************************/ -void openXwindow (int argc, char *argv[], char *pixmap_bytes[], char *pixmask_bits, int pixmask_width, int pixmask_height) -{ - - unsigned int borderwidth = 1; - XClassHint classHint; - char *display_name = NULL; - char *wname = argv[0]; - XTextProperty name; - - XGCValues gcv; - unsigned long gcm; - - char *geometry = NULL; - - int dummy = 0; - int i, wx, wy; - - for (i = 1; argv[i]; i++) - { - if (!strcmp (argv[i], "-display")) - { - display_name = argv[i + 1]; - i++; - } - if (!strcmp (argv[i], "-geometry")) - { - geometry = argv[i + 1]; - i++; - } - } - - if (!(display = XOpenDisplay (display_name))) - { - fprintf (stderr, "%s: can't open display %s\n", - wname, XDisplayName (display_name)); - exit (1); - } - screen = DefaultScreen (display); - Root = RootWindow (display, screen); - d_depth = DefaultDepth (display, screen); - x_fd = XConnectionNumber (display); - - /* Convert XPM to XImage */ - GetXPM (&wmgen, pixmap_bytes); - - /* Create a window to hold the stuff */ - mysizehints.flags = USSize | USPosition; - mysizehints.x = 0; - mysizehints.y = 0; - - back_pix = GetColor ("white"); - fore_pix = GetColor ("black"); - - XWMGeometry (display, screen, Geometry, NULL, borderwidth, &mysizehints, - &mysizehints.x, &mysizehints.y, &mysizehints.width, &mysizehints.height, &dummy); - - mysizehints.width = 64; - mysizehints.height = 64; - - win = XCreateSimpleWindow (display, Root, mysizehints.x, mysizehints.y, - mysizehints.width, mysizehints.height, borderwidth, fore_pix, back_pix); - - iconwin = XCreateSimpleWindow (display, win, mysizehints.x, mysizehints.y, - mysizehints.width, mysizehints.height, borderwidth, fore_pix, back_pix); - - /* Activate hints */ - XSetWMNormalHints (display, win, &mysizehints); - classHint.res_name = wname; - classHint.res_class = wname; - XSetClassHint (display, win, &classHint); - - XSelectInput (display, win, ButtonPressMask | ExposureMask | ButtonReleaseMask | PointerMotionMask | StructureNotifyMask); - XSelectInput (display, iconwin, ButtonPressMask | ExposureMask | ButtonReleaseMask | PointerMotionMask | StructureNotifyMask); - - if (XStringListToTextProperty (&wname, 1, &name) == 0) - { - fprintf (stderr, "%s: can't allocate window name\n", wname); - exit (1); - } - - XSetWMName (display, win, &name); - - /* Create GC for drawing */ - - gcm = GCForeground | GCBackground | GCGraphicsExposures; - gcv.foreground = fore_pix; - gcv.background = back_pix; - gcv.graphics_exposures = 0; - NormalGC = XCreateGC (display, Root, gcm, &gcv); - - /* ONLYSHAPE ON */ - - pixmask = XCreateBitmapFromData (display, win, pixmask_bits, pixmask_width, pixmask_height); - - XShapeCombineMask (display, win, ShapeBounding, 0, 0, pixmask, ShapeSet); - XShapeCombineMask (display, iconwin, ShapeBounding, 0, 0, pixmask, ShapeSet); - - /* ONLYSHAPE OFF */ - - mywmhints.initial_state = WithdrawnState; - mywmhints.icon_window = iconwin; - mywmhints.icon_x = mysizehints.x; - mywmhints.icon_y = mysizehints.y; - mywmhints.window_group = win; - mywmhints.flags = StateHint | IconWindowHint | IconPositionHint | WindowGroupHint; - - XSetWMHints (display, win, &mywmhints); - - XSetCommand (display, win, argv, argc); - XMapWindow (display, win); - - if (geometry) - { - if (sscanf (geometry, "+%d+%d", &wx, &wy) != 2) - { - fprintf (stderr, "Bad geometry string.\n"); - exit (1); - } - XMoveWindow (display, win, wx, wy); - } -} diff --git a/washerdryer/wmgeneral/wmgeneral.h b/washerdryer/wmgeneral/wmgeneral.h deleted file mode 100644 index 00872b5..0000000 --- a/washerdryer/wmgeneral/wmgeneral.h +++ /dev/null @@ -1,62 +0,0 @@ -#ifndef WMGENERAL_H_INCLUDED -#define WMGENERAL_H_INCLUDED - -/***********/ - /* Defines */ -/***********/ - -#define MAX_MOUSE_REGION (16) - -/************/ - /* Typedefs */ -/************/ - -typedef struct _rckeys rckeys; - -struct _rckeys - { - const char *label; - char **var; - }; - -typedef struct _rckeys2 rckeys2; - -struct _rckeys2 - { - const char *family; - const char *label; - char **var; - }; - -typedef struct - { - Pixmap pixmap; - Pixmap mask; - XpmAttributes attributes; - } -XpmIcon; - -/*******************/ - /* Global variable */ -/*******************/ - -Display *display; - -/***********************/ - /* Function Prototypes */ -/***********************/ - -void AddMouseRegion (int index, int left, int top, int right, int bottom); -int CheckMouseRegion (int x, int y); - -void openXwindow (int argc, char *argv[], char **, char *, int, int); -void RedrawWindow (void); -void RedrawWindowXY (int x, int y); - -void createXBMfromXPM (char *, char **, int, int); -void copyXPMArea (int, int, int, int, int, int); -void copyXBMArea (int, int, int, int, int, int); -void setMaskXY (int, int); - - -#endif -- 2.11.4.GIT