Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
Tag: branch-exp
E.h actions.c areas.c borders.c buttons.c cursors.c desktops.c
evhandlers.c focus.c grabs.c ipc.c menus-misc.c menus.c
moveresize.c pager.c session.c
Log Message:
Merge.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/E.h,v
retrieving revision 1.314.2.11
retrieving revision 1.314.2.12
diff -u -3 -r1.314.2.11 -r1.314.2.12
--- E.h 10 Aug 2004 19:36:24 -0000 1.314.2.11
+++ E.h 15 Aug 2004 07:28:26 -0000 1.314.2.12
@@ -1600,9 +1600,10 @@
#define ECSR_NONE 0
#define ECSR_ROOT 1
#define ECSR_GRAB 2
-#define ECSR_ACT_MOVE 3
-#define ECSR_ACT_RESIZE 4
-#define ECSR_COUNT 5
+#define ECSR_PGRAB 3
+#define ECSR_ACT_MOVE 4
+#define ECSR_ACT_RESIZE 5
+#define ECSR_COUNT 6
void ECursorsInit(void);
ECursor *ECursorCreate(const char *name, const char *image,
int native_id, XColor * fg, XColor * bg);
@@ -1965,10 +1966,14 @@
/* grabs.c */
void GrabActionKey(Action * a);
void UnGrabActionKey(Action * a);
-void GrabTheButtons(Window win);
-int GrabThePointer(Window win, int csr);
-int GrabConfineThePointer(Window win, int csr);
-void UnGrabTheButtons(void);
+void GrabButtonsSet(Window win, unsigned int csr);
+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,
+ unsigned int csr, int confine);
+void GrabButtonRelease(unsigned int button,
+ unsigned int modifiers, Window win);
/* groups.c */
void CopyGroupConfig(GroupConfig * src, GroupConfig * dest);
@@ -2149,8 +2154,6 @@
time_t MenuGetTimestamp(const Menu * m);
int MenuIsNotEmpty(const Menu * m);
void MenuAddItem(Menu * m, MenuItem * mi);
-void MenuShowMasker(Menu * m);
-void MenuHideMasker(void);
void ShowInternalMenu(Menu ** pm, MenuStyle ** pms,
const char *style,
Menu * (mcf) (const char *name,
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/actions.c,v
retrieving revision 1.174.2.4
retrieving revision 1.174.2.5
diff -u -3 -r1.174.2.4 -r1.174.2.5
--- actions.c 8 Aug 2004 00:02:16 -0000 1.174.2.4
+++ actions.c 15 Aug 2004 07:28:26 -0000 1.174.2.5
@@ -79,65 +79,49 @@
ActionClass *ac;
int j;
Action *a;
- Window pager_hi_win;
+ unsigned int mod, button, mask;
ac = (ActionClass *) FindItem("BUTTONBINDINGS", 0, LIST_FINDBY_NAME,
LIST_TYPE_ACLASS);
- if (ac)
+ if (!ac)
+ return;
+
+ ac->ref_count++;
+ for (j = 0; j < ac->num; j++)
{
- pager_hi_win = PagerGetHiWin(ewin->pager);
- ac->ref_count++;
- for (j = 0; j < ac->num; j++)
- {
- a = ac->list[j];
- if ((a)
- && ((a->event == EVENT_MOUSE_DOWN)
- || (a->event == EVENT_MOUSE_UP)))
- {
- unsigned int mod, button, mask;
+ a = ac->list[j];
+ if ((!a) || ((a->event != EVENT_MOUSE_DOWN)
+ && (a->event != EVENT_MOUSE_UP)))
+ continue;
- mod = 0;
- button = 0;
- if (a->anymodifier)
- mod = AnyModifier;
- else
- mod = a->modifiers;
- if (a->anybutton)
- button = AnyButton;
- else
- button = a->button;
- mask = ButtonPressMask | ButtonReleaseMask;
- if (mod == AnyModifier)
- {
-#if 0 /* Why? */
- if (pager_hi_win)
- XGrabButton(disp, button, mod, pager_hi_win,
- False, mask, GrabModeSync, GrabModeAsync,
- None, None);
-#endif
- XGrabButton(disp, button, mod, ewin->win, False, mask,
- GrabModeSync, GrabModeAsync, None, None);
- }
- else
- {
- int i;
+ mod = 0;
+ button = 0;
- for (i = 0; i < 8; i++)
- {
-#if 0 /* Why? */
- if (pager_hi_win)
- XGrabButton(disp, button,
- mod | mask_mod_combos[i],
- pager_hi_win, False, mask,
- GrabModeSync, GrabModeAsync, None,
- None);
-#endif
- XGrabButton(disp, button, mod | mask_mod_combos[i],
- ewin->win, False, mask, GrabModeSync,
- GrabModeAsync, None, None);
- }
- }
+ if (a->anymodifier)
+ mod = AnyModifier;
+ else
+ mod = a->modifiers;
+
+ if (a->anybutton)
+ button = AnyButton;
+ else
+ button = a->button;
+
+ mask = ButtonPressMask | ButtonReleaseMask;
+
+ if (mod == AnyModifier)
+ {
+ GrabButtonSet(button, mod, ewin->win, mask, ECSR_PGRAB, 1);
+ }
+ else
+ {
+ int i;
+
+ for (i = 0; i < 8; i++)
+ {
+ GrabButtonSet(button, mod | mask_mod_combos[i], ewin->win,
+ mask, ECSR_PGRAB, 1);
}
}
}
@@ -149,54 +133,47 @@
ActionClass *ac;
int j;
Action *a;
- Window pager_hi_win;
+ unsigned int mod, button;
ac = (ActionClass *) FindItem("BUTTONBINDINGS", 0, LIST_FINDBY_NAME,
LIST_TYPE_ACLASS);
- if (ac)
+ if (!ac)
+ return;
+
+ ac->ref_count--;
+ for (j = 0; j < ac->num; j++)
{
- pager_hi_win = PagerGetHiWin(ewin->pager);
- ac->ref_count--;
- for (j = 0; j < ac->num; j++)
- {
- a = ac->list[j];
- if ((a)
- && ((a->event == EVENT_MOUSE_DOWN)
- || (a->event == EVENT_MOUSE_UP)))
- {
- unsigned int mod, button;
+ a = ac->list[j];
+ if ((!a) || ((a->event != EVENT_MOUSE_DOWN)
+ && (a->event != EVENT_MOUSE_UP)))
+ continue;
- mod = 0;
- button = 0;
- if (a->anymodifier)
- mod = AnyModifier;
- else
- mod = a->modifiers;
- if (a->anybutton)
- button = AnyButton;
- else
- button = a->button;
- if (mod == AnyModifier)
- {
- if (pager_hi_win)
- XUngrabButton(disp, button, mod, pager_hi_win);
- XUngrabButton(disp, button, mod, ewin->win);
- }
- else
- {
- int i;
+ mod = 0;
+ button = 0;
- for (i = 0; i < 8; i++)
- {
- if (pager_hi_win)
- XUngrabButton(disp, button,
- mod | mask_mod_combos[i],
- pager_hi_win);
- XUngrabButton(disp, button,
- mod | mask_mod_combos[i], ewin->win);
- }
- }
+ if (a->anymodifier)
+ mod = AnyModifier;
+ else
+ mod = a->modifiers;
+
+ if (a->anybutton)
+ button = AnyButton;
+ else
+ button = a->button;
+
+ if (mod == AnyModifier)
+ {
+ GrabButtonRelease(button, mod, ewin->win);
+ }
+ else
+ {
+ int i;
+
+ for (i = 0; i < 8; i++)
+ {
+ GrabButtonRelease(button, mod | mask_mod_combos[i],
+ ewin->win);
}
}
}
@@ -1667,7 +1644,7 @@
EDBUG_RETURN(0);
}
- GrabThePointer(VRoot.win, ECSR_GRAB);
+ GrabPointerSet(VRoot.win, ECSR_GRAB, 0);
Mode.mode = MODE_BUTTONDRAG;
Mode.button_move_pending = 1;
Mode.start_x = Mode.x;
@@ -1692,7 +1669,7 @@
EDBUG_RETURN(0);
Mode.mode = MODE_NONE;
- UnGrabTheButtons();
+ GrabPointerRelease();
if (!Mode.button_move_pending)
{
d = DesktopAt(Mode.x, Mode.y);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/areas.c,v
retrieving revision 1.71.2.2
retrieving revision 1.71.2.3
diff -u -3 -r1.71.2.2 -r1.71.2.3
--- areas.c 8 Aug 2004 22:49:04 -0000 1.71.2.2
+++ areas.c 15 Aug 2004 07:28:26 -0000 1.71.2.3
@@ -274,6 +274,7 @@
SoundPlay("SOUND_MOVE_AREA_DOWN");
ActionsSuspend();
+ MenusHide();
/* remove lots of event masks from windows.. we dont want to bother */
/* handling events as a result of our playing wiht windows */
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/borders.c,v
retrieving revision 1.221.2.4
retrieving revision 1.221.2.5
diff -u -3 -r1.221.2.4 -r1.221.2.5
--- borders.c 10 Aug 2004 19:36:26 -0000 1.221.2.4
+++ borders.c 15 Aug 2004 07:28:26 -0000 1.221.2.5
@@ -501,7 +501,7 @@
if ((!ewin->client.transient) && (Conf.place.manual)
&& (!ewin->client.already_placed) && (!Mode.wm.startup) && (!Mode.place))
{
- cangrab = GrabThePointer(VRoot.win, ECSR_GRAB);
+ cangrab = GrabPointerSet(VRoot.win, ECSR_GRAB, 0);
if ((cangrab == GrabNotViewable) || (cangrab == AlreadyGrabbed)
|| (cangrab == GrabFrozen))
{
@@ -534,7 +534,7 @@
if (ewin->desktop >= 0)
GotoDesktop(ewin->desktop);
- GrabThePointer(VRoot.win, ECSR_GRAB);
+ GrabPointerSet(VRoot.win, ECSR_GRAB, 0);
XQueryPointer(disp, VRoot.win, &root_return, &junk, &rx, &ry, &wx,
&wy, &mask);
XUngrabPointer(disp, CurrentTime);
@@ -604,7 +604,7 @@
MoveEwin(ewin, x, y);
RaiseEwin(ewin);
ShowEwin(ewin);
- GrabThePointer(VRoot.win, ECSR_GRAB);
+ GrabPointerSet(VRoot.win, ECSR_GRAB, 0);
Mode.have_place_grab = 1;
Mode.place = 1;
ICCCM_Configure(ewin);
@@ -1160,7 +1160,7 @@
if (!b)
b = FindItem("__FALLBACK_BORDER", 0, LIST_FINDBY_NAME, LIST_TYPE_BORDER);
- ewin->border = b;
+ ewin->normal_border = ewin->border = b;
}
/*
@@ -1439,12 +1439,12 @@
att.do_not_propagate_mask = ButtonPressMask | ButtonReleaseMask;
XChangeWindowAttributes(disp, ewin->win,
CWEventMask | CWDontPropagate, &att);
+ ewin->client.win = win;
FocusEwinSetGrabs(ewin);
GrabButtonGrabs(ewin);
EwinListAdd(&EwinListStack, ewin, 0);
EwinListAdd(&EwinListFocus, ewin, 0);
- ewin->client.win = win;
ewin->client.event_mask = EWIN_CLIENT_EVENT_MASK;
AddItem(ewin, "EWIN", win, LIST_TYPE_EWIN);
@@ -3683,7 +3683,7 @@
static void
BorderWinpartEventMouseDown(XEvent * ev, EWin * ewin, int j)
{
- GrabThePointer(ewin->bits[j].win, ECSR_GRAB);
+ GrabPointerSet(ewin->bits[j].win, ECSR_GRAB, 0);
ewin->bits[j].state = STATE_CLICKED;
BorderWinpartChange(ewin, j, 0);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/buttons.c,v
retrieving revision 1.36.2.2
retrieving revision 1.36.2.3
diff -u -3 -r1.36.2.2 -r1.36.2.3
--- buttons.c 9 Aug 2004 22:35:19 -0000 1.36.2.2
+++ buttons.c 15 Aug 2004 07:28:27 -0000 1.36.2.3
@@ -673,7 +673,7 @@
Window win = ev->xbutton.window;
ActionClass *ac;
- GrabThePointer(win, ECSR_GRAB);
+ GrabPointerSet(win, ECSR_GRAB, 0);
if (b->inside_win)
{
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/cursors.c,v
retrieving revision 1.20
retrieving revision 1.20.2.1
diff -u -3 -r1.20 -r1.20.2.1
--- cursors.c 18 Jul 2004 12:27:38 -0000 1.20
+++ cursors.c 15 Aug 2004 07:28:27 -0000 1.20.2.1
@@ -202,6 +202,7 @@
ECsrs[ECSR_NONE] = None;
ECsrs[ECSR_ROOT] = ECursorGetByName("DEFAULT", XC_left_ptr);
ECsrs[ECSR_GRAB] = ECursorGetByName("GRAB", XC_crosshair);
+ ECsrs[ECSR_PGRAB] = ECursorGetByName("PGRAB", XC_X_cursor);
ECsrs[ECSR_ACT_MOVE] = ECursorGetByName("GRAB_MOVE", XC_fleur);
ECsrs[ECSR_ACT_RESIZE] = ECursorGetByName("GRAB_RESIZE", XC_sizing);
}
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/desktops.c,v
retrieving revision 1.95.2.6
retrieving revision 1.95.2.7
diff -u -3 -r1.95.2.6 -r1.95.2.7
--- desktops.c 10 Aug 2004 19:36:28 -0000 1.95.2.6
+++ desktops.c 15 Aug 2004 07:28:27 -0000 1.95.2.7
@@ -721,6 +721,7 @@
Eprintf("GotoDesktop %d\n", desk);
SlideoutsHide();
+ MenusHide();
ModulesSignal(ESIGNAL_DESK_SWITCH);
@@ -915,6 +916,7 @@
if ((desk < 0) || (desk >= Conf.desks.num))
EDBUG_RETURN_;
+ MenusHide();
FocusNewDeskBegin();
desks.desk[desk].viewable = 1;
RefreshDesktop(desk);
@@ -952,6 +954,7 @@
if ((desk <= 0) || (desk >= Conf.desks.num))
EDBUG_RETURN_;
+ MenusHide();
FocusNewDeskBegin();
MoveToDeskBottom(desk);
UncoverDesktop(desks.order[0]);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/evhandlers.c,v
retrieving revision 1.173.2.6
retrieving revision 1.173.2.7
diff -u -3 -r1.173.2.6 -r1.173.2.7
--- evhandlers.c 9 Aug 2004 22:35:19 -0000 1.173.2.6
+++ evhandlers.c 15 Aug 2004 07:28:27 -0000 1.173.2.7
@@ -223,7 +223,7 @@
LIST_TYPE_ACLASS);
if (ac)
{
- GrabThePointer(ewin->win, ECSR_GRAB);
+ GrabPointerSet(ewin->win, ECSR_GRAB, 0);
if (EventAclass(ev, ewin, ac))
{
goto done;
@@ -254,7 +254,7 @@
}
TooltipsHandleEvent();
- UnGrabTheButtons();
+ GrabPointerRelease();
ModeGetXY(ev->xbutton.root, ev->xbutton.x_root, ev->xbutton.y_root);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/focus.c,v
retrieving revision 1.81.2.1
retrieving revision 1.81.2.2
diff -u -3 -r1.81.2.1 -r1.81.2.2
--- focus.c 3 Aug 2004 23:19:03 -0000 1.81.2.1
+++ focus.c 15 Aug 2004 07:28:27 -0000 1.81.2.2
@@ -159,15 +159,20 @@
ewin->active && Conf.focus.clickraises) ||
(Conf.focus.mode == MODE_FOCUS_CLICK && !ewin->active))
{
- XGrabButton(disp, AnyButton, AnyModifier, ewin->win_container,
- False, ButtonPressMask, GrabModeSync, GrabModeAsync,
- None, None);
-/* Eprintf("FocusEwinSetGrabs: %#lx grab\n", ewin->client.win); */
+ GrabButtonSet(AnyButton, AnyModifier, ewin->win_container,
+ ButtonPressMask, ECSR_PGRAB, 1);
+#if 0
+ Eprintf("FocusEwinSetGrabs: %#lx grab %s\n", ewin->client.win,
+ EwinGetTitle(ewin));
+#endif
}
else
{
- XUngrabButton(disp, AnyButton, AnyModifier, ewin->win_container);
-/* Eprintf("FocusEwinSetGrabs: %#lx ungrab\n", ewin->client.win); */
+ GrabButtonRelease(AnyButton, AnyModifier, ewin->win_container);
+#if 0
+ Eprintf("FocusEwinSetGrabs: %#lx ungrab %s\n", ewin->client.win,
+ EwinGetTitle(ewin));
+#endif
}
}
@@ -192,7 +197,7 @@
for (i = 0; i < num; i++)
{
ewin = lst[i];
- XUngrabButton(disp, AnyButton, AnyModifier, ewin->win_container);
+ GrabButtonRelease(AnyButton, AnyModifier, ewin->win_container);
FocusEwinSetGrabs(ewin);
}
@@ -453,7 +458,9 @@
{
EWin *ewin;
- ewin = GetEwinByCurrentPointer();
+ ewin = FindEwinByChildren(win);
+ if (!ewin)
+ ewin = FindEwinByBase(win);
if (!ewin)
return;
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/grabs.c,v
retrieving revision 1.17.2.1
retrieving revision 1.17.2.2
diff -u -3 -r1.17.2.1 -r1.17.2.2
--- grabs.c 8 Aug 2004 00:02:18 -0000 1.17.2.1
+++ grabs.c 15 Aug 2004 07:28:28 -0000 1.17.2.2
@@ -75,64 +75,66 @@
}
void
-GrabTheButtons(Window win)
+GrabButtonsSet(Window win, unsigned int csr)
{
- EDBUG(4, "GrabTheButtons");
if (Mode.grabs.pointer_grab_active)
- EDBUG_RETURN_;
+ return;
+
XGrabPointer(disp, win, True, ButtonPressMask | ButtonReleaseMask,
- GrabModeAsync, GrabModeAsync, None, None, CurrentTime);
+ GrabModeAsync, GrabModeAsync, None, ECsrGet(csr), CurrentTime);
+
Mode.grabs.pointer_grab_window = win;
Mode.grabs.pointer_grab_active = 1;
- EDBUG_RETURN_;
}
int
-GrabThePointer(Window win, int csr)
+GrabPointerSet(Window win, unsigned int csr, int confine)
{
int ret;
+ Window confine_to = (confine) ? win : None;
- EDBUG(4, "GrabThePointer");
if (Mode.grabs.pointer_grab_active)
- EDBUG_RETURN(1);
- ret =
- XGrabPointer(disp, win, True,
- ButtonPressMask | ButtonReleaseMask | PointerMotionMask |
- ButtonMotionMask | EnterWindowMask | LeaveWindowMask,
- GrabModeAsync, GrabModeAsync, None, ECsrGet(csr),
- CurrentTime);
- Mode.grabs.pointer_grab_window = win;
- Mode.grabs.pointer_grab_active = 1;
- EDBUG_RETURN(ret);
-}
+ return 1;
-int
-GrabConfineThePointer(Window win, int csr)
-{
- int ret;
+ ret = XGrabPointer(disp, win, True,
+ ButtonPressMask | ButtonReleaseMask | PointerMotionMask |
+ ButtonMotionMask | EnterWindowMask | LeaveWindowMask,
+ GrabModeAsync, GrabModeAsync, confine_to, ECsrGet(csr),
+ CurrentTime);
- EDBUG(4, "GrabThePointer");
- if (Mode.grabs.pointer_grab_active)
- EDBUG_RETURN(1);
- ret =
- XGrabPointer(disp, win, True,
- ButtonPressMask | ButtonReleaseMask | PointerMotionMask |
- ButtonMotionMask | EnterWindowMask | LeaveWindowMask,
- GrabModeAsync, GrabModeAsync, win, ECsrGet(csr),
- CurrentTime);
Mode.grabs.pointer_grab_window = win;
Mode.grabs.pointer_grab_active = 1;
- EDBUG_RETURN(ret);
+
+ return ret;
}
void
-UnGrabTheButtons()
+GrabPointerRelease(void)
{
- EDBUG(4, "UnGrabTheButtons");
if (!Mode.grabs.pointer_grab_active)
- EDBUG_RETURN_;
+ return;
+
XUngrabPointer(disp, CurrentTime);
+
Mode.grabs.pointer_grab_active = 0;
Mode.grabs.pointer_grab_window = None;
- EDBUG_RETURN_;
+}
+
+void
+GrabButtonSet(unsigned int button, unsigned int modifiers, Window win,
+ unsigned int event_mask, unsigned int csr, int confine)
+{
+ Bool owner_events = False;
+ int pointer_mode = GrabModeSync;
+ int keyboard_mode = GrabModeAsync;
+ Window confine_to = (confine) ? win : None;
+
+ XGrabButton(disp, button, modifiers, win, owner_events, event_mask,
+ pointer_mode, keyboard_mode, confine_to, ECsrGet(csr));
+}
+
+void
+GrabButtonRelease(unsigned int button, unsigned int modifiers, Window win)
+{
+ XUngrabButton(disp, button, modifiers, win);
}
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/ipc.c,v
retrieving revision 1.174.2.6
retrieving revision 1.174.2.7
diff -u -3 -r1.174.2.6 -r1.174.2.7
--- ipc.c 8 Aug 2004 22:49:04 -0000 1.174.2.6
+++ ipc.c 15 Aug 2004 07:28:28 -0000 1.174.2.7
@@ -4136,15 +4136,22 @@
l = 0;
sscanf(p, "%1000s %n", param, &l);
p += l;
- if (!strncmp(param, "unset", 2))
+ if (!strncmp(param, "allow", 2))
{
- UnGrabTheButtons();
+ l = 0;
+ sscanf(p, "%d", &l);
+ XAllowEvents(disp, l, CurrentTime);
+ IpcPrintf("XAllowEvents\n");
+ }
+ else if (!strncmp(param, "unset", 2))
+ {
+ GrabPointerRelease();
IpcPrintf("Ungrab\n");
}
else
{
sscanf(param, "%li", &win);
- GrabConfineThePointer(win, ECSR_ACT_RESIZE);
+ GrabPointerSet(win, ECSR_ACT_RESIZE, 1);
IpcPrintf("Grab %#lx\n", win);
}
}
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/Attic/menus-misc.c,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -3 -r1.1.2.4 -r1.1.2.5
--- menus-misc.c 10 Aug 2004 19:36:31 -0000 1.1.2.4
+++ menus-misc.c 15 Aug 2004 07:28:28 -0000 1.1.2.5
@@ -172,6 +172,7 @@
FILE *f;
EDBUG(5, "MenuCreateFromDirectory");
+
m = MenuCreate(name, NULL, parent, ms);
if (stat(dir, &st) >= 0)
@@ -636,6 +637,7 @@
}
if (list)
freestrlist(list, num);
+
EDBUG_RETURN(m);
}
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/menus.c,v
retrieving revision 1.147.2.4
retrieving revision 1.147.2.5
diff -u -3 -r1.147.2.4 -r1.147.2.5
--- menus.c 8 Aug 2004 00:02:19 -0000 1.147.2.4
+++ menus.c 15 Aug 2004 07:28:28 -0000 1.147.2.5
@@ -1022,7 +1022,32 @@
EDBUG_RETURN_;
}
-void
+static void
+MenuShowMasker(Menu * m)
+{
+ EWin *ewin;
+
+ ewin = FindEwinByMenu(m);
+ if ((ewin) && (!Mode.menus.cover_win))
+ {
+ Window parent;
+ Window wl[2];
+
+ parent = desks.desk[ewin->desktop].win;
+ Mode.menus.cover_win =
+ ECreateEventWindow(parent, 0, 0, VRoot.w, VRoot.h);
+ Mode.menus.win_covered = ewin->win;
+ wl[0] = Mode.menus.win_covered;
+ wl[1] = Mode.menus.cover_win;
+ XSelectInput(disp, Mode.menus.cover_win,
+ ButtonPressMask | ButtonReleaseMask | EnterWindowMask |
+ LeaveWindowMask);
+ XRestackWindows(disp, wl, 2);
+ EMapWindow(disp, Mode.menus.cover_win);
+ }
+}
+
+static void
MenuHideMasker(void)
{
if (Mode.menus.cover_win)
@@ -1204,31 +1229,6 @@
EDBUG_RETURN_;
}
-void
-MenuShowMasker(Menu * m)
-{
- EWin *ewin;
-
- ewin = FindEwinByMenu(m);
- if ((ewin) && (!Mode.menus.cover_win))
- {
- Window parent;
- Window wl[2];
-
- parent = desks.desk[ewin->desktop].win;
- Mode.menus.cover_win =
- ECreateEventWindow(parent, 0, 0, VRoot.w, VRoot.h);
- Mode.menus.win_covered = ewin->win;
- wl[0] = Mode.menus.win_covered;
- wl[1] = Mode.menus.cover_win;
- XSelectInput(disp, Mode.menus.cover_win,
- ButtonPressMask | ButtonReleaseMask | EnterWindowMask |
- LeaveWindowMask);
- XRestackWindows(disp, wl, 2);
- EMapWindow(disp, Mode.menus.cover_win);
- }
-}
-
int
MenusActive(void)
{
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/moveresize.c,v
retrieving revision 1.22.2.1
retrieving revision 1.22.2.2
diff -u -3 -r1.22.2.1 -r1.22.2.2
--- moveresize.c 31 Jul 2004 20:25:54 -0000 1.22.2.1
+++ moveresize.c 15 Aug 2004 07:28:28 -0000 1.22.2.2
@@ -51,8 +51,8 @@
}
SoundPlay("SOUND_MOVE_START");
- UnGrabTheButtons();
- GrabConfineThePointer(VRoot.win, ECSR_ACT_MOVE);
+ GrabPointerRelease();
+ GrabPointerSet(VRoot.win, ECSR_ACT_MOVE, 1);
Mode.mode = MODE_MOVE_PENDING;
Mode.constrained = constrained;
@@ -94,7 +94,7 @@
int d, wasresize = 0, num, i;
EDBUG(6, "doMoveEnd");
- UnGrabTheButtons();
+ GrabPointerRelease();
if (ewin && ewin != mode_moveresize_ewin)
return 0;
@@ -275,8 +275,8 @@
Mode.queue_up = 0;
SoundPlay("SOUND_RESIZE_START");
- UnGrabTheButtons();
- GrabConfineThePointer(VRoot.win, ECSR_ACT_RESIZE);
+ GrabPointerRelease();
+ GrabPointerSet(VRoot.win, ECSR_ACT_RESIZE, 1);
switch (hv)
{
@@ -360,7 +360,7 @@
int i;
EDBUG(0, "doResizeEnd");
- UnGrabTheButtons();
+ GrabPointerRelease();
if (ewin && ewin != mode_moveresize_ewin)
return 0;
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/pager.c,v
retrieving revision 1.103.2.5
retrieving revision 1.103.2.6
diff -u -3 -r1.103.2.5 -r1.103.2.6
--- pager.c 8 Aug 2004 22:31:42 -0000 1.103.2.5
+++ pager.c 15 Aug 2004 07:28:28 -0000 1.103.2.6
@@ -1703,7 +1703,7 @@
EMoveResizeWindow(disp, p->hi_win, px + wx, py + wy, ww, wh);
ESetWindowBackgroundPixmap(disp, p->hi_win, ewin->mini_pmm.pmap);
EMapRaised(disp, p->hi_win);
- GrabThePointer(p->hi_win, None);
+ GrabPointerSet(p->hi_win, None, 0);
p->hi_visible = 1;
p->hi_ewin = ewin;
p->hi_win_w = ww;
@@ -1840,7 +1840,7 @@
}
mode_context_pager = NULL;
- UnGrabTheButtons();
+ GrabPointerRelease();
}
done:
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/session.c,v
retrieving revision 1.75.2.1
retrieving revision 1.75.2.2
diff -u -3 -r1.75.2.1 -r1.75.2.2
--- session.c 31 Jul 2004 20:25:55 -0000 1.75.2.1
+++ session.c 15 Aug 2004 07:28:28 -0000 1.75.2.2
@@ -1242,7 +1242,8 @@
if (disp)
{
UngrabX();
- UnGrabTheButtons();
+ GrabPointerRelease();
+ XAllowEvents(disp, AsyncBoth, CurrentTime);
/* This mechanism is only needed when the SM is unavailable: */
ICCCM_SetEInfoOnAll();
-------------------------------------------------------
SF.Net email is sponsored by Shop4tech.com-Lowest price on Blank Media
100pk Sonic DVD-R 4x for only $29 -100pk Sonic DVD+R for only $33
Save 50% off Retail on Ink & Toner - Free Shipping and Free Gift.
http://www.shop4tech.com/z/Inkjet_Cartridges/9_108_r285
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
