From ccbb6e8e15b43cc8a0b94392e393082d9f2c1ecc Mon Sep 17 00:00:00 2001 From: dan Date: Sun, 24 Sep 2000 02:31:58 +0000 Subject: [PATCH] Fixed some bugs, and compilation warnings. --- WINGs/array.c | 10 +++++----- WINGs/bagtree.c | 6 +++--- WINGs/fontmanager.c | 15 ++++++--------- WINGs/wcolorpanel.c | 2 +- WINGs/wlist.c | 1 - WINGs/wruler.c | 8 ++++---- WINGs/wtext.c | 13 ++++++------- WPrefs.app/Appearance.c | 8 ++++---- WPrefs.app/Font.c | 7 +++---- WPrefs.app/WPrefs.h | 3 +++ WPrefs.app/editmenu.h | 2 +- src/shutdown.c | 17 ++++++++--------- util/wmsetup.c | 1 + wrlib/testrot.c | 1 + 14 files changed, 46 insertions(+), 48 deletions(-) diff --git a/WINGs/array.c b/WINGs/array.c index a82b70f0..8dd77047 100644 --- a/WINGs/array.c +++ b/WINGs/array.c @@ -20,17 +20,17 @@ typedef struct W_Array { - void **items; /* the array data */ - int itemCount; /* # of items in array */ - int allocSize; /* allocated size of array */ - void (*destructor)(void *item); /* the destructor to free elements */ + void **items; /* the array data */ + int itemCount; /* # of items in array */ + int allocSize; /* allocated size of array */ + WMFreeDataProc *destructor; /* the destructor to free elements */ } W_Array; WMArray* WMCreateArray(int initialSize) { - WMCreateArrayWithDestructor(initialSize, NULL); + return WMCreateArrayWithDestructor(initialSize, NULL); } diff --git a/WINGs/bagtree.c b/WINGs/bagtree.c index 1cacb001..4e7b0c2e 100644 --- a/WINGs/bagtree.c +++ b/WINGs/bagtree.c @@ -395,7 +395,7 @@ WMCreateTreeBag(void) WMBag* -WMCreateTreeBagWithDestructor(void (*destructor)(void*)) +WMCreateTreeBagWithDestructor(WMFreeDataProc *destructor) { WMBag *bag; @@ -752,7 +752,7 @@ WMMapBag(WMBag *self, void (*function)(void*, void*), void *data) static int -findInTree(W_Bag *tree, W_Node *node, int (*function)(void*,void*), void *cdata) +findInTree(W_Bag *tree, W_Node *node, WMMatchDataProc *function, void *cdata) { int index; @@ -772,7 +772,7 @@ findInTree(W_Bag *tree, W_Node *node, int (*function)(void*,void*), void *cdata) int -WMFindInBag(WMBag *self, int (*match)(void*,void*), void *cdata) +WMFindInBag(WMBag *self, WMMatchDataProc *match, void *cdata) { return findInTree(self, self->root, match, cdata); } diff --git a/WINGs/fontmanager.c b/WINGs/fontmanager.c index 28a1928a..dce8f9ff 100644 --- a/WINGs/fontmanager.c +++ b/WINGs/fontmanager.c @@ -32,11 +32,9 @@ changeFontProp(char *fname, char *newprop, int which) WMFont * WMGetFontPlain(WMScreen *scrPtr, WMFont *font) { - WMFont *nfont=NULL; - if(!scrPtr|| !font) - return NULL; - return font; - + if(!scrPtr || !font) + return NULL; + return font; } WMFont * @@ -72,10 +70,9 @@ WMGetFontItalic(WMScreen *scrPtr, WMFont *font) WMFont * WMGetFontOfSize(WMScreen *scrPtr, WMFont *font, int size) { - WMFont *nfont=NULL; - if(!scrPtr || !font || size<1) - return NULL; - return font; + if(!scrPtr || !font || size<1) + return NULL; + return font; } diff --git a/WINGs/wcolorpanel.c b/WINGs/wcolorpanel.c index 481c5357..bf09e19e 100644 --- a/WINGs/wcolorpanel.c +++ b/WINGs/wcolorpanel.c @@ -2158,7 +2158,7 @@ wheelRender(W_ColorPanel *panel) unsigned char *ptr; RColor gray; unsigned long ofs = 0; - unsigned char shift = getShift(sizeof(unsigned char)); + /*unsigned char shift = getShift(sizeof(unsigned char));*/ image = RCreateImage(colorWheelSize+4, colorWheelSize+4, True); if (!image) { diff --git a/WINGs/wlist.c b/WINGs/wlist.c index 68ce3665..04f854bd 100644 --- a/WINGs/wlist.c +++ b/WINGs/wlist.c @@ -270,7 +270,6 @@ void WMClearList(WMList *lPtr) { int oldSelected = lPtr->selectedItem; - int i; WMEmptyArray(lPtr->items); diff --git a/WINGs/wruler.c b/WINGs/wruler.c index 6799c24b..14ae652c 100644 --- a/WINGs/wruler.c +++ b/WINGs/wruler.c @@ -223,8 +223,6 @@ static void drawRulerOnPixmap(Ruler * rPtr) static void paintRuler(Ruler * rPtr) { - WMScreen *screen = rPtr->view->screen; - if (!rPtr->drawBuffer || !rPtr->view->flags.realized) return; @@ -337,7 +335,6 @@ static void rulerDidResize(W_ViewDelegate * self, WMView * view) static void handleEvents(XEvent * event, void *data) { Ruler *rPtr = (Ruler *) data; - Display *dpy = event->xany.display; switch (event->type) { case Expose: @@ -487,6 +484,7 @@ void WMSetRulerMargins(WMRuler * rPtr, WMRulerMargins margins) } + WMRulerMargins * WMGetRulerMargins(WMRuler * rPtr) { @@ -505,8 +503,10 @@ WMGetRulerMargins(WMRuler * rPtr) /*for */ margins->tabs = rPtr->margins.tabs; + return margins; } + Bool WMIsMarginEqualToMargin(WMRulerMargins *aMargin, WMRulerMargins *anotherMargin) { @@ -541,7 +541,7 @@ void WMSetRulerOffset(WMRuler * rPtr, int pixels) int WMGetRulerOffset(WMRuler * rPtr) { if (!rPtr) - return; + return 0; /* what value should return if no ruler? -1 or 0? */ return rPtr->offset; } diff --git a/WINGs/wtext.c b/WINGs/wtext.c index f423d791..30462138 100644 --- a/WINGs/wtext.c +++ b/WINGs/wtext.c @@ -1902,16 +1902,15 @@ handleTextKeyPress(Text *tPtr, XEvent *event) if (((XKeyEvent *) event)->state & ControlMask) control_pressed = True; buffer[XLookupString(&event->xkey, buffer, 1, &ksym, NULL)] = 0; - + switch(ksym) { case XK_Right: -WMScrollText(tPtr, -14); + WMScrollText(tPtr, -14); case XK_Left: { - TextBlock *tb = tPtr->currentTextBlock; - int x = tPtr->cursor.x + tPtr->visible.x; - int y = tPtr->visible.y + tPtr->cursor.y + tPtr->cursor.h; - int w, pos; + //TextBlock *tb = tPtr->currentTextBlock; + //int x = tPtr->cursor.x + tPtr->visible.x; + //int y = tPtr->visible.y + tPtr->cursor.y + tPtr->cursor.h; #if 0 if(!tb) @@ -1931,7 +1930,7 @@ WMScrollText(tPtr, -14); 3 + tPtr->visible.y + tPtr->cursor.y + tPtr->cursor.h - tPtr->vpos); if(x == tPtr->cursor.x + tPtr->visible.x) { -printf("same %d %d\n", x, tPtr->cursor.x + tPtr->visible.x); + printf("same %d %d\n", x, tPtr->cursor.x + tPtr->visible.x); cursorToTextPosition(tPtr, tPtr->visible.x, 3 + tPtr->visible.y + tPtr->cursor.y + tPtr->cursor.h); } diff --git a/WPrefs.app/Appearance.c b/WPrefs.app/Appearance.c index ccf4a0d3..2746f32d 100644 --- a/WPrefs.app/Appearance.c +++ b/WPrefs.app/Appearance.c @@ -1798,7 +1798,7 @@ createPanel(Panel *p) WMSetButtonImagePosition(panel->newB, WIPAbove); WMSetButtonText(panel->newB, _("New")); WMSetButtonAction(panel->newB, newTexture, panel); - SetButtonAlphaImage(scr, panel->newB, TNEW_FILE); + SetButtonAlphaImage(scr, panel->newB, TNEW_FILE, NULL, NULL); WMSetBalloonTextForView(_("Create a new texture."), WMWidgetView(panel->newB)); @@ -1810,7 +1810,7 @@ createPanel(Panel *p) WMSetButtonImagePosition(panel->ripB, WIPAbove); WMSetButtonText(panel->ripB, _("Extract...")); WMSetButtonAction(panel->ripB, extractTexture, panel); - SetButtonAlphaImage(scr, panel->ripB, TEXTR_FILE); + SetButtonAlphaImage(scr, panel->ripB, TEXTR_FILE, NULL, NULL); WMSetBalloonTextForView(_("Extract texture(s) from a theme or a style file."), WMWidgetView(panel->ripB)); @@ -1823,7 +1823,7 @@ createPanel(Panel *p) WMSetButtonFont(panel->editB, font); WMSetButtonImagePosition(panel->editB, WIPAbove); WMSetButtonText(panel->editB, _("Edit")); - SetButtonAlphaImage(scr, panel->editB, TEDIT_FILE); + SetButtonAlphaImage(scr, panel->editB, TEDIT_FILE, NULL, NULL); WMSetButtonAction(panel->editB, editTexture, panel); WMSetBalloonTextForView(_("Edit the highlighted texture."), WMWidgetView(panel->editB)); @@ -1834,7 +1834,7 @@ createPanel(Panel *p) WMSetButtonFont(panel->delB, font); WMSetButtonImagePosition(panel->delB, WIPAbove); WMSetButtonText(panel->delB, _("Delete")); - SetButtonAlphaImage(scr, panel->delB, TDEL_FILE); + SetButtonAlphaImage(scr, panel->delB, TDEL_FILE, NULL, NULL); WMSetButtonEnabled(panel->delB, False); WMSetButtonAction(panel->delB, deleteTexture, panel); WMSetBalloonTextForView(_("Delete the highlighted texture."), diff --git a/WPrefs.app/Font.c b/WPrefs.app/Font.c index 1842273c..701011c7 100644 --- a/WPrefs.app/Font.c +++ b/WPrefs.app/Font.c @@ -335,11 +335,10 @@ error: static void changeLanguageAction(WMWidget *w, void *data) { - Panel *panel = (Panel*)data; + /*Panel *panel = (Panel*)data;*/ WMMenuItem *mi; - proplist_t pl, font; - char buffer[512]; - + proplist_t pl; + mi = WMGetPopUpButtonMenuItem(w, WMGetPopUpButtonSelectedItem(w)); pl = WMGetMenuItemRepresentedObject(mi); diff --git a/WPrefs.app/WPrefs.h b/WPrefs.app/WPrefs.h index 6e8308c8..fc2195e6 100644 --- a/WPrefs.app/WPrefs.h +++ b/WPrefs.app/WPrefs.h @@ -80,6 +80,9 @@ void AddSection(Panel *panel, char *iconFile); char *LocateImage(char *name); +void SetButtonAlphaImage(WMScreen *scr, WMButton *bPtr, char *file, + char *title1, char *title2); + WMWindow *GetWindow(Panel *panel); /* manipulate the dictionary for the WindowMaker domain */ diff --git a/WPrefs.app/editmenu.h b/WPrefs.app/editmenu.h index bec1038b..5dbca382 100644 --- a/WPrefs.app/editmenu.h +++ b/WPrefs.app/editmenu.h @@ -106,7 +106,7 @@ void WEditMenuHide(WEditMenu *menu); void WEditMenuUnhide(WEditMenu *menu); -void WEdirMenuShowAt(WEditMenu *menu, int x, int y); +void WEditMenuShowAt(WEditMenu *menu, int x, int y); #endif diff --git a/src/shutdown.c b/src/shutdown.c index d3513496..5c3293a2 100644 --- a/src/shutdown.c +++ b/src/shutdown.c @@ -144,33 +144,32 @@ Shutdown(WShutdownMode mode) } - - -static restoreWindows(WMBag *bag, WMBagIterator iter) +static void +restoreWindows(WMBag *bag, WMBagIterator iter) { WCoreWindow *next; WCoreWindow *core; WWindow *wwin; - + if (iter == NULL) { core = WMBagFirst(bag, &iter); } else { core = WMBagNext(bag, &iter); } - + if (core == NULL) return; - + restoreWindows(bag, iter); - + /* go to the end of the list */ while (core->stacking->under) core = core->stacking->under; while (core) { next = core->stacking->above; - + if (core->descriptor.parent_type==WCLASS_WINDOW) { Window window; @@ -182,7 +181,7 @@ static restoreWindows(WMBag *bag, WMBagIterator iter) core = next; } } - + /* *---------------------------------------------------------------------- diff --git a/util/wmsetup.c b/util/wmsetup.c index 0768d572..c1fdf0e4 100644 --- a/util/wmsetup.c +++ b/util/wmsetup.c @@ -18,6 +18,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #if 1 +int main() { } diff --git a/wrlib/testrot.c b/wrlib/testrot.c index 68cc4912..97ab7c05 100644 --- a/wrlib/testrot.c +++ b/wrlib/testrot.c @@ -4,6 +4,7 @@ #include "wraster.h" #include #include +#include #include "tile.xpm" Display *dpy; Window win; -- 2.11.4.GIT