Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
ecore-e16.c ecore-e16.h ewmh.c
Log Message:
Follow ecore_x API changes.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/ecore-e16.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- ecore-e16.c 12 May 2005 16:50:52 -0000 1.12
+++ ecore-e16.c 12 Jun 2005 08:03:19 -0000 1.13
@@ -939,16 +939,16 @@
}
void
-ecore_x_netwm_desk_roots_set(Ecore_X_Window root, unsigned int n_desks,
- Ecore_X_Window * vroots)
+ecore_x_netwm_desk_roots_set(Ecore_X_Window root, Ecore_X_Window * vroots,
+ unsigned int n_desks)
{
ecore_x_window_prop_window_set(root, ECORE_X_ATOM_NET_VIRTUAL_ROOTS, vroots,
n_desks);
}
void
-ecore_x_netwm_desk_names_set(Ecore_X_Window root, unsigned int n_desks,
- const char **names)
+ecore_x_netwm_desk_names_set(Ecore_X_Window root, const char **names,
+ unsigned int n_desks)
{
char ss[32], *buf;
const char *s;
@@ -994,8 +994,8 @@
}
void
-ecore_x_netwm_desk_workareas_set(Ecore_X_Window root, unsigned int n_desks,
- unsigned int *areas)
+ecore_x_netwm_desk_workareas_set(Ecore_X_Window root, unsigned int *areas,
+ unsigned int n_desks)
{
ecore_x_window_prop_card32_set(root, ECORE_X_ATOM_NET_WORKAREA, areas,
4 * n_desks);
@@ -1009,8 +1009,8 @@
}
void
-ecore_x_netwm_desk_viewports_set(Ecore_X_Window root, unsigned int n_desks,
- unsigned int *origins)
+ecore_x_netwm_desk_viewports_set(Ecore_X_Window root, unsigned int *origins,
+ unsigned int n_desks)
{
ecore_x_window_prop_card32_set(root, ECORE_X_ATOM_NET_DESKTOP_VIEWPORT,
origins, 2 * n_desks);
@@ -1032,8 +1032,8 @@
/* Mapping order */
void
-ecore_x_netwm_client_list_set(Ecore_X_Window root, unsigned int n_clients,
- Ecore_X_Window * p_clients)
+ecore_x_netwm_client_list_set(Ecore_X_Window root, Ecore_X_Window * p_clients,
+ unsigned int n_clients)
{
ecore_x_window_prop_window_set(root, ECORE_X_ATOM_NET_CLIENT_LIST,
p_clients,
n_clients);
@@ -1042,8 +1042,8 @@
/* Stacking order */
void
ecore_x_netwm_client_list_stacking_set(Ecore_X_Window root,
- unsigned int n_clients,
- Ecore_X_Window * p_clients)
+ Ecore_X_Window * p_clients,
+ unsigned int n_clients)
{
ecore_x_window_prop_window_set(root, ECORE_X_ATOM_NET_CLIENT_LIST_STACKING,
p_clients, n_clients);
@@ -1066,10 +1066,15 @@
_ecore_x_window_prop_string_utf8_set(win, ECORE_X_ATOM_NET_WM_NAME, name);
}
-char *
-ecore_x_netwm_name_get(Ecore_X_Window win)
+int
+ecore_x_netwm_name_get(Ecore_X_Window win, char **name)
{
- return _ecore_x_window_prop_string_utf8_get(win, ECORE_X_ATOM_NET_WM_NAME);
+ char *s;
+
+ s = _ecore_x_window_prop_string_utf8_get(win, ECORE_X_ATOM_NET_WM_NAME);
+ *name = s;
+
+ return s != NULL;
}
void
@@ -1079,11 +1084,16 @@
name);
}
-char *
-ecore_x_netwm_visible_name_get(Ecore_X_Window win)
+int
+ecore_x_netwm_visible_name_get(Ecore_X_Window win, char **name)
{
- return _ecore_x_window_prop_string_utf8_get(win,
-
ECORE_X_ATOM_NET_WM_VISIBLE_NAME);
+ char *s;
+
+ s = _ecore_x_window_prop_string_utf8_get(win,
+ ECORE_X_ATOM_NET_WM_VISIBLE_NAME);
+ *name = s;
+
+ return s != NULL;
}
void
@@ -1093,11 +1103,15 @@
name);
}
-char *
-ecore_x_netwm_icon_name_get(Ecore_X_Window win)
+int
+ecore_x_netwm_icon_name_get(Ecore_X_Window win, char **name)
{
- return _ecore_x_window_prop_string_utf8_get(win,
- ECORE_X_ATOM_NET_WM_ICON_NAME);
+ char *s;
+
+ s = _ecore_x_window_prop_string_utf8_get(win,
ECORE_X_ATOM_NET_WM_ICON_NAME);
+ *name = s;
+
+ return s != NULL;
}
void
@@ -1108,11 +1122,16 @@
name);
}
-char *
-ecore_x_netwm_visible_icon_name_get(Ecore_X_Window win)
+int
+ecore_x_netwm_visible_icon_name_get(Ecore_X_Window win, char **name)
{
- return _ecore_x_window_prop_string_utf8_get(win,
-
ECORE_X_ATOM_NET_WM_VISIBLE_ICON_NAME);
+ char *s;
+
+ s = _ecore_x_window_prop_string_utf8_get(win,
+
ECORE_X_ATOM_NET_WM_VISIBLE_ICON_NAME);
+ *name = s;
+
+ return s != NULL;
}
void
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/ecore-e16.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- ecore-e16.h 7 May 2005 11:19:57 -0000 1.8
+++ ecore-e16.h 12 Jun 2005 08:03:19 -0000 1.9
@@ -198,47 +198,50 @@
void ecore_x_netwm_desk_count_set(Ecore_X_Window root,
unsigned int n_desks);
void ecore_x_netwm_desk_roots_set(Ecore_X_Window root,
- unsigned int n_desks,
- Ecore_X_Window * vroots);
+ Ecore_X_Window * vroots,
+ unsigned int n_desks);
void ecore_x_netwm_desk_names_set(Ecore_X_Window root,
- unsigned int n_desks,
- const char **names);
+ const char **names,
+ unsigned int n_desks);
void ecore_x_netwm_desk_size_set(Ecore_X_Window root,
unsigned int width,
unsigned int height);
void ecore_x_netwm_desk_workareas_set(Ecore_X_Window root,
- unsigned int n_desks,
- unsigned int *areas);
+ unsigned int *areas,
+ unsigned int n_desks);
void ecore_x_netwm_desk_current_set(Ecore_X_Window root,
unsigned int desk);
void ecore_x_netwm_desk_viewports_set(Ecore_X_Window root,
- unsigned int n_desks,
- unsigned int *origins);
+ unsigned int *origins,
+ unsigned int n_desks);
void ecore_x_netwm_showing_desktop_set(Ecore_X_Window root,
int on);
void ecore_x_netwm_client_list_set(Ecore_X_Window root,
- unsigned int n_clients,
- Ecore_X_Window * p_clients);
+ Ecore_X_Window * p_clients,
+ unsigned int n_clients);
void ecore_x_netwm_client_list_stacking_set(Ecore_X_Window root,
- unsigned int
- n_clients,
Ecore_X_Window *
- p_clients);
+ p_clients,
+ unsigned int
+ n_clients);
void ecore_x_netwm_client_active_set(Ecore_X_Window root,
Ecore_X_Window win);
void ecore_x_netwm_name_set(Ecore_X_Window win,
const char *name);
-char *ecore_x_netwm_name_get(Ecore_X_Window win);
+int ecore_x_netwm_name_get(Ecore_X_Window win, char **name);
void ecore_x_netwm_icon_name_set(Ecore_X_Window win,
const char *name);
-char *ecore_x_netwm_icon_name_get(Ecore_X_Window win);
+int ecore_x_netwm_icon_name_get(Ecore_X_Window win,
+ char **name);
void ecore_x_netwm_visible_name_set(Ecore_X_Window win,
const char *name);
-char *ecore_x_netwm_visible_name_get(Ecore_X_Window win);
+int ecore_x_netwm_visible_name_get(Ecore_X_Window win,
+ char **name);
void ecore_x_netwm_visible_icon_name_set(Ecore_X_Window win,
const char *name);
-char *ecore_x_netwm_visible_icon_name_get(Ecore_X_Window win);
+int ecore_x_netwm_visible_icon_name_get(Ecore_X_Window win,
+ char **name);
void ecore_x_netwm_desktop_set(Ecore_X_Window win,
unsigned int desk);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/ewmh.c,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -3 -r1.71 -r1.72
--- ewmh.c 2 Jun 2005 22:11:08 -0000 1.71
+++ ewmh.c 12 Jun 2005 08:03:19 -0000 1.72
@@ -179,7 +179,7 @@
for (i = 0; i < n_desks; i++)
wl[i] = DeskGetWin(i);
- ecore_x_netwm_desk_roots_set(VRoot.win, n_desks, wl);
+ ecore_x_netwm_desk_roots_set(VRoot.win, wl, n_desks);
Efree(wl);
}
@@ -188,7 +188,7 @@
EWMH_SetDesktopNames(void)
{
/* Fall back to defaults */
- ecore_x_netwm_desk_names_set(VRoot.win, DesksGetNumber(), NULL);
+ ecore_x_netwm_desk_names_set(VRoot.win, NULL, DesksGetNumber());
}
void
@@ -220,7 +220,7 @@
p_coord[4 * i + 3] = VRoot.h;
}
- ecore_x_netwm_desk_workareas_set(VRoot.win, n_desks, p_coord);
+ ecore_x_netwm_desk_workareas_set(VRoot.win, p_coord, n_desks);
Efree(p_coord);
}
@@ -250,7 +250,7 @@
p_coord[2 * i + 1] = ay * VRoot.h;
}
- ecore_x_netwm_desk_viewports_set(VRoot.win, n_desks, p_coord);
+ ecore_x_netwm_desk_viewports_set(VRoot.win, p_coord, n_desks);
Efree(p_coord);
}
@@ -279,12 +279,12 @@
wl = Emalloc(num * sizeof(Ecore_X_Window));
for (i = 0; i < num; i++)
wl[i] = lst[num - i - 1]->client.win;
- ecore_x_netwm_client_list_set(VRoot.win, num, wl);
+ ecore_x_netwm_client_list_set(VRoot.win, wl, num);
Efree(wl);
}
else
{
- ecore_x_netwm_client_list_set(VRoot.win, 0, NULL);
+ ecore_x_netwm_client_list_set(VRoot.win, NULL, 0);
}
if (lst)
Efree(lst);
@@ -304,12 +304,12 @@
wl = Emalloc(num * sizeof(Ecore_X_Window));
for (i = 0; i < num; i++)
wl[i] = lst[num - i - 1]->client.win;
- ecore_x_netwm_client_list_stacking_set(VRoot.win, num, wl);
+ ecore_x_netwm_client_list_stacking_set(VRoot.win, wl, num);
Efree(wl);
}
else
{
- ecore_x_netwm_client_list_stacking_set(VRoot.win, 0, NULL);
+ ecore_x_netwm_client_list_stacking_set(VRoot.win, NULL, 0);
}
}
@@ -426,7 +426,7 @@
_EFREE(ewin->ewmh.wm_name);
- val = ecore_x_netwm_name_get(ewin->client.win);
+ ecore_x_netwm_name_get(ewin->client.win, &val);
if (!val)
return;
ewin->ewmh.wm_name = EstrUtf82Int(val, 0);
@@ -442,7 +442,7 @@
_EFREE(ewin->ewmh.wm_icon_name);
- val = ecore_x_netwm_icon_name_get(ewin->client.win);
+ ecore_x_netwm_icon_name_get(ewin->client.win, &val);
if (!val)
return;
ewin->ewmh.wm_icon_name = EstrUtf82Int(val, 0);
-------------------------------------------------------
This SF.Net email is sponsored by: NEC IT Guy Games. How far can you shotput
a projector? How fast can you ride your desk chair down the office luge track?
If you want to score the big prize, get to know the little guy.
Play to win an NEC 61" plasma display: http://www.necitguy.com/?r=20
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
