all repos — openbox @ c716d1788bb4f4b9db403617023f06347ba48102

openbox fork - make it a bit more like ryudo

Remove double newlines.
Mikael Magnusson mikachu@comhem.se
commit

c716d1788bb4f4b9db403617023f06347ba48102

parent

617effd275a7c998d9bea686bc1a33240fd16704

M openbox/actions.copenbox/actions.c

@@ -58,7 +58,6 @@ };

static GSList *registered = NULL; - void actions_startup(gboolean reconfig) { if (reconfig) return;
M openbox/actions/desktop.copenbox/actions/desktop.c

@@ -122,8 +122,6 @@ {

Options *o = options; guint d; - - switch (o->type) { case LAST: d = screen_last_desktop;
M openbox/client.copenbox/client.c

@@ -108,7 +108,6 @@ static void client_call_notifies(ObClient *self, GSList *list);

static void client_ping_event(ObClient *self, gboolean dead); static void client_prompt_kill(ObClient *self); - void client_startup(gboolean reconfig) { if ((client_default_icon = RrImageCacheFind(ob_rr_icons,

@@ -503,7 +502,6 @@ relative_focused = (focus_client != NULL &&

(client_search_focus_tree_full(self) != NULL || client_search_focus_group_full(self) != NULL)); - /* This is focus stealing prevention */ ob_debug_type(OB_DEBUG_FOCUS, "Want to focus new window 0x%x at time %u "

@@ -657,7 +655,6 @@ window, self->frame->window, self->class);

return; } - ObClient *client_fake_manage(Window window) {

@@ -1380,7 +1377,6 @@ /* * *

Group transient windows are not allowed to have other group transient windows as their children. * * */ - /* No change has occured */ if (oldgroup == newgroup &&

@@ -2194,7 +2190,6 @@ hints->icon_mask : None),

(gint*)&w, (gint*)&h, &data); xerror_set_ignore(FALSE); - if (xicon) { if (w > 0 && h > 0) { /* is this icon in the cache yet? */

@@ -2686,7 +2681,6 @@ return (client_mouse_focusable(self) &&

self->type != OB_CLIENT_TYPE_DESKTOP); } - static void client_apply_startup_state(ObClient *self, gint x, gint y, gint w, gint h) {

@@ -2995,7 +2989,6 @@

g_assert(*w > 0); g_assert(*h > 0); } - void client_configure(ObClient *self, gint x, gint y, gint w, gint h, gboolean user, gboolean final, gboolean force_reply)
M openbox/config.hopenbox/config.h

@@ -198,5 +198,4 @@ src. */

void config_app_settings_copy_non_defaults(const ObAppSettings *src, ObAppSettings *dest); - #endif
M openbox/event.copenbox/event.c

@@ -1114,7 +1114,6 @@ we need to a notify then */

move = TRUE; } - if (e->xconfigurerequest.value_mask & CWStackMode) { ObClient *sibling = NULL; gulong ignore_start;
M openbox/focus.copenbox/focus.c

@@ -359,4 +359,3 @@ }

return ok; } -
M openbox/focus_cycle.copenbox/focus_cycle.c

@@ -96,7 +96,6 @@ goto done_cycle;

list = client_list; } - if (focus_cycle_target == NULL) { focus_cycle_iconic_windows = TRUE; focus_cycle_all_desktops = all_desktops;
M openbox/frame.copenbox/frame.c

@@ -590,7 +590,6 @@ self->width - (ob_rr_theme->grip_width +

sidebwidth) * 2, self->bwidth); - if (sidebwidth) { XMoveResizeWindow(ob_display, self->lgripleft, 0,
M openbox/keyboard.copenbox/keyboard.c

@@ -326,4 +326,3 @@

popup_free(popup); popup = NULL; } -
M openbox/keytree.hopenbox/keytree.h

@@ -42,5 +42,4 @@ void tree_assimilate(KeyBindingTree *node);

KeyBindingTree *tree_find(KeyBindingTree *search, gboolean *conflict); gboolean tree_chroot(KeyBindingTree *tree, GList *keylist); - #endif
M openbox/menu.copenbox/menu.c

@@ -62,7 +62,6 @@ static gunichar parse_shortcut(const gchar *label, gboolean allow_shortcut,

gchar **strippedlabel, guint *position, gboolean *always_show); - static void client_dest(ObClient *client, gpointer data) { /* menus can be associated with a client, so close any that are since
M openbox/menuframe.copenbox/menuframe.c

@@ -696,7 +696,6 @@ XSetWindowBorderWidth(ob_display, e->window, e->border);

XSetWindowBorder(ob_display, e->window, RrColorPixel(ob_rr_theme->menu_border_color)); - text_a = (e->entry->type == OB_MENU_ENTRY_TYPE_NORMAL && !e->entry->data.normal.enabled ? /* disabled */

@@ -1085,7 +1084,6 @@ menu_frame_hide(f);

} } } - ObMenuFrame* menu_frame_under(gint x, gint y) {
M openbox/modkeys.copenbox/modkeys.c

@@ -187,4 +187,3 @@ if (sym == keymap[(i-min_keycode) * keysyms_per_keycode + j])

return i; return 0; } -
M openbox/moveresize.copenbox/moveresize.c

@@ -348,7 +348,6 @@ moveresize_client->frame->area.x,

moveresize_client->frame->area.y); } - static void do_resize(void) { gint x, y, w, h, lw, lh;
M openbox/openbox.copenbox/openbox.c

@@ -85,7 +85,6 @@

#include <X11/Xlib.h> #include <X11/keysym.h> - RrInstance *ob_rr_inst; RrImageCache *ob_rr_icons; RrTheme *ob_rr_theme;

@@ -147,7 +146,6 @@ parse_paths_startup();

session_startup(argc, argv); } - ob_display = XOpenDisplay(NULL); if (ob_display == NULL)

@@ -222,7 +220,6 @@ XC_bottom_left_corner);

cursors[OB_CURSOR_WEST] = load_cursor("left_side", XC_left_side); cursors[OB_CURSOR_NORTHWEST] = load_cursor("top_left_corner", XC_top_left_corner); - prop_startup(); /* get atoms values for the display */ extensions_query_all(); /* find which extensions are present */
M openbox/prompt.copenbox/prompt.c

@@ -294,7 +294,6 @@ RrMinSize(prompt_a_pfocus, &bw, &bh);

self->button[i].width = MAX(self->button[i].width, bw); self->button[i].height = MAX(self->button[i].height, bh); - self->button[i].width += BUTTON_HMARGIN * 2; self->button[i].height += BUTTON_VMARGIN * 2;
M openbox/session.copenbox/session.c

@@ -397,7 +397,6 @@ ob_debug_type(OB_DEBUG_SM, "Saving is done (success = %d)\n", success);

SmcSaveYourselfDone(conn, success); } - static void sm_save_yourself(SmcConn conn, SmPointer data, gint save_type, Bool shutdown, gint interact_style, Bool fast) {
M render/gradient.crender/gradient.c

@@ -659,7 +659,6 @@ data += w;

} } - static void gradient_diagonal(RrSurface *sf, gint w, gint h) { gint x, y;
M render/render.crender/render.c

@@ -333,7 +333,6 @@ g_free(a);

} } - static void pixel_data_to_pixmap(RrAppearance *l, gint x, gint y, gint w, gint h) {
M render/test.crender/test.c

@@ -90,7 +90,6 @@ }

exit (0); #endif - RrPaint(look, win, w, h); done = 0; while (!done) {
M render/theme.crender/theme.c

@@ -567,7 +567,6 @@ OB_DEFAULT_ICON_pixel_data);

theme->def_win_icon_w = OB_DEFAULT_ICON_WIDTH; theme->def_win_icon_h = OB_DEFAULT_ICON_HEIGHT; - /* read the decoration textures */ if (!read_appearance(db, inst, "window.active.title.bg", theme->a_focused_title,

@@ -1762,7 +1761,6 @@ *interlaced = TRUE;

else *interlaced = FALSE; } - static gboolean read_appearance(XrmDatabase db, const RrInstance *inst, const gchar *rname, RrAppearance *value,
M tests/usertimewin.ctests/usertimewin.c

@@ -66,7 +66,6 @@ XChangeProperty(display, twin, atime, XA_CARDINAL, 32,

PropModeReplace, (unsigned char*)&num, 1); XFlush(display); - while (1) { XNextEvent(display, &report); }