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

Window handling function api rename/rewrap continued. 

SVN revision: 22326
This commit is contained in:
Kim Woelders 2006-04-23 22:11:26 +00:00
parent 45f309b64f
commit 60b882006c
15 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/E.h
View File

@ -731,7 +731,7 @@ int GrabKeyboardRelease(void);
int GrabPointerSet(Window win, unsigned int csr, int confine);
void GrabPointerRelease(void);
void GrabButtonSet(unsigned int button, unsigned int modifiers,
Window window, unsigned int event_mask,
Window win, unsigned int event_mask,
unsigned int csr, int confine);
void GrabButtonRelease(unsigned int button,
unsigned int modifiers, Window win);

8
src/aclass.c
View File

@ -1490,7 +1490,7 @@ GrabButtonGrabs(EWin * ewin)
if (mod == AnyModifier)
{
GrabButtonSet(button, mod, EoGetWin(ewin), mask, ECSR_PGRAB, 1);
GrabButtonSet(button, mod, EoGetXwin(ewin), mask, ECSR_PGRAB, 1);
}
else
{
@ -1499,7 +1499,7 @@ GrabButtonGrabs(EWin * ewin)
for (i = 0; i < 8; i++)
{
GrabButtonSet(button, mod | Mode.masks.mod_combos[i],
EoGetWin(ewin), mask, ECSR_PGRAB, 1);
EoGetXwin(ewin), mask, ECSR_PGRAB, 1);
}
}
}
@ -1540,7 +1540,7 @@ UnGrabButtonGrabs(EWin * ewin)
if (mod == AnyModifier)
{
GrabButtonRelease(button, mod, EoGetWin(ewin));
GrabButtonRelease(button, mod, EoGetXwin(ewin));
}
else
{
@ -1549,7 +1549,7 @@ UnGrabButtonGrabs(EWin * ewin)
for (i = 0; i < 8; i++)
{
GrabButtonRelease(button, mod | Mode.masks.mod_combos[i],
EoGetWin(ewin));
EoGetXwin(ewin));
}
}
}

4
src/buttons.c
View File

@ -447,7 +447,7 @@ ButtonDragStart(Button * b)
if (ButtonIsFixed(b))
return;
GrabPointerSet(EoGetWin(b), ECSR_GRAB, 0);
GrabPointerSet(EoGetXwin(b), ECSR_GRAB, 0);
Mode.mode = MODE_BUTTONDRAG;
Mode_buttons.move_pending = 1;
Mode_buttons.start_x = Mode.events.x;
@ -527,7 +527,7 @@ ButtonEventMouseDown(Button * b, XEvent * ev)
{
Mode_buttons.button = b;
GrabPointerSet(EoGetWin(b), ECSR_GRAB, 0);
GrabPointerSet(EoGetXwin(b), ECSR_GRAB, 0);
if (b->inside_win)
{

2
src/eimage.c
View File

@ -418,7 +418,7 @@ EDrawableDumpImage(Drawable draw, const char *txt)
int w, h;
w = h = 0;
EGetGeometry(draw, NULL, NULL, NULL, &w, &h, NULL, NULL);
EXGetGeometry(draw, NULL, NULL, NULL, &w, &h, NULL, NULL);
if (w <= 0 || h <= 0)
return;
imlib_context_set_drawable(draw);

2
src/eimage.h
View File

@ -93,4 +93,6 @@ void ScaleRect(Window src, Pixmap dst, Pixmap * pdst,
int sx, int sy, int sw, int sh,
int dx, int dy, int dw, int dh, int scale);
void EDrawableDumpImage(Drawable draw, const char *txt);
#endif /* _EIMAGE_H_ */

4
src/eobj.c
View File

@ -380,11 +380,7 @@ EobjMoveResize(EObj * eo, int x, int y, int w, int h)
#if USE_COMPOSITE
if (eo->type == EOBJ_TYPE_EWIN)
{
if (EventDebug(250))
EDrawableDumpImage(eo->win, "Win1");
ECompMgrMoveResizeFix(eo, x, y, w, h);
if (EventDebug(250))
EDrawableDumpImage(eo->win, "Win2");
}
else
#endif

2
src/ewins.c
View File

@ -1965,7 +1965,7 @@ ActionsCheck(const char *which, EWin * ewin, XEvent * ev)
if (ev->type == ButtonPress)
{
GrabPointerSet(EoGetWin(ewin), ECSR_GRAB, 0);
GrabPointerSet(EoGetXwin(ewin), ECSR_GRAB, 0);
FocusToEWin(ewin, FOCUS_CLICK);
}
else if (ev->type == ButtonRelease)

4
src/focus.c
View File

@ -217,7 +217,7 @@ FocusEwinSetGrabs(EWin * ewin)
{
if (!ewin->state.click_grab_isset)
{
GrabButtonSet(AnyButton, AnyModifier, _EwinGetContainerWin(ewin),
GrabButtonSet(AnyButton, AnyModifier, _EwinGetContainerXwin(ewin),
ButtonPressMask, ECSR_PGRAB, 1);
if (EventDebug(EDBUG_TYPE_GRABS))
Eprintf("FocusEwinSetGrabs: %#lx set %s\n",
@ -230,7 +230,7 @@ FocusEwinSetGrabs(EWin * ewin)
if (ewin->state.click_grab_isset)
{
GrabButtonRelease(AnyButton, AnyModifier,
_EwinGetContainerWin(ewin));
_EwinGetContainerXwin(ewin));
if (EventDebug(EDBUG_TYPE_GRABS))
Eprintf("FocusEwinSetGrabs: %#lx unset %s\n",
_EwinGetClientXwin(ewin), EwinGetName(ewin));

3
src/gnome.c
View File

@ -740,7 +740,8 @@ GNOME_SetHints(Window win_wm_check)
unsigned int val;
atom_set = XInternAtom(disp, "_WIN_DESKTOP_BUTTON_PROXY", False);
Mode.button_proxy_win = ECreateWindow(VRoot.win, -80, -80, 24, 24, 0);
Mode.button_proxy_win =
XCreateSimpleWindow(disp, VRoot.win, -80, -80, 24, 24, 0, 0, 0);
val = Mode.button_proxy_win;
ecore_x_window_prop_card32_set(VRoot.win, atom_set, &val, 1);
ecore_x_window_prop_card32_set(Mode.button_proxy_win, atom_set, &val, 1);

2
src/hints.c
View File

@ -60,7 +60,7 @@ HintsInit(void)
ENL_WIN_DATA = XInternAtom(disp, "ENL_WIN_DATA", False);
ENL_WIN_BORDER = XInternAtom(disp, "ENL_WIN_BORDER", False);
win = ECreateWindow(VRoot.win, -200, -200, 5, 5, 0);
win = XCreateSimpleWindow(disp, VRoot.win, -200, -200, 5, 5, 0, 0, 0);
ICCCM_Init();
MWM_SetInfo();

2
src/hiwin.c
View File

@ -458,7 +458,7 @@ HiwinShow(Hiwin * phi, EWin * ewin, int zoom, int confine)
EoMoveResize(phi, x - w / 2, y - h / 2, w, h);
}
GrabPointerSet(EoGetWin(phi), ECSR_ACT_MOVE, confine);
GrabPointerSet(EoGetXwin(phi), ECSR_ACT_MOVE, confine);
pz->fini(phi, 1);
}

4
src/slideout.c
View File

@ -233,7 +233,7 @@ SlideoutShow(Slideout * s, EWin * ewin, Window win)
s->ref_count++;
s->context_ewin = ewin;
GrabPointerSet(EoGetWin(s), ECSR_ROOT, 0);
GrabPointerSet(EoGetXwin(s), ECSR_ROOT, 0);
Mode_slideouts.active = s;
}
@ -379,7 +379,7 @@ SlideoutHandleEvent(XEvent * ev, void *prm)
break;
case LeaveNotify:
if (ev->xcrossing.mode != NotifyUngrab)
GrabPointerSet(EoGetWin(s), ECSR_ROOT, 0);
GrabPointerSet(EoGetXwin(s), ECSR_ROOT, 0);
break;
}
}

4
src/warp.c
View File

@ -164,8 +164,8 @@ WarpFocusWinShow(WarpFocusWin * fw)
* Grab the keyboard. The grab is automatically released when
* WarpFocusHide unmaps warpFocusWindow.
*/
GrabKeyboardSet(EoGetWin(fw));
GrabPointerSet(EoGetWin(fw), None, 0);
GrabKeyboardSet(EoGetXwin(fw));
GrabPointerSet(EoGetXwin(fw), None, 0);
TooltipsEnable(0);
}

2
src/x.c
View File

@ -901,7 +901,7 @@ EDrawableCheck(Drawable draw, int grab)
if (grab)
EGrabServer();
ok = EGetGeometry(draw, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
ok = EXGetGeometry(draw, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
if (grab && !ok)
EUngrabServer();

2
src/xwin.h
View File

@ -115,6 +115,8 @@ Pixmap ECreatePixmapCopy(Pixmap src, unsigned int w,
void ECopyArea(Drawable src, Drawable dst, int sx, int sy,
unsigned int w, unsigned int h, int dx, int dy);
#define EXGetGeometry EGetGeometry
GC EXCreateGC(Drawable draw, unsigned long mask,
XGCValues * val);
int EXFreeGC(GC gc);