e16
/
e16
3
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Remove unused parameter. 

SVN revision: 41510
This commit is contained in:
Kim Woelders 2009-07-27 16:46:54 +00:00
parent 8ae039e08e
commit cdaddb3376
20 changed files with 77 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/borders.c
View File

@ -471,10 +471,10 @@ EwinBorderDetach(EWin * ewin)
TooltipsSetPending(0, NULL, NULL);
EventCallbackUnregister(EoGetWin(ewin), 0, BorderFrameHandleEvents, ewin);
EventCallbackUnregister(EoGetWin(ewin), BorderFrameHandleEvents, ewin);
for (i = 0; i < b->num_winparts; i++)
{
EventCallbackUnregister(ewin->bits[i].win, 0,
EventCallbackUnregister(ewin->bits[i].win,
BorderWinpartHandleEvents, &ewin->bits[i]);
if (ewin->bits[i].win)
EDestroyWindow(ewin->bits[i].win);
@ -512,7 +512,7 @@ EwinBorderSetTo(EWin * ewin, const Border * b)
ewin->state.no_border = b->num_winparts <= 0;
EventCallbackRegister(EoGetWin(ewin), 0, BorderFrameHandleEvents, ewin);
EventCallbackRegister(EoGetWin(ewin), BorderFrameHandleEvents, ewin);
if (b->num_winparts > 0)
ewin->bits = EMALLOC(EWinBit, b->num_winparts);
@ -524,7 +524,7 @@ EwinBorderSetTo(EWin * ewin, const Border * b)
ewin->bits[i].win = ECreateWindow(EoGetWin(ewin), -10, -10, 1, 1, 0);
ECursorApply(b->part[i].ec, ewin->bits[i].win);
EMapWindow(ewin->bits[i].win);
EventCallbackRegister(ewin->bits[i].win, 0,
EventCallbackRegister(ewin->bits[i].win,
BorderWinpartHandleEvents, &ewin->bits[i]);
if (b->part[i].flags & FLAG_TITLE)
ESelectInput(ewin->bits[i].win, EWIN_BORDER_TITLE_EVENT_MASK);

6
src/buttons.c
View File

@ -1,6 +1,6 @@
/*
* Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors
* Copyright (C) 2004-2008 Kim Woelders
* Copyright (C) 2004-2009 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
@ -165,7 +165,7 @@ ButtonCreate(const char *name, int id, const char *iclass,
EoSetFade(b, 1);
ESelectInput(EoGetWin(b), BUTTON_EVENT_MASK);
EventCallbackRegister(EoGetWin(b), 0, ButtonHandleEvents, b);
EventCallbackRegister(EoGetWin(b), ButtonHandleEvents, b);
return b;
}
@ -394,7 +394,7 @@ ButtonEmbedWindow(Button * b, Window WindowToEmbed)
EGetGeometry(WindowToEmbed, NULL, NULL, NULL, &w, &h, NULL, NULL);
EMoveWindow(b->inside_win, (EoGetW(b) - w) >> 1, (EoGetH(b) - h) >> 1);
b->event_win = ECreateEventWindow(EoGetWin(b), 0, 0, w, h);
EventCallbackRegister(b->event_win, 0, ButtonHandleEvents, b);
EventCallbackRegister(b->event_win, ButtonHandleEvents, b);
ESelectInput(b->event_win,
ButtonPressMask | ButtonReleaseMask | EnterWindowMask |

6
src/comms.c
View File

@ -1,6 +1,6 @@
/*
* Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors
* Copyright (C) 2004-2008 Kim Woelders
* Copyright (C) 2004-2009 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
@ -290,8 +290,8 @@ CommsInit(void)
comms_win = ECreateEventWindow(VROOT, -100, -100, 5, 5);
ESelectInput(comms_win, StructureNotifyMask | SubstructureNotifyMask);
EventCallbackRegister(comms_win, 0, ClientHandleCommsEvents, NULL);
EventCallbackRegister(VROOT, 0, ClientHandleRootEvents, NULL);
EventCallbackRegister(comms_win, ClientHandleCommsEvents, NULL);
EventCallbackRegister(VROOT, ClientHandleRootEvents, NULL);
Esnprintf(s, sizeof(s), "WINID %8lx", WinGetXwin(comms_win));
ecore_x_window_prop_string_set(WinGetXwin(comms_win), E16_ATOM_COMMS_WIN, s);

12
src/container.c
View File

@ -117,17 +117,17 @@ ContainerCreate(const char *name)
ct->win = ECreateClientWindow(VROOT, 0, 0, 1, 1);
ct->icon_win = ECreateWindow(ct->win, 0, 0, 128, 26, 0);
EventCallbackRegister(ct->icon_win, 0, ContainerEventIconWin, ct);
EventCallbackRegister(ct->icon_win, ContainerEventIconWin, ct);
ct->cover_win = ECreateWindow(ct->win, 0, 0, 128, 26, 0);
EventCallbackRegister(ct->cover_win, 0, ContainerEventCoverWin, ct);
EventCallbackRegister(ct->cover_win, ContainerEventCoverWin, ct);
ct->scroll_win = ECreateWindow(ct->win, 6, 26, 116, 6, 0);
EventCallbackRegister(ct->scroll_win, 0, ContainerEventScrollWin, ct);
EventCallbackRegister(ct->scroll_win, ContainerEventScrollWin, ct);
ct->arrow1_win = ECreateWindow(ct->win, 0, 26, 6, 6, 0);
EventCallbackRegister(ct->arrow1_win, 0, ContainerEventArrow1Win, ct);
EventCallbackRegister(ct->arrow1_win, ContainerEventArrow1Win, ct);
ct->arrow2_win = ECreateWindow(ct->win, 122, 26, 6, 6, 0);
EventCallbackRegister(ct->arrow2_win, 0, ContainerEventArrow2Win, ct);
EventCallbackRegister(ct->arrow2_win, ContainerEventArrow2Win, ct);
ct->scrollbar_win = ECreateWindow(ct->scroll_win, 122, 26, 6, 6, 0);
EventCallbackRegister(ct->scrollbar_win, 0, ContainerEventScrollbarWin, ct);
EventCallbackRegister(ct->scrollbar_win, ContainerEventScrollbarWin, ct);
ct->scrollbarknob_win = ECreateWindow(ct->scrollbar_win, -20, -20, 4, 4, 0);
ESelectInput(ct->icon_win,

10
src/desktops.c
View File

@ -386,7 +386,7 @@ DeskCreate(int desk, int configure)
EoSetNoRedirect(dsk, 1);
EoInit(dsk, EOBJ_TYPE_DESK, win,
0, 0, WinGetW(VROOT), WinGetH(VROOT), 0, buf);
EventCallbackRegister(EoGetWin(dsk), 0, DeskHandleEvents, dsk);
EventCallbackRegister(EoGetWin(dsk), DeskHandleEvents, dsk);
dsk->bg.o = EoObj(dsk);
if (desk == 0)
{
@ -399,7 +399,7 @@ DeskCreate(int desk, int configure)
0, "Root-bg");
eo->floating = 0;
EobjSetLayer(eo, 0);
EventCallbackRegister(EobjGetWin(eo), 0, DeskHandleEvents, dsk);
EventCallbackRegister(EobjGetWin(eo), DeskHandleEvents, dsk);
dsk->bg.o_bg = eo;
ESelectInput(EobjGetWin(eo), EnterWindowMask);
#endif
@ -423,7 +423,7 @@ DeskCreate(int desk, int configure)
EobjReparent(eo, EoObj(dsk), 0, 0);
EobjSetLayer(eo, 0);
dsk->bg.o_bg = eo;
EventCallbackRegister(EobjGetWin(eo), 0, DeskHandleEvents, dsk);
EventCallbackRegister(EobjGetWin(eo), DeskHandleEvents, dsk);
#endif
#endif
@ -448,12 +448,12 @@ DeskDestroy(Desk * dsk)
#if USE_COMPOSITE
if (dsk->bg.o_bg)
{
EventCallbackUnregister(EobjGetWin(dsk->bg.o_bg), 0, DeskHandleEvents,
EventCallbackUnregister(EobjGetWin(dsk->bg.o_bg), DeskHandleEvents,
dsk);
EobjWindowDestroy(dsk->bg.o_bg);
}
#endif
EventCallbackUnregister(EoGetWin(dsk), 0, DeskHandleEvents, dsk);
EventCallbackUnregister(EoGetWin(dsk), DeskHandleEvents, dsk);
DeskControlsDestroy(dsk, 1);
DeskControlsDestroy(dsk, 2);

14
src/dialog.c
View File

@ -235,7 +235,7 @@ DialogCreate(const char *name)
d->name = Estrdup(name);
d->win = ECreateClientWindow(VROOT, -20, -20, 2, 2);
EventCallbackRegister(d->win, 0, DialogHandleEvents, d);
EventCallbackRegister(d->win, DialogHandleEvents, d);
d->iclass = ImageclassAlloc("DIALOG", 1);
d->tclass = TextclassAlloc("DIALOG", 1);
@ -330,7 +330,7 @@ DialogAddButton(Dialog * d, const char *text, DialogCallbackFunc * func,
db->func = func;
db->image = image;
db->win = ECreateWindow(d->win, -20, -20, 2, 2, 0);
EventCallbackRegister(db->win, 0, DButtonHandleEvents, db);
EventCallbackRegister(db->win, DButtonHandleEvents, db);
EMapWindow(db->win);
db->x = -1;
db->y = -1;
@ -1016,13 +1016,11 @@ DialogRealizeItem(Dialog * d, DItem * di)
ESelectInput(di->item.slider.base_win,
EnterWindowMask | LeaveWindowMask |
ButtonPressMask | ButtonReleaseMask);
EventCallbackRegister(di->item.slider.base_win, 0, DItemHandleEvents,
di);
EventCallbackRegister(di->item.slider.base_win, DItemHandleEvents, di);
ESelectInput(di->item.slider.knob_win,
EnterWindowMask | LeaveWindowMask |
ButtonPressMask | ButtonReleaseMask | PointerMotionMask);
EventCallbackRegister(di->item.slider.knob_win, 0, DItemHandleEvents,
di);
EventCallbackRegister(di->item.slider.knob_win, DItemHandleEvents, di);
if (!di->item.slider.ic_base)
{
@ -1098,7 +1096,7 @@ DialogRealizeItem(Dialog * d, DItem * di)
ESelectInput(di->item.area.area_win,
EnterWindowMask | LeaveWindowMask | ButtonPressMask |
ButtonReleaseMask | PointerMotionMask);
EventCallbackRegister(di->item.area.area_win, 0, DItemHandleEvents, di);
EventCallbackRegister(di->item.area.area_win, DItemHandleEvents, di);
di->w = iw;
di->h = ih;
break;
@ -1409,7 +1407,7 @@ DialogRealizeItem(Dialog * d, DItem * di)
}
if (di->win && register_win_callback)
EventCallbackRegister(di->win, 0, DItemHandleEvents, di);
EventCallbackRegister(di->win, DItemHandleEvents, di);
}
static void

8
src/ecompmgr.c
View File

@ -1583,7 +1583,7 @@ ECompMgrWinNew(EObj * eo)
cw->opacity = 0xdeadbeef;
ECompMgrWinSetOpacity(eo, eo->opacity);
EventCallbackRegister(EobjGetWin(eo), 0, ECompMgrHandleWindowEvent, eo);
EventCallbackRegister(EobjGetWin(eo), ECompMgrHandleWindowEvent, eo);
}
void
@ -1782,7 +1782,7 @@ ECompMgrWinDel(EObj * eo)
if (eo->fading)
ECompMgrWinFadeEnd(eo, 1);
EventCallbackUnregister(EobjGetWin(eo), 0, ECompMgrHandleWindowEvent, eo);
EventCallbackUnregister(EobjGetWin(eo), ECompMgrHandleWindowEvent, eo);
if (!eo->gone)
{
@ -2495,7 +2495,7 @@ ECompMgrStart(void)
rgn_tmp = ERegionCreate();
rgn_tmp2 = ERegionCreate();
EventCallbackRegister(VROOT, 0, ECompMgrHandleRootEvent, NULL);
EventCallbackRegister(VROOT, ECompMgrHandleRootEvent, NULL);
wm_cm_sel = SelectionAcquire("_NET_WM_CM_S", NULL, NULL);
@ -2563,7 +2563,7 @@ ECompMgrStop(void)
XCompositeUnredirectSubwindows(disp, WinGetXwin(VROOT),
CompositeRedirectManual);
EventCallbackUnregister(VROOT, 0, ECompMgrHandleRootEvent, NULL);
EventCallbackUnregister(VROOT, ECompMgrHandleRootEvent, NULL);
#if USE_COMPOSITE_OVERLAY_WINDOW
if (Mode_compmgr.cow != None)

10
src/edge.c
View File

@ -1,6 +1,6 @@
/*
* Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors
* Copyright (C) 2004-2008 Kim Woelders
* Copyright (C) 2004-2009 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
@ -242,10 +242,10 @@ EdgeWindowsShow(void)
ESelectInput(EobjGetWin(w2), EnterWindowMask | LeaveWindowMask);
ESelectInput(EobjGetWin(w3), EnterWindowMask | LeaveWindowMask);
ESelectInput(EobjGetWin(w4), EnterWindowMask | LeaveWindowMask);
EventCallbackRegister(EobjGetWin(w1), 0, EdgeHandleEvents, (void *)0);
EventCallbackRegister(EobjGetWin(w2), 0, EdgeHandleEvents, (void *)1);
EventCallbackRegister(EobjGetWin(w3), 0, EdgeHandleEvents, (void *)2);
EventCallbackRegister(EobjGetWin(w4), 0, EdgeHandleEvents, (void *)3);
EventCallbackRegister(EobjGetWin(w1), EdgeHandleEvents, (void *)0);
EventCallbackRegister(EobjGetWin(w2), EdgeHandleEvents, (void *)1);
EventCallbackRegister(EobjGetWin(w3), EdgeHandleEvents, (void *)2);
EventCallbackRegister(EobjGetWin(w4), EdgeHandleEvents, (void *)3);
}
DeskCurrentGetArea(&cx, &cy);
DesksGetAreaSize(&ax, &ay);

19
src/ewins.c
View File

@ -246,12 +246,11 @@ EwinManage(EWin * ewin)
EobjListFocusAdd(&ewin->o, 1);
EobjListOrderAdd(&ewin->o);
EventCallbackRegister(EoGetWin(ewin), 0,
EwinHandleEventsToplevel, ewin);
EventCallbackRegister(ewin->win_container, 0,
EwinHandleEventsContainer, ewin);
EventCallbackRegister(EwinGetClientWin(ewin), 0,
EwinHandleEventsClient, ewin);
EventCallbackRegister(EoGetWin(ewin), EwinHandleEventsToplevel, ewin);
EventCallbackRegister(ewin->win_container, EwinHandleEventsContainer,
ewin);
EventCallbackRegister(EwinGetClientWin(ewin), EwinHandleEventsClient,
ewin);
}
att.event_mask = EWIN_CONTAINER_EVENT_MASK;
@ -378,10 +377,10 @@ EwinDestroy(EWin * ewin)
Eprintf("EwinDestroy %#lx st=%d: %s\n", EwinGetClientXwin(ewin),
ewin->state.state, EwinGetTitle(ewin));
EventCallbackUnregister(EoGetWin(ewin), 0, EwinHandleEventsToplevel, ewin);
EventCallbackUnregister(ewin->win_container, 0, EwinHandleEventsContainer,
EventCallbackUnregister(EoGetWin(ewin), EwinHandleEventsToplevel, ewin);
EventCallbackUnregister(ewin->win_container, EwinHandleEventsContainer,
ewin);
EventCallbackUnregister(EwinGetClientWin(ewin), 0, EwinHandleEventsClient,
EventCallbackUnregister(EwinGetClientWin(ewin), EwinHandleEventsClient,
ewin);
if (!EwinIsInternal(ewin))
EUnregisterWindow(EwinGetClientWin(ewin));
@ -2498,7 +2497,7 @@ EwinHandleEventsRoot(Win win __UNUSED__, XEvent * ev, void *prm __UNUSED__)
static void
EwinsInit(void)
{
EventCallbackRegister(VROOT, 0, EwinHandleEventsRoot, NULL);
EventCallbackRegister(VROOT, EwinHandleEventsRoot, NULL);
}
/*

6
src/glwin.c
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2007-2008 Kim Woelders
* Copyright (C) 2007-2009 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
@ -644,7 +644,7 @@ GlwinCreate(const char *title __UNUSED__, int width, int height)
win = EobjGetWin(GLWin.eo);
GLWin.eo->fade = GLWin.eo->shadow = 1;
EventCallbackRegister(win, 0, GlwinEvent, &GLWin);
EventCallbackRegister(win, GlwinEvent, &GLWin);
ESelectInput(win, ExposureMask | KeyPressMask | ButtonPressMask |
StructureNotifyMask);
@ -698,7 +698,7 @@ GlwinExit(void)
if (GLWin.eo)
{
EventCallbackUnregister(EobjGetWin(GLWin.eo), 0, GlwinEvent, &GLWin);
EventCallbackUnregister(EobjGetWin(GLWin.eo), GlwinEvent, &GLWin);
EobjUnmap(GLWin.eo);
EobjDestroy(GLWin.eo);
GLWin.eo = NULL;

6
src/hints.c
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2003-2008 Kim Woelders
* Copyright (C) 2003-2009 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
@ -607,7 +607,7 @@ SelectionAcquire(const char *name, EventCallbackFunc * func, void *data)
if (sel->func)
{
ESelectInput(sel->win, SubstructureNotifyMask);
EventCallbackRegister(sel->win, 0, sel->func, sel->data);
EventCallbackRegister(sel->win, sel->func, sel->data);
}
ecore_x_client_message32_send(WinGetXwin(VROOT), E_XA_MANAGER,
@ -634,7 +634,7 @@ SelectionRelease(ESelection * sel)
XSetSelectionOwner(disp, sel->atom, None, sel->time);
if (sel->func)
{
EventCallbackUnregister(sel->win, 0, sel->func, sel->data);
EventCallbackUnregister(sel->win, sel->func, sel->data);
}
EDestroyWindow(sel->win);
Efree(sel);

8
src/hiwin.c
View File

@ -1,6 +1,6 @@
/*
* Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors
* Copyright (C) 2004-2008 Kim Woelders
* Copyright (C) 2004-2009 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
@ -249,7 +249,7 @@ HiwinCreate(void)
EoSetFade(phi, 1);
EoSetFloating(phi, 1);
EoSetLayer(phi, 19);
EventCallbackRegister(EoGetWin(phi), 0, HiwinEvent, phi);
EventCallbackRegister(EoGetWin(phi), HiwinEvent, phi);
ESelectInput(EoGetWin(phi),
ButtonPressMask | ButtonReleaseMask | PointerMotionMask |
EnterWindowMask | LeaveWindowMask);
@ -278,7 +278,7 @@ HiwinInit(Hiwin * phi, EWin * ewin)
#if DEBUG_HIWIN
Eprintf("Unregister %s\n", EwinGetTitle(phi->ewin));
#endif
EventCallbackUnregister(EoGetWin(phi->ewin), 0, HiwinEwinEvent, phi);
EventCallbackUnregister(EoGetWin(phi->ewin), HiwinEwinEvent, phi);
}
#endif
@ -290,7 +290,7 @@ HiwinInit(Hiwin * phi, EWin * ewin)
#if DEBUG_HIWIN
Eprintf("Register %s\n", EwinGetTitle(phi->ewin));
#endif
EventCallbackRegister(EoGetWin(phi->ewin), 0, HiwinEwinEvent, phi);
EventCallbackRegister(EoGetWin(phi->ewin), HiwinEwinEvent, phi);
}
#endif

4
src/magwin.c
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2007-2008 Kim Woelders
* Copyright (C) 2007-2009 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
@ -433,7 +433,7 @@ MagwinCreate(const char *title, int width, int height)
StructureNotifyMask;
ESelectInput(win, mw->ewin->client.event_mask);
EventCallbackRegister(win, 0, MagwinEvent, mw);
EventCallbackRegister(win, MagwinEvent, mw);
EQueryPointer(VROOT, &mw->cx, &mw->cy, NULL, NULL);
mw->scale = 1;

8
src/menus.c
View File

@ -718,7 +718,7 @@ MenuRealize(Menu * m)
if (!m->win)
{
m->win = ECreateClientWindow(VROOT, 0, 0, 1, 1);
EventCallbackRegister(m->win, 0, MenuHandleEvents, m);
EventCallbackRegister(m->win, MenuHandleEvents, m);
}
maxh = maxw = 0;
@ -737,7 +737,7 @@ MenuRealize(Menu * m)
has_i = 1;
m->items[i]->win = ECreateWindow(m->win, 0, 0, 1, 1, 0);
EventCallbackRegister(m->items[i]->win, 0, MenuItemHandleEvents,
EventCallbackRegister(m->items[i]->win, MenuItemHandleEvents,
m->items[i]);
ESelectInput(m->items[i]->win, MENU_ITEM_EVENT_MASK);
EMapWindow(m->items[i]->win);
@ -1035,7 +1035,7 @@ MenuShowMasker(Menu * m __UNUSED__)
EobjSetLayer(eo, 11);
ESelectInput(EobjGetWin(eo), ButtonPressMask | ButtonReleaseMask |
EnterWindowMask | LeaveWindowMask);
EventCallbackRegister(EobjGetWin(eo), 0, MenuMaskerHandleEvents, NULL);
EventCallbackRegister(EobjGetWin(eo), MenuMaskerHandleEvents, NULL);
Mode_menus.cover_win = eo;
}
@ -1051,7 +1051,7 @@ MenuHideMasker(void)
if (!eo)
return;
EventCallbackUnregister(EobjGetWin(eo), 0, MenuMaskerHandleEvents, NULL);
EventCallbackUnregister(EobjGetWin(eo), MenuMaskerHandleEvents, NULL);
EobjWindowDestroy(eo);
Mode_menus.cover_win = NULL;
}

2
src/pager.c
View File

@ -145,7 +145,7 @@ PagerCreate(void)
p->name = NULL;
p->win = ECreateClientWindow(VROOT, 0, 0, 1, 1);
EventCallbackRegister(p->win, 0, PagerEvent, p);
EventCallbackRegister(p->win, PagerEvent, p);
p->sel_win = ECreateWindow(p->win, 0, 0, 1, 1, 0);
return p;

4
src/slideout.c
View File

@ -1,6 +1,6 @@
/*
* Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors
* Copyright (C) 2004-2008 Kim Woelders
* Copyright (C) 2004-2009 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
@ -76,7 +76,7 @@ SlideoutCreate(const char *name, char dir)
EoInit(s, EOBJ_TYPE_MISC, None, -10, -10, 1, 1, 1, name);
EoSetShadow(s, 1);
ESelectInput(EoGetWin(s), SLIDEOUT_EVENT_MASK);
EventCallbackRegister(EoGetWin(s), 0, SlideoutHandleEvent, s);
EventCallbackRegister(EoGetWin(s), SlideoutHandleEvent, s);
return s;
}

8
src/systray.c
View File

@ -123,7 +123,7 @@ SystrayObjManage(Container * ct, Window xwin)
return win;
ESelectInput(win, StructureNotifyMask | PropertyChangeMask);
EventCallbackRegister(win, 0, SystrayItemEvent, ct);
EventCallbackRegister(win, SystrayItemEvent, ct);
EReparentWindow(win, ct->icon_win, 0, 0);
XAddToSaveSet(disp, xwin);
@ -144,7 +144,7 @@ SystrayObjUnmanage(Container * ct __UNUSED__, Win win, int gone)
EReparentWindow(win, VROOT, 0, 0);
XRemoveFromSaveSet(disp, WinGetXwin(win));
}
EventCallbackUnregister(win, 0, SystrayItemEvent, ct);
EventCallbackUnregister(win, SystrayItemEvent, ct);
EUnregisterWindow(win);
}
@ -442,7 +442,7 @@ SystrayInit(Container * ct)
win = ct->icon_win;
ESelectInputChange(win, SubstructureRedirectMask, 0);
EventCallbackRegister(win, 0, SystrayEvent, ct);
EventCallbackRegister(win, SystrayEvent, ct);
/* Container parameter setup */
ct->wm_name = "Systray";
@ -457,7 +457,7 @@ SystrayExit(Container * ct, int wm_exit __UNUSED__)
SelectionRelease(systray_sel);
systray_sel = None;
EventCallbackUnregister(ct->win, 0, SystrayEvent, ct);
EventCallbackUnregister(ct->win, SystrayEvent, ct);
while (ct->num_objs)
{

4
src/warp.c
View File

@ -85,7 +85,7 @@ WarpFocusWinCreate(void)
EoSetFade(fw, 1);
EoSetShadow(fw, 1);
EventCallbackRegister(EoGetWin(fw), 0, WarpFocusHandleEvent, NULL);
EventCallbackRegister(EoGetWin(fw), WarpFocusHandleEvent, NULL);
ESelectInput(EoGetWin(fw), ButtonReleaseMask);
fw->tc = TextclassFind("WARPFOCUS", 0);
@ -103,7 +103,7 @@ WarpFocusWinCreate(void)
static void
WarpFocusWinDestroy(WarpFocusWin * fw)
{
EventCallbackUnregister(EoGetWin(fw), 0, WarpFocusHandleEvent, NULL);
EventCallbackUnregister(EoGetWin(fw), WarpFocusHandleEvent, NULL);
EoFini(fw);
Efree(fw);
}

8
src/x.c
View File

@ -1,6 +1,6 @@
/*
* Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors
* Copyright (C) 2004-2008 Kim Woelders
* Copyright (C) 2004-2009 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
@ -248,8 +248,7 @@ EXidSet(Window xwin, Win parent, int x, int y, int w, int h, int depth,
}
void
EventCallbackRegister(Win win, int type __UNUSED__, EventCallbackFunc * func,
void *prm)
EventCallbackRegister(Win win, EventCallbackFunc * func, void *prm)
{
EventCallbackItem *eci;
@ -268,8 +267,7 @@ EventCallbackRegister(Win win, int type __UNUSED__, EventCallbackFunc * func,
}
void
EventCallbackUnregister(Win win, int type __UNUSED__,
EventCallbackFunc * func, void *prm)
EventCallbackUnregister(Win win, EventCallbackFunc * func, void *prm)
{
EventCallbackList *ecl;
EventCallbackItem *eci;

9
src/xwin.h
View File

@ -1,6 +1,6 @@
/*
* Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors
* Copyright (C) 2004-2008 Kim Woelders
* Copyright (C) 2004-2009 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,10 +150,9 @@ void EDestroyWin(Win win);
Win ERegisterWindow(Window xwin, XWindowAttributes * pxwa);
void EUnregisterWindow(Win win);
void EUnregisterXwin(Window xwin);
void EventCallbackRegister(Win win, int type,
EventCallbackFunc * func, void *prm);
void EventCallbackUnregister(Win win, int type,
EventCallbackFunc * func,
void EventCallbackRegister(Win win, EventCallbackFunc * func,
void *prm);
void EventCallbackUnregister(Win win, EventCallbackFunc * func,
void *prm);
void EventCallbacksProcess(Win win, XEvent * ev);