kwo pushed a commit to branch master. http://git.enlightenment.org/e16/e16.git/commit/?id=ca5040e6439f3b3fea5e2593d38175be820d024c
commit ca5040e6439f3b3fea5e2593d38175be820d024c Author: Kim Woelders <k...@woelders.dk> Date: Sun Feb 4 09:35:32 2018 +0100 Remove pseudotransparency support - 3 - Remove obsolete image type argument. --- src/borders.c | 7 +++---- src/buttons.c | 4 ++-- src/container.c | 18 +++++++----------- src/coords.c | 5 ++--- src/desktops.c | 9 ++++----- src/dialog.c | 19 +++++++++---------- src/dock.c | 4 ++-- src/hiwin.c | 4 ++-- src/iclass.c | 25 ++++++++++--------------- src/iclass.h | 24 ++++-------------------- src/icons.c | 5 ++--- src/menus.c | 9 +++------ src/pager.c | 6 +++--- src/progress.c | 10 +++++----- src/startup.c | 6 +++--- src/tooltips.c | 7 +++---- src/warp.c | 4 ++-- 17 files changed, 66 insertions(+), 100 deletions(-) diff --git a/src/borders.c b/src/borders.c index 4ddc76b7..91614d47 100644 --- a/src/borders.c +++ b/src/borders.c @@ -1,6 +1,6 @@ /* * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors - * Copyright (C) 2004-2017 Kim Woelders + * Copyright (C) 2004-2018 Kim Woelders * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to @@ -121,9 +121,8 @@ BorderWinpartITclassApply(EWin * ewin, int i, int force) ewb->is = is; ewb->ts = ts; - ITApply(ewb->win, ebp->iclass, is, ewb->state, - ewin->state.active, EoIsSticky(ewin), ST_BORDER, - ebp->tclass, ts, txt, flags); + ITApply(ewb->win, ebp->iclass, is, ewb->state, ewin->state.active, + EoIsSticky(ewin), ebp->tclass, ts, txt, flags); if (ebp->flags & FLAG_MINIICON) { diff --git a/src/buttons.c b/src/buttons.c index 25ef96d6..20a35fe8 100644 --- a/src/buttons.c +++ b/src/buttons.c @@ -1,6 +1,6 @@ /* * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors - * Copyright (C) 2004-2015 Kim Woelders + * Copyright (C) 2004-2018 Kim Woelders * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to @@ -264,7 +264,7 @@ static void ButtonDraw(Button * b) { ITApply(EoGetWin(b), b->iclass, NULL, - b->state, 0, 0, ST_BUTTON, b->tclass, NULL, b->label, 0); + b->state, 0, 0, b->tclass, NULL, b->label, 0); EoShapeUpdate(b, 0); } diff --git a/src/container.c b/src/container.c index a9fda4b1..cabc68bc 100644 --- a/src/container.c +++ b/src/container.c @@ -907,19 +907,16 @@ ContainerDrawScroll(Container * ct) } } - ImageclassApply(ic_base, ct->scroll_win, 0, 0, STATE_NORMAL, ST_ICONBOX); - ImageclassApply(ic_knob, ct->scrollbar_win, 0, 0, ST(ct->scrollbar_state), - ST_ICONBOX); + ImageclassApply(ic_base, ct->scroll_win, 0, 0, STATE_NORMAL); + ImageclassApply(ic_knob, ct->scrollbar_win, 0, 0, ST(ct->scrollbar_state)); if (WinIsMapped(ct->scrollbarknob_win)) ImageclassApply(ic_snob, ct->scrollbarknob_win, 0, 0, - ST(ct->scrollbar_state), ST_ICONBOX); + ST(ct->scrollbar_state)); if (WinIsMapped(ct->arrow1_win)) { - ImageclassApply(ic_arr1, ct->arrow1_win, 0, 0, ST(ct->arrow1_state), - ST_ICONBOX); - ImageclassApply(ic_arr2, ct->arrow2_win, 0, 0, ST(ct->arrow2_state), - ST_ICONBOX); + ImageclassApply(ic_arr1, ct->arrow1_win, 0, 0, ST(ct->arrow1_state)); + ImageclassApply(ic_arr2, ct->arrow2_win, 0, 0, ST(ct->arrow2_state)); } } @@ -1082,8 +1079,7 @@ ContainerDraw(Container * ct) { EMoveResizeWindow(ct->cover_win, ib_xlt, ib_ylt, ib_ww, ib_hh); EMapWindow(ct->cover_win); - ImageclassApply(ib_ic_cover, ct->cover_win, 0, 0, STATE_NORMAL, - ST_ICONBOX); + ImageclassApply(ib_ic_cover, ct->cover_win, 0, 0, STATE_NORMAL); } else { @@ -1100,7 +1096,7 @@ ContainerDraw(Container * ct) { /* Start out with iconbox image class image */ im = ImageclassGetImageBlended(ct->ic_box, ct->icon_win, ib_w0, ib_h0, - 0, 0, STATE_NORMAL, ST_ICONBOX); + 0, 0, STATE_NORMAL); } else { diff --git a/src/coords.c b/src/coords.c index 37aebe08..1cff5111 100644 --- a/src/coords.c +++ b/src/coords.c @@ -1,6 +1,6 @@ /* * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors - * Copyright (C) 2006-2013 Kim Woelders + * Copyright (C) 2006-2018 Kim Woelders * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to @@ -142,8 +142,7 @@ _CoordsShow(EWin * ewin, int mode) EobjMap(eo, 0); } - ITApply(EobjGetWin(eo), ic, NULL, STATE_NORMAL, 1, 0, ST_SOLID, tc, NULL, s, - 1); + ITApply(EobjGetWin(eo), ic, NULL, STATE_NORMAL, 1, 0, tc, NULL, s, 1); if (md) /* Assuming that shape change only happens when size changes too */ EobjShapeUpdate(eo, 0); diff --git a/src/desktops.c b/src/desktops.c index 9a80c0cd..6ae8685f 100644 --- a/src/desktops.c +++ b/src/desktops.c @@ -1,6 +1,6 @@ /* * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors - * Copyright (C) 2004-2015 Kim Woelders + * Copyright (C) 2004-2018 Kim Woelders * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to @@ -2398,7 +2398,7 @@ CB_DesktopDisplayRedraw(Dialog * d, int val, void *data) if (!dd->initialised) { ic = ImageclassFind("SETTINGS_DESKTOP_AREA", 1); - ImageclassApply(ic, win, 0, 0, STATE_NORMAL, ST_SOLID); + ImageclassApply(ic, win, 0, 0, STATE_NORMAL); dd->initialised = 1; } @@ -2426,8 +2426,7 @@ CB_DesktopDisplayRedraw(Dialog * d, int val, void *data) else { ic = ImageclassFind("SETTINGS_DESKTOP_AREA", 1); - ImageclassApply(ic, dd->wins[i], 0, 0, STATE_NORMAL, - ST_SOLID); + ImageclassApply(ic, dd->wins[i], 0, 0, STATE_NORMAL); } } } @@ -2633,7 +2632,7 @@ CB_AreaDisplayRedraw(Dialog * d, int val, void *data) EX_Pixmap pmap; ic = ImageclassFind("SETTINGS_AREA_AREA", 1); - ImageclassApply(ic, win, 0, 0, STATE_NORMAL, ST_SOLID); + ImageclassApply(ic, win, 0, 0, STATE_NORMAL); /* Note: awin is destroyed when the dialog is destroyed */ dd->awin = ECreateWindow(win, 0, 0, 18, 14, 0); diff --git a/src/dialog.c b/src/dialog.c index d76df4bc..56c25aea 100644 --- a/src/dialog.c +++ b/src/dialog.c @@ -330,7 +330,7 @@ DialogRedraw(Dialog * d) PmapMaskFree(&d->pmm_bg); ImageclassApplyCopy(d->iclass, d->win, d->w, d->h, 0, 0, STATE_NORMAL, - &(d->pmm_bg), IC_FLAG_FULL_SIZE, ST_DIALOG); + &(d->pmm_bg), IC_FLAG_FULL_SIZE); if (d->pmm_bg.pmap == NoXID) return; @@ -1339,8 +1339,7 @@ DialogDrawItem(Dialog * d, DItem * di) di->item.slider.knob_w, di->item.slider.knob_h); if (di->item.slider.base_win) ImageclassApply(di->item.slider.ic_base, - di->item.slider.base_win, - 0, 0, STATE_NORMAL, ST_WIDGET); + di->item.slider.base_win, 0, 0, STATE_NORMAL); state = STATE_NORMAL; if ((di->hilited) && (di->clicked)) state = STATE_CLICKED; @@ -1350,7 +1349,7 @@ DialogDrawItem(Dialog * d, DItem * di) state = STATE_CLICKED; if (di->item.slider.knob_win) ImageclassApply(di->item.slider.ic_knob, - di->item.slider.knob_win, 0, 0, state, ST_WIDGET); + di->item.slider.knob_win, 0, 0, state); break; case DITEM_BUTTON: @@ -1362,13 +1361,13 @@ DialogDrawItem(Dialog * d, DItem * di) else if (!(di->hilited) && (di->clicked)) state = STATE_CLICKED; ITApply(di->win, di->iclass, NULL, state, 0, 0, - ST_WIDGET, di->tclass, NULL, di->text, 0); + di->tclass, NULL, di->text, 0); break; case DITEM_AREA: if (!d->redraw) break; - ImageclassApply(di->iclass, di->win, 0, 0, STATE_NORMAL, ST_DIALOG); + ImageclassApply(di->iclass, di->win, 0, 0, STATE_NORMAL); if (di->item.area.init_func) di->item.area.init_func(di, 0, NULL); break; @@ -1377,9 +1376,9 @@ DialogDrawItem(Dialog * d, DItem * di) if (!d->redraw) break; if (di->item.separator.horizontal) - ImageclassApply(di->iclass, di->win, 0, 0, STATE_NORMAL, ST_WIDGET); + ImageclassApply(di->iclass, di->win, 0, 0, STATE_NORMAL); else - ImageclassApply(di->iclass, di->win, 0, 0, STATE_CLICKED, ST_WIDGET); + ImageclassApply(di->iclass, di->win, 0, 0, STATE_CLICKED); break; case DITEM_TEXT: @@ -1408,7 +1407,7 @@ DialogDrawItem(Dialog * d, DItem * di) else if (!(di->hilited) && (di->clicked)) state = STATE_CLICKED; ImageclassApply(di->iclass, di->item.check_button.check_win, - DialogItemCheckButtonGetState(di), 0, state, ST_WIDGET); + DialogItemCheckButtonGetState(di), 0, state); if (!d->redraw && (TextclassGetTextState(di->tclass, di->state, 0, 0) == TextclassGetTextState(di->tclass, state, 0, 0))) @@ -1427,7 +1426,7 @@ DialogDrawItem(Dialog * d, DItem * di) else if (!(di->hilited) && (di->clicked)) state = STATE_CLICKED; ImageclassApply(di->iclass, di->item.radio_button.radio_win, - di->item.radio_button.onoff, 0, state, ST_WIDGET); + di->item.radio_button.onoff, 0, state); if (!d->redraw && (TextclassGetTextState(di->tclass, di->state, 0, 0) == TextclassGetTextState(di->tclass, state, 0, 0))) diff --git a/src/dock.c b/src/dock.c index f53e9aac..c6d4ce65 100644 --- a/src/dock.c +++ b/src/dock.c @@ -1,6 +1,6 @@ /* * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors - * Copyright (C) 2004-2015 Kim Woelders + * Copyright (C) 2004-2018 Kim Woelders * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to @@ -148,5 +148,5 @@ DockIt(EWin * ewin) XMapWindow(disp, ewin->icccm.icon_win); } - ImageclassApply(ic, EoGetWin(ewin), 0, 0, STATE_NORMAL, ST_BUTTON); + ImageclassApply(ic, EoGetWin(ewin), 0, 0, STATE_NORMAL); } diff --git a/src/hiwin.c b/src/hiwin.c index c3b8bd5d..5a8a4b09 100644 --- a/src/hiwin.c +++ b/src/hiwin.c @@ -1,6 +1,6 @@ /* * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors - * Copyright (C) 2004-2015 Kim Woelders + * Copyright (C) 2004-2018 Kim Woelders * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to @@ -155,7 +155,7 @@ HiwinRenderIclassInit(Hiwin * phi __UNUSED__) static void HiwinRenderIclassDraw(Hiwin * phi) { - ImageclassApply(hiwin_ic, EoGetWin(phi), 0, 0, STATE_NORMAL, ST_PAGER); + ImageclassApply(hiwin_ic, EoGetWin(phi), 0, 0, STATE_NORMAL); } static void diff --git a/src/iclass.c b/src/iclass.c index 482a5a32..557dcafd 100644 --- a/src/iclass.c +++ b/src/iclass.c @@ -642,8 +642,7 @@ ImageclassGetImage(ImageClass * ic, int active, int sticky, int state) EImage * ImageclassGetImageBlended(ImageClass * ic, Win win __UNUSED__, int w, int h, - int active, int sticky, int state, - int image_type __UNUSED__) + int active, int sticky, int state) { ImageState *is; EImage *im, *bg; @@ -693,8 +692,7 @@ ImageclassGetImageBlended(ImageClass * ic, Win win __UNUSED__, int w, int h, static void ImagestateMakePmapMask(ImageState * is, Win win, PmapMask * pmm, - int pmapflags __UNUSED__, int w, int h, - int image_type __UNUSED__) + int pmapflags __UNUSED__, int w, int h) { if (is->pixmapfillstyle == FILL_STRETCH) { @@ -865,7 +863,7 @@ ImagestateDrawNoImg(ImageState * is, EX_Drawable draw, int x, int y, int w, void ITApply(Win win, ImageClass * ic, ImageState * is, - int state, int active, int sticky, int image_type, + int state, int active, int sticky, TextClass * tc, TextState * ts, const char *text, int flags) { int w, h; @@ -897,8 +895,7 @@ ITApply(Win win, ImageClass * ic, ImageState * is, { PmapMask pmm; - ImagestateMakePmapMask(is, win, &pmm, IC_FLAG_MAKE_MASK, w, h, - image_type); + ImagestateMakePmapMask(is, win, &pmm, IC_FLAG_MAKE_MASK, w, h); if (pmm.pmap) { @@ -966,11 +963,9 @@ ITApply(Win win, ImageClass * ic, ImageState * is, } void -ImageclassApply(ImageClass * ic, Win win, int active, int sticky, int state, - int image_type) +ImageclassApply(ImageClass * ic, Win win, int active, int sticky, int state) { - ITApply(win, ic, NULL, state, active, sticky, image_type, NULL, NULL, NULL, - 0); + ITApply(win, ic, NULL, state, active, sticky, NULL, NULL, NULL, 0); } static void @@ -1000,7 +995,7 @@ PmapMaskTile(PmapMask * pmm, Win win, unsigned int w, unsigned int h) void ImageclassApplyCopy(ImageClass * ic, Win win, int w, int h, int active, int sticky, int state, - PmapMask * pmm, int pmapflags, int image_type) + PmapMask * pmm, int pmapflags) { ImageState *is; @@ -1023,7 +1018,7 @@ ImageclassApplyCopy(ImageClass * ic, Win win, int w, int h, /* Imlib2 will not render pixmaps with dimensions > 8192 */ if (is->im && w <= 8192 && h <= 8192) { - ImagestateMakePmapMask(is, win, pmm, pmapflags, w, h, image_type); + ImagestateMakePmapMask(is, win, pmm, pmapflags, w, h); if ((pmapflags & IC_FLAG_FULL_SIZE) && pmm->pmap && (pmm->w != w || pmm->h != h)) @@ -1232,7 +1227,7 @@ ImageclassIpc(const char *params) else st = STATE_NORMAL; - ImageclassApply(ic, win, 0, 0, st, ST_SOLID); + ImageclassApply(ic, win, 0, 0, st); EDestroyWin(win); } else if (!strcmp(param2, "apply_copy")) @@ -1271,7 +1266,7 @@ ImageclassIpc(const char *params) } ImageclassApplyCopy(ic, win, w, h, 0, 0, st, &pmm, - IC_FLAG_MAKE_MASK | IC_FLAG_FULL_SIZE, ST_SOLID); + IC_FLAG_MAKE_MASK | IC_FLAG_FULL_SIZE); IpcPrintf("0x%08x 0x%08x\n", pmm.pmap, pmm.mask); EDestroyWin(win); } diff --git a/src/iclass.h b/src/iclass.h index 6655f3db..132d0c71 100644 --- a/src/iclass.h +++ b/src/iclass.h @@ -43,20 +43,6 @@ #define FILL_INT_TILE_H 4 #define FILL_INT_TILE_V 8 -/* Selective Transparency item types */ -#define ST_SOLID 0 -#define ST_BORDER 1 -#define ST_WIDGET 2 -#define ST_ICONBOX 3 -#define ST_MENU 4 -#define ST_MENU_ITEM 5 -#define ST_TOOLTIP 6 -#define ST_DIALOG 7 -#define ST_HILIGHT 8 -#define ST_PAGER 9 -#define ST_WARPLIST 10 -#define ST_BUTTON 11 - /* ImageclassApplyCopy flags */ #define IC_FLAG_NONE 0x00 /* No flags */ #define IC_FLAG_WRITABLE 0x01 /* Provide writable pixmaps */ @@ -85,18 +71,16 @@ void ImageclassApplySimple(ImageClass * ic, Win win, EX_Drawable draw, int state, int x, int y, int w, int h); void ImageclassApply(ImageClass * ic, Win win, - int active, int sticky, int state, - int image_type); + int active, int sticky, int state); void ImageclassApplyCopy(ImageClass * ic, Win win, int w, int h, int active, int sticky, int state, PmapMask * pmm, - int pmapflags, int image_type); + int pmapflags); EImage *ImageclassGetImageBlended(ImageClass * ic, Win win, int w, int h, int active, - int sticky, int state, - int image_type); + int sticky, int state); void ITApply(Win win, ImageClass * ic, ImageState * is, - int state, int active, int sticky, int image_type, + int state, int active, int sticky, TextClass * tc, TextState * ts, const char *text, int flags); diff --git a/src/icons.c b/src/icons.c index 5f16c06f..44c7dc06 100644 --- a/src/icons.c +++ b/src/icons.c @@ -1,6 +1,6 @@ /* * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors - * Copyright (C) 2004-2014 Kim Woelders + * Copyright (C) 2004-2018 Kim Woelders * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to @@ -230,8 +230,7 @@ IB_GetFallbackIcon(EWin * ewin, int size) IB_IconGetSize(ww, hh, size, 1, &w, &h); ic = ImageclassFind("ICONBOX_HORIZONTAL", 1); - im = ImageclassGetImageBlended(ic, EoGetWin(ewin), w, h, 0, 0, - STATE_NORMAL, ST_SOLID); + im = ImageclassGetImageBlended(ic, EoGetWin(ewin), w, h, 0, 0, STATE_NORMAL); return im; } diff --git a/src/menus.c b/src/menus.c index e8533429..a22fc336 100644 --- a/src/menus.c +++ b/src/menus.c @@ -907,8 +907,7 @@ MenuRedraw(Menu * m) { PmapMaskFree(&m->pmm); ImageclassApplyCopy(m->style->bg_iclass, m->win, m->w, m->h, 0, - 0, STATE_NORMAL, &m->pmm, IC_FLAG_MAKE_MASK, - ST_MENU); + 0, STATE_NORMAL, &m->pmm, IC_FLAG_MAKE_MASK); EGetWindowBackgroundPixmap(m->win); EXCopyAreaTiled(m->pmm.pmap, NoXID, WinGetPmap(m->win), 0, 0, m->w, m->h, 0, 0); @@ -939,7 +938,6 @@ MenuDrawItem(Menu * m, MenuItem * mi, char shape, int state) if (!mi_pmm->pmap) { int x, y, w, h; - int item_type; ImageClass *ic; PmapMask pmm; EImage *im; @@ -951,7 +949,6 @@ MenuDrawItem(Menu * m, MenuItem * mi, char shape, int state) mi_pmm->mask = NoXID; ic = (mi->child) ? m->style->sub_iclass : m->style->item_iclass; - item_type = (mi->state != STATE_NORMAL) ? ST_MENU_ITEM : ST_MENU; if (!m->style->use_item_bg) { @@ -959,7 +956,7 @@ MenuDrawItem(Menu * m, MenuItem * mi, char shape, int state) if ((mi->state != STATE_NORMAL) || (mi->child)) { ImageclassApplyCopy(ic, mi->win, w, h, 0, 0, mi->state, &pmm, - IC_FLAG_MAKE_MASK, item_type); + IC_FLAG_MAKE_MASK); EXCopyAreaTiled(pmm.pmap, pmm.mask, mi_pmm->pmap, 0, 0, w, h, 0, 0); PmapMaskFree(&pmm); @@ -968,7 +965,7 @@ MenuDrawItem(Menu * m, MenuItem * mi, char shape, int state) else { ImageclassApplyCopy(ic, mi->win, w, h, 0, 0, mi->state, &pmm, - IC_FLAG_MAKE_MASK, item_type); + IC_FLAG_MAKE_MASK); EXCopyAreaTiled(pmm.pmap, pmm.mask, mi_pmm->pmap, 0, 0, w, h, 0, 0); PmapMaskFree(&pmm); diff --git a/src/pager.c b/src/pager.c index e661058e..9ac921a5 100644 --- a/src/pager.c +++ b/src/pager.c @@ -1,6 +1,6 @@ /* * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors - * Copyright (C) 2004-2015 Kim Woelders + * Copyright (C) 2004-2018 Kim Woelders * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to @@ -680,7 +680,7 @@ _PagerEwinMoveResize(EWin * ewin, int resize __UNUSED__) { DeskGetArea(p->dsk, &cx, &cy); EMoveResizeWindow(p->sel_win, cx * p->dw, cy * p->dh, p->dw, p->dh); - ImageclassApply(ic, p->sel_win, 0, 0, STATE_NORMAL, ST_PAGER); + ImageclassApply(ic, p->sel_win, 0, 0, STATE_NORMAL); } } @@ -1070,7 +1070,7 @@ _PagerUpdateSel(Pager * p, void *prm __UNUSED__) EMapWindow(p->sel_win); ic = ImageclassFind("PAGER_SEL", 0); if (ic) - ImageclassApply(ic, p->sel_win, 0, 0, STATE_NORMAL, ST_PAGER); + ImageclassApply(ic, p->sel_win, 0, 0, STATE_NORMAL); } } diff --git a/src/progress.c b/src/progress.c index 00d81db9..fd4d1c37 100644 --- a/src/progress.c +++ b/src/progress.c @@ -1,6 +1,6 @@ /* * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors - * Copyright (C) 2006-2013 Kim Woelders + * Copyright (C) 2006-2018 Kim Woelders * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to @@ -150,7 +150,7 @@ ProgressbarSet(Progressbar * p, int progress) Esnprintf(s, sizeof(s), "%i%%", p->value); EobjResize(p->p_win, w, p->h); - ImageclassApply(p->ic, EobjGetWin(p->p_win), 1, 0, STATE_NORMAL, ST_SOLID); + ImageclassApply(p->ic, EobjGetWin(p->p_win), 1, 0, STATE_NORMAL); EobjShapeUpdate(p->p_win, 0); pad = ImageclassGetPadding(p->ic); @@ -169,9 +169,9 @@ ProgressbarShow(Progressbar * p) { EImageBorder *pad; - ImageclassApply(p->ic, EobjGetWin(p->win), 0, 0, STATE_NORMAL, ST_SOLID); - ImageclassApply(p->ic, EobjGetWin(p->n_win), 0, 0, STATE_CLICKED, ST_SOLID); - ImageclassApply(p->ic, EobjGetWin(p->p_win), 1, 0, STATE_NORMAL, ST_SOLID); + ImageclassApply(p->ic, EobjGetWin(p->win), 0, 0, STATE_NORMAL); + ImageclassApply(p->ic, EobjGetWin(p->n_win), 0, 0, STATE_CLICKED); + ImageclassApply(p->ic, EobjGetWin(p->p_win), 1, 0, STATE_NORMAL); EobjMap(p->win, 0); EobjMap(p->n_win, 0); diff --git a/src/startup.c b/src/startup.c index e8d6e722..27857dbe 100644 --- a/src/startup.c +++ b/src/startup.c @@ -1,6 +1,6 @@ /* * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors - * Copyright (C) 2004-2013 Kim Woelders + * Copyright (C) 2004-2018 Kim Woelders * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to @@ -100,8 +100,8 @@ StartupWindowsCreate(void) EMapRaised(b1); EMapRaised(b2); - ImageclassApply(ic, b1, 0, 0, 0, ST_SOLID); - ImageclassApply(ic, b2, 0, 0, 0, ST_SOLID); + ImageclassApply(ic, b1, 0, 0, 0); + ImageclassApply(ic, b2, 0, 0, 0); } BackgroundSet(bg, win1, WinGetW(VROOT), WinGetH(VROOT)); diff --git a/src/tooltips.c b/src/tooltips.c index 73ba2681..86fd333a 100644 --- a/src/tooltips.c +++ b/src/tooltips.c @@ -1,6 +1,6 @@ /* * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors - * Copyright (C) 2004-2015 Kim Woelders + * Copyright (C) 2004-2018 Kim Woelders * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to @@ -423,7 +423,7 @@ TooltipShow(ToolTip * tt, const char *text, ActionClass * ac, int x, int y) iy = (h - ih) / 2; EMoveResizeWindow(tt->iwin, ix, iy, iw, ih); EMapWindow(tt->iwin); - ImageclassApply(tt->tooltippic, tt->iwin, 0, 0, STATE_NORMAL, ST_SOLID); + ImageclassApply(tt->tooltippic, tt->iwin, 0, 0, STATE_NORMAL); } else EUnmapWindow(tt->iwin); @@ -556,8 +556,7 @@ TooltipShow(ToolTip * tt, const char *text, ActionClass * ac, int x, int y) eo = tt->win[i]; if (!eo) continue; - ImageclassApply(tt->iclass[i], EobjGetWin(eo), 0, 0, STATE_NORMAL, - ST_TOOLTIP); + ImageclassApply(tt->iclass[i], EobjGetWin(eo), 0, 0, STATE_NORMAL); EobjShapeUpdate(eo, 0); EobjMap(eo, 0); } diff --git a/src/warp.c b/src/warp.c index 8b6c656a..4bfe0716 100644 --- a/src/warp.c +++ b/src/warp.c @@ -1,6 +1,6 @@ /* * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors - * Copyright (C) 2004-2016 Kim Woelders + * Copyright (C) 2004-2018 Kim Woelders * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to @@ -258,7 +258,7 @@ WarpFocusWinPaint(WarpFocusWin * fw) state = (i == warpFocusIndex) ? STATE_CLICKED : STATE_NORMAL; - ImageclassApply(fw->ic, wi->win, 0, 0, state, ST_WARPLIST); + ImageclassApply(fw->ic, wi->win, 0, 0, state); iw = 0; if (Conf.warplist.icon_mode != 0) --