diff options
| -rw-r--r-- | openbox/client.c | 8 | ||||
| -rw-r--r-- | openbox/frame.c | 2 | ||||
| -rw-r--r-- | openbox/prop.c | 8 | ||||
| -rw-r--r-- | openbox/prop.h | 4 | ||||
| -rw-r--r-- | openbox/screen.c | 14 | ||||
| -rw-r--r-- | openbox/stacking.c | 2 |
6 files changed, 19 insertions, 19 deletions
diff --git a/openbox/client.c b/openbox/client.c index b5a66d3f..930f3ee4 100644 --- a/openbox/client.c +++ b/openbox/client.c @@ -126,7 +126,7 @@ void client_set_list() windows = NULL; PROP_SETA32(RootWindow(ob_display, ob_screen), - net_client_list, window, (guint32*)windows, size); + net_client_list, window, (gulong*)windows, size); if (windows) g_free(windows); @@ -1300,7 +1300,7 @@ void client_setup_decor_and_functions(ObClient *self) static void client_change_allowed_actions(ObClient *self) { - guint32 actions[9]; + gulong actions[9]; gint num = 0; /* desktop windows are kept on all desktops */ @@ -1715,8 +1715,8 @@ void client_update_icons(ObClient *self) static void client_change_state(ObClient *self) { - guint32 state[2]; - guint32 netstate[11]; + gulong state[2]; + gulong netstate[11]; guint num; state[0] = self->wmstate; diff --git a/openbox/frame.c b/openbox/frame.c index f390887a..47c3f027 100644 --- a/openbox/frame.c +++ b/openbox/frame.c @@ -422,7 +422,7 @@ void frame_adjust_area(ObFrame *self, gboolean moved, } if (!STRUT_EQUAL(self->size, oldsize)) { - guint32 vals[4]; + gulong vals[4]; vals[0] = self->size.left; vals[1] = self->size.right; vals[2] = self->size.top; diff --git a/openbox/prop.c b/openbox/prop.c index f6559c40..fe21bc44 100644 --- a/openbox/prop.c +++ b/openbox/prop.c @@ -206,7 +206,7 @@ static gboolean get_prealloc(Window win, Atom prop, Atom type, gint size, data[i] = xdata[i]; break; case 16: - ((guint16*)data)[i] = ((guint16*)xdata)[i]; + ((gushort*)data)[i] = ((gushort*)xdata)[i]; break; case 32: ((guint32*)data)[i] = ((gulong*)xdata)[i]; @@ -245,7 +245,7 @@ static gboolean get_all(Window win, Atom prop, Atom type, gint size, (*data)[i] = xdata[i]; break; case 16: - ((guint16*)*data)[i] = ((guint16*)xdata)[i]; + ((gushort*)*data)[i] = ((gushort*)xdata)[i]; break; case 32: ((guint32*)*data)[i] = ((gulong*)xdata)[i]; @@ -383,13 +383,13 @@ gboolean prop_get_strings_utf8(Window win, Atom prop, gchar ***ret) return FALSE; } -void prop_set32(Window win, Atom prop, Atom type, guint32 val) +void prop_set32(Window win, Atom prop, Atom type, gulong val) { XChangeProperty(ob_display, win, prop, type, 32, PropModeReplace, (guchar*)&val, 1); } -void prop_set_array32(Window win, Atom prop, Atom type, guint32 *val, +void prop_set_array32(Window win, Atom prop, Atom type, gulong *val, guint num) { XChangeProperty(ob_display, win, prop, type, 32, PropModeReplace, diff --git a/openbox/prop.h b/openbox/prop.h index 4a7b44a0..edaaf2e6 100644 --- a/openbox/prop.h +++ b/openbox/prop.h @@ -177,8 +177,8 @@ gboolean prop_get_string_utf8(Window win, Atom prop, gchar **ret); gboolean prop_get_strings_locale(Window win, Atom prop, gchar ***ret); gboolean prop_get_strings_utf8(Window win, Atom prop, gchar ***ret); -void prop_set32(Window win, Atom prop, Atom type, guint32 val); -void prop_set_array32(Window win, Atom prop, Atom type, guint32 *val, +void prop_set32(Window win, Atom prop, Atom type, gulong val); +void prop_set_array32(Window win, Atom prop, Atom type, gulong *val, guint num); void prop_set_string_utf8(Window win, Atom prop, gchar *val); void prop_set_strings_utf8(Window win, Atom prop, gchar **strs); diff --git a/openbox/screen.c b/openbox/screen.c index 9ed7e057..62c3b58e 100644 --- a/openbox/screen.c +++ b/openbox/screen.c @@ -156,7 +156,7 @@ gboolean screen_annex() XSetWindowAttributes attrib; pid_t pid; gint i, num_support; - guint32 *supported; + gulong *supported; /* create the netwm support window */ attrib.override_redirect = TRUE; @@ -206,7 +206,7 @@ gboolean screen_annex() /* set the _NET_SUPPORTED_ATOMS hint */ num_support = 51; i = 0; - supported = g_new(guint32, num_support); + supported = g_new(gulong, num_support); supported[i++] = prop_atoms.net_current_desktop; supported[i++] = prop_atoms.net_number_of_desktops; supported[i++] = prop_atoms.net_desktop_geometry; @@ -340,7 +340,7 @@ void screen_resize() static gint oldw = 0, oldh = 0; gint w, h; GList *it; - guint32 geometry[2]; + gulong geometry[2]; w = WidthOfScreen(ScreenOfDisplay(ob_display, ob_screen)); h = HeightOfScreen(ScreenOfDisplay(ob_display, ob_screen)); @@ -368,7 +368,7 @@ void screen_resize() void screen_set_num_desktops(guint num) { guint i, old; - guint32 *viewport; + gulong *viewport; GList *it; g_assert(num > 0); @@ -381,7 +381,7 @@ void screen_set_num_desktops(guint num) net_number_of_desktops, cardinal, num); /* set the viewport hint */ - viewport = g_new0(guint32, num * 2); + viewport = g_new0(gulong, num * 2); PROP_SETA32(RootWindow(ob_display, ob_screen), net_desktop_viewport, cardinal, viewport, num * 2); g_free(viewport); @@ -969,7 +969,7 @@ screen_area_add_strut_bottom(const StrutPartial *s, const Rect *monitor_area, void screen_update_areas() { guint i, x; - long *dims; + gulong *dims; GList *it; gint o; @@ -987,7 +987,7 @@ void screen_update_areas() area[i] = g_new0(Rect, screen_num_monitors + 1); area[i] = NULL; - dims = g_new(long, 4 * screen_num_desktops); + dims = g_new(gulong, 4 * screen_num_desktops); for (i = 0; i < screen_num_desktops + 1; ++i) { Strut *struts; diff --git a/openbox/stacking.c b/openbox/stacking.c index 35b2c1a7..714d2a1c 100644 --- a/openbox/stacking.c +++ b/openbox/stacking.c @@ -49,7 +49,7 @@ void stacking_set_list() } PROP_SETA32(RootWindow(ob_display, ob_screen), - net_client_list_stacking, window, (guint32*)windows, i); + net_client_list_stacking, window, (gulong*)windows, i); g_free(windows); } |