From 38807b65c7b2f71c5eae46ded119f5dcd7941996 Mon Sep 17 00:00:00 2001 From: dan Date: Sun, 7 Nov 1999 21:40:22 +0000 Subject: [PATCH] - 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. --- Makefile.in | 9 +-- WINGs/ChangeLog | 7 ++ WINGs/Makefile.in | 2 +- WINGs/Resources/Makefile.in | 9 +-- WINGs/WINGs.h | 4 +- WINGs/wpopupbutton.c | 63 ++++++++------- WINGs/wsplitview.c | 150 ++++++++++++++++++------------------ WINGs/wtest.c | 8 +- WPrefs.app/Appearance.c | 3 +- WPrefs.app/Makefile.in | 2 +- WPrefs.app/po/Makefile.in | 9 +-- WPrefs.app/tiff/Makefile.in | 9 +-- WPrefs.app/xpm/Makefile.in | 9 +-- WindowMaker/Backgrounds/Makefile.in | 9 +-- WindowMaker/Defaults/Makefile.in | 9 +-- WindowMaker/IconSets/Makefile.in | 9 +-- WindowMaker/Icons/Makefile.in | 9 +-- WindowMaker/Makefile.in | 9 +-- WindowMaker/Pixmaps/Makefile.in | 9 +-- WindowMaker/Styles/Makefile.in | 9 +-- WindowMaker/Themes/Makefile.in | 9 +-- contrib/Makefile.in | 9 +-- doc/Makefile.in | 9 +-- po/Makefile.in | 9 +-- src/Makefile.in | 2 +- src/event.c | 1 - src/main.c | 1 + test/Makefile.in | 2 +- util/Makefile.in | 2 +- wmlib/Makefile.in | 2 +- wrlib/Makefile.in | 2 +- wrlib/view.c | 1 + 32 files changed, 167 insertions(+), 229 deletions(-) diff --git a/Makefile.in b/Makefile.in index 14437457..7b9ab4c7 100644 --- a/Makefile.in +++ b/Makefile.in @@ -114,9 +114,9 @@ GZIP_ENV = --best all: all-redirect .SUFFIXES: $(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) \ && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -255,11 +255,6 @@ distdir: $(DISTFILES) -rm -rf $(distdir) mkdir $(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 \ d=$(srcdir); \ if test -d $$d/$$file; then \ diff --git a/WINGs/ChangeLog b/WINGs/ChangeLog index dab73d58..4b9600b4 100644 --- a/WINGs/ChangeLog +++ b/WINGs/ChangeLog @@ -15,6 +15,13 @@ changes since wmaker 0.61.1: - added vertical views and multiple views in WMSplitView (Wolff ) - changed values of parameter values of WMSplitViewConstrainProc() - configurable default fontsize patch (Igor P. Roboul ) +- 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: ............................ diff --git a/WINGs/Makefile.in b/WINGs/Makefile.in index 2d80bdb4..9f1a46ad 100644 --- a/WINGs/Makefile.in +++ b/WINGs/Makefile.in @@ -215,7 +215,7 @@ all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s $(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 cd $(top_builddir) \ diff --git a/WINGs/Resources/Makefile.in b/WINGs/Resources/Makefile.in index bb8f69d6..8d4b7d06 100644 --- a/WINGs/Resources/Makefile.in +++ b/WINGs/Resources/Makefile.in @@ -112,9 +112,9 @@ GZIP_ENV = --best all: all-redirect .SUFFIXES: $(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) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -146,11 +146,6 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) subdir = WINGs/Resources 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 \ d=$(srcdir); \ if test -d $$d/$$file; then \ diff --git a/WINGs/WINGs.h b/WINGs/WINGs.h index aadbc5c9..567c7f40 100644 --- a/WINGs/WINGs.h +++ b/WINGs/WINGs.h @@ -1256,9 +1256,9 @@ WMSplitView *WMCreateSplitView(WMWidget *parent); Bool WMGetSplitViewVertical(WMSplitView *sPtr); 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 */ void WMRemoveSplitViewSubview(WMSplitView *sPtr, WMView *view); diff --git a/WINGs/wpopupbutton.c b/WINGs/wpopupbutton.c index 6a17c970..029bec38 100644 --- a/WINGs/wpopupbutton.c +++ b/WINGs/wpopupbutton.c @@ -211,13 +211,13 @@ WMGetPopUpButtonEnabled(WMPopUpButton *bPtr) void WMSetPopUpButtonSelectedItem(WMPopUpButton *bPtr, int index) -{ - if (index < 0) { - if (bPtr->view->flags.mapped) - paintPopUpButton(bPtr); - return; - } - +{ + + wassertr(index < WMGetBagItemCount(bPtr->items)); + + /* if (index >= WMGetBagCount(bPtr->items)) + index = -1;*/ + bPtr->selectedItemIndex = index; if (bPtr->view->flags.mapped) @@ -414,14 +414,17 @@ static void paintMenuEntry(PopUpButton *bPtr, int index, int highlight) { W_Screen *scr = bPtr->view->screen; - int i; int yo; - int width, height, itemHeight; + int width, height, itemHeight, itemCount; char *title; - + + itemCount = WMGetBagItemCount(bPtr->items); + if (index < 0 || index >= itemCount) + return; + itemHeight = bPtr->view->size.height; width = bPtr->view->size.width; - height = itemHeight * WMGetBagItemCount(bPtr->items); + height = itemHeight * itemCount; yo = (itemHeight - WMFontHeight(scr->normalFont))/2; if (!highlight) { @@ -443,13 +446,13 @@ paintMenuEntry(PopUpButton *bPtr, int index, int highlight) W_PaintText(bPtr->menuView, bPtr->menuView->window, scr->normalFont, 6, index*itemHeight + yo, width, WALeft, WMColorGC(scr->black), False, title, strlen(title)); - + if (!bPtr->flags.pullsDown && index == bPtr->selectedItemIndex) { XCopyArea(scr->display, scr->popUpIndicator->pixmap, bPtr->menuView->window, scr->copyGC, 0, 0, scr->popUpIndicator->width, scr->popUpIndicator->height, 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; - if (bPtr->scrollStartY > scrHeight-1 - && bPtr->menuView->pos.y+bPtr->menuView->size.height > scrHeight-1) { + if (bPtr->scrollStartY >= scrHeight-1 + && bPtr->menuView->pos.y+bPtr->menuView->size.height >= scrHeight-1) { repeat = 1; 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->view->size.height; - if (bPtr->highlightedItem >= WMGetBagItemCount(bPtr->items)) - bPtr->highlightedItem = WMGetBagItemCount(bPtr->items)-1; - if (oldItem!=bPtr->highlightedItem) { - WMMenuItem *item = - WMGetPopUpButtonMenuItem(bPtr, bPtr->highlightedItem); + WMMenuItem *item; paintMenuEntry(bPtr, oldItem, False); - - paintMenuEntry(bPtr, bPtr->highlightedItem, - WMGetMenuItemEnabled(item)); + + if (bPtr->highlightedItem >= 0 && + 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); @@ -661,10 +666,16 @@ handleActionEvents(XEvent *event, void *data) if (oldItem!=bPtr->highlightedItem) { WMMenuItem *item; - item = WMGetPopUpButtonMenuItem(bPtr, bPtr->highlightedItem); paintMenuEntry(bPtr, oldItem, False); - paintMenuEntry(bPtr, bPtr->highlightedItem, - WMGetMenuItemEnabled(item)); + if (bPtr->highlightedItem >= 0 && + 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 diff --git a/WINGs/wsplitview.c b/WINGs/wsplitview.c index 15748f96..7b3e544a 100644 --- a/WINGs/wsplitview.c +++ b/WINGs/wsplitview.c @@ -11,13 +11,13 @@ char *WMSplitViewWillResizeSubviewsNotification = "WMSplitViewWillResizeSubviewsNotification"; */ -typedef struct _T_SplitViewSubView { +typedef struct _T_SplitViewSubview { WMView *view; int minSize; int maxSize; int size; int pos; -} T_SplitViewSubView; +} T_SplitViewSubview; typedef struct W_SplitView { @@ -44,28 +44,28 @@ typedef struct W_SplitView { #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))) -#define _GetPSubViewStructAt(i) \ -((T_SplitViewSubView*)WMGetFromBag(sPtr->subviewsBag,(i))) +#define _GetPSubviewStructAt(i) \ +((T_SplitViewSubview*)WMGetFromBag(sPtr->subviewsBag,(i))) -#define _GetSubViewAt(i) \ -(((T_SplitViewSubView*)WMGetFromBag(sPtr->subviewsBag,(i)))->view) +#define _GetSubviewAt(i) \ +(((T_SplitViewSubview*)WMGetFromBag(sPtr->subviewsBag,(i)))->view) #define _GetMinSizeAt(i) \ -(((T_SplitViewSubView*)WMGetFromBag(sPtr->subviewsBag,(i)))->minSize) +(((T_SplitViewSubview*)WMGetFromBag(sPtr->subviewsBag,(i)))->minSize) #define _GetMaxSizeAt(i) \ -(((T_SplitViewSubView*)WMGetFromBag(sPtr->subviewsBag,(i)))->maxSize) +(((T_SplitViewSubview*)WMGetFromBag(sPtr->subviewsBag,(i)))->maxSize) #define _GetSizeAt(i) \ -(((T_SplitViewSubView*)WMGetFromBag(sPtr->subviewsBag,(i)))->size) +(((T_SplitViewSubview*)WMGetFromBag(sPtr->subviewsBag,(i)))->size) #define _GetPosAt(i) \ -(((T_SplitViewSubView*)WMGetFromBag(sPtr->subviewsBag,(i)))->pos) +(((T_SplitViewSubview*)WMGetFromBag(sPtr->subviewsBag,(i)))->pos) #define _GetSplitViewSize() \ ((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 updateConstraints(SplitView *sPtr) { - T_SplitViewSubView *p; + T_SplitViewSubview *p; int i, count; - count = _GetSubViewsCount(); + count = _GetSubviewsCount(); for (i = 0; i < count; i++) { - p = _GetPSubViewStructAt(i); + p = _GetPSubviewStructAt(i); getConstraints(sPtr, i, &(p->minSize), &(p->maxSize)); } } @@ -171,12 +171,12 @@ static int checkSizes(SplitView *sPtr) { int i, count, offset; - T_SplitViewSubView *p; + T_SplitViewSubview *p; - count = _GetSubViewsCount(); + count = _GetSubviewsCount(); offset = 0; for (i = 0; i < count; i++) { - p = _GetPSubViewStructAt(i); + p = _GetPSubviewStructAt(i); if (p->size < p->minSize) { offset += p->minSize - p->size; p->size = p->minSize; @@ -194,12 +194,12 @@ static void checkPositions(SplitView *sPtr) { int i, count, pos; - T_SplitViewSubView *p; + T_SplitViewSubview *p; - count = _GetSubViewsCount(); + count = _GetSubviewsCount(); pos = 0; for (i = 0; i < count; i++) { - p = _GetPSubViewStructAt(i); + p = _GetPSubviewStructAt(i); p->pos = pos; pos += p->size + DIVIDER_THICKNESS; } @@ -210,11 +210,11 @@ static void updateSubviewsGeom(SplitView *sPtr) { int i, count; - T_SplitViewSubView *p; + T_SplitViewSubview *p; - count = _GetSubViewsCount(); + count = _GetSubviewsCount(); for (i = 0; i < count; i++) { - p = _GetPSubViewStructAt(i); + p = _GetPSubviewStructAt(i); resizeView(sPtr, p->view, p->size); moveView(sPtr, p->view, p->pos); } @@ -226,7 +226,7 @@ getTotalSize(SplitView *sPtr) { int i, count, totSize; - count = _GetSubViewsCount(); + count = _GetSubviewsCount(); if (!count) return (0); @@ -241,17 +241,17 @@ getTotalSize(SplitView *sPtr) static Bool distributeOffsetEqually(SplitView *sPtr, int offset) { - T_SplitViewSubView *p; + T_SplitViewSubview *p; int i, count, sizeChanged, forced; - if ((count = _GetSubViewsCount()) < 1) + if ((count = _GetSubviewsCount()) < 1) return (True); forced = False; while (offset != 0) { sizeChanged = 0; for (i = 0; i < count && offset != 0; i++) { - p = _GetPSubViewStructAt(i); + p = _GetPSubviewStructAt(i); if (offset < 0) { if (p->size > p->minSize) { offset++; @@ -265,7 +265,7 @@ distributeOffsetEqually(SplitView *sPtr, int offset) } } if (offset != 0 && !sizeChanged) { - p = _GetPSubViewStructAt(count-1); + p = _GetPSubviewStructAt(count-1); if (offset > 0) { p->size += offset; p->maxSize = MAX_SUBVIEW_SIZE; @@ -282,14 +282,14 @@ distributeOffsetEqually(SplitView *sPtr, int offset) static Bool distributeOffsetFormEnd(SplitView *sPtr, int offset) { - T_SplitViewSubView *p; + T_SplitViewSubview *p; int i, count, sizeTmp; - if ((count = _GetSubViewsCount()) < 1) + if ((count = _GetSubviewsCount()) < 1) return (True); for (i = count-1; i >= 0 && offset != 0; i--) { - p = _GetPSubViewStructAt(i); + p = _GetPSubviewStructAt(i); sizeTmp = p->size; if (offset > 0) { if (p->maxSize == MAX_SUBVIEW_SIZE || p->size + offset < p->maxSize) @@ -310,25 +310,25 @@ distributeOffsetFormEnd(SplitView *sPtr, int offset) static void -adjustSplitViewSubViews(WMSplitView *sPtr) +adjustSplitViewSubviews(WMSplitView *sPtr) { - T_SplitViewSubView *p; + T_SplitViewSubview *p; int i, count, adjSize, adjPad; CHECK_CLASS(sPtr, WC_SplitView); #if 0 - printf("---- (adjustSplitViewSubViews - 1) ----\n"); - dumpSubViews(sPtr); + printf("---- (adjustSplitViewSubviews - 1) ----\n"); + dumpSubviews(sPtr); #endif - if ((count = _GetSubViewsCount()) < 1) + if ((count = _GetSubviewsCount()) < 1) return; adjSize = (_GetSplitViewSize() - ((count-1) * DIVIDER_THICKNESS)) / count; adjPad = (_GetSplitViewSize() - ((count-1) * DIVIDER_THICKNESS)) % count; for (i = 0; i < count; i++) { - p = _GetPSubViewStructAt(i); + p = _GetPSubviewStructAt(i); p->size = adjSize; } @@ -340,28 +340,28 @@ adjustSplitViewSubViews(WMSplitView *sPtr) sPtr->flags.subviewsWereManuallyMoved = 0; #if 0 - printf("---- (adjustSplitViewSubViews - 2) ----\n"); - dumpSubViews(sPtr); + printf("---- (adjustSplitViewSubviews - 2) ----\n"); + dumpSubviews(sPtr); #endif } #if 0 static void -handleSubViewResized(void *self, WMNotification *notif) +handleSubviewResized(void *self, WMNotification *notif) { SplitView *sPtr = (SplitView*)self; CHECK_CLASS(sPtr, WC_SplitView); if (WMGetNotificationName(notif) == WMViewSizeDidChangeNotification) { - T_SplitViewSubView *p; + T_SplitViewSubview *p; int i, count, done; WMView *view = WMGetNotificationObject(notif); - count = _GetSubViewsCount(); + count = _GetSubviewsCount(); done = 0; for (i = 0; i < count; i++) { - p = _GetPSubViewStructAt(i); + p = _GetPSubviewStructAt(i); if (p->view == view) { done = 1; break; @@ -384,7 +384,7 @@ handleViewResized(void *self, WMNotification *notification) #if 0 printf("---- (handleViewResized - 1) ----\n"); - dumpSubViews(sPtr); + dumpSubviews(sPtr); #endif updateConstraints(sPtr); @@ -395,13 +395,13 @@ handleViewResized(void *self, WMNotification *notification) checkPositions(sPtr); updateSubviewsGeom(sPtr); } else - adjustSplitViewSubViews(sPtr); + adjustSplitViewSubviews(sPtr); assert(checkSizes(sPtr) == 0); #if 0 printf("---- (handleViewResized - 2) ----\n"); - dumpSubViews(sPtr); + dumpSubviews(sPtr); #endif } @@ -409,14 +409,14 @@ handleViewResized(void *self, WMNotification *notification) static void paintSplitView(SplitView *sPtr) { - T_SplitViewSubView *p; + T_SplitViewSubview *p; W_Screen *scr = sPtr->view->screen; int x, y, i, count; WMPixmap *dimple = scr->scrollerDimple; #if 0 printf("---- (paintSplitView - 1) ----\n"); - dumpSubViews(sPtr); + dumpSubviews(sPtr); #endif if (!sPtr->view->flags.mapped || !sPtr->view->flags.realized) @@ -424,7 +424,7 @@ paintSplitView(SplitView *sPtr) XClearWindow(scr->display, sPtr->view->window); - count = _GetSubViewsCount(); + count = _GetSubviewsCount(); if (count == 0) return; @@ -444,7 +444,7 @@ paintSplitView(SplitView *sPtr) } for (i = 0; i < count-1; i++) { - p = _GetPSubViewStructAt(i); + p = _GetPSubviewStructAt(i); if (sPtr->flags.vertical) x += p->size; @@ -463,7 +463,7 @@ paintSplitView(SplitView *sPtr) #if 0 printf("---- (paintSplitView - 2) ----\n"); - dumpSubViews(sPtr); + dumpSubviews(sPtr); #endif } @@ -531,7 +531,7 @@ dragDivider(SplitView *sPtr, int clickX, int clickY) scr = sPtr->view->screen; divider = ofs = pos = done = 0; coord = (sPtr->flags.vertical) ? clickX : clickY; - count = _GetSubViewsCount(); + count = _GetSubviewsCount(); if (count < 2) return; @@ -585,11 +585,11 @@ dragDivider(SplitView *sPtr, int clickX, int clickY) } if (dragging) { - T_SplitViewSubView *p1, *p2; + T_SplitViewSubview *p1, *p2; int totSize; - p1 = _GetPSubViewStructAt(divider); - p2 = _GetPSubViewStructAt(divider+1); + p1 = _GetPSubviewStructAt(divider); + p2 = _GetPSubviewStructAt(divider+1); totSize = p1->size + DIVIDER_THICKNESS + p2->size; @@ -648,7 +648,7 @@ destroySplitView(SplitView *sPtr) { int i, count; - count = _GetSubViewsCount(); + count = _GetSubviewsCount(); for (i = 0; i < count; i++) wfree(WMGetFromBag(sPtr->subviewsBag, i)); WMFreeBag(sPtr->subviewsBag); @@ -696,13 +696,13 @@ WMCreateSplitView(WMWidget *parent) void -WMAdjustSplitViewSubViews(WMSplitView *sPtr) +WMAdjustSplitViewSubviews(WMSplitView *sPtr) { CHECK_CLASS(sPtr, WC_SplitView); checkSizes(sPtr); - adjustSplitViewSubViews(sPtr); + adjustSplitViewSubviews(sPtr); assert(checkSizes(sPtr) == 0); } @@ -712,18 +712,18 @@ void WMAddSplitViewSubview(WMSplitView *sPtr, WMView *subview) { int wasMapped, count; - T_SplitViewSubView *p; + T_SplitViewSubview *p; CHECK_CLASS(sPtr, WC_SplitView); - if (!(p = (T_SplitViewSubView*)wmalloc(sizeof(T_SplitViewSubView)))) + if (!(p = (T_SplitViewSubview*)wmalloc(sizeof(T_SplitViewSubview)))) return; wasMapped = subview->flags.mapped; if (wasMapped) W_UnmapView(subview); - count = _GetSubViewsCount(); + count = _GetSubviewsCount(); p->view = subview; getConstraints(sPtr, count, &(p->minSize), &(p->maxSize)); if (sPtr->flags.vertical) @@ -738,11 +738,11 @@ WMAddSplitViewSubview(WMSplitView *sPtr, WMView *subview) We should have something like that... WMSetViewNotifySizeChanges(subview, True); - WMAddNotificationObserver(handleSubViewResized, sPtr, + WMAddNotificationObserver(handleSubviewResized, sPtr, WMViewSizeDidChangeNotification, subview); WMSetViewNotifyMoveChanges(subview, True); - WMAddNotificationObserver(handleSubViewResized, sPtr, + WMAddNotificationObserver(handleSubviewResized, sPtr, WMViewMoveDidChangeNotification, subview); */ @@ -755,12 +755,12 @@ WMAddSplitViewSubview(WMSplitView *sPtr, WMView *subview) WMView* -WMGetSplitViewSubViewAt(WMSplitView *sPtr, int index) +WMGetSplitViewSubviewAt(WMSplitView *sPtr, int index) { CHECK_CLASS(sPtr, WC_SplitView); - if (index > 0 && index < _GetSubViewsCount()) - return (_GetSubViewAt(index)); + if (index > 0 && index < _GetSubviewsCount()) + return (_GetSubviewAt(index)); else return (NULL); } @@ -769,14 +769,14 @@ WMGetSplitViewSubViewAt(WMSplitView *sPtr, int index) void WMRemoveSplitViewSubview(WMSplitView *sPtr, WMView *view) { - T_SplitViewSubView *p; + T_SplitViewSubview *p; int i, count; CHECK_CLASS(sPtr, WC_SplitView); - count = _GetSubViewsCount(); + count = _GetSubviewsCount(); for (i = 0; i < count; i++) { - p = _GetPSubViewStructAt(i); + p = _GetPSubviewStructAt(i); if (p->view == view) { wfree(p); WMDeleteFromBag(sPtr->subviewsBag, i); @@ -791,12 +791,12 @@ WMRemoveSplitViewSubview(WMSplitView *sPtr, WMView *view) void WMRemoveSplitViewSubviewAt(WMSplitView *sPtr, int index) { - T_SplitViewSubView *p; + T_SplitViewSubview *p; CHECK_CLASS(sPtr, WC_SplitView); - if (index > 0 && index < _GetSubViewsCount()) { - p = _GetPSubViewStructAt(index); + if (index > 0 && index < _GetSubviewsCount()) { + p = _GetPSubviewStructAt(index); wfree(p); WMDeleteFromBag(sPtr->subviewsBag, index); sPtr->flags.adjustOnPaint = 1; @@ -815,11 +815,11 @@ WMSetSplitViewConstrainProc(WMSplitView *sPtr, WMSplitViewConstrainProc *proc) int -WMGetSplitViewSubViewsCount(WMSplitView *sPtr) +WMGetSplitViewSubviewsCount(WMSplitView *sPtr) { CHECK_CLASS(sPtr, WC_SplitView); - return (_GetSubViewsCount()); + return (_GetSubviewsCount()); } diff --git a/WINGs/wtest.c b/WINGs/wtest.c index 12cd7b5f..2dec3448 100644 --- a/WINGs/wtest.c +++ b/WINGs/wtest.c @@ -505,7 +505,7 @@ appendSubviewButtonAction(WMWidget *self, void *data) char buf[64]; WMLabel *label = WMCreateLabel(sPtr); - sprintf(buf, "Subview %d", WMGetSplitViewSubViewsCount(sPtr) + 1); + sprintf(buf, "Subview %d", WMGetSplitViewSubviewsCount(sPtr) + 1); WMSetLabelText(label, buf); WMSetLabelRelief(label, WRSunken); WMAddSplitViewSubview(sPtr, WMWidgetView(label)); @@ -517,10 +517,10 @@ void removeSubviewButtonAction(WMWidget *self, void *data) { WMSplitView *sPtr = (WMSplitView*)data; - int count = WMGetSplitViewSubViewsCount(sPtr); + int count = WMGetSplitViewSubviewsCount(sPtr); if (count > 2) { - WMView *view = WMGetSplitViewSubViewAt(sPtr, count-1); + WMView *view = WMGetSplitViewSubviewAt(sPtr, count-1); WMDestroyWidget(WMWidgetOfView(view)); WMRemoveSplitViewSubviewAt(sPtr, count-1); } @@ -536,7 +536,7 @@ orientationButtonAction(WMWidget *self, void *data) void adjustSubviewsButtonAction(WMWidget *self, void *data) { - WMAdjustSplitViewSubViews((WMSplitView*)data); + WMAdjustSplitViewSubviews((WMSplitView*)data); } void diff --git a/WPrefs.app/Appearance.c b/WPrefs.app/Appearance.c index f188d893..684fc07d 100644 --- a/WPrefs.app/Appearance.c +++ b/WPrefs.app/Appearance.c @@ -1722,7 +1722,6 @@ createPanel(Panel *p) panel->secP = WMCreatePopUpButton(panel->texF); WMResizeWidget(panel->secP, 228, 20); WMMoveWidget(panel->secP, 7, 7); - WMSetPopUpButtonSelectedItem(panel->secP, 0); WMAddPopUpButtonItem(panel->secP, _("Titlebar of Focused Window")); WMAddPopUpButtonItem(panel->secP, _("Titlebar of Unfocused Windows")); WMAddPopUpButtonItem(panel->secP, _("Titlebar of Focused Window's Owner")); @@ -1732,6 +1731,7 @@ createPanel(Panel *p) WMAddPopUpButtonItem(panel->secP, _("Icon Background")); /* WMAddPopUpButtonItem(panel->secP, _("Workspace Backgrounds")); */ + WMSetPopUpButtonSelectedItem(panel->secP, 0); WMSetPopUpButtonAction(panel->secP, changePage, panel); panel->texLs = WMCreateList(panel->texF); @@ -1818,7 +1818,6 @@ createPanel(Panel *p) panel->colP = WMCreatePopUpButton(panel->colF); WMResizeWidget(panel->colP, 228, 20); WMMoveWidget(panel->colP, 7, 7); - WMSetPopUpButtonSelectedItem(panel->colP, 0); WMAddPopUpButtonItem(panel->colP, _("Focused Window Title")); WMAddPopUpButtonItem(panel->colP, _("Unfocused Window Title")); WMAddPopUpButtonItem(panel->colP, _("Owner of Focused Window Title")); diff --git a/WPrefs.app/Makefile.in b/WPrefs.app/Makefile.in index e8419187..f6e1c4c8 100644 --- a/WPrefs.app/Makefile.in +++ b/WPrefs.app/Makefile.in @@ -157,7 +157,7 @@ all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s $(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 cd $(top_builddir) \ diff --git a/WPrefs.app/po/Makefile.in b/WPrefs.app/po/Makefile.in index 7c9d46d0..57dfb383 100644 --- a/WPrefs.app/po/Makefile.in +++ b/WPrefs.app/po/Makefile.in @@ -124,9 +124,9 @@ all: all-redirect .SUFFIXES: .SUFFIXES: .mo .po $(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) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -139,11 +139,6 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) subdir = WPrefs.app/po 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 \ d=$(srcdir); \ if test -d $$d/$$file; then \ diff --git a/WPrefs.app/tiff/Makefile.in b/WPrefs.app/tiff/Makefile.in index 8542e65f..37f525a3 100644 --- a/WPrefs.app/tiff/Makefile.in +++ b/WPrefs.app/tiff/Makefile.in @@ -113,9 +113,9 @@ GZIP_ENV = --best all: all-redirect .SUFFIXES: $(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) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -147,11 +147,6 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) subdir = WPrefs.app/tiff 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 \ d=$(srcdir); \ if test -d $$d/$$file; then \ diff --git a/WPrefs.app/xpm/Makefile.in b/WPrefs.app/xpm/Makefile.in index 28b17fa2..ba04a972 100644 --- a/WPrefs.app/xpm/Makefile.in +++ b/WPrefs.app/xpm/Makefile.in @@ -113,9 +113,9 @@ GZIP_ENV = --best all: all-redirect .SUFFIXES: $(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) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -147,11 +147,6 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) subdir = WPrefs.app/xpm 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 \ d=$(srcdir); \ if test -d $$d/$$file; then \ diff --git a/WindowMaker/Backgrounds/Makefile.in b/WindowMaker/Backgrounds/Makefile.in index 6c115db8..cffef0ce 100755 --- a/WindowMaker/Backgrounds/Makefile.in +++ b/WindowMaker/Backgrounds/Makefile.in @@ -112,9 +112,9 @@ GZIP_ENV = --best all: all-redirect .SUFFIXES: $(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) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -146,11 +146,6 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) subdir = WindowMaker/Backgrounds 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 \ d=$(srcdir); \ if test -d $$d/$$file; then \ diff --git a/WindowMaker/Defaults/Makefile.in b/WindowMaker/Defaults/Makefile.in index 4fba800e..468d6c8c 100755 --- a/WindowMaker/Defaults/Makefile.in +++ b/WindowMaker/Defaults/Makefile.in @@ -114,9 +114,9 @@ GZIP_ENV = --best all: all-redirect .SUFFIXES: $(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) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -148,11 +148,6 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) subdir = WindowMaker/Defaults 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 \ d=$(srcdir); \ if test -d $$d/$$file; then \ diff --git a/WindowMaker/IconSets/Makefile.in b/WindowMaker/IconSets/Makefile.in index 3cac17cb..e06f2189 100755 --- a/WindowMaker/IconSets/Makefile.in +++ b/WindowMaker/IconSets/Makefile.in @@ -114,9 +114,9 @@ GZIP_ENV = --best all: all-redirect .SUFFIXES: $(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) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -148,11 +148,6 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) subdir = WindowMaker/IconSets 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 \ d=$(srcdir); \ if test -d $$d/$$file; then \ diff --git a/WindowMaker/Icons/Makefile.in b/WindowMaker/Icons/Makefile.in index 23b1b65f..735aedbb 100755 --- a/WindowMaker/Icons/Makefile.in +++ b/WindowMaker/Icons/Makefile.in @@ -113,9 +113,9 @@ GZIP_ENV = --best all: all-redirect .SUFFIXES: $(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) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -147,11 +147,6 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) subdir = WindowMaker/Icons 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 \ d=$(srcdir); \ if test -d $$d/$$file; then \ diff --git a/WindowMaker/Makefile.in b/WindowMaker/Makefile.in index 027f85f7..7d4500bb 100755 --- a/WindowMaker/Makefile.in +++ b/WindowMaker/Makefile.in @@ -115,9 +115,9 @@ GZIP_ENV = --best all: all-redirect .SUFFIXES: $(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) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -235,11 +235,6 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) subdir = WindowMaker 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 \ d=$(srcdir); \ if test -d $$d/$$file; then \ diff --git a/WindowMaker/Pixmaps/Makefile.in b/WindowMaker/Pixmaps/Makefile.in index 895f1e16..3a9ddd5e 100755 --- a/WindowMaker/Pixmaps/Makefile.in +++ b/WindowMaker/Pixmaps/Makefile.in @@ -113,9 +113,9 @@ GZIP_ENV = --best all: all-redirect .SUFFIXES: $(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) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -147,11 +147,6 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) subdir = WindowMaker/Pixmaps 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 \ d=$(srcdir); \ if test -d $$d/$$file; then \ diff --git a/WindowMaker/Styles/Makefile.in b/WindowMaker/Styles/Makefile.in index 2f9ed026..68239408 100755 --- a/WindowMaker/Styles/Makefile.in +++ b/WindowMaker/Styles/Makefile.in @@ -113,9 +113,9 @@ GZIP_ENV = --best all: all-redirect .SUFFIXES: $(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) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -147,11 +147,6 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) subdir = WindowMaker/Styles 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 \ d=$(srcdir); \ if test -d $$d/$$file; then \ diff --git a/WindowMaker/Themes/Makefile.in b/WindowMaker/Themes/Makefile.in index 97f8f21e..0b3743f4 100755 --- a/WindowMaker/Themes/Makefile.in +++ b/WindowMaker/Themes/Makefile.in @@ -112,9 +112,9 @@ GZIP_ENV = --best all: all-redirect .SUFFIXES: $(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) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -146,11 +146,6 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) subdir = WindowMaker/Themes 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 \ d=$(srcdir); \ if test -d $$d/$$file; then \ diff --git a/contrib/Makefile.in b/contrib/Makefile.in index 170ea453..4bfa80a8 100644 --- a/contrib/Makefile.in +++ b/contrib/Makefile.in @@ -106,9 +106,9 @@ GZIP_ENV = --best all: all-redirect .SUFFIXES: $(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) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -121,11 +121,6 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) subdir = contrib 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 \ d=$(srcdir); \ if test -d $$d/$$file; then \ diff --git a/doc/Makefile.in b/doc/Makefile.in index 0cea1aca..d7d2f723 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -113,9 +113,9 @@ GZIP_ENV = --best all: all-redirect .SUFFIXES: $(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) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -167,11 +167,6 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) subdir = doc 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 \ d=$(srcdir); \ if test -d $$d/$$file; then \ diff --git a/po/Makefile.in b/po/Makefile.in index f9c6ee44..d0fa1933 100644 --- a/po/Makefile.in +++ b/po/Makefile.in @@ -124,9 +124,9 @@ all: all-redirect .SUFFIXES: .SUFFIXES: .mo .po $(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) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -139,11 +139,6 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) subdir = po 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 \ d=$(srcdir); \ if test -d $$d/$$file; then \ diff --git a/src/Makefile.in b/src/Makefile.in index fc1b79ec..460f4489 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -154,7 +154,7 @@ all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s $(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 cd $(top_builddir) \ diff --git a/src/event.c b/src/event.c index f0aa940e..d3902689 100644 --- a/src/event.c +++ b/src/event.c @@ -961,7 +961,6 @@ raiseWindow(WScreen *scr) static void handleEnterNotify(XEvent *event) { - WMenu *menu; WWindow *wwin; WObjDescriptor *desc = NULL; XEvent ev; diff --git a/src/main.c b/src/main.c index 049a0f99..82de2c89 100644 --- a/src/main.c +++ b/src/main.c @@ -49,6 +49,7 @@ #include "xmodifier.h" #include "defaults.h" #include "session.h" +#include "dialog.h" #include diff --git a/test/Makefile.in b/test/Makefile.in index c2f54992..5b378c48 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -138,7 +138,7 @@ all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s $(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 cd $(top_builddir) \ diff --git a/util/Makefile.in b/util/Makefile.in index 57ff8c54..f59172c9 100644 --- a/util/Makefile.in +++ b/util/Makefile.in @@ -200,7 +200,7 @@ all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s $(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 cd $(top_builddir) \ diff --git a/wmlib/Makefile.in b/wmlib/Makefile.in index b57a7126..2cfe79ae 100644 --- a/wmlib/Makefile.in +++ b/wmlib/Makefile.in @@ -139,7 +139,7 @@ all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s $(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 cd $(top_builddir) \ diff --git a/wrlib/Makefile.in b/wrlib/Makefile.in index 4c4e5ece..69d62e24 100644 --- a/wrlib/Makefile.in +++ b/wrlib/Makefile.in @@ -178,7 +178,7 @@ all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s $(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 cd $(top_builddir) \ diff --git a/wrlib/view.c b/wrlib/view.c index 31a74eef..d683c1e1 100644 --- a/wrlib/view.c +++ b/wrlib/view.c @@ -62,4 +62,5 @@ int main(int argc, char **argv) XFlush(dpy); getchar(); + exit(0); } -- 2.11.4.GIT