Enlightenment CVS committal Author : sebastid Project : e17 Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore_x Modified Files: Ecore_X.h Ecore_X_Atoms.h ecore_x.c ecore_x_netwm.c ecore_x_window_prop.c Log Message: Add ewmh protocols, and return -1 if E doesn't know the protocol =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_x/Ecore_X.h,v retrieving revision 1.110 retrieving revision 1.111 diff -u -3 -r1.110 -r1.111 --- Ecore_X.h 25 Apr 2005 08:40:56 -0000 1.110 +++ Ecore_X.h 28 Apr 2005 06:50:10 -0000 1.111 @@ -694,6 +694,18 @@ */ ECORE_X_WM_PROTOCOL_TAKE_FOCUS, + /** + * If enabled the window manager can ping the window to check + * if it is alive. + */ + ECORE_X_NET_WM_PROTOCOL_PING, + + /** + * If enabled the window manager can sync updating with the + * window (?) + */ + ECORE_X_NET_WM_PROTOCOL_SYNC_REQUEST, + /* Number of defined items */ ECORE_X_WM_PROTOCOL_NUM } Ecore_X_WM_Protocol; =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_x/Ecore_X_Atoms.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- Ecore_X_Atoms.h 10 Apr 2005 10:20:18 -0000 1.6 +++ Ecore_X_Atoms.h 28 Apr 2005 06:50:11 -0000 1.7 @@ -113,6 +113,9 @@ extern Ecore_X_Atom ECORE_X_ATOM_NET_FRAME_EXTENTS; extern Ecore_X_Atom ECORE_X_ATOM_NET_REQUEST_FRAME_EXTENTS; +extern Ecore_X_Atom ECORE_X_ATOM_NET_WM_PING; +extern Ecore_X_Atom ECORE_X_ATOM_NET_WM_SYNC_REQUEST; + /* Selections */ extern Ecore_X_Atom ECORE_X_ATOM_SELECTION_TARGETS; extern Ecore_X_Atom ECORE_X_ATOM_SELECTION_PRIMARY; =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_x/ecore_x.c,v retrieving revision 1.72 retrieving revision 1.73 diff -u -3 -r1.72 -r1.73 --- ecore_x.c 25 Apr 2005 08:40:57 -0000 1.72 +++ ecore_x.c 28 Apr 2005 06:50:11 -0000 1.73 @@ -368,6 +368,8 @@ _ecore_x_atoms_wm_protocols[ECORE_X_WM_PROTOCOL_DELETE_REQUEST] = ECORE_X_ATOM_WM_DELETE_WINDOW; _ecore_x_atoms_wm_protocols[ECORE_X_WM_PROTOCOL_TAKE_FOCUS] = ECORE_X_ATOM_WM_TAKE_FOCUS; + _ecore_x_atoms_wm_protocols[ECORE_X_NET_WM_PROTOCOL_PING] = ECORE_X_ATOM_NET_WM_PING; + _ecore_x_atoms_wm_protocols[ECORE_X_NET_WM_PROTOCOL_SYNC_REQUEST] = ECORE_X_ATOM_NET_WM_SYNC_REQUEST; _ecore_x_selection_data_init(); _ecore_x_dnd_init(); =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_x/ecore_x_netwm.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -3 -r1.13 -r1.14 --- ecore_x_netwm.c 10 Apr 2005 10:20:18 -0000 1.13 +++ ecore_x_netwm.c 28 Apr 2005 06:50:11 -0000 1.14 @@ -266,6 +266,9 @@ Ecore_X_Atom ECORE_X_ATOM_NET_FRAME_EXTENTS = 0; Ecore_X_Atom ECORE_X_ATOM_NET_REQUEST_FRAME_EXTENTS = 0; +Ecore_X_Atom ECORE_X_ATOM_NET_WM_PING = 0; +Ecore_X_Atom ECORE_X_ATOM_NET_WM_SYNC_REQUEST = 0; + void ecore_x_netwm_init(void) { @@ -357,6 +360,9 @@ ECORE_X_ATOM_NET_FRAME_EXTENTS = _ATOM_GET("_NET_FRAME_EXTENTS"); ECORE_X_ATOM_NET_REQUEST_FRAME_EXTENTS = _ATOM_GET("_NET_REQUEST_FRAME_EXTENTS"); + + ECORE_X_ATOM_NET_WM_PING = _ATOM_GET("_NET_WM_PING"); + ECORE_X_ATOM_NET_WM_SYNC_REQUEST = _ATOM_GET("_NET_WM_SYNC_REQUEST"); } /* =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_x/ecore_x_window_prop.c,v retrieving revision 1.62 retrieving revision 1.63 diff -u -3 -r1.62 -r1.63 --- ecore_x_window_prop.c 9 Mar 2005 23:11:49 -0000 1.62 +++ ecore_x_window_prop.c 28 Apr 2005 06:50:11 -0000 1.63 @@ -614,6 +614,7 @@ { Ecore_X_WM_Protocol j; + prot_ret[i] = -1; for (j = 0; j < ECORE_X_WM_PROTOCOL_NUM; j++) { if (_ecore_x_atoms_wm_protocols[j] == protos[i]) ------------------------------------------------------- SF.Net email is sponsored by: Tell us your software development plans! Take this survey and enter to win a one-year sub to SourceForge.net Plus IDC's 2005 look-ahead and a copy of this survey Click here to start! http://www.idcswdc.com/cgi-bin/survey?id=105hix _______________________________________________ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs