Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
E.h grabs.c ipc.c
Log Message:
Enable showing some grab info.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/E.h,v
retrieving revision 1.314
retrieving revision 1.315
diff -u -3 -r1.314 -r1.315
--- E.h 26 Jul 2004 18:54:48 -0000 1.314
+++ E.h 5 Aug 2004 23:08:33 -0000 1.315
@@ -1206,6 +1206,11 @@
} display;
struct
{
+ char pointer_grab_active;
+ Window pointer_grab_window;
+ } grabs;
+ struct
+ {
char master; /* We are the master E */
char single; /* No slaves */
char window; /* Running in virtual root window */
@@ -1239,7 +1244,6 @@
char have_place_grab;
char action_inhibit;
char justclicked;
- char click_focus_grabbed;
EWin *focuswin;
EWin *mouse_over_ewin;
int px, py, x, y;
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/grabs.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- grabs.c 15 Jul 2004 18:23:54 -0000 1.17
+++ grabs.c 5 Aug 2004 23:08:34 -0000 1.18
@@ -22,8 +22,6 @@
*/
#include "E.h"
-static Window grab_window;
-
void
GrabActionKey(Action * a)
{
@@ -80,12 +78,12 @@
GrabTheButtons(Window win)
{
EDBUG(4, "GrabTheButtons");
- if (Mode.click_focus_grabbed)
+ if (Mode.grabs.pointer_grab_active)
EDBUG_RETURN_;
XGrabPointer(disp, win, True, ButtonPressMask | ButtonReleaseMask,
GrabModeAsync, GrabModeAsync, None, None, CurrentTime);
- grab_window = win;
- Mode.click_focus_grabbed = 1;
+ Mode.grabs.pointer_grab_window = win;
+ Mode.grabs.pointer_grab_active = 1;
EDBUG_RETURN_;
}
@@ -95,7 +93,7 @@
int ret;
EDBUG(4, "GrabThePointer");
- if (Mode.click_focus_grabbed)
+ if (Mode.grabs.pointer_grab_active)
EDBUG_RETURN(1);
ret =
XGrabPointer(disp, win, True,
@@ -103,8 +101,8 @@
ButtonMotionMask | EnterWindowMask | LeaveWindowMask,
GrabModeAsync, GrabModeAsync, None, ECsrGet(csr),
CurrentTime);
- grab_window = win;
- Mode.click_focus_grabbed = 1;
+ Mode.grabs.pointer_grab_window = win;
+ Mode.grabs.pointer_grab_active = 1;
EDBUG_RETURN(ret);
}
@@ -114,7 +112,7 @@
int ret;
EDBUG(4, "GrabThePointer");
- if (Mode.click_focus_grabbed)
+ if (Mode.grabs.pointer_grab_active)
EDBUG_RETURN(1);
ret =
XGrabPointer(disp, win, True,
@@ -122,8 +120,8 @@
ButtonMotionMask | EnterWindowMask | LeaveWindowMask,
GrabModeAsync, GrabModeAsync, win, ECsrGet(csr),
CurrentTime);
- grab_window = win;
- Mode.click_focus_grabbed = 1;
+ Mode.grabs.pointer_grab_window = win;
+ Mode.grabs.pointer_grab_active = 1;
EDBUG_RETURN(ret);
}
@@ -131,10 +129,10 @@
UnGrabTheButtons()
{
EDBUG(4, "UnGrabTheButtons");
- if (!Mode.click_focus_grabbed)
+ if (!Mode.grabs.pointer_grab_active)
EDBUG_RETURN_;
XUngrabPointer(disp, CurrentTime);
- Mode.click_focus_grabbed = 0;
- grab_window = 0;
+ Mode.grabs.pointer_grab_active = 0;
+ Mode.grabs.pointer_grab_window = None;
EDBUG_RETURN_;
}
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/ipc.c,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -3 -r1.174 -r1.175
--- ipc.c 25 Jul 2004 09:34:43 -0000 1.174
+++ ipc.c 5 Aug 2004 23:08:34 -0000 1.175
@@ -3522,7 +3522,7 @@
if (!strcmp(params, "click"))
{
Conf.focus.mode = MODE_FOCUS_CLICK;
- Mode.click_focus_grabbed = 1;
+ Mode.grabs.pointer_grab_active = 1;
}
else if (!strcmp(params, "pointer"))
{
@@ -3535,14 +3535,14 @@
else if (!strcmp(params, "clicknograb"))
{
Conf.focus.mode = MODE_FOCUS_CLICK;
- Mode.click_focus_grabbed = 0;
+ Mode.grabs.pointer_grab_active = 0;
}
else if (!strcmp(params, "?"))
{
Esnprintf(buf, sizeof(buf), "Focus Mode: ");
if (Conf.focus.mode == MODE_FOCUS_CLICK)
{
- if (Mode.click_focus_grabbed)
+ if (Mode.grabs.pointer_grab_active)
{
strcat(buf, "click");
}
@@ -5839,23 +5839,18 @@
}
static void
-IPC_MiscInfo(const char *params __UNUSED__, Client * c)
+IPC_MiscInfo(const char *params __UNUSED__, Client * c __UNUSED__)
{
- char buf[FILEPATH_LEN_MAX];
- char buf3[FILEPATH_LEN_MAX];
+ IpcPrintf("stuff:\n");
- Esnprintf(buf, sizeof(buf), "stuff:\n");
if (Mode.focuswin)
- {
- Esnprintf(buf3, sizeof(buf3), "mode.focuswin - %8x\n",
- (unsigned)Mode.focuswin->client.win);
- strcat(buf, buf3);
- }
+ IpcPrintf(" mode.focuswin - %#lx\n", Mode.focuswin->client.win);
+
if (Mode.cur_menu_mode)
- {
- strcat(buf, "cur_menu_mode is set\n");
- }
- CommsSend(c, buf);
+ IpcPrintf(" cur_menu_mode is set\n");
+
+ IpcPrintf("Pointer grab on=%d win=%#lx\n",
+ Mode.grabs.pointer_grab_active, Mode.grabs.pointer_grab_window);
}
static void
-------------------------------------------------------
This SF.Net email is sponsored by OSTG. Have you noticed the changes on
Linux.com, ITManagersJournal and NewsForge in the past few weeks? Now,
one more big change to announce. We are now OSTG- Open Source Technology
Group. Come see the changes on the new OSTG site. www.ostg.com
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
