gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-20 21:08:08 +01:00
Code Issues Projects Releases Wiki Activity

- fixed a bug that crashed the programm when a popup button was scrolled.

Browse Source 
- fixed a bug that caused incorrect drawing position of the popup indicator.
- fixed a bug that prevented selecting no item (-1) in a popup button.
- an assertion will be raised if the program tries to select a popup button
  item that is beyond the total number of items present in the popup button.
- changed names of functions for SplitView to be consistent. Some contained
  SubView while other Subview. Now all have Subview.
This commit is contained in:
dan
1999-11-07 21:40:22 +00:00
parent eaba3dc788
commit 38807b65c7
32 changed files with 167 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile.in
View File

@@ -114,9 +114,9 @@ GZIP_ENV = --best
all: all-redirect all: all-redirect
.SUFFIXES: .SUFFIXES:
$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) \ cd $(top_builddir) \
&& CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
@@ -255,11 +255,6 @@ distdir: $(DISTFILES)
-rm -rf $(distdir) -rm -rf $(distdir)
mkdir $(distdir) mkdir $(distdir)
-chmod 777 $(distdir) -chmod 777 $(distdir)
here=`cd $(top_builddir) && pwd`; \
top_distdir=`cd $(distdir) && pwd`; \
distdir=`cd $(distdir) && pwd`; \
cd $(top_srcdir) \
&& $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Makefile
@for file in $(DISTFILES); do \ @for file in $(DISTFILES); do \
d=$(srcdir); \ d=$(srcdir); \
if test -d $$d/$$file; then \ if test -d $$d/$$file; then \

7
WINGs/ChangeLog
View File

@@ -15,6 +15,13 @@ changes since wmaker 0.61.1:
- added vertical views and multiple views in WMSplitView (Wolff <wolff@cybercable.fr>) - added vertical views and multiple views in WMSplitView (Wolff <wolff@cybercable.fr>)
- changed values of parameter values of WMSplitViewConstrainProc() - changed values of parameter values of WMSplitViewConstrainProc()
- configurable default fontsize patch (Igor P. Roboul <igor@mordor.myip.org>) - configurable default fontsize patch (Igor P. Roboul <igor@mordor.myip.org>)
- fixed a bug that crashed the programm when a popup button was scrolled.
- fixed a bug that caused incorrect drawing position of the popup indicator.
- fixed a bug that prevented selecting no item (-1) in a popup button.
- an assertion will be raised if the program tries to select a popup button
item that is beyond the total number of items present in the popup button.
- changed names of functions for SplitView to be consistent. Some contained
SubView while other Subview. Now all have Subview.
changes since wmaker 0.61.0: changes since wmaker 0.61.0:
............................ ............................

2
WINGs/Makefile.in
View File

@@ -215,7 +215,7 @@ all: all-redirect
.SUFFIXES: .SUFFIXES:
.SUFFIXES: .S .c .lo .o .s .SUFFIXES: .S .c .lo .o .s
$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
cd $(top_srcdir) && $(AUTOMAKE) --gnu WINGs/Makefile cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps WINGs/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) \ cd $(top_builddir) \

9
WINGs/Resources/Makefile.in
View File

@@ -112,9 +112,9 @@ GZIP_ENV = --best
all: all-redirect all: all-redirect
.SUFFIXES: .SUFFIXES:
$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
cd $(top_srcdir) && $(AUTOMAKE) --gnu WINGs/Resources/Makefile cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps WINGs/Resources/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) \ cd $(top_builddir) \
&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
@@ -146,11 +146,6 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
subdir = WINGs/Resources subdir = WINGs/Resources
distdir: $(DISTFILES) distdir: $(DISTFILES)
here=`cd $(top_builddir) && pwd`; \
top_distdir=`cd $(top_distdir) && pwd`; \
distdir=`cd $(distdir) && pwd`; \
cd $(top_srcdir) \
&& $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu WINGs/Resources/Makefile
@for file in $(DISTFILES); do \ @for file in $(DISTFILES); do \
d=$(srcdir); \ d=$(srcdir); \
if test -d $$d/$$file; then \ if test -d $$d/$$file; then \

4
WINGs/WINGs.h
View File

@@ -1256,9 +1256,9 @@ WMSplitView *WMCreateSplitView(WMWidget *parent);
Bool WMGetSplitViewVertical(WMSplitView *sPtr); Bool WMGetSplitViewVertical(WMSplitView *sPtr);
void WMSetSplitViewVertical(WMSplitView *sPtr, Bool flag); void WMSetSplitViewVertical(WMSplitView *sPtr, Bool flag);
int WMGetSplitViewSubViewsCount(WMSplitView *sPtr); /* ??? remove ??? */ int WMGetSplitViewSubviewsCount(WMSplitView *sPtr); /* ??? remove ??? */
WMView *WMGetSplitViewSubViewAt(WMSplitView *sPtr, int index); WMView *WMGetSplitViewSubviewAt(WMSplitView *sPtr, int index);
/* remove the first subview == view */ /* remove the first subview == view */
void WMRemoveSplitViewSubview(WMSplitView *sPtr, WMView *view); void WMRemoveSplitViewSubview(WMSplitView *sPtr, WMView *view);

53
WINGs/wpopupbutton.c
View File

@@ -212,11 +212,11 @@ WMGetPopUpButtonEnabled(WMPopUpButton *bPtr)
void void
WMSetPopUpButtonSelectedItem(WMPopUpButton *bPtr, int index) WMSetPopUpButtonSelectedItem(WMPopUpButton *bPtr, int index)
{ {
if (index < 0) {
if (bPtr->view->flags.mapped) wassertr(index < WMGetBagItemCount(bPtr->items));
paintPopUpButton(bPtr);
return; /* if (index >= WMGetBagCount(bPtr->items))
} index = -1;*/
bPtr->selectedItemIndex = index; bPtr->selectedItemIndex = index;
@@ -414,14 +414,17 @@ static void
paintMenuEntry(PopUpButton *bPtr, int index, int highlight) paintMenuEntry(PopUpButton *bPtr, int index, int highlight)
{ {
W_Screen *scr = bPtr->view->screen; W_Screen *scr = bPtr->view->screen;
int i;
int yo; int yo;
int width, height, itemHeight; int width, height, itemHeight, itemCount;
char *title; char *title;
itemCount = WMGetBagItemCount(bPtr->items);
if (index < 0 || index >= itemCount)
return;
itemHeight = bPtr->view->size.height; itemHeight = bPtr->view->size.height;
width = bPtr->view->size.width; width = bPtr->view->size.width;
height = itemHeight * WMGetBagItemCount(bPtr->items); height = itemHeight * itemCount;
yo = (itemHeight - WMFontHeight(scr->normalFont))/2; yo = (itemHeight - WMFontHeight(scr->normalFont))/2;
if (!highlight) { if (!highlight) {
@@ -449,7 +452,7 @@ paintMenuEntry(PopUpButton *bPtr, int index, int highlight)
bPtr->menuView->window, scr->copyGC, 0, 0, bPtr->menuView->window, scr->copyGC, 0, 0,
scr->popUpIndicator->width, scr->popUpIndicator->height, scr->popUpIndicator->width, scr->popUpIndicator->height,
width-scr->popUpIndicator->width-4, width-scr->popUpIndicator->width-4,
i*itemHeight+(itemHeight-scr->popUpIndicator->height)/2); index*itemHeight+(itemHeight-scr->popUpIndicator->height)/2);
} }
} }
@@ -575,8 +578,8 @@ autoScroll(void *data)
int dy = 0; int dy = 0;
if (bPtr->scrollStartY > scrHeight-1 if (bPtr->scrollStartY >= scrHeight-1
&& bPtr->menuView->pos.y+bPtr->menuView->size.height > scrHeight-1) { && bPtr->menuView->pos.y+bPtr->menuView->size.height >= scrHeight-1) {
repeat = 1; repeat = 1;
if (bPtr->menuView->pos.y+bPtr->menuView->size.height-5 if (bPtr->menuView->pos.y+bPtr->menuView->size.height-5
@@ -605,17 +608,19 @@ autoScroll(void *data)
bPtr->highlightedItem = (bPtr->scrollStartY - bPtr->menuView->pos.y) bPtr->highlightedItem = (bPtr->scrollStartY - bPtr->menuView->pos.y)
/ bPtr->view->size.height; / bPtr->view->size.height;
if (bPtr->highlightedItem >= WMGetBagItemCount(bPtr->items))
bPtr->highlightedItem = WMGetBagItemCount(bPtr->items)-1;
if (oldItem!=bPtr->highlightedItem) { if (oldItem!=bPtr->highlightedItem) {
WMMenuItem *item = WMMenuItem *item;
WMGetPopUpButtonMenuItem(bPtr, bPtr->highlightedItem);
paintMenuEntry(bPtr, oldItem, False); paintMenuEntry(bPtr, oldItem, False);
paintMenuEntry(bPtr, bPtr->highlightedItem, if (bPtr->highlightedItem >= 0 &&
WMGetMenuItemEnabled(item)); bPtr->highlightedItem < WMGetBagItemCount(bPtr->items)) {
item = WMGetPopUpButtonMenuItem(bPtr, bPtr->highlightedItem);
paintMenuEntry(bPtr, bPtr->highlightedItem,
WMGetMenuItemEnabled(item));
} else {
bPtr->highlightedItem = -1;
}
} }
bPtr->timer = WMAddTimerHandler(SCROLL_DELAY, autoScroll, bPtr); bPtr->timer = WMAddTimerHandler(SCROLL_DELAY, autoScroll, bPtr);
@@ -661,10 +666,16 @@ handleActionEvents(XEvent *event, void *data)
if (oldItem!=bPtr->highlightedItem) { if (oldItem!=bPtr->highlightedItem) {
WMMenuItem *item; WMMenuItem *item;
item = WMGetPopUpButtonMenuItem(bPtr, bPtr->highlightedItem);
paintMenuEntry(bPtr, oldItem, False); paintMenuEntry(bPtr, oldItem, False);
paintMenuEntry(bPtr, bPtr->highlightedItem, if (bPtr->highlightedItem >= 0 &&
WMGetMenuItemEnabled(item)); bPtr->highlightedItem < WMGetBagItemCount(bPtr->items)) {
item = WMGetPopUpButtonMenuItem(bPtr, bPtr->highlightedItem);
paintMenuEntry(bPtr, bPtr->highlightedItem,
WMGetMenuItemEnabled(item));
} else {
bPtr->highlightedItem = -1;
}
} }
if (event->xmotion.y_root >= scrHeight-1 if (event->xmotion.y_root >= scrHeight-1

150
WINGs/wsplitview.c
View File

@@ -11,13 +11,13 @@ char *WMSplitViewWillResizeSubviewsNotification
= "WMSplitViewWillResizeSubviewsNotification"; = "WMSplitViewWillResizeSubviewsNotification";
*/ */
typedef struct _T_SplitViewSubView { typedef struct _T_SplitViewSubview {
WMView *view; WMView *view;
int minSize; int minSize;
int maxSize; int maxSize;
int size; int size;
int pos; int pos;
} T_SplitViewSubView; } T_SplitViewSubview;
typedef struct W_SplitView { typedef struct W_SplitView {
@@ -44,28 +44,28 @@ typedef struct W_SplitView {
#define MAX_SUBVIEW_SIZE -1 #define MAX_SUBVIEW_SIZE -1
#define _GetSubViewsCount() WMGetBagItemCount(sPtr->subviewsBag) #define _GetSubviewsCount() WMGetBagItemCount(sPtr->subviewsBag)
#define _AddPSubViewStruct(P) \ #define _AddPSubviewStruct(P) \
(WMPutInBag(sPtr->subviewsBag,((void*)P))) (WMPutInBag(sPtr->subviewsBag,((void*)P)))
#define _GetPSubViewStructAt(i) \ #define _GetPSubviewStructAt(i) \
((T_SplitViewSubView*)WMGetFromBag(sPtr->subviewsBag,(i))) ((T_SplitViewSubview*)WMGetFromBag(sPtr->subviewsBag,(i)))
#define _GetSubViewAt(i) \ #define _GetSubviewAt(i) \
(((T_SplitViewSubView*)WMGetFromBag(sPtr->subviewsBag,(i)))->view) (((T_SplitViewSubview*)WMGetFromBag(sPtr->subviewsBag,(i)))->view)
#define _GetMinSizeAt(i) \ #define _GetMinSizeAt(i) \
(((T_SplitViewSubView*)WMGetFromBag(sPtr->subviewsBag,(i)))->minSize) (((T_SplitViewSubview*)WMGetFromBag(sPtr->subviewsBag,(i)))->minSize)
#define _GetMaxSizeAt(i) \ #define _GetMaxSizeAt(i) \
(((T_SplitViewSubView*)WMGetFromBag(sPtr->subviewsBag,(i)))->maxSize) (((T_SplitViewSubview*)WMGetFromBag(sPtr->subviewsBag,(i)))->maxSize)
#define _GetSizeAt(i) \ #define _GetSizeAt(i) \
(((T_SplitViewSubView*)WMGetFromBag(sPtr->subviewsBag,(i)))->size) (((T_SplitViewSubview*)WMGetFromBag(sPtr->subviewsBag,(i)))->size)
#define _GetPosAt(i) \ #define _GetPosAt(i) \
(((T_SplitViewSubView*)WMGetFromBag(sPtr->subviewsBag,(i)))->pos) (((T_SplitViewSubview*)WMGetFromBag(sPtr->subviewsBag,(i)))->pos)
#define _GetSplitViewSize() \ #define _GetSplitViewSize() \
((sPtr->flags.vertical) ? sPtr->view->size.width : sPtr->view->size.height) ((sPtr->flags.vertical) ? sPtr->view->size.width : sPtr->view->size.height)
@@ -99,12 +99,12 @@ getConstraints(SplitView *sPtr, int index, int *minSize, int *maxSize)
static void static void
updateConstraints(SplitView *sPtr) updateConstraints(SplitView *sPtr)
{ {
T_SplitViewSubView *p; T_SplitViewSubview *p;
int i, count; int i, count;
count = _GetSubViewsCount(); count = _GetSubviewsCount();
for (i = 0; i < count; i++) { for (i = 0; i < count; i++) {
p = _GetPSubViewStructAt(i); p = _GetPSubviewStructAt(i);
getConstraints(sPtr, i, &(p->minSize), &(p->maxSize)); getConstraints(sPtr, i, &(p->minSize), &(p->maxSize));
} }
} }
@@ -171,12 +171,12 @@ static int
checkSizes(SplitView *sPtr) checkSizes(SplitView *sPtr)
{ {
int i, count, offset; int i, count, offset;
T_SplitViewSubView *p; T_SplitViewSubview *p;
count = _GetSubViewsCount(); count = _GetSubviewsCount();
offset = 0; offset = 0;
for (i = 0; i < count; i++) { for (i = 0; i < count; i++) {
p = _GetPSubViewStructAt(i); p = _GetPSubviewStructAt(i);
if (p->size < p->minSize) { if (p->size < p->minSize) {
offset += p->minSize - p->size; offset += p->minSize - p->size;
p->size = p->minSize; p->size = p->minSize;
@@ -194,12 +194,12 @@ static void
checkPositions(SplitView *sPtr) checkPositions(SplitView *sPtr)
{ {
int i, count, pos; int i, count, pos;
T_SplitViewSubView *p; T_SplitViewSubview *p;
count = _GetSubViewsCount(); count = _GetSubviewsCount();
pos = 0; pos = 0;
for (i = 0; i < count; i++) { for (i = 0; i < count; i++) {
p = _GetPSubViewStructAt(i); p = _GetPSubviewStructAt(i);
p->pos = pos; p->pos = pos;
pos += p->size + DIVIDER_THICKNESS; pos += p->size + DIVIDER_THICKNESS;
} }
@@ -210,11 +210,11 @@ static void
updateSubviewsGeom(SplitView *sPtr) updateSubviewsGeom(SplitView *sPtr)
{ {
int i, count; int i, count;
T_SplitViewSubView *p; T_SplitViewSubview *p;
count = _GetSubViewsCount(); count = _GetSubviewsCount();
for (i = 0; i < count; i++) { for (i = 0; i < count; i++) {
p = _GetPSubViewStructAt(i); p = _GetPSubviewStructAt(i);
resizeView(sPtr, p->view, p->size); resizeView(sPtr, p->view, p->size);
moveView(sPtr, p->view, p->pos); moveView(sPtr, p->view, p->pos);
} }
@@ -226,7 +226,7 @@ getTotalSize(SplitView *sPtr)
{ {
int i, count, totSize; int i, count, totSize;
count = _GetSubViewsCount(); count = _GetSubviewsCount();
if (!count) if (!count)
return (0); return (0);
@@ -241,17 +241,17 @@ getTotalSize(SplitView *sPtr)
static Bool static Bool
distributeOffsetEqually(SplitView *sPtr, int offset) distributeOffsetEqually(SplitView *sPtr, int offset)
{ {
T_SplitViewSubView *p; T_SplitViewSubview *p;
int i, count, sizeChanged, forced; int i, count, sizeChanged, forced;
if ((count = _GetSubViewsCount()) < 1) if ((count = _GetSubviewsCount()) < 1)
return (True); return (True);
forced = False; forced = False;
while (offset != 0) { while (offset != 0) {
sizeChanged = 0; sizeChanged = 0;
for (i = 0; i < count && offset != 0; i++) { for (i = 0; i < count && offset != 0; i++) {
p = _GetPSubViewStructAt(i); p = _GetPSubviewStructAt(i);
if (offset < 0) { if (offset < 0) {
if (p->size > p->minSize) { if (p->size > p->minSize) {
offset++; offset++;
@@ -265,7 +265,7 @@ distributeOffsetEqually(SplitView *sPtr, int offset)
} }
} }
if (offset != 0 && !sizeChanged) { if (offset != 0 && !sizeChanged) {
p = _GetPSubViewStructAt(count-1); p = _GetPSubviewStructAt(count-1);
if (offset > 0) { if (offset > 0) {
p->size += offset; p->size += offset;
p->maxSize = MAX_SUBVIEW_SIZE; p->maxSize = MAX_SUBVIEW_SIZE;
@@ -282,14 +282,14 @@ distributeOffsetEqually(SplitView *sPtr, int offset)
static Bool static Bool
distributeOffsetFormEnd(SplitView *sPtr, int offset) distributeOffsetFormEnd(SplitView *sPtr, int offset)
{ {
T_SplitViewSubView *p; T_SplitViewSubview *p;
int i, count, sizeTmp; int i, count, sizeTmp;
if ((count = _GetSubViewsCount()) < 1) if ((count = _GetSubviewsCount()) < 1)
return (True); return (True);
for (i = count-1; i >= 0 && offset != 0; i--) { for (i = count-1; i >= 0 && offset != 0; i--) {
p = _GetPSubViewStructAt(i); p = _GetPSubviewStructAt(i);
sizeTmp = p->size; sizeTmp = p->size;
if (offset > 0) { if (offset > 0) {
if (p->maxSize == MAX_SUBVIEW_SIZE || p->size + offset < p->maxSize) if (p->maxSize == MAX_SUBVIEW_SIZE || p->size + offset < p->maxSize)
@@ -310,25 +310,25 @@ distributeOffsetFormEnd(SplitView *sPtr, int offset)
static void static void
adjustSplitViewSubViews(WMSplitView *sPtr) adjustSplitViewSubviews(WMSplitView *sPtr)
{ {
T_SplitViewSubView *p; T_SplitViewSubview *p;
int i, count, adjSize, adjPad; int i, count, adjSize, adjPad;
CHECK_CLASS(sPtr, WC_SplitView); CHECK_CLASS(sPtr, WC_SplitView);
#if 0 #if 0
printf("---- (adjustSplitViewSubViews - 1) ----\n"); printf("---- (adjustSplitViewSubviews - 1) ----\n");
dumpSubViews(sPtr); dumpSubviews(sPtr);
#endif #endif
if ((count = _GetSubViewsCount()) < 1) if ((count = _GetSubviewsCount()) < 1)
return; return;
adjSize = (_GetSplitViewSize() - ((count-1) * DIVIDER_THICKNESS)) / count; adjSize = (_GetSplitViewSize() - ((count-1) * DIVIDER_THICKNESS)) / count;
adjPad = (_GetSplitViewSize() - ((count-1) * DIVIDER_THICKNESS)) % count; adjPad = (_GetSplitViewSize() - ((count-1) * DIVIDER_THICKNESS)) % count;
for (i = 0; i < count; i++) { for (i = 0; i < count; i++) {
p = _GetPSubViewStructAt(i); p = _GetPSubviewStructAt(i);
p->size = adjSize; p->size = adjSize;
} }
@@ -340,28 +340,28 @@ adjustSplitViewSubViews(WMSplitView *sPtr)
sPtr->flags.subviewsWereManuallyMoved = 0; sPtr->flags.subviewsWereManuallyMoved = 0;
#if 0 #if 0
printf("---- (adjustSplitViewSubViews - 2) ----\n"); printf("---- (adjustSplitViewSubviews - 2) ----\n");
dumpSubViews(sPtr); dumpSubviews(sPtr);
#endif #endif
} }
#if 0 #if 0
static void static void
handleSubViewResized(void *self, WMNotification *notif) handleSubviewResized(void *self, WMNotification *notif)
{ {
SplitView *sPtr = (SplitView*)self; SplitView *sPtr = (SplitView*)self;
CHECK_CLASS(sPtr, WC_SplitView); CHECK_CLASS(sPtr, WC_SplitView);
if (WMGetNotificationName(notif) == WMViewSizeDidChangeNotification) { if (WMGetNotificationName(notif) == WMViewSizeDidChangeNotification) {
T_SplitViewSubView *p; T_SplitViewSubview *p;
int i, count, done; int i, count, done;
WMView *view = WMGetNotificationObject(notif); WMView *view = WMGetNotificationObject(notif);
count = _GetSubViewsCount(); count = _GetSubviewsCount();
done = 0; done = 0;
for (i = 0; i < count; i++) { for (i = 0; i < count; i++) {
p = _GetPSubViewStructAt(i); p = _GetPSubviewStructAt(i);
if (p->view == view) { if (p->view == view) {
done = 1; done = 1;
break; break;
@@ -384,7 +384,7 @@ handleViewResized(void *self, WMNotification *notification)
#if 0 #if 0
printf("---- (handleViewResized - 1) ----\n"); printf("---- (handleViewResized - 1) ----\n");
dumpSubViews(sPtr); dumpSubviews(sPtr);
#endif #endif
updateConstraints(sPtr); updateConstraints(sPtr);
@@ -395,13 +395,13 @@ handleViewResized(void *self, WMNotification *notification)
checkPositions(sPtr); checkPositions(sPtr);
updateSubviewsGeom(sPtr); updateSubviewsGeom(sPtr);
} else } else
adjustSplitViewSubViews(sPtr); adjustSplitViewSubviews(sPtr);
assert(checkSizes(sPtr) == 0); assert(checkSizes(sPtr) == 0);
#if 0 #if 0
printf("---- (handleViewResized - 2) ----\n"); printf("---- (handleViewResized - 2) ----\n");
dumpSubViews(sPtr); dumpSubviews(sPtr);
#endif #endif
} }
@@ -409,14 +409,14 @@ handleViewResized(void *self, WMNotification *notification)
static void static void
paintSplitView(SplitView *sPtr) paintSplitView(SplitView *sPtr)
{ {
T_SplitViewSubView *p; T_SplitViewSubview *p;
W_Screen *scr = sPtr->view->screen; W_Screen *scr = sPtr->view->screen;
int x, y, i, count; int x, y, i, count;
WMPixmap *dimple = scr->scrollerDimple; WMPixmap *dimple = scr->scrollerDimple;
#if 0 #if 0
printf("---- (paintSplitView - 1) ----\n"); printf("---- (paintSplitView - 1) ----\n");
dumpSubViews(sPtr); dumpSubviews(sPtr);
#endif #endif
if (!sPtr->view->flags.mapped || !sPtr->view->flags.realized) if (!sPtr->view->flags.mapped || !sPtr->view->flags.realized)
@@ -424,7 +424,7 @@ paintSplitView(SplitView *sPtr)
XClearWindow(scr->display, sPtr->view->window); XClearWindow(scr->display, sPtr->view->window);
count = _GetSubViewsCount(); count = _GetSubviewsCount();
if (count == 0) if (count == 0)
return; return;
@@ -444,7 +444,7 @@ paintSplitView(SplitView *sPtr)
} }
for (i = 0; i < count-1; i++) { for (i = 0; i < count-1; i++) {
p = _GetPSubViewStructAt(i); p = _GetPSubviewStructAt(i);
if (sPtr->flags.vertical) if (sPtr->flags.vertical)
x += p->size; x += p->size;
@@ -463,7 +463,7 @@ paintSplitView(SplitView *sPtr)
#if 0 #if 0
printf("---- (paintSplitView - 2) ----\n"); printf("---- (paintSplitView - 2) ----\n");
dumpSubViews(sPtr); dumpSubviews(sPtr);
#endif #endif
} }
@@ -531,7 +531,7 @@ dragDivider(SplitView *sPtr, int clickX, int clickY)
scr = sPtr->view->screen; scr = sPtr->view->screen;
divider = ofs = pos = done = 0; divider = ofs = pos = done = 0;
coord = (sPtr->flags.vertical) ? clickX : clickY; coord = (sPtr->flags.vertical) ? clickX : clickY;
count = _GetSubViewsCount(); count = _GetSubviewsCount();
if (count < 2) if (count < 2)
return; return;
@@ -585,11 +585,11 @@ dragDivider(SplitView *sPtr, int clickX, int clickY)
} }
if (dragging) { if (dragging) {
T_SplitViewSubView *p1, *p2; T_SplitViewSubview *p1, *p2;
int totSize; int totSize;
p1 = _GetPSubViewStructAt(divider); p1 = _GetPSubviewStructAt(divider);
p2 = _GetPSubViewStructAt(divider+1); p2 = _GetPSubviewStructAt(divider+1);
totSize = p1->size + DIVIDER_THICKNESS + p2->size; totSize = p1->size + DIVIDER_THICKNESS + p2->size;
@@ -648,7 +648,7 @@ destroySplitView(SplitView *sPtr)
{ {
int i, count; int i, count;
count = _GetSubViewsCount(); count = _GetSubviewsCount();
for (i = 0; i < count; i++) for (i = 0; i < count; i++)
wfree(WMGetFromBag(sPtr->subviewsBag, i)); wfree(WMGetFromBag(sPtr->subviewsBag, i));
WMFreeBag(sPtr->subviewsBag); WMFreeBag(sPtr->subviewsBag);
@@ -696,13 +696,13 @@ WMCreateSplitView(WMWidget *parent)
void void
WMAdjustSplitViewSubViews(WMSplitView *sPtr) WMAdjustSplitViewSubviews(WMSplitView *sPtr)
{ {
CHECK_CLASS(sPtr, WC_SplitView); CHECK_CLASS(sPtr, WC_SplitView);
checkSizes(sPtr); checkSizes(sPtr);
adjustSplitViewSubViews(sPtr); adjustSplitViewSubviews(sPtr);
assert(checkSizes(sPtr) == 0); assert(checkSizes(sPtr) == 0);
} }
@@ -712,18 +712,18 @@ void
WMAddSplitViewSubview(WMSplitView *sPtr, WMView *subview) WMAddSplitViewSubview(WMSplitView *sPtr, WMView *subview)
{ {
int wasMapped, count; int wasMapped, count;
T_SplitViewSubView *p; T_SplitViewSubview *p;
CHECK_CLASS(sPtr, WC_SplitView); CHECK_CLASS(sPtr, WC_SplitView);
if (!(p = (T_SplitViewSubView*)wmalloc(sizeof(T_SplitViewSubView)))) if (!(p = (T_SplitViewSubview*)wmalloc(sizeof(T_SplitViewSubview))))
return; return;
wasMapped = subview->flags.mapped; wasMapped = subview->flags.mapped;
if (wasMapped) if (wasMapped)
W_UnmapView(subview); W_UnmapView(subview);
count = _GetSubViewsCount(); count = _GetSubviewsCount();
p->view = subview; p->view = subview;
getConstraints(sPtr, count, &(p->minSize), &(p->maxSize)); getConstraints(sPtr, count, &(p->minSize), &(p->maxSize));
if (sPtr->flags.vertical) if (sPtr->flags.vertical)
@@ -738,11 +738,11 @@ WMAddSplitViewSubview(WMSplitView *sPtr, WMView *subview)
We should have something like that... We should have something like that...
WMSetViewNotifySizeChanges(subview, True); WMSetViewNotifySizeChanges(subview, True);
WMAddNotificationObserver(handleSubViewResized, sPtr, WMAddNotificationObserver(handleSubviewResized, sPtr,
WMViewSizeDidChangeNotification, WMViewSizeDidChangeNotification,
subview); subview);
WMSetViewNotifyMoveChanges(subview, True); WMSetViewNotifyMoveChanges(subview, True);
WMAddNotificationObserver(handleSubViewResized, sPtr, WMAddNotificationObserver(handleSubviewResized, sPtr,
WMViewMoveDidChangeNotification, WMViewMoveDidChangeNotification,
subview); subview);
*/ */
@@ -755,12 +755,12 @@ WMAddSplitViewSubview(WMSplitView *sPtr, WMView *subview)
WMView* WMView*
WMGetSplitViewSubViewAt(WMSplitView *sPtr, int index) WMGetSplitViewSubviewAt(WMSplitView *sPtr, int index)
{ {
CHECK_CLASS(sPtr, WC_SplitView); CHECK_CLASS(sPtr, WC_SplitView);
if (index > 0 && index < _GetSubViewsCount()) if (index > 0 && index < _GetSubviewsCount())
return (_GetSubViewAt(index)); return (_GetSubviewAt(index));
else else
return (NULL); return (NULL);
} }
@@ -769,14 +769,14 @@ WMGetSplitViewSubViewAt(WMSplitView *sPtr, int index)
void void
WMRemoveSplitViewSubview(WMSplitView *sPtr, WMView *view) WMRemoveSplitViewSubview(WMSplitView *sPtr, WMView *view)
{ {
T_SplitViewSubView *p; T_SplitViewSubview *p;
int i, count; int i, count;
CHECK_CLASS(sPtr, WC_SplitView); CHECK_CLASS(sPtr, WC_SplitView);
count = _GetSubViewsCount(); count = _GetSubviewsCount();
for (i = 0; i < count; i++) { for (i = 0; i < count; i++) {
p = _GetPSubViewStructAt(i); p = _GetPSubviewStructAt(i);
if (p->view == view) { if (p->view == view) {
wfree(p); wfree(p);
WMDeleteFromBag(sPtr->subviewsBag, i); WMDeleteFromBag(sPtr->subviewsBag, i);
@@ -791,12 +791,12 @@ WMRemoveSplitViewSubview(WMSplitView *sPtr, WMView *view)
void void
WMRemoveSplitViewSubviewAt(WMSplitView *sPtr, int index) WMRemoveSplitViewSubviewAt(WMSplitView *sPtr, int index)
{ {
T_SplitViewSubView *p; T_SplitViewSubview *p;
CHECK_CLASS(sPtr, WC_SplitView); CHECK_CLASS(sPtr, WC_SplitView);
if (index > 0 && index < _GetSubViewsCount()) { if (index > 0 && index < _GetSubviewsCount()) {
p = _GetPSubViewStructAt(index); p = _GetPSubviewStructAt(index);
wfree(p); wfree(p);
WMDeleteFromBag(sPtr->subviewsBag, index); WMDeleteFromBag(sPtr->subviewsBag, index);
sPtr->flags.adjustOnPaint = 1; sPtr->flags.adjustOnPaint = 1;
@@ -815,11 +815,11 @@ WMSetSplitViewConstrainProc(WMSplitView *sPtr, WMSplitViewConstrainProc *proc)
int int
WMGetSplitViewSubViewsCount(WMSplitView *sPtr) WMGetSplitViewSubviewsCount(WMSplitView *sPtr)
{ {
CHECK_CLASS(sPtr, WC_SplitView); CHECK_CLASS(sPtr, WC_SplitView);
return (_GetSubViewsCount()); return (_GetSubviewsCount());
} }

8
WINGs/wtest.c
View File

@@ -505,7 +505,7 @@ appendSubviewButtonAction(WMWidget *self, void *data)
char buf[64]; char buf[64];
WMLabel *label = WMCreateLabel(sPtr); WMLabel *label = WMCreateLabel(sPtr);
sprintf(buf, "Subview %d", WMGetSplitViewSubViewsCount(sPtr) + 1); sprintf(buf, "Subview %d", WMGetSplitViewSubviewsCount(sPtr) + 1);
WMSetLabelText(label, buf); WMSetLabelText(label, buf);
WMSetLabelRelief(label, WRSunken); WMSetLabelRelief(label, WRSunken);
WMAddSplitViewSubview(sPtr, WMWidgetView(label)); WMAddSplitViewSubview(sPtr, WMWidgetView(label));
@@ -517,10 +517,10 @@ void
removeSubviewButtonAction(WMWidget *self, void *data) removeSubviewButtonAction(WMWidget *self, void *data)
{ {
WMSplitView *sPtr = (WMSplitView*)data; WMSplitView *sPtr = (WMSplitView*)data;
int count = WMGetSplitViewSubViewsCount(sPtr); int count = WMGetSplitViewSubviewsCount(sPtr);
if (count > 2) { if (count > 2) {
WMView *view = WMGetSplitViewSubViewAt(sPtr, count-1); WMView *view = WMGetSplitViewSubviewAt(sPtr, count-1);
WMDestroyWidget(WMWidgetOfView(view)); WMDestroyWidget(WMWidgetOfView(view));
WMRemoveSplitViewSubviewAt(sPtr, count-1); WMRemoveSplitViewSubviewAt(sPtr, count-1);
} }
@@ -536,7 +536,7 @@ orientationButtonAction(WMWidget *self, void *data)
void void
adjustSubviewsButtonAction(WMWidget *self, void *data) adjustSubviewsButtonAction(WMWidget *self, void *data)
{ {
WMAdjustSplitViewSubViews((WMSplitView*)data); WMAdjustSplitViewSubviews((WMSplitView*)data);
} }
void void

3
WPrefs.app/Appearance.c
View File

@@ -1722,7 +1722,6 @@ createPanel(Panel *p)
panel->secP = WMCreatePopUpButton(panel->texF); panel->secP = WMCreatePopUpButton(panel->texF);
WMResizeWidget(panel->secP, 228, 20); WMResizeWidget(panel->secP, 228, 20);
WMMoveWidget(panel->secP, 7, 7); WMMoveWidget(panel->secP, 7, 7);
WMSetPopUpButtonSelectedItem(panel->secP, 0);
WMAddPopUpButtonItem(panel->secP, _("Titlebar of Focused Window")); WMAddPopUpButtonItem(panel->secP, _("Titlebar of Focused Window"));
WMAddPopUpButtonItem(panel->secP, _("Titlebar of Unfocused Windows")); WMAddPopUpButtonItem(panel->secP, _("Titlebar of Unfocused Windows"));
WMAddPopUpButtonItem(panel->secP, _("Titlebar of Focused Window's Owner")); WMAddPopUpButtonItem(panel->secP, _("Titlebar of Focused Window's Owner"));
@@ -1732,6 +1731,7 @@ createPanel(Panel *p)
WMAddPopUpButtonItem(panel->secP, _("Icon Background")); WMAddPopUpButtonItem(panel->secP, _("Icon Background"));
/* WMAddPopUpButtonItem(panel->secP, _("Workspace Backgrounds")); /* WMAddPopUpButtonItem(panel->secP, _("Workspace Backgrounds"));
*/ */
WMSetPopUpButtonSelectedItem(panel->secP, 0);
WMSetPopUpButtonAction(panel->secP, changePage, panel); WMSetPopUpButtonAction(panel->secP, changePage, panel);
panel->texLs = WMCreateList(panel->texF); panel->texLs = WMCreateList(panel->texF);
@@ -1818,7 +1818,6 @@ createPanel(Panel *p)
panel->colP = WMCreatePopUpButton(panel->colF); panel->colP = WMCreatePopUpButton(panel->colF);
WMResizeWidget(panel->colP, 228, 20); WMResizeWidget(panel->colP, 228, 20);
WMMoveWidget(panel->colP, 7, 7); WMMoveWidget(panel->colP, 7, 7);
WMSetPopUpButtonSelectedItem(panel->colP, 0);
WMAddPopUpButtonItem(panel->colP, _("Focused Window Title")); WMAddPopUpButtonItem(panel->colP, _("Focused Window Title"));
WMAddPopUpButtonItem(panel->colP, _("Unfocused Window Title")); WMAddPopUpButtonItem(panel->colP, _("Unfocused Window Title"));
WMAddPopUpButtonItem(panel->colP, _("Owner of Focused Window Title")); WMAddPopUpButtonItem(panel->colP, _("Owner of Focused Window Title"));

2
WPrefs.app/Makefile.in
View File

@@ -157,7 +157,7 @@ all: all-redirect
.SUFFIXES: .SUFFIXES:
.SUFFIXES: .S .c .lo .o .s .SUFFIXES: .S .c .lo .o .s
$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
cd $(top_srcdir) && $(AUTOMAKE) --gnu WPrefs.app/Makefile cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps WPrefs.app/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) \ cd $(top_builddir) \

9
WPrefs.app/po/Makefile.in
View File

@@ -124,9 +124,9 @@ all: all-redirect
.SUFFIXES: .SUFFIXES:
.SUFFIXES: .mo .po .SUFFIXES: .mo .po
$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
cd $(top_srcdir) && $(AUTOMAKE) --gnu WPrefs.app/po/Makefile cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps WPrefs.app/po/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) \ cd $(top_builddir) \
&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
@@ -139,11 +139,6 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
subdir = WPrefs.app/po subdir = WPrefs.app/po
distdir: $(DISTFILES) distdir: $(DISTFILES)
here=`cd $(top_builddir) && pwd`; \
top_distdir=`cd $(top_distdir) && pwd`; \
distdir=`cd $(distdir) && pwd`; \
cd $(top_srcdir) \
&& $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu WPrefs.app/po/Makefile
@for file in $(DISTFILES); do \ @for file in $(DISTFILES); do \
d=$(srcdir); \ d=$(srcdir); \
if test -d $$d/$$file; then \ if test -d $$d/$$file; then \

9
WPrefs.app/tiff/Makefile.in
View File

@@ -113,9 +113,9 @@ GZIP_ENV = --best
all: all-redirect all: all-redirect
.SUFFIXES: .SUFFIXES:
$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
cd $(top_srcdir) && $(AUTOMAKE) --gnu WPrefs.app/tiff/Makefile cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps WPrefs.app/tiff/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) \ cd $(top_builddir) \
&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
@@ -147,11 +147,6 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
subdir = WPrefs.app/tiff subdir = WPrefs.app/tiff
distdir: $(DISTFILES) distdir: $(DISTFILES)
here=`cd $(top_builddir) && pwd`; \
top_distdir=`cd $(top_distdir) && pwd`; \
distdir=`cd $(distdir) && pwd`; \
cd $(top_srcdir) \
&& $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu WPrefs.app/tiff/Makefile
@for file in $(DISTFILES); do \ @for file in $(DISTFILES); do \
d=$(srcdir); \ d=$(srcdir); \
if test -d $$d/$$file; then \ if test -d $$d/$$file; then \

9
WPrefs.app/xpm/Makefile.in
View File

@@ -113,9 +113,9 @@ GZIP_ENV = --best
all: all-redirect all: all-redirect
.SUFFIXES: .SUFFIXES:
$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
cd $(top_srcdir) && $(AUTOMAKE) --gnu WPrefs.app/xpm/Makefile cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps WPrefs.app/xpm/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) \ cd $(top_builddir) \
&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
@@ -147,11 +147,6 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
subdir = WPrefs.app/xpm subdir = WPrefs.app/xpm
distdir: $(DISTFILES) distdir: $(DISTFILES)
here=`cd $(top_builddir) && pwd`; \
top_distdir=`cd $(top_distdir) && pwd`; \
distdir=`cd $(distdir) && pwd`; \
cd $(top_srcdir) \
&& $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu WPrefs.app/xpm/Makefile
@for file in $(DISTFILES); do \ @for file in $(DISTFILES); do \
d=$(srcdir); \ d=$(srcdir); \
if test -d $$d/$$file; then \ if test -d $$d/$$file; then \

9
WindowMaker/Backgrounds/Makefile.in
View File

@@ -112,9 +112,9 @@ GZIP_ENV = --best
all: all-redirect all: all-redirect
.SUFFIXES: .SUFFIXES:
$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
cd $(top_srcdir) && $(AUTOMAKE) --gnu WindowMaker/Backgrounds/Makefile cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps WindowMaker/Backgrounds/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) \ cd $(top_builddir) \
&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
@@ -146,11 +146,6 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
subdir = WindowMaker/Backgrounds subdir = WindowMaker/Backgrounds
distdir: $(DISTFILES) distdir: $(DISTFILES)
here=`cd $(top_builddir) && pwd`; \
top_distdir=`cd $(top_distdir) && pwd`; \
distdir=`cd $(distdir) && pwd`; \
cd $(top_srcdir) \
&& $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu WindowMaker/Backgrounds/Makefile
@for file in $(DISTFILES); do \ @for file in $(DISTFILES); do \
d=$(srcdir); \ d=$(srcdir); \
if test -d $$d/$$file; then \ if test -d $$d/$$file; then \

9
WindowMaker/Defaults/Makefile.in
View File

@@ -114,9 +114,9 @@ GZIP_ENV = --best
all: all-redirect all: all-redirect
.SUFFIXES: .SUFFIXES:
$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
cd $(top_srcdir) && $(AUTOMAKE) --gnu WindowMaker/Defaults/Makefile cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps WindowMaker/Defaults/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) \ cd $(top_builddir) \
&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
@@ -148,11 +148,6 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
subdir = WindowMaker/Defaults subdir = WindowMaker/Defaults
distdir: $(DISTFILES) distdir: $(DISTFILES)
here=`cd $(top_builddir) && pwd`; \
top_distdir=`cd $(top_distdir) && pwd`; \
distdir=`cd $(distdir) && pwd`; \
cd $(top_srcdir) \
&& $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu WindowMaker/Defaults/Makefile
@for file in $(DISTFILES); do \ @for file in $(DISTFILES); do \
d=$(srcdir); \ d=$(srcdir); \
if test -d $$d/$$file; then \ if test -d $$d/$$file; then \

9
WindowMaker/IconSets/Makefile.in
View File

@@ -114,9 +114,9 @@ GZIP_ENV = --best
all: all-redirect all: all-redirect
.SUFFIXES: .SUFFIXES:
$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
cd $(top_srcdir) && $(AUTOMAKE) --gnu WindowMaker/IconSets/Makefile cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps WindowMaker/IconSets/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) \ cd $(top_builddir) \
&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
@@ -148,11 +148,6 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
subdir = WindowMaker/IconSets subdir = WindowMaker/IconSets
distdir: $(DISTFILES) distdir: $(DISTFILES)
here=`cd $(top_builddir) && pwd`; \
top_distdir=`cd $(top_distdir) && pwd`; \
distdir=`cd $(distdir) && pwd`; \
cd $(top_srcdir) \
&& $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu WindowMaker/IconSets/Makefile
@for file in $(DISTFILES); do \ @for file in $(DISTFILES); do \
d=$(srcdir); \ d=$(srcdir); \
if test -d $$d/$$file; then \ if test -d $$d/$$file; then \

9
WindowMaker/Icons/Makefile.in
View File

@@ -113,9 +113,9 @@ GZIP_ENV = --best
all: all-redirect all: all-redirect
.SUFFIXES: .SUFFIXES:
$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
cd $(top_srcdir) && $(AUTOMAKE) --gnu WindowMaker/Icons/Makefile cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps WindowMaker/Icons/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) \ cd $(top_builddir) \
&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
@@ -147,11 +147,6 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
subdir = WindowMaker/Icons subdir = WindowMaker/Icons
distdir: $(DISTFILES) distdir: $(DISTFILES)
here=`cd $(top_builddir) && pwd`; \
top_distdir=`cd $(top_distdir) && pwd`; \
distdir=`cd $(distdir) && pwd`; \
cd $(top_srcdir) \
&& $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu WindowMaker/Icons/Makefile
@for file in $(DISTFILES); do \ @for file in $(DISTFILES); do \
d=$(srcdir); \ d=$(srcdir); \
if test -d $$d/$$file; then \ if test -d $$d/$$file; then \

9
WindowMaker/Makefile.in
View File

@@ -115,9 +115,9 @@ GZIP_ENV = --best
all: all-redirect all: all-redirect
.SUFFIXES: .SUFFIXES:
$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
cd $(top_srcdir) && $(AUTOMAKE) --gnu WindowMaker/Makefile cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps WindowMaker/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) \ cd $(top_builddir) \
&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
@@ -235,11 +235,6 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
subdir = WindowMaker subdir = WindowMaker
distdir: $(DISTFILES) distdir: $(DISTFILES)
here=`cd $(top_builddir) && pwd`; \
top_distdir=`cd $(top_distdir) && pwd`; \
distdir=`cd $(distdir) && pwd`; \
cd $(top_srcdir) \
&& $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu WindowMaker/Makefile
@for file in $(DISTFILES); do \ @for file in $(DISTFILES); do \
d=$(srcdir); \ d=$(srcdir); \
if test -d $$d/$$file; then \ if test -d $$d/$$file; then \

9
WindowMaker/Pixmaps/Makefile.in
View File

@@ -113,9 +113,9 @@ GZIP_ENV = --best
all: all-redirect all: all-redirect
.SUFFIXES: .SUFFIXES:
$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
cd $(top_srcdir) && $(AUTOMAKE) --gnu WindowMaker/Pixmaps/Makefile cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps WindowMaker/Pixmaps/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) \ cd $(top_builddir) \
&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
@@ -147,11 +147,6 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
subdir = WindowMaker/Pixmaps subdir = WindowMaker/Pixmaps
distdir: $(DISTFILES) distdir: $(DISTFILES)
here=`cd $(top_builddir) && pwd`; \
top_distdir=`cd $(top_distdir) && pwd`; \
distdir=`cd $(distdir) && pwd`; \
cd $(top_srcdir) \
&& $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu WindowMaker/Pixmaps/Makefile
@for file in $(DISTFILES); do \ @for file in $(DISTFILES); do \
d=$(srcdir); \ d=$(srcdir); \
if test -d $$d/$$file; then \ if test -d $$d/$$file; then \

9
WindowMaker/Styles/Makefile.in
View File

@@ -113,9 +113,9 @@ GZIP_ENV = --best
all: all-redirect all: all-redirect
.SUFFIXES: .SUFFIXES:
$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
cd $(top_srcdir) && $(AUTOMAKE) --gnu WindowMaker/Styles/Makefile cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps WindowMaker/Styles/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) \ cd $(top_builddir) \
&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
@@ -147,11 +147,6 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
subdir = WindowMaker/Styles subdir = WindowMaker/Styles
distdir: $(DISTFILES) distdir: $(DISTFILES)
here=`cd $(top_builddir) && pwd`; \
top_distdir=`cd $(top_distdir) && pwd`; \
distdir=`cd $(distdir) && pwd`; \
cd $(top_srcdir) \
&& $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu WindowMaker/Styles/Makefile
@for file in $(DISTFILES); do \ @for file in $(DISTFILES); do \
d=$(srcdir); \ d=$(srcdir); \
if test -d $$d/$$file; then \ if test -d $$d/$$file; then \

9
WindowMaker/Themes/Makefile.in
View File

@@ -112,9 +112,9 @@ GZIP_ENV = --best
all: all-redirect all: all-redirect
.SUFFIXES: .SUFFIXES:
$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
cd $(top_srcdir) && $(AUTOMAKE) --gnu WindowMaker/Themes/Makefile cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps WindowMaker/Themes/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) \ cd $(top_builddir) \
&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
@@ -146,11 +146,6 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
subdir = WindowMaker/Themes subdir = WindowMaker/Themes
distdir: $(DISTFILES) distdir: $(DISTFILES)
here=`cd $(top_builddir) && pwd`; \
top_distdir=`cd $(top_distdir) && pwd`; \
distdir=`cd $(distdir) && pwd`; \
cd $(top_srcdir) \
&& $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu WindowMaker/Themes/Makefile
@for file in $(DISTFILES); do \ @for file in $(DISTFILES); do \
d=$(srcdir); \ d=$(srcdir); \
if test -d $$d/$$file; then \ if test -d $$d/$$file; then \

9
contrib/Makefile.in
View File

@@ -106,9 +106,9 @@ GZIP_ENV = --best
all: all-redirect all: all-redirect
.SUFFIXES: .SUFFIXES:
$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
cd $(top_srcdir) && $(AUTOMAKE) --gnu contrib/Makefile cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps contrib/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) \ cd $(top_builddir) \
&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
@@ -121,11 +121,6 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
subdir = contrib subdir = contrib
distdir: $(DISTFILES) distdir: $(DISTFILES)
here=`cd $(top_builddir) && pwd`; \
top_distdir=`cd $(top_distdir) && pwd`; \
distdir=`cd $(distdir) && pwd`; \
cd $(top_srcdir) \
&& $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu contrib/Makefile
@for file in $(DISTFILES); do \ @for file in $(DISTFILES); do \
d=$(srcdir); \ d=$(srcdir); \
if test -d $$d/$$file; then \ if test -d $$d/$$file; then \

9
doc/Makefile.in
View File

@@ -113,9 +113,9 @@ GZIP_ENV = --best
all: all-redirect all: all-redirect
.SUFFIXES: .SUFFIXES:
$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps doc/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) \ cd $(top_builddir) \
&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
@@ -167,11 +167,6 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
subdir = doc subdir = doc
distdir: $(DISTFILES) distdir: $(DISTFILES)
here=`cd $(top_builddir) && pwd`; \
top_distdir=`cd $(top_distdir) && pwd`; \
distdir=`cd $(distdir) && pwd`; \
cd $(top_srcdir) \
&& $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu doc/Makefile
@for file in $(DISTFILES); do \ @for file in $(DISTFILES); do \
d=$(srcdir); \ d=$(srcdir); \
if test -d $$d/$$file; then \ if test -d $$d/$$file; then \

9
po/Makefile.in
View File

@@ -124,9 +124,9 @@ all: all-redirect
.SUFFIXES: .SUFFIXES:
.SUFFIXES: .mo .po .SUFFIXES: .mo .po
$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
cd $(top_srcdir) && $(AUTOMAKE) --gnu po/Makefile cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps po/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) \ cd $(top_builddir) \
&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
@@ -139,11 +139,6 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
subdir = po subdir = po
distdir: $(DISTFILES) distdir: $(DISTFILES)
here=`cd $(top_builddir) && pwd`; \
top_distdir=`cd $(top_distdir) && pwd`; \
distdir=`cd $(distdir) && pwd`; \
cd $(top_srcdir) \
&& $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu po/Makefile
@for file in $(DISTFILES); do \ @for file in $(DISTFILES); do \
d=$(srcdir); \ d=$(srcdir); \
if test -d $$d/$$file; then \ if test -d $$d/$$file; then \

2
src/Makefile.in
View File

@@ -154,7 +154,7 @@ all: all-redirect
.SUFFIXES: .SUFFIXES:
.SUFFIXES: .S .c .lo .o .s .SUFFIXES: .S .c .lo .o .s
$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) \ cd $(top_builddir) \

1
src/event.c
View File

@@ -961,7 +961,6 @@ raiseWindow(WScreen *scr)
static void static void
handleEnterNotify(XEvent *event) handleEnterNotify(XEvent *event)
{ {
WMenu *menu;
WWindow *wwin; WWindow *wwin;
WObjDescriptor *desc = NULL; WObjDescriptor *desc = NULL;
XEvent ev; XEvent ev;

1
src/main.c
View File

@@ -49,6 +49,7 @@
#include "xmodifier.h" #include "xmodifier.h"
#include "defaults.h" #include "defaults.h"
#include "session.h" #include "session.h"
#include "dialog.h"
#include <proplist.h> #include <proplist.h>

2
test/Makefile.in
View File

@@ -138,7 +138,7 @@ all: all-redirect
.SUFFIXES: .SUFFIXES:
.SUFFIXES: .S .c .lo .o .s .SUFFIXES: .S .c .lo .o .s
$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
cd $(top_srcdir) && $(AUTOMAKE) --gnu test/Makefile cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps test/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) \ cd $(top_builddir) \

2
util/Makefile.in
View File

@@ -200,7 +200,7 @@ all: all-redirect
.SUFFIXES: .SUFFIXES:
.SUFFIXES: .S .c .lo .o .s .SUFFIXES: .S .c .lo .o .s
$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
cd $(top_srcdir) && $(AUTOMAKE) --gnu util/Makefile cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps util/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) \ cd $(top_builddir) \

2
wmlib/Makefile.in
View File

@@ -139,7 +139,7 @@ all: all-redirect
.SUFFIXES: .SUFFIXES:
.SUFFIXES: .S .c .lo .o .s .SUFFIXES: .S .c .lo .o .s
$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
cd $(top_srcdir) && $(AUTOMAKE) --gnu wmlib/Makefile cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps wmlib/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) \ cd $(top_builddir) \

2
wrlib/Makefile.in
View File

@@ -178,7 +178,7 @@ all: all-redirect
.SUFFIXES: .SUFFIXES:
.SUFFIXES: .S .c .lo .o .s .SUFFIXES: .S .c .lo .o .s
$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
cd $(top_srcdir) && $(AUTOMAKE) --gnu wrlib/Makefile cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps wrlib/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) \ cd $(top_builddir) \

1
wrlib/view.c
View File

@@ -62,4 +62,5 @@ int main(int argc, char **argv)
XFlush(dpy); XFlush(dpy);
getchar(); getchar();
exit(0);
} }