diff options
Diffstat (limited to 'openbox')
37 files changed, 163 insertions, 163 deletions
diff --git a/openbox/actions.c b/openbox/actions.c index 7cabbad5..cfe0bdde 100644 --- a/openbox/actions.c +++ b/openbox/actions.c @@ -299,7 +299,7 @@ static gboolean actions_interactive_begin_act(ObActionsAct *act, guint state) /* if using focus_delay, stop the timer now so that focus doesn't go moving on us, which would kill the action */ event_halt_focus_delay(); - + return TRUE; } else diff --git a/openbox/actions/desktop.c b/openbox/actions/desktop.c index 0620c453..d3a0d0c3 100644 --- a/openbox/actions/desktop.c +++ b/openbox/actions/desktop.c @@ -122,7 +122,7 @@ static gboolean run_func(ObActionsData *data, gpointer options) Options *o = options; guint d; - + switch (o->type) { case LAST: diff --git a/openbox/actions/focus.c b/openbox/actions/focus.c index d0acfbd9..ea7a6a2c 100644 --- a/openbox/actions/focus.c +++ b/openbox/actions/focus.c @@ -48,7 +48,7 @@ static gboolean run_func(ObActionsData *data, gpointer options) /* ob_debug("button %d focusable %d context %d %d %d\n", data->button, client_mouse_focusable(data->client), - data->context, + data->context, OB_FRAME_CONTEXT_CLIENT, OB_FRAME_CONTEXT_FRAME); */ if (data->button == 0 || client_mouse_focusable(data->client) || diff --git a/openbox/actions/moveresizeto.c b/openbox/actions/moveresizeto.c index 0f339e86..046a7b80 100644 --- a/openbox/actions/moveresizeto.c +++ b/openbox/actions/moveresizeto.c @@ -130,7 +130,7 @@ static gboolean run_func(ObActionsData *data, gpointer options) /* get the client's size back */ w -= c->frame->size.left + c->frame->size.right; - h -= c->frame->size.top + c->frame->size.bottom; + h -= c->frame->size.top + c->frame->size.bottom; frame_frame_gravity(c->frame, &x, &y); /* get the client coords */ client_try_configure(c, &x, &y, &w, &h, &lw, &lh, TRUE); diff --git a/openbox/client.c b/openbox/client.c index b8a2ea24..0392ee35 100644 --- a/openbox/client.c +++ b/openbox/client.c @@ -1,5 +1,5 @@ /* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- - + client.c for the Openbox window manager Copyright (c) 2006 Mikael Magnusson Copyright (c) 2003-2007 Dana Jansens @@ -237,7 +237,7 @@ void client_manage(Window window) grab_server(FALSE); return; /* don't manage it */ } - + /* is the window a docking app */ if ((wmhint = XGetWMHints(ob_display, window))) { if ((wmhint->flags & StateHint) && @@ -597,7 +597,7 @@ ObClient *client_fake_manage(Window window) frame_adjust_area(self->frame, FALSE, TRUE, TRUE); ob_debug("gave extents left %d right %d top %d bottom %d\n", - self->frame->size.left, self->frame->size.right, + self->frame->size.left, self->frame->size.right, self->frame->size.top, self->frame->size.bottom); /* free the ObAppSettings shallow copy */ @@ -1078,7 +1078,7 @@ static void client_get_all(ObClient *self, gboolean real) if (self->type == OB_CLIENT_TYPE_DESKTOP) self->desktop = DESKTOP_ALL; } - + #ifdef SYNC client_update_sync_request_counter(self); #endif @@ -1104,7 +1104,7 @@ static void client_get_area(ObClient *self) { XWindowAttributes wattrib; Status ret; - + ret = XGetWindowAttributes(ob_display, self->window, &wattrib); g_assert(ret != BadWindow); @@ -1125,7 +1125,7 @@ static void client_get_desktop(ObClient *self) self->desktop = screen_num_desktops - 1; else self->desktop = d; - ob_debug("client requested desktop 0x%x\n", self->desktop); + ob_debug("client requested desktop 0x%x\n", self->desktop); } else { GSList *it; gboolean first = TRUE; @@ -1172,7 +1172,7 @@ static void client_get_state(ObClient *self) { guint32 *state; guint num; - + if (PROP_GETA32(self->window, net_wm_state, atom, &state, &num)) { gulong i; for (i = 0; i < num; ++i) { @@ -1255,7 +1255,7 @@ void client_update_transient_for(ObClient *self) self->transient_for_group, trangroup, client_direct_parent(self), target); self->transient_for_group = trangroup; - + } static void client_update_transient_tree(ObClient *self, @@ -1401,7 +1401,7 @@ void client_get_type_and_transientness(ObClient *self) self->type = -1; self->transient = FALSE; - + if (PROP_GETA32(self->window, net_wm_window_type, atom, &val, &num)) { /* use the first value that we know about in the array */ for (i = 0; i < num; ++i) { @@ -1437,7 +1437,7 @@ void client_get_type_and_transientness(ObClient *self) if (XGetTransientForHint(ob_display, self->window, &t)) self->transient = TRUE; - + if (self->type == (ObClientType) -1) { /*the window type hint was not set, which means we either classify ourself as a normal window or a dialog, depending on if we are a @@ -1476,7 +1476,7 @@ void client_update_protocols(ObClient *self) notified whenever we want it to receive focus */ self->focus_notify = TRUE; #ifdef SYNC - else if (proto[i] == prop_atoms.net_wm_sync_request) + else if (proto[i] == prop_atoms.net_wm_sync_request) /* if this protocol is requested, then resizing the window will be synchronized between the frame and the client */ @@ -1556,13 +1556,13 @@ void client_update_normal_hints(ObClient *self) if (size.flags & PMinSize) SIZE_SET(self->min_size, size.min_width, size.min_height); - + if (size.flags & PMaxSize) SIZE_SET(self->max_size, size.max_width, size.max_height); - + if (size.flags & PBaseSize) SIZE_SET(self->base_size, size.base_width, size.base_height); - + if (size.flags & PResizeInc && size.width_inc && size.height_inc) SIZE_SET(self->size_inc, size.width_inc, size.height_inc); @@ -1796,7 +1796,7 @@ void client_update_wmhints(ObClient *self) /* assume a window takes input if it doesnt specify */ self->can_focus = TRUE; - + if ((hints = XGetWMHints(ob_display, self->window)) != NULL) { gboolean ur; @@ -1883,7 +1883,7 @@ void client_update_title(ObClient *self) gchar *visible = NULL; g_free(self->title); - + /* try netwm */ if (!PROP_GETS(self->window, net_wm_name, utf8, &data)) { /* try old x stuff */ @@ -2011,7 +2011,7 @@ void client_update_icons(ObClient *self) } self->icons = g_new(ObClientIcon, self->nicons); - + /* store the icons */ i = 0; for (j = 0; j < self->nicons; ++j) { @@ -2068,7 +2068,7 @@ void client_update_icons(ObClient *self) or removes it entirely, it's not very likely it is going to set one right away afterwards - if it has parents, then one of them will have an icon already + if it has parents, then one of them will have an icon already */ if (self->nicons == 0 && !self->parents) { RrPixel32 *icon = ob_rr_theme->def_win_icon; @@ -2442,7 +2442,7 @@ gboolean client_should_show(ObClient *self) return FALSE; if (self->desktop == screen_desktop || self->desktop == DESKTOP_ALL) return TRUE; - + return FALSE; } @@ -2586,7 +2586,7 @@ static void client_apply_startup_state(ObClient *self, client_shade(self, TRUE); if (demands_attention) client_hilite(self, TRUE); - + if (max_vert && max_horz) client_maximize(self, TRUE, 0); else if (max_vert) @@ -2788,7 +2788,7 @@ void client_try_configure(ObClient *self, gint *x, gint *y, gint *w, gint *h, /* you cannot resize to nothing */ if (basew + *w < 1) *w = 1 - basew; if (baseh + *h < 1) *h = 1 - baseh; - + /* save the logical size */ *logicalw = incw > 1 ? *w : *w + basew; *logicalh = inch > 1 ? *h : *h + baseh; @@ -3103,7 +3103,7 @@ void client_iconify(ObClient *self, gboolean iconic, gboolean curdesk, void client_maximize(ObClient *self, gboolean max, gint dir) { gint x, y, w, h; - + g_assert(dir == 0 || dir == 1 || dir == 2); if (!(self->functions & OB_CLIENT_FUNC_MAXIMIZE)) return; /* can't */ @@ -3191,7 +3191,7 @@ void client_close(ObClient *self) close, we just kill it */ if (!self->delete_window) client_kill(self); - + /* XXX: itd be cool to do timeouts and shit here for killing the client's process off @@ -3293,7 +3293,7 @@ ObClient *client_search_modal_child(ObClient *self) { GSList *it; ObClient *ret; - + for (it = self->transients; it; it = g_slist_next(it)) { ObClient *c = it->data; if ((ret = client_search_modal_child(c))) return ret; @@ -3304,7 +3304,7 @@ ObClient *client_search_modal_child(ObClient *self) gboolean client_validate(ObClient *self) { - XEvent e; + XEvent e; XSync(ob_display, FALSE); /* get all events on the server */ @@ -3320,7 +3320,7 @@ gboolean client_validate(ObClient *self) void client_set_wm_state(ObClient *self, glong state) { if (state == self->wmstate) return; /* no change */ - + switch (state) { case IconicState: client_iconify(self, TRUE, TRUE, FALSE); @@ -3349,11 +3349,11 @@ void client_set_state(ObClient *self, Atom action, glong data1, glong data2) action == prop_atoms.net_wm_state_remove || action == prop_atoms.net_wm_state_toggle)) /* an invalid action was passed to the client message, ignore it */ - return; + return; for (i = 0; i < 2; ++i) { Atom state = i == 0 ? data1 : data2; - + if (!state) continue; /* if toggling, then pick whether we're adding or removing */ @@ -3400,7 +3400,7 @@ void client_set_state(ObClient *self, Atom action, glong data1, glong data2) action = undecorated ? prop_atoms.net_wm_state_remove : prop_atoms.net_wm_state_add; } - + if (action == prop_atoms.net_wm_state_add) { if (state == prop_atoms.net_wm_state_modal) { modal = TRUE; @@ -3709,7 +3709,7 @@ static ObClientIcon* client_icon_recursive(ObClient *self, gint w, gint h) if ((parent = client_icon_recursive(c, w, h))) break; } - + return parent; } @@ -3763,7 +3763,7 @@ void client_set_layer(ObClient *self, gint layer) void client_set_undecorated(ObClient *self, gboolean undecorated) { if (self->undecorated != undecorated && - /* don't let it undecorate if the function is missing, but let + /* don't let it undecorate if the function is missing, but let it redecorate */ (self->functions & OB_CLIENT_FUNC_UNDECORATE || !undecorated)) { @@ -3783,7 +3783,7 @@ ObClient *client_direct_parent(ObClient *self) if (!self->parents) return NULL; if (self->transient_for_group) return NULL; return self->parents->data; -} +} ObClient *client_search_top_direct_parent(ObClient *self) { @@ -3798,7 +3798,7 @@ static GSList *client_search_all_top_parents_internal(ObClient *self, { GSList *ret; ObClient *p; - + /* move up the direct transient chain as far as possible */ while ((p = client_direct_parent(self)) && (!bylayer || p->layer == layer)) diff --git a/openbox/client.h b/openbox/client.h index e33b89e4..cba1aebb 100644 --- a/openbox/client.h +++ b/openbox/client.h @@ -43,7 +43,7 @@ struct _ObClientIcon gint height; RrPixel32 *data; }; - + /*! Possible window types */ typedef enum { @@ -147,7 +147,7 @@ struct _ObClient window placement. In theory, where this window exists. */ StrutPartial strut; - + /*! The logical size of the window The "logical" size of the window is refers to the user's perception of the size of the window, and is the value that should be displayed to the @@ -170,7 +170,7 @@ struct _ObClient A value of 0 means this is ignored. */ gfloat max_ratio; - + /*! The minimum size of the client window If the min is > the max, then the window is not resizable */ @@ -192,7 +192,7 @@ struct _ObClient /*! The client's specified colormap */ Colormap colormap; - + /*! Where to place the decorated window in relation to the undecorated window */ gint gravity; @@ -203,7 +203,7 @@ struct _ObClient /*! True if the client supports the delete_window protocol */ gboolean delete_window; - + /*! Was the window's position requested by the application or the user? if by the application, we force it completely onscreen, if by the user we only force it if it tries to go completely offscreen, if neither, we @@ -213,7 +213,7 @@ struct _ObClient /*! Was the window's size requested by the application or the user? If by the application we don't let it go outside the available area */ guint sized; - + /*! Can the window receive input focus? */ gboolean can_focus; /*! Notify the window when it receives focus? */ diff --git a/openbox/client_list_menu.c b/openbox/client_list_menu.c index 62558ef4..25bb6230 100644 --- a/openbox/client_list_menu.c +++ b/openbox/client_list_menu.c @@ -129,7 +129,7 @@ static gboolean self_update(ObMenuFrame *frame, gpointer data) menu_free(desktop_menus->data); desktop_menus = g_slist_delete_link(desktop_menus, desktop_menus); } - + for (i = 0; i < screen_num_desktops; ++i) { ObMenu *submenu; gchar *name = g_strdup_printf("%s-%u", MENU_NAME, i); diff --git a/openbox/client_menu.c b/openbox/client_menu.c index fbca23d1..43f98c74 100644 --- a/openbox/client_menu.c +++ b/openbox/client_menu.c @@ -378,7 +378,7 @@ void client_menu_startup() menu_set_execute_func(menu, client_menu_execute); e = menu_add_normal(menu, CLIENT_RESTORE, _("R_estore"), NULL, TRUE); - e->data.normal.mask = ob_rr_theme->max_toggled_mask; + e->data.normal.mask = ob_rr_theme->max_toggled_mask; e->data.normal.mask_normal_color = ob_rr_theme->menu_color; e->data.normal.mask_selected_color = ob_rr_theme->menu_selected_color; e->data.normal.mask_disabled_color = ob_rr_theme->menu_disabled_color; @@ -398,7 +398,7 @@ void client_menu_startup() ob_rr_theme->menu_disabled_selected_color; e = menu_add_normal(menu, CLIENT_MAXIMIZE, _("Ma_ximize"), NULL, TRUE); - e->data.normal.mask = ob_rr_theme->max_mask; + e->data.normal.mask = ob_rr_theme->max_mask; e->data.normal.mask_normal_color = ob_rr_theme->menu_color; e->data.normal.mask_selected_color = ob_rr_theme->menu_selected_color; e->data.normal.mask_disabled_color = ob_rr_theme->menu_disabled_color; diff --git a/openbox/config.c b/openbox/config.c index dad98a0b..d74b95f0 100644 --- a/openbox/config.c +++ b/openbox/config.c @@ -189,7 +189,7 @@ static void parse_per_app_settings(ObParseInst *i, xmlDocPtr doc, if (class_set || name_set) { xmlNodePtr n, c; ObAppSettings *settings = config_create_app_settings();; - + if (name_set) settings->name = g_pattern_spec_new(name); @@ -320,7 +320,7 @@ static void parse_per_app_settings(ObParseInst *i, xmlDocPtr doc, config_per_app_settings = g_slist_append(config_per_app_settings, (gpointer) settings); } - + app = parse_find_node("application", app->next); } @@ -362,7 +362,7 @@ static void parse_key(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, else if ((n = parse_find_node("action", node->children))) { while (n) { ObActionsAct *action; - + action = actions_parse(i, doc, n); if (action) keyboard_bind(keylist, action); @@ -401,7 +401,7 @@ static void parse_keyboard(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, /* -<context name="Titlebar"> +<context name="Titlebar"> <mousebind button="Left" action="Press"> <action name="Raise"></action> </mousebind> @@ -420,7 +420,7 @@ static void parse_mouse(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, mouse_unbind_all(); node = node->children; - + if ((n = parse_find_node("dragThreshold", node))) config_mouse_threshold = parse_int(doc, n); if ((n = parse_find_node("doubleClickTime", node))) @@ -472,7 +472,7 @@ static void parse_focus(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, xmlNodePtr n; node = node->children; - + if ((n = parse_find_node("focusNew", node))) config_focus_new = parse_bool(doc, n); if ((n = parse_find_node("followMouse", node))) @@ -493,7 +493,7 @@ static void parse_placement(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, xmlNodePtr n; node = node->children; - + if ((n = parse_find_node("policy", node))) if (parse_contains("UnderMouse", doc, n)) config_place_policy = OB_PLACE_POLICY_MOUSE; @@ -507,7 +507,7 @@ static void parse_margins(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, xmlNodePtr n; node = node->children; - + if ((n = parse_find_node("top", node))) config_margins.top = MAX(0, parse_int(doc, n)); if ((n = parse_find_node("left", node))) @@ -607,7 +607,7 @@ static void parse_desktops(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, xmlNodePtr n; node = node->children; - + if ((n = parse_find_node("number", node))) { gint d = parse_int(doc, n); if (d > 0) @@ -642,7 +642,7 @@ static void parse_resize(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, xmlNodePtr n; node = node->children; - + if ((n = parse_find_node("drawContents", node))) config_resize_redraw = parse_bool(doc, n); if ((n = parse_find_node("popupShow", node))) { @@ -763,8 +763,8 @@ static void parse_menu(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, config_menu_client_list_icons = parse_bool(doc, n); } } - -static void parse_resistance(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, + +static void parse_resistance(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, gpointer d) { xmlNodePtr n; diff --git a/openbox/dock.c b/openbox/dock.c index e8c6e630..990c8208 100644 --- a/openbox/dock.c +++ b/openbox/dock.c @@ -138,12 +138,12 @@ void dock_add(Window win, XWMHints *wmhints) if (data[1]) app->class = g_strdup(data[1]); } - g_strfreev(data); + g_strfreev(data); } if (app->name == NULL) app->name = g_strdup(""); if (app->class == NULL) app->class = g_strdup(""); - + if (XGetWindowAttributes(ob_display, app->icon_win, &attrib)) { app->w = attrib.width; app->h = attrib.height; @@ -405,7 +405,7 @@ void dock_configure() break; } break; - } + } } } diff --git a/openbox/event.c b/openbox/event.c index c3a17fbd..614373d6 100644 --- a/openbox/event.c +++ b/openbox/event.c @@ -662,7 +662,7 @@ static void event_process(const XEvent *ec, gpointer data) xwc.border_width = e->xconfigurerequest.border_width; xwc.sibling = e->xconfigurerequest.above; xwc.stack_mode = e->xconfigurerequest.detail; - + /* we are not to be held responsible if someone sends us an invalid request! */ xerror_set_ignore(TRUE); @@ -695,7 +695,7 @@ static void event_process(const XEvent *ec, gpointer data) static void event_handle_root(XEvent *e) { Atom msgtype; - + switch(e->type) { case SelectionClear: ob_debug("Another WM has requested to replace us. Exiting.\n"); @@ -792,7 +792,7 @@ static void event_handle_client(ObClient *client, XEvent *e) ObFrameContext con; static gint px = -1, py = -1; static guint pb = 0; - + switch (e->type) { case ButtonPress: /* save where the press occured for the first button pressed */ @@ -835,7 +835,7 @@ static void event_handle_client(ObClient *client, XEvent *e) case OB_FRAME_CONTEXT_ALLDESKTOPS: client->frame->desk_press = (e->type == ButtonPress); frame_adjust_state(client->frame); - break; + break; case OB_FRAME_CONTEXT_SHADE: client->frame->shade_press = (e->type == ButtonPress); frame_adjust_state(client->frame); @@ -1208,7 +1208,7 @@ static void event_handle_client(ObClient *client, XEvent *e) /* we don't want the reparent event, put it back on the stack for the X server to deal with after we unmanage the window */ XPutBackEvent(ob_display, e); - + ob_debug("ReparentNotify for window 0x%x\n", client->window); client_unmanage(client); break; @@ -1436,7 +1436,7 @@ static void event_handle_client(ObClient *client, XEvent *e) case PropertyNotify: /* validate cuz we query stuff off the client here */ if (!client_validate(client)) break; - + /* compress changes to a single property into a single change */ while (XCheckTypedWindowEvent(ob_display, client->window, e->type, &ce)) { @@ -1759,8 +1759,8 @@ static gboolean event_handle_menu(XEvent *ev) menu_frame_select(e->frame, NULL, FALSE); } break; - case MotionNotify: - if ((e = menu_entry_frame_under(ev->xmotion.x_root, + case MotionNotify: + if ((e = menu_entry_frame_under(ev->xmotion.x_root, ev->xmotion.y_root))) if (!(f = find_active_menu()) || f == e->frame || diff --git a/openbox/extensions.c b/openbox/extensions.c index b7d8e73a..89a96576 100644 --- a/openbox/extensions.c +++ b/openbox/extensions.c @@ -3,17 +3,17 @@ extensions.c for the Openbox window manager Copyright (c) 2006 Mikael Magnusson Copyright (c) 2003-2007 Dana Jansens - + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + See the COPYING file for a copy of the GNU General Public License. */ @@ -38,7 +38,7 @@ void extensions_query_all() { gint junk; (void)junk; - + #ifdef XKB extensions_xkb = XkbQueryExtension(ob_display, &junk, &extensions_xkb_event_basep, diff --git a/openbox/extensions.h b/openbox/extensions.h index 3fbac871..31558740 100644 --- a/openbox/extensions.h +++ b/openbox/extensions.h @@ -70,5 +70,5 @@ extern gint extensions_sync_event_basep; void extensions_query_all(); void extensions_xinerama_screens(Rect **areas, guint *nxin); - + #endif diff --git a/openbox/focus.c b/openbox/focus.c index 9a0b2bdc..0dafd799 100644 --- a/openbox/focus.c +++ b/openbox/focus.c @@ -274,7 +274,7 @@ ObClient *focus_order_find_first(guint desktop) static gboolean focus_target_has_siblings(ObClient *ft, gboolean iconic_windows, gboolean all_desktops) - + { GSList *it; @@ -320,7 +320,7 @@ gboolean focus_valid_target(ObClient *ft, ok = ok && ((dock_windows && ft->type == OB_CLIENT_TYPE_DOCK) || (desktop_windows && ft->type == OB_CLIENT_TYPE_DESKTOP)); /* modal windows are important and can always get focus if they are - visible and stuff, so don't change 'ok' based on their type */ + visible and stuff, so don't change 'ok' based on their type */ else if (!ft->modal) /* normal non-helper windows are valid targets */ ok = ok && @@ -332,7 +332,7 @@ gboolean focus_valid_target(ObClient *ft, include helper windows ... */ ((focus_client && ft->group == focus_client->group && helper_windows) || - /* ... or if there are no other windows in its group + /* ... or if there are no other windows in its group that can be focused instead */ !focus_target_has_siblings(ft, iconic_windows, all_desktops)))); diff --git a/openbox/focus_cycle.c b/openbox/focus_cycle.c index 02510c4d..85cdf480 100644 --- a/openbox/focus_cycle.c +++ b/openbox/focus_cycle.c @@ -165,7 +165,7 @@ done_cycle: /* this be mostly ripped from fvwm */ static ObClient *focus_find_directional(ObClient *c, ObDirection dir, gboolean dock_windows, - gboolean desktop_windows) + gboolean desktop_windows) { gint my_cx, my_cy, his_cx, his_cy; gint offset = 0; @@ -302,7 +302,7 @@ ObClient* focus_directional_cycle(ObDirection dir, gboolean dock_windows, focus_cycle_desktop_windows)) ft = it->data; } - + if (ft && ft != focus_cycle_target) {/* prevents flicker */ focus_cycle_target = ft; if (!interactive) diff --git a/openbox/focus_cycle_indicator.c b/openbox/focus_cycle_indicator.c index a7ebf014..79071314 100644 --- a/openbox/focus_cycle_indicator.c +++ b/openbox/focus_cycle_indicator.c @@ -46,7 +46,7 @@ static Window create_window(Window parent, gulong mask, return XCreateWindow(ob_display, parent, 0, 0, 1, 1, 0, RrDepth(ob_rr_inst), InputOutput, RrVisual(ob_rr_inst), mask, attrib); - + } void focus_cycle_indicator_startup(gboolean reconfig) diff --git a/openbox/frame.c b/openbox/frame.c index 55fe98f8..8f28526b 100644 --- a/openbox/frame.c +++ b/openbox/frame.c @@ -59,7 +59,7 @@ static Window createWindow(Window parent, Visual *visual, (visual ? 32 : RrDepth(ob_rr_inst)), InputOutput, (visual ? visual : RrVisual(ob_rr_inst)), mask, attrib); - + } static Visual *check_32bit_client(ObClient *c) @@ -156,7 +156,7 @@ ObFrame *frame_new(ObClient *client) self->handle = createWindow(self->window, NULL, mask, &attrib); self->lgrip = createWindow(self->handle, NULL, mask, &attrib); - self->rgrip = createWindow(self->handle, NULL, mask, &attrib); + self->rgrip = createWindow(self->handle, NULL, mask, &attrib); self->handleleft = createWindow(self->handle, NULL, mask, &attrib); self->handleright = createWindow(self->handle, NULL, mask, &attrib); @@ -177,9 +177,9 @@ ObFrame *frame_new(ObClient *client) XMapWindow(ob_display, self->backback); XMapWindow(ob_display, self->backfront); - self->max_press = self->close_press = self->desk_press = + self->max_press = self->close_press = self->desk_press = self->iconify_press = self->shade_press = FALSE; - self->max_hover = self->close_hover = self->desk_hover = + self->max_hover = self->close_hover = self->desk_hover = self->iconify_hover = self->shade_hover = FALSE; set_theme_statics(self); @@ -224,7 +224,7 @@ static void set_theme_statics(ObFrame *self) static void free_theme_statics(ObFrame *self) { - RrAppearanceFree(self->a_unfocused_title); + RrAppearanceFree(self->a_unfocused_title); RrAppearanceFree(self->a_focused_title); RrAppearanceFree(self->a_unfocused_label); RrAppearanceFree(self->a_focused_label); @@ -378,7 +378,7 @@ void frame_adjust_area(ObFrame *self, gboolean moved, { self->size.bottom += ob_rr_theme->handle_height + self->bwidth; } - + /* position/size and map/unmap all the windows */ if (!fake) { @@ -548,7 +548,7 @@ void frame_adjust_area(ObFrame *self, gboolean moved, sidebwidth) * 2, self->bwidth); - + if (sidebwidth) { XMoveResizeWindow(ob_display, self->lgripleft, 0, @@ -766,7 +766,7 @@ void frame_adjust_area(ObFrame *self, gboolean moved, if (!frame_iconify_animating(self)) /* move and resize the top level frame. shading can change without being moved or resized. - + but don't do this during an iconify animation. it will be reflected afterwards. */ @@ -1571,7 +1571,7 @@ void frame_flash_start(ObFrame *self) flash_done); g_get_current_time(&self->flash_end); g_time_val_add(&self->flash_end, G_USEC_PER_SEC * 5); - + self->flashing = TRUE; } @@ -1622,7 +1622,7 @@ static gboolean frame_animate_iconify(gpointer p) /* how far do we have left to go ? */ g_get_current_time(&now); time = frame_animate_iconify_time_left(self, &now); - + if (time == 0 || iconifying) { /* start where the frame is supposed to be */ x = self->area.x; diff --git a/openbox/framerender.c b/openbox/framerender.c index fe789d96..8cb5910f 100644 --- a/openbox/framerender.c +++ b/openbox/framerender.c @@ -126,12 +126,12 @@ void framerender_frame(ObFrame *self) (self->max_press ? ob_rr_theme->a_toggled_focused_pressed_max : (self->max_hover ? - ob_rr_theme->a_toggled_hover_focused_max : + ob_rr_theme->a_toggled_hover_focused_max : ob_rr_theme->a_toggled_focused_unpressed_max)) : (self->max_press ? ob_rr_theme->a_focused_pressed_max : (self->max_hover ? - ob_rr_theme->a_hover_focused_max : + ob_rr_theme->a_hover_focused_max : ob_rr_theme->a_focused_unpressed_max)))); n = self->a_icon; i = (!(self->decorations & OB_FRAME_DECOR_ICONIFY) ? @@ -139,7 +139,7 @@ void framerender_frame(ObFrame *self) (self->iconify_press ? ob_rr_theme->a_focused_pressed_iconify : (self->iconify_hover ? - ob_rr_theme->a_hover_focused_iconify : + ob_rr_theme->a_hover_focused_iconify : ob_rr_theme->a_focused_unpressed_iconify))); d = (!(self->decorations & OB_FRAME_DECOR_ALLDESKTOPS) ? ob_rr_theme->a_disabled_focused_desk : @@ -147,12 +147,12 @@ void framerender_frame(ObFrame *self) (self->desk_press ? ob_rr_theme->a_toggled_focused_pressed_desk : (self->desk_hover ? - ob_rr_theme->a_toggled_hover_focused_desk : + ob_rr_theme->a_toggled_hover_focused_desk : ob_rr_theme->a_toggled_focused_unpressed_desk)) : (self->desk_press ? ob_rr_theme->a_focused_pressed_desk : (self->desk_hover ? - ob_rr_theme->a_hover_focused_desk : + ob_rr_theme->a_hover_focused_desk : ob_rr_theme->a_focused_unpressed_desk)))); s = (!(self->decorations & OB_FRAME_DECOR_SHADE) ? ob_rr_theme->a_disabled_focused_shade : @@ -160,19 +160,19 @@ void framerender_frame(ObFrame *self) (self->shade_press ? ob_rr_theme->a_toggled_focused_pressed_shade : (self->shade_hover ? - ob_rr_theme->a_toggled_hover_focused_shade : + ob_rr_theme->a_toggled_hover_focused_shade : ob_rr_theme->a_toggled_focused_unpressed_shade)) : (self->shade_press ? ob_rr_theme->a_focused_pressed_shade : (self->shade_hover ? - ob_rr_theme->a_hover_focused_shade : + ob_rr_theme->a_hover_focused_shade : ob_rr_theme->a_focused_unpressed_shade)))); c = (!(self->decorations & OB_FRAME_DECOR_CLOSE) ? ob_rr_theme->a_disabled_focused_close : (self->close_press ? ob_rr_theme->a_focused_pressed_close : (self->close_hover ? - ob_rr_theme->a_hover_focused_close : + ob_rr_theme->a_hover_focused_close : ob_rr_theme->a_focused_unpressed_close))); } else { t = self->a_unfocused_title; @@ -183,12 +183,12 @@ void framerender_frame(ObFrame *self) (self->max_press ? ob_rr_theme->a_toggled_unfocused_pressed_max : (self->max_hover ? - ob_rr_theme->a_toggled_hover_unfocused_max : + ob_rr_theme->a_toggled_hover_unfocused_max : ob_rr_theme->a_toggled_unfocused_unpressed_max)) : (self->max_press ? ob_rr_theme->a_unfocused_pressed_max : (self->max_hover ? - ob_rr_theme->a_hover_unfocused_max : + ob_rr_theme->a_hover_unfocused_max : ob_rr_theme->a_unfocused_unpressed_max)))); n = self->a_icon; i = (!(self->decorations & OB_FRAME_DECOR_ICONIFY) ? @@ -196,7 +196,7 @@ void framerender_frame(ObFrame *self) (self->iconify_press ? ob_rr_theme->a_unfocused_pressed_iconify : (self->iconify_hover ? - ob_rr_theme->a_hover_unfocused_iconify : + ob_rr_theme->a_hover_unfocused_iconify : ob_rr_theme->a_unfocused_unpressed_iconify))); d = (!(self->decorations & OB_FRAME_DECOR_ALLDESKTOPS) ? ob_rr_theme->a_disabled_unfocused_desk : @@ -204,12 +204,12 @@ void framerender_frame(ObFrame *self) (self->desk_press ? ob_rr_theme->a_toggled_unfocused_pressed_desk : (self->desk_hover ? - ob_rr_theme->a_toggled_hover_unfocused_desk : + ob_rr_theme->a_toggled_hover_unfocused_desk : ob_rr_theme->a_toggled_unfocused_unpressed_desk)) : (self->desk_press ? ob_rr_theme->a_unfocused_pressed_desk : (self->desk_hover ? - ob_rr_theme->a_hover_unfocused_desk : + ob_rr_theme->a_hover_unfocused_desk : ob_rr_theme->a_unfocused_unpressed_desk)))); s = (!(self->decorations & OB_FRAME_DECOR_SHADE) ? ob_rr_theme->a_disabled_unfocused_shade : @@ -217,19 +217,19 @@ void framerender_frame(ObFrame *self) (self->shade_press ? ob_rr_theme->a_toggled_unfocused_pressed_shade : (self->shade_hover ? - ob_rr_theme->a_toggled_hover_unfocused_shade : + ob_rr_theme->a_toggled_hover_unfocused_shade : ob_rr_theme->a_toggled_unfocused_unpressed_shade)) : (self->shade_press ? ob_rr_theme->a_unfocused_pressed_shade : (self->shade_hover ? - ob_rr_theme->a_hover_unfocused_shade : + ob_rr_theme->a_hover_unfocused_shade : ob_rr_theme->a_unfocused_unpressed_shade)))); c = (!(self->decorations & OB_FRAME_DECOR_CLOSE) ? ob_rr_theme->a_disabled_unfocused_close : (self->close_press ? ob_rr_theme->a_unfocused_pressed_close : (self->close_hover ? - ob_rr_theme->a_hover_unfocused_close : + ob_rr_theme->a_hover_unfocused_close : ob_rr_theme->a_unfocused_unpressed_close))); } clear = ob_rr_theme->a_clear; diff --git a/openbox/keytree.h b/openbox/keytree.h index 59a515c7..391cb154 100644 --- a/openbox/keytree.h +++ b/openbox/keytree.h @@ -29,9 +29,9 @@ typedef struct KeyBindingTree { gboolean chroot; /* the level up in the tree */ - struct KeyBindingTree *parent; + struct KeyBindingTree *parent; /* the next binding in the tree at the same level */ - struct KeyBindingTree *next_sibling; + struct KeyBindingTree *next_sibling; /* the first child of this binding (next binding in a chained sequence).*/ struct KeyBindingTree *first_child; } KeyBindingTree; diff --git a/openbox/mainloop.c b/openbox/mainloop.c index f2a25133..591a7159 100644 --- a/openbox/mainloop.c +++ b/openbox/mainloop.c @@ -505,7 +505,7 @@ static glong timecompare(GTimeVal *a, GTimeVal *b) if ((r = b->tv_sec - a->tv_sec)) return r; return b->tv_usec - a->tv_usec; - + } static void insert_timer(ObMainLoop *loop, ObMainLoopTimer *ins) @@ -601,7 +601,7 @@ static void timer_dispatch(ObMainLoop *loop, GTimeVal **wait) for (it = loop->timers; it; it = next) { ObMainLoopTimer *curr; - + next = g_slist_next(it); curr = it->data; @@ -611,14 +611,14 @@ static void timer_dispatch(ObMainLoop *loop, GTimeVal **wait) */ if (curr->del_me) { /* delete the top */ - loop->timers = g_slist_delete_link(loop->timers, it); + loop->timers = g_slist_delete_link(loop->timers, it); if (curr->destroy) curr->destroy(curr->data); g_free(curr); continue; } - /* the queue is sorted, so if this timer shouldn't fire, none are + /* the queue is sorted, so if this timer shouldn't fire, none are ready */ if (timecompare(&NEAREST_TIMEOUT(loop), &loop->now) < 0) break; diff --git a/openbox/menu.c b/openbox/menu.c index b49177ba..b69b7a3b 100644 --- a/openbox/menu.c +++ b/openbox/menu.c @@ -111,7 +111,7 @@ void menu_startup(gboolean reconfig) g_message(_("Unable to find a valid menu file '%s'"), "menu.xml"); } - + g_assert(menu_parse_state.parent == NULL); if (!reconfig) @@ -198,7 +198,7 @@ static ObMenu* menu_from_name(gchar *name) g_message(_("Attempted to access menu '%s' but it does not exist"), name); return self; -} +} #define VALID_SHORTCUT(c) (((c) >= '0' && (c) <= '9') || \ ((c) >= 'A' && (c) <= 'Z') || \ @@ -209,7 +209,7 @@ static gunichar parse_shortcut(const gchar *label, gboolean allow_shortcut, gboolean *always_show) { gunichar shortcut = 0; - + *position = 0; *always_show = FALSE; @@ -268,7 +268,7 @@ static void parse_menu_item(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, { ObMenuParseState *state = data; gchar *label; - + if (state->parent) { if (parse_attr_string("label", node, &label)) { GSList *acts = NULL; diff --git a/openbox/menuframe.c b/openbox/menuframe.c index 7fff8b69..d2f513c4 100644 --- a/openbox/menuframe.c +++ b/openbox/menuframe.c @@ -605,7 +605,7 @@ static gint menu_entry_frame_get_height(ObMenuEntryFrame *self, if (self->entry->data.separator.label != NULL) { h += ob_rr_theme->menu_title_height + (ob_rr_theme->mbwidth - PADDING) * 2; - + /* if the first entry is a labeled separator, then make its border overlap with the menu's outside border */ if (first_entry) @@ -888,7 +888,7 @@ static void menu_frame_update(ObMenuFrame *self) more_frame = menu_entry_frame_new(more_entry, self); /* make it get deleted when the menu frame goes away */ menu_entry_unref(more_entry); - + /* add our More... entry to the frame */ self->entries = g_list_append(self->entries, more_frame); } @@ -1135,8 +1135,8 @@ void menu_frame_select(ObMenuFrame *self, ObMenuEntryFrame *entry, entry = old; if (old == entry) return; - - if (config_submenu_show_delay) { + + if (config_submenu_show_delay) { /* remove any submenu open requests */ ob_main_loop_timeout_remove(ob_main_loop, menu_entry_frame_submenu_timeout); diff --git a/openbox/mouse.c b/openbox/mouse.c index 97abf708..97616096 100644 --- a/openbox/mouse.c +++ b/openbox/mouse.c @@ -146,7 +146,7 @@ void mouse_unbind_all() { gint i; GSList *it; - + for(i = 0; i < OB_FRAME_NUM_CONTEXTS; ++i) { for (it = bound_contexts[i]; it; it = g_slist_next(it)) { ObMouseBinding *b = it->data; diff --git a/openbox/moveresize.c b/openbox/moveresize.c index 1d4b322c..7388107d 100644 --- a/openbox/moveresize.c +++ b/openbox/moveresize.c @@ -72,7 +72,7 @@ static gboolean sync_timeout_func(gpointer data); static void client_dest(ObClient *client, gpointer data) { if (moveresize_client == client) - moveresize_end(TRUE); + moveresize_end(TRUE); } void moveresize_startup(gboolean reconfig) @@ -661,7 +661,7 @@ static void resize_with_keys(gint keycode, gint state) pdy = -dh; else if (key_resize_edge == OB_DIRECTION_SOUTH) pdy = dh; - + screen_pointer_pos(&opx, &opy); XWarpPointer(ob_display, None, None, 0, 0, 0, 0, pdx, pdy); /* steal the motion events this causes */ @@ -722,7 +722,7 @@ gboolean moveresize_event(XEvent *e) dw = (e->xmotion.x_root - start_x); dh = -(e->xmotion.y_root - start_y); lockcorner = OB_CORNER_BOTTOMLEFT; - } else if (corner == prop_atoms.net_wm_moveresize_size_right) { + } else if (corner == prop_atoms.net_wm_moveresize_size_right) { dw = (e->xmotion.x_root - start_x); dh = 0; lockcorner = OB_CORNER_BOTTOMLEFT; diff --git a/openbox/openbox.c b/openbox/openbox.c index 00fe6e6e..0c758cfd 100644 --- a/openbox/openbox.c +++ b/openbox/openbox.c @@ -129,7 +129,7 @@ gint main(gint argc, gchar **argv) if (chdir(g_get_home_dir()) == -1) g_message(_("Unable to change to home directory '%s': %s"), g_get_home_dir(), g_strerror(errno)); - + /* parse the command line args, which can change the argv[0] */ parse_args(&argc, argv); /* parse the environment variables */ @@ -155,7 +155,7 @@ gint main(gint argc, gchar **argv) prop_startup(); /* Send client message telling the OB process to: - * remote_control = 1 -> reconfigure + * remote_control = 1 -> reconfigure * remote_control = 2 -> restart */ PROP_MSG(RootWindow(ob_display, ob_screen), ob_control, remote_control, 0, 0, 0); @@ -443,7 +443,7 @@ gint main(gint argc, gchar **argv) g_free(ob_sm_save_file); g_free(ob_sm_id); g_free(program_name); - + return exitcode; } @@ -456,7 +456,7 @@ static void signal_handler(gint signal, gpointer data) break; case SIGUSR2: ob_debug("Caught signal %d. Reconfiguring.\n", signal); - ob_reconfigure(); + ob_reconfigure(); break; case SIGCHLD: /* reap children */ diff --git a/openbox/openbox.h b/openbox/openbox.h index 460de0b4..b768fee3 100644 --- a/openbox/openbox.h +++ b/openbox/openbox.h @@ -35,7 +35,7 @@ extern RrTheme *ob_rr_theme; extern struct _ObMainLoop *ob_main_loop; /*! The X display */ -extern Display *ob_display; +extern Display *ob_display; /*! The number of the screen on which we're running */ extern gint ob_screen; diff --git a/openbox/place.c b/openbox/place.c index 99911966..6a97c363 100644 --- a/openbox/place.c +++ b/openbox/place.c @@ -86,7 +86,7 @@ static Rect **pick_head(ObClient *c) /* try on the client's desktop */ for (it = c->group->members; it; it = g_slist_next(it)) { - ObClient *itc = it->data; + ObClient *itc = it->data; if (itc != c && (itc->desktop == c->desktop || itc->desktop == DESKTOP_ALL || c->desktop == DESKTOP_ALL)) @@ -99,7 +99,7 @@ static Rect **pick_head(ObClient *c) /* try on all desktops */ for (it = c->group->members; it; it = g_slist_next(it)) { - ObClient *itc = it->data; + ObClient *itc = it->data; if (itc != c) { add_choice(choice, client_monitor(it->data)); ob_debug("placement adding choice %d for group sibling on " @@ -446,7 +446,7 @@ static gboolean place_transient_splash(ObClient *client, gint *x, gint *y) } } if (!first) { - *x = ((r + 1 - l) - client->frame->area.width) / 2 + l; + *x = ((r + 1 - l) - client->frame->area.width) / 2 + l; *y = ((b + 1 - t) - client->frame->area.height) / 2 + t; return TRUE; } diff --git a/openbox/popup.c b/openbox/popup.c index f5072748..d49148ff 100644 --- a/openbox/popup.c +++ b/openbox/popup.c @@ -46,7 +46,7 @@ ObPopup *popup_new() 0, 0, 1, 1, 0, RrDepth(ob_rr_inst), InputOutput, RrVisual(ob_rr_inst), CWOverrideRedirect, &attrib); - + self->text = XCreateWindow(ob_display, self->bg, 0, 0, 1, 1, 0, RrDepth(ob_rr_inst), InputOutput, RrVisual(ob_rr_inst), 0, NULL); @@ -110,7 +110,7 @@ void popup_text_width_to_string(ObPopup *self, gchar *text) self->a_text->texture[0].data.text.string = text; self->textw = RrMinWidth(self->a_text); } else - self->textw = 0; + self->textw = 0; } void popup_height_to_string(ObPopup *self, gchar *text) @@ -138,7 +138,7 @@ void popup_set_text_align(ObPopup *self, RrJustify align) static gboolean popup_show_timeout(gpointer data) { ObPopup *self = data; - + XMapWindow(ob_display, self->bg); stacking_raise(INTERNAL_AS_WINDOW(self)); self->mapped = TRUE; @@ -159,7 +159,7 @@ void popup_delay_show(ObPopup *self, gulong usec, gchar *text) RECT_SET(mon, self->x, self->y, 1, 1); area = screen_physical_area_monitor(screen_find_monitor(&mon)); - /* when there is no icon and the text is not parent relative, then + /* when there is no icon and the text is not parent relative, then fill the whole dialog with the text appearance, don't use the bg at all */ if (self->hasicon || self->a_text->surface.grad == RR_SURFACE_PARENTREL) @@ -248,10 +248,10 @@ void popup_delay_show(ObPopup *self, gulong usec, gchar *text) x=MAX(MIN(x, area->width-w),0); y=MAX(MIN(y, area->height-h),0); - + /* set the windows/appearances up */ XMoveResizeWindow(ob_display, self->bg, x, y, w, h); - /* when there is no icon and the text is not parent relative, then + /* when there is no icon and the text is not parent relative, then fill the whole dialog with the text appearance, don't use the bg at all */ if (self->hasicon || self->a_text->surface.grad == RR_SURFACE_PARENTREL) @@ -523,7 +523,7 @@ void pager_popup_delay_show(ObPagerPopup *self, gulong usec, for (i = self->desks; i < screen_num_desktops; ++i) { XSetWindowAttributes attr; - attr.border_pixel = + attr.border_pixel = RrColorPixel(ob_rr_theme->osd_border_color); self->wins[i] = XCreateWindow(ob_display, self->popup->bg, 0, 0, 1, 1, ob_rr_theme->obwidth, diff --git a/openbox/popup.h b/openbox/popup.h index f96ad664..0072f53e 100644 --- a/openbox/popup.h +++ b/openbox/popup.h @@ -53,7 +53,7 @@ struct _ObPopup guint iconhm; /* icon height multiplier. multipled by the normal height */ gboolean mapped; gboolean delay_mapped; - + void (*draw_icon)(gint x, gint y, gint w, gint h, gpointer data); gpointer draw_icon_data; }; diff --git a/openbox/prop.c b/openbox/prop.c index aec146d5..46d688c8 100644 --- a/openbox/prop.c +++ b/openbox/prop.c @@ -37,7 +37,7 @@ void prop_startup() CREATE(utf8, "UTF8_STRING"); CREATE(manager, "MANAGER"); - + CREATE(wm_colormap_windows, "WM_COLORMAP_WINDOWS"); CREATE(wm_protocols, "WM_PROTOCOLS"); CREATE(wm_state, "WM_STATE"); @@ -150,7 +150,7 @@ void prop_startup() CREATE(net_wm_state_above, "_NET_WM_STATE_ABOVE"); CREATE(net_wm_state_below, "_NET_WM_STATE_BELOW"); CREATE(net_wm_state_demands_attention, "_NET_WM_STATE_DEMANDS_ATTENTION"); - + prop_atoms.net_wm_state_add = 1; prop_atoms.net_wm_state_remove = 0; prop_atoms.net_wm_state_toggle = 2; @@ -362,7 +362,7 @@ gboolean prop_get_string_utf8(Window win, Atom prop, gchar **ret) gchar *raw; gchar *str; guint num; - + if (get_all(win, prop, prop_atoms.utf8, 8, (guchar**)&raw, &num)) { str = g_strndup(raw, num); /* grab the first string from the list */ g_free(raw); diff --git a/openbox/prop.h b/openbox/prop.h index b9d6795e..914c1f61 100644 --- a/openbox/prop.h +++ b/openbox/prop.h @@ -62,7 +62,7 @@ typedef struct Atoms { /* Atoms that are used inside messages - these don't go in net_supported */ - Atom net_wm_moveresize_size_topleft; + Atom net_wm_moveresize_size_topleft; Atom net_wm_moveresize_size_top; Atom net_wm_moveresize_size_topright; Atom net_wm_moveresize_size_right; @@ -189,7 +189,7 @@ typedef struct Atoms { */ /* Openbox specific atoms */ - + Atom ob_wm_action_undecorate; Atom ob_wm_state_undecorated; Atom openbox_pid; /* this is depreecated in favour of ob_control */ diff --git a/openbox/propwin.c b/openbox/propwin.c index c20cc353..774591d5 100644 --- a/openbox/propwin.c +++ b/openbox/propwin.c @@ -1,5 +1,5 @@ /* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- - + propwin.c for the Openbox window manager Copyright (c) 2006 Mikael Magnusson Copyright (c) 2003-2007 Dana Jansens diff --git a/openbox/resist.c b/openbox/resist.c index 49875fbb..fcd12ab4 100644 --- a/openbox/resist.c +++ b/openbox/resist.c @@ -50,7 +50,7 @@ void resist_move_windows(ObClient *c, gint resist, gint *x, gint *y) ct = RECT_TOP(c->frame->area); cr = RECT_RIGHT(c->frame->area); cb = RECT_BOTTOM(c->frame->area); - + for (it = stacking_list; it; it = g_list_next(it)) { ObClient *target; gint tl, tt, tr, tb; /* 1 past the target's edges on each side */ @@ -60,7 +60,7 @@ void resist_move_windows(ObClient *c, gint resist, gint *x, gint *y) target = it->data; /* don't snap to self or non-visibles */ - if (!target->frame->visible || target == c) continue; + if (!target->frame->visible || target == c) continue; /* don't snap to windows set to below and skip_taskbar (desklets) */ if (target->below && !c->below && target->skip_taskbar) continue; @@ -145,7 +145,7 @@ void resist_move_monitors(ObClient *c, gint resist, gint *x, gint *y) cb = RECT_BOTTOM(c->frame->area); RECT_SET(desired_area, *x, *y, c->area.width, c->area.height); - + for (i = 0; i < screen_num_monitors; ++i) { parea = screen_physical_area_monitor(i); @@ -218,7 +218,7 @@ void resist_size_windows(ObClient *c, gint resist, gint *w, gint *h, target = it->data; /* don't snap to invisibles or ourself */ - if (!target->frame->visible || target == c) continue; + if (!target->frame->visible || target == c) continue; /* don't snap to windows set to below and skip_taskbar (desklets) */ if (target->below && !c->below && target->skip_taskbar) continue; @@ -286,7 +286,7 @@ void resist_size_monitors(ObClient *c, gint resist, gint *w, gint *h, gint l, t, r, b; /* my left, top, right and bottom sides */ gint dlt, drb; /* my destination left/top and right/bottom sides */ Rect *area, *parea; - gint al, at, ar, ab; /* screen boundaries */ + gint al, at, ar, ab; /* screen boundaries */ gint pl, pt, pr, pb; /* physical screen boundaries */ gint incw, inch; guint i; diff --git a/openbox/screen.c b/openbox/screen.c index 707d0b6b..6f51bc1b 100644 --- a/openbox/screen.c +++ b/openbox/screen.c @@ -532,7 +532,7 @@ void screen_set_num_desktops(guint num) stacking_raise(CLIENT_AS_WINDOW(c)); } } - + /* change our struts/area to match (after moving windows) */ screen_update_areas(); @@ -552,7 +552,7 @@ void screen_set_desktop(guint num, gboolean dofocus) guint old; gulong ignore_start; gboolean allow_omni; - + g_assert(num < screen_num_desktops); old = screen_desktop; @@ -1008,7 +1008,7 @@ void screen_update_layout() if (PROP_GETA32(RootWindow(ob_display, ob_screen), net_desktop_layout, cardinal, &data, &num)) { if (num == 3 || num == 4) { - + if (data[0] == prop_atoms.net_wm_orientation_vert) l.orientation = OB_ORIENTATION_VERT; else if (data[0] == prop_atoms.net_wm_orientation_horz) @@ -1090,7 +1090,7 @@ void screen_update_desktop_names() void screen_show_desktop(gboolean show, ObClient *show_only) { GList *it; - + if (show == screen_showing_desktop) return; /* no change */ screen_showing_desktop = show; @@ -1353,7 +1353,7 @@ Rect* screen_area_all_monitors(guint desktop) g_free(m); } - + return a; } #endif diff --git a/openbox/session.c b/openbox/session.c index 5918aa13..96d7563f 100644 --- a/openbox/session.c +++ b/openbox/session.c @@ -436,7 +436,7 @@ static void sm_save_complete(SmcConn conn, SmPointer data) static void sm_shutdown_cancelled(SmcConn conn, SmPointer data) { - ob_debug_type(OB_DEBUG_SM, "Shutdown cancelled\n"); + ob_debug_type(OB_DEBUG_SM, "Shutdown cancelled\n"); } static gboolean session_save_to_file(const ObSMSaveData *savedata) @@ -747,7 +747,7 @@ static void session_load_file(const gchar *path) parse_find_node("undecorated", node->children) != NULL; state->focused = parse_find_node("focused", node->children) != NULL; - + /* save this. they are in the file in stacking order, so preserve that order here */ session_saved_state = g_list_append(session_saved_state, state); diff --git a/openbox/stacking.c b/openbox/stacking.c index 4a58d91e..2280b877 100644 --- a/openbox/stacking.c +++ b/openbox/stacking.c @@ -366,7 +366,7 @@ void stacking_add(ObWindow *win) } static GList *find_highest_relative(ObClient *client) -{ +{ GList *ret = NULL; if (client->parents) { @@ -383,7 +383,7 @@ static GList *find_highest_relative(ObClient *client) /* only look at windows in the same layer and that are visible */ if (c->layer == client->layer && - !c->iconic && + !c->iconic && (c->desktop == client->desktop || c->desktop == DESKTOP_ALL || client->desktop == DESKTOP_ALL)) diff --git a/openbox/translate.c b/openbox/translate.c index a9ff3e26..5b2b4ebe 100644 --- a/openbox/translate.c +++ b/openbox/translate.c @@ -68,7 +68,7 @@ gboolean translate_button(const gchar *str, guint *state, guint *button) gboolean ret = FALSE; parsed = g_strsplit(str, "-", -1); - + /* first, find the button (last token) */ l = NULL; for (i = 0; parsed[i] != NULL; ++i) @@ -110,7 +110,7 @@ gboolean translate_key(const gchar *str, guint *state, guint *keycode) KeySym sym; parsed = g_strsplit(str, "-", -1); - + /* first, find the key (last token) */ l = NULL; for (i = 0; parsed[i] != NULL; ++i) @@ -145,7 +145,7 @@ gboolean translate_key(const gchar *str, guint *state, guint *keycode) *keycode = XKeysymToKeycode(ob_display, sym); } if (!*keycode) { - g_message(_("Requested key '%s' does not exist on the display"), l); + g_message(_("Requested key '%s' does not exist on the display"), l); goto translation_fail; } |