7c7
< * $Id: dmenu.c,v 1.14 1996/03/02 07:31:51 jkh Exp $
---
> * $Id: dmenu.c,v 1.15 1996/04/07 03:52:23 jkh Exp $
22,28d21
< * 3. All advertising materials mentioning features or use of this software
< * must display the following acknowledgement:
< * This product includes software developed by Jordan Hubbard
< * for the FreeBSD Project.
< * 4. The name of Jordan Hubbard or the FreeBSD project may not be used to
< * endorse or promote products derived from this software without specific
< * prior written permission.
55c48
< return RET_SUCCESS;
---
> return DITEM_SUCCESS;
60a54,56
> WINDOW *w;
>
> w = savescr();
62c58,60
< return dmenuOpenSimple((DMenu *)tmp->data);
---
> (void)dmenuOpenSimple((DMenu *)tmp->data);
> restorescr(w);
> return DITEM_SUCCESS;
68c66
< int i;
---
> WINDOW *w;
70c68,69
< i = systemExecute((char *)tmp->data) ? RET_FAIL : RET_SUCCESS;
---
> w = savescr();
> systemExecute((char *)tmp->data);
72c71,72
< return i;
---
> restorescr(w);
> return DITEM_SUCCESS;
77a78,80
> WINDOW *w;
>
> w = savescr();
82c85,86
< return RET_SUCCESS;
---
> restorescr(w);
> return DITEM_SUCCESS;
89c93
< return RET_SUCCESS;
---
> return DITEM_LEAVE_MENU;
97c101
< return RET_SUCCESS;
---
> return DITEM_SUCCESS;
103,104c107,111
< *((unsigned int *)tmp->data) |= tmp->aux;
< return RET_SUCCESS;
---
> if (*((unsigned int *)tmp->data) & tmp->aux)
> *((unsigned int *)tmp->data) &= ~tmp->aux;
> else
> *((unsigned int *)tmp->data) |= tmp->aux;
> return DITEM_SUCCESS;
111c118
< return RET_SUCCESS;
---
> return DITEM_SUCCESS;
191c198
< if (menu->type == DMENU_NORMAL_TYPE)
---
> if (menu->type & DMENU_NORMAL_TYPE)
195c202
< else if (menu->type == DMENU_RADIO_TYPE)
---
> else if (menu->type & DMENU_RADIO_TYPE)
199c206
< else if (menu->type == DMENU_CHECKLIST_TYPE)
---
> else if (menu->type & DMENU_CHECKLIST_TYPE)
201a209,210
> else
> msgFatal("Menu: `%s' is of an unknown type\n", menu->title);
205c214
< if (rval)
---
> if (rval || menu->type & (DMENU_SELECTION_RETURNS | DMENU_RADIO_TYPE | DMENU_CHECKLIST_TYPE))