Aire-One
/
awesome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Stop using variable size type, use stdtypes 

Signed-off-by: Julien Danjou <julien@danjou.info>
This commit is contained in:
Julien Danjou 2009-04-26 13:01:37 +02:00
parent 503283ac28
commit c2dc991903
3 changed files with 19 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
button.h
View File

@ -30,7 +30,7 @@ struct button_t
/** Lua references */ /** Lua references */
luaA_ref_array_t refs; luaA_ref_array_t refs;
/** Key modifiers */ /** Key modifiers */
unsigned long mod; uint16_t mod;
/** Mouse button number */ /** Mouse button number */
xcb_button_t button; xcb_button_t button;
/** Lua function to execute on press. */ /** Lua function to execute on press. */

39
window.c
View File

@ -54,23 +54,21 @@ window_state_get_unchecked(xcb_window_t w)
/** Get a window state (WM_STATE). /** Get a window state (WM_STATE).
* \param cookie The cookie. * \param cookie The cookie.
* \return The current state of the window, or -1 on error. * \return The current state of the window, or 0 on error.
*/ */
long uint32_t
window_state_get_reply(xcb_get_property_cookie_t cookie) window_state_get_reply(xcb_get_property_cookie_t cookie)
{ {
long result = -1; uint32_t result = 0;
unsigned char *p = NULL;
xcb_get_property_reply_t *prop_r; xcb_get_property_reply_t *prop_r;
if(!(prop_r = xcb_get_property_reply(globalconf.connection, cookie, NULL))) if((prop_r = xcb_get_property_reply(globalconf.connection, cookie, NULL)))
return -1; {
if(xcb_get_property_value_length(prop_r))
result = *(uint32_t *) xcb_get_property_value(prop_r);
p = xcb_get_property_value(prop_r); p_delete(&prop_r);
if(xcb_get_property_value_length(prop_r) != 0) }
result = *p;
p_delete(&prop_r);
return result; return result;
} }
@ -118,23 +116,22 @@ window_buttons_grab(xcb_window_t win, button_array_t *buttons)
double double
window_opacity_get(xcb_window_t win) window_opacity_get(xcb_window_t win)
{ {
xcb_get_property_cookie_t prop_c; xcb_get_property_cookie_t prop_c =
xcb_get_property_reply_t *prop_r; xcb_get_property_unchecked(globalconf.connection, false, win,
_NET_WM_WINDOW_OPACITY, CARDINAL, 0L, 1L);
prop_c = xcb_get_property_unchecked(globalconf.connection, false, win, xcb_get_property_reply_t *prop_r =
_NET_WM_WINDOW_OPACITY, CARDINAL, 0L, 1L); xcb_get_property_reply(globalconf.connection, prop_c, NULL);
prop_r = xcb_get_property_reply(globalconf.connection, prop_c, NULL);
if(prop_r && prop_r->value_len && prop_r->format == 32) if(prop_r && prop_r->value_len && prop_r->format == 32)
{ {
unsigned int *data = xcb_get_property_value(prop_r); uint32_t value = *(uint32_t *) xcb_get_property_value(prop_r);
unsigned int value = *data;
p_delete(&prop_r); p_delete(&prop_r);
return (double) value / (double) 0xffffffff; return (double) value / (double) 0xffffffff;
} }
p_delete(&prop_r); p_delete(&prop_r);
return -1; return -1;
} }
@ -145,11 +142,9 @@ window_opacity_get(xcb_window_t win)
void void
window_opacity_set(xcb_window_t win, double opacity) window_opacity_set(xcb_window_t win, double opacity)
{ {
unsigned int real_opacity = 0xffffffff;
if(opacity >= 0 && opacity <= 1) if(opacity >= 0 && opacity <= 1)
{ {
real_opacity = opacity * 0xffffffff; uint32_t real_opacity = opacity * 0xffffffff;
xcb_change_property(globalconf.connection, XCB_PROP_MODE_REPLACE, win, xcb_change_property(globalconf.connection, XCB_PROP_MODE_REPLACE, win,
_NET_WM_WINDOW_OPACITY, CARDINAL, 32, 1L, &real_opacity); _NET_WM_WINDOW_OPACITY, CARDINAL, 32, 1L, &real_opacity);
} }

2
window.h
View File

@ -26,7 +26,7 @@
void window_state_set(xcb_window_t, long); void window_state_set(xcb_window_t, long);
xcb_get_property_cookie_t window_state_get_unchecked(xcb_window_t); xcb_get_property_cookie_t window_state_get_unchecked(xcb_window_t);
long window_state_get_reply(xcb_get_property_cookie_t); uint32_t window_state_get_reply(xcb_get_property_cookie_t);
void window_configure(xcb_window_t, area_t, int); void window_configure(xcb_window_t, area_t, int);
void window_buttons_grab(xcb_window_t, button_array_t *); void window_buttons_grab(xcb_window_t, button_array_t *);
double window_opacity_get(xcb_window_t); double window_opacity_get(xcb_window_t);