forked from enlightenment/efl
Add atom for set/get of top shelf geometry.
Fix void function in netwm that was returning a value when it shouldn't. Remove wasted whitespace. SVN revision: 44981
This commit is contained in:
parent
f3fb3dea17
commit
11a9a1badf
|
@ -1571,6 +1571,9 @@ EAPI int ecore_x_e_illume_quickpanel_priority_major_get(Ecore_X_
|
|||
EAPI void ecore_x_e_illume_quickpanel_priority_minor_set(Ecore_X_Window win, unsigned int priority);
|
||||
EAPI int ecore_x_e_illume_quickpanel_priority_minor_get(Ecore_X_Window win);
|
||||
EAPI void ecore_x_e_illume_home_send(Ecore_X_Window win);
|
||||
EAPI void ecore_x_e_illume_top_shelf_geometry_set(Ecore_X_Window win, int x, int y, int w, int h);
|
||||
EAPI int ecore_x_e_illume_top_shelf_geometry_get(Ecore_X_Window win, int *x, int *y, int *w, int *h);
|
||||
|
||||
|
||||
EAPI void ecore_x_xinerama_query_screens_prefetch(void);
|
||||
EAPI void ecore_x_xinerama_query_screens_fetch(void);
|
||||
|
|
|
@ -222,5 +222,6 @@ EAPI extern Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_QUICKPANEL_ON;
|
|||
EAPI extern Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_QUICKPANEL_OFF;
|
||||
EAPI extern Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_QUICKPANEL_PRIORITY_MAJOR;
|
||||
EAPI extern Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_QUICKPANEL_PRIORITY_MINOR;
|
||||
EAPI extern Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_TOP_SHELF_GEOMETRY;
|
||||
|
||||
#endif /* _ECORE_X_ATOMS_H */
|
||||
|
|
|
@ -245,3 +245,4 @@ EAPI Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_QUICKPANEL_ON = 0;
|
|||
EAPI Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_QUICKPANEL_OFF = 0;
|
||||
EAPI Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_QUICKPANEL_PRIORITY_MAJOR = 0;
|
||||
EAPI Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_QUICKPANEL_PRIORITY_MINOR = 0;
|
||||
EAPI Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_TOP_SHELF_GEOMETRY = 0;
|
||||
|
|
|
@ -237,7 +237,8 @@ _ecore_x_atoms_init(void)
|
|||
{ "_E_ILLUME_QUICKPANEL_ON", &ECORE_X_ATOM_E_ILLUME_QUICKPANEL_ON },
|
||||
{ "_E_ILLUME_QUICKPANEL_OFF", &ECORE_X_ATOM_E_ILLUME_QUICKPANEL_OFF },
|
||||
{ "_E_ILLUME_QUICKPANEL_PRIORITY_MAJOR", &ECORE_X_ATOM_E_ILLUME_QUICKPANEL_PRIORITY_MAJOR },
|
||||
{ "_E_ILLUME_QUICKPANEL_PRIORITY_MINOR", &ECORE_X_ATOM_E_ILLUME_QUICKPANEL_PRIORITY_MINOR }
|
||||
{ "_E_ILLUME_QUICKPANEL_PRIORITY_MINOR", &ECORE_X_ATOM_E_ILLUME_QUICKPANEL_PRIORITY_MINOR },
|
||||
{ "_E_ILLUME_TOP_SHELF_GEOMETRY", &ECORE_X_ATOM_E_ILLUME_TOP_SHELF_GEOMETRY }
|
||||
};
|
||||
Atom *atoms;
|
||||
char **names;
|
||||
|
|
|
@ -415,3 +415,34 @@ ecore_x_e_illume_quickpanel_priority_minor_get(Ecore_X_Window win)
|
|||
return 0;
|
||||
return val;
|
||||
}
|
||||
|
||||
EAPI void
|
||||
ecore_x_e_illume_top_shelf_geometry_set(Ecore_X_Window win, int x, int y, int w, int h)
|
||||
{
|
||||
unsigned int geom[4];
|
||||
|
||||
geom[0] = x;
|
||||
geom[1] = y;
|
||||
geom[2] = w;
|
||||
geom[3] = h;
|
||||
ecore_x_window_prop_card32_set(win, ECORE_X_ATOM_E_ILLUME_TOP_SHELF_GEOMETRY,
|
||||
geom, 4);
|
||||
}
|
||||
|
||||
EAPI int
|
||||
ecore_x_e_illume_top_shelf_geometry_get(Ecore_X_Window win, int *x, int *y, int *w, int *h)
|
||||
{
|
||||
int ret = 0;
|
||||
unsigned int geom[4];
|
||||
|
||||
ret =
|
||||
ecore_x_window_prop_card32_get(win,
|
||||
ECORE_X_ATOM_E_ILLUME_TOP_SHELF_GEOMETRY,
|
||||
geom, 4);
|
||||
if (ret != 4) return 0;
|
||||
if (x) *x = geom[0];
|
||||
if (y) *y = geom[1];
|
||||
if (w) *w = geom[2];
|
||||
if (h) *h = geom[3];
|
||||
return 1;
|
||||
}
|
||||
|
|
|
@ -1344,7 +1344,6 @@ _ecore_x_netwm_startup_info_process(Ecore_X_Startup_Info *info)
|
|||
static int
|
||||
_ecore_x_netwm_startup_info_parse(Ecore_X_Startup_Info *info, char *data)
|
||||
{
|
||||
|
||||
while (*data)
|
||||
{
|
||||
int in_quot_sing, in_quot_dbl, escaped;
|
||||
|
@ -1534,6 +1533,6 @@ ecore_x_screen_is_composited_set(int screen, Ecore_X_Window win)
|
|||
|
||||
snprintf(buf, sizeof(buf), "_NET_WM_CM_S%i", screen);
|
||||
if (atom == None) atom = XInternAtom(_ecore_x_disp, buf, True);
|
||||
if (atom == None) return 0;
|
||||
if (atom == None) return;
|
||||
XSetSelectionOwner(_ecore_x_disp, atom, win, _ecore_x_event_last_time);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue