Remove double newlines.
This commit is contained in:
parent
617effd275
commit
c716d1788b
22 changed files with 0 additions and 33 deletions
|
@ -58,7 +58,6 @@ struct _ObActionsAct {
|
||||||
|
|
||||||
static GSList *registered = NULL;
|
static GSList *registered = NULL;
|
||||||
|
|
||||||
|
|
||||||
void actions_startup(gboolean reconfig)
|
void actions_startup(gboolean reconfig)
|
||||||
{
|
{
|
||||||
if (reconfig) return;
|
if (reconfig) return;
|
||||||
|
|
|
@ -122,8 +122,6 @@ static gboolean run_func(ObActionsData *data, gpointer options)
|
||||||
Options *o = options;
|
Options *o = options;
|
||||||
guint d;
|
guint d;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
switch (o->type) {
|
switch (o->type) {
|
||||||
case LAST:
|
case LAST:
|
||||||
d = screen_last_desktop;
|
d = screen_last_desktop;
|
||||||
|
|
|
@ -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_ping_event(ObClient *self, gboolean dead);
|
||||||
static void client_prompt_kill(ObClient *self);
|
static void client_prompt_kill(ObClient *self);
|
||||||
|
|
||||||
|
|
||||||
void client_startup(gboolean reconfig)
|
void client_startup(gboolean reconfig)
|
||||||
{
|
{
|
||||||
if ((client_default_icon = RrImageCacheFind(ob_rr_icons,
|
if ((client_default_icon = RrImageCacheFind(ob_rr_icons,
|
||||||
|
@ -503,7 +502,6 @@ void client_manage(Window window, ObPrompt *prompt)
|
||||||
(client_search_focus_tree_full(self) != NULL ||
|
(client_search_focus_tree_full(self) != NULL ||
|
||||||
client_search_focus_group_full(self) != NULL));
|
client_search_focus_group_full(self) != NULL));
|
||||||
|
|
||||||
|
|
||||||
/* This is focus stealing prevention */
|
/* This is focus stealing prevention */
|
||||||
ob_debug_type(OB_DEBUG_FOCUS,
|
ob_debug_type(OB_DEBUG_FOCUS,
|
||||||
"Want to focus new window 0x%x at time %u "
|
"Want to focus new window 0x%x at time %u "
|
||||||
|
@ -658,7 +656,6 @@ void client_manage(Window window, ObPrompt *prompt)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
ObClient *client_fake_manage(Window window)
|
ObClient *client_fake_manage(Window window)
|
||||||
{
|
{
|
||||||
ObClient *self;
|
ObClient *self;
|
||||||
|
@ -1381,7 +1378,6 @@ static void client_update_transient_tree(ObClient *self,
|
||||||
transient windows as their children.
|
transient windows as their children.
|
||||||
* * */
|
* * */
|
||||||
|
|
||||||
|
|
||||||
/* No change has occured */
|
/* No change has occured */
|
||||||
if (oldgroup == newgroup &&
|
if (oldgroup == newgroup &&
|
||||||
oldgtran == newgtran &&
|
oldgtran == newgtran &&
|
||||||
|
@ -2194,7 +2190,6 @@ void client_update_icons(ObClient *self)
|
||||||
(gint*)&w, (gint*)&h, &data);
|
(gint*)&w, (gint*)&h, &data);
|
||||||
xerror_set_ignore(FALSE);
|
xerror_set_ignore(FALSE);
|
||||||
|
|
||||||
|
|
||||||
if (xicon) {
|
if (xicon) {
|
||||||
if (w > 0 && h > 0) {
|
if (w > 0 && h > 0) {
|
||||||
/* is this icon in the cache yet? */
|
/* is this icon in the cache yet? */
|
||||||
|
@ -2686,7 +2681,6 @@ gboolean client_enter_focusable(ObClient *self)
|
||||||
self->type != OB_CLIENT_TYPE_DESKTOP);
|
self->type != OB_CLIENT_TYPE_DESKTOP);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static void client_apply_startup_state(ObClient *self,
|
static void client_apply_startup_state(ObClient *self,
|
||||||
gint x, gint y, gint w, gint h)
|
gint x, gint y, gint w, gint h)
|
||||||
{
|
{
|
||||||
|
@ -2996,7 +2990,6 @@ void client_try_configure(ObClient *self, gint *x, gint *y, gint *w, gint *h,
|
||||||
g_assert(*h > 0);
|
g_assert(*h > 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void client_configure(ObClient *self, gint x, gint y, gint w, gint h,
|
void client_configure(ObClient *self, gint x, gint y, gint w, gint h,
|
||||||
gboolean user, gboolean final, gboolean force_reply)
|
gboolean user, gboolean final, gboolean force_reply)
|
||||||
{
|
{
|
||||||
|
|
|
@ -198,5 +198,4 @@ ObAppSettings* config_create_app_settings();
|
||||||
void config_app_settings_copy_non_defaults(const ObAppSettings *src,
|
void config_app_settings_copy_non_defaults(const ObAppSettings *src,
|
||||||
ObAppSettings *dest);
|
ObAppSettings *dest);
|
||||||
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -1114,7 +1114,6 @@ static void event_handle_client(ObClient *client, XEvent *e)
|
||||||
move = TRUE;
|
move = TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if (e->xconfigurerequest.value_mask & CWStackMode) {
|
if (e->xconfigurerequest.value_mask & CWStackMode) {
|
||||||
ObClient *sibling = NULL;
|
ObClient *sibling = NULL;
|
||||||
gulong ignore_start;
|
gulong ignore_start;
|
||||||
|
|
|
@ -359,4 +359,3 @@ gboolean focus_valid_target(ObClient *ft,
|
||||||
|
|
||||||
return ok;
|
return ok;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -96,7 +96,6 @@ ObClient* focus_cycle(gboolean forward, gboolean all_desktops,
|
||||||
list = client_list;
|
list = client_list;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if (focus_cycle_target == NULL) {
|
if (focus_cycle_target == NULL) {
|
||||||
focus_cycle_iconic_windows = TRUE;
|
focus_cycle_iconic_windows = TRUE;
|
||||||
focus_cycle_all_desktops = all_desktops;
|
focus_cycle_all_desktops = all_desktops;
|
||||||
|
|
|
@ -590,7 +590,6 @@ void frame_adjust_area(ObFrame *self, gboolean moved,
|
||||||
sidebwidth) * 2,
|
sidebwidth) * 2,
|
||||||
self->bwidth);
|
self->bwidth);
|
||||||
|
|
||||||
|
|
||||||
if (sidebwidth) {
|
if (sidebwidth) {
|
||||||
XMoveResizeWindow(ob_display, self->lgripleft,
|
XMoveResizeWindow(ob_display, self->lgripleft,
|
||||||
0,
|
0,
|
||||||
|
|
|
@ -326,4 +326,3 @@ void keyboard_shutdown(gboolean reconfig)
|
||||||
popup_free(popup);
|
popup_free(popup);
|
||||||
popup = NULL;
|
popup = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -42,5 +42,4 @@ void tree_assimilate(KeyBindingTree *node);
|
||||||
KeyBindingTree *tree_find(KeyBindingTree *search, gboolean *conflict);
|
KeyBindingTree *tree_find(KeyBindingTree *search, gboolean *conflict);
|
||||||
gboolean tree_chroot(KeyBindingTree *tree, GList *keylist);
|
gboolean tree_chroot(KeyBindingTree *tree, GList *keylist);
|
||||||
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -62,7 +62,6 @@ static gunichar parse_shortcut(const gchar *label, gboolean allow_shortcut,
|
||||||
gchar **strippedlabel, guint *position,
|
gchar **strippedlabel, guint *position,
|
||||||
gboolean *always_show);
|
gboolean *always_show);
|
||||||
|
|
||||||
|
|
||||||
static void client_dest(ObClient *client, gpointer data)
|
static void client_dest(ObClient *client, gpointer data)
|
||||||
{
|
{
|
||||||
/* menus can be associated with a client, so close any that are since
|
/* menus can be associated with a client, so close any that are since
|
||||||
|
|
|
@ -696,7 +696,6 @@ void menu_frame_render(ObMenuFrame *self)
|
||||||
XSetWindowBorder(ob_display, e->window,
|
XSetWindowBorder(ob_display, e->window,
|
||||||
RrColorPixel(ob_rr_theme->menu_border_color));
|
RrColorPixel(ob_rr_theme->menu_border_color));
|
||||||
|
|
||||||
|
|
||||||
text_a = (e->entry->type == OB_MENU_ENTRY_TYPE_NORMAL &&
|
text_a = (e->entry->type == OB_MENU_ENTRY_TYPE_NORMAL &&
|
||||||
!e->entry->data.normal.enabled ?
|
!e->entry->data.normal.enabled ?
|
||||||
/* disabled */
|
/* disabled */
|
||||||
|
@ -1086,7 +1085,6 @@ void menu_frame_hide_all_client(ObClient *client)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
ObMenuFrame* menu_frame_under(gint x, gint y)
|
ObMenuFrame* menu_frame_under(gint x, gint y)
|
||||||
{
|
{
|
||||||
ObMenuFrame *ret = NULL;
|
ObMenuFrame *ret = NULL;
|
||||||
|
|
|
@ -187,4 +187,3 @@ KeyCode modkeys_sym_to_code(KeySym sym)
|
||||||
return i;
|
return i;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -348,7 +348,6 @@ static void do_move(gboolean keyboard, gint keydist)
|
||||||
moveresize_client->frame->area.y);
|
moveresize_client->frame->area.y);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static void do_resize(void)
|
static void do_resize(void)
|
||||||
{
|
{
|
||||||
gint x, y, w, h, lw, lh;
|
gint x, y, w, h, lw, lh;
|
||||||
|
|
|
@ -85,7 +85,6 @@
|
||||||
#include <X11/Xlib.h>
|
#include <X11/Xlib.h>
|
||||||
#include <X11/keysym.h>
|
#include <X11/keysym.h>
|
||||||
|
|
||||||
|
|
||||||
RrInstance *ob_rr_inst;
|
RrInstance *ob_rr_inst;
|
||||||
RrImageCache *ob_rr_icons;
|
RrImageCache *ob_rr_icons;
|
||||||
RrTheme *ob_rr_theme;
|
RrTheme *ob_rr_theme;
|
||||||
|
@ -148,7 +147,6 @@ gint main(gint argc, gchar **argv)
|
||||||
session_startup(argc, argv);
|
session_startup(argc, argv);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
ob_display = XOpenDisplay(NULL);
|
ob_display = XOpenDisplay(NULL);
|
||||||
if (ob_display == NULL)
|
if (ob_display == NULL)
|
||||||
ob_exit_with_error(_("Failed to open the display from the DISPLAY environment variable."));
|
ob_exit_with_error(_("Failed to open the display from the DISPLAY environment variable."));
|
||||||
|
@ -223,7 +221,6 @@ gint main(gint argc, gchar **argv)
|
||||||
cursors[OB_CURSOR_NORTHWEST] = load_cursor("top_left_corner",
|
cursors[OB_CURSOR_NORTHWEST] = load_cursor("top_left_corner",
|
||||||
XC_top_left_corner);
|
XC_top_left_corner);
|
||||||
|
|
||||||
|
|
||||||
prop_startup(); /* get atoms values for the display */
|
prop_startup(); /* get atoms values for the display */
|
||||||
extensions_query_all(); /* find which extensions are present */
|
extensions_query_all(); /* find which extensions are present */
|
||||||
|
|
||||||
|
|
|
@ -294,7 +294,6 @@ static void prompt_layout(ObPrompt *self)
|
||||||
self->button[i].width = MAX(self->button[i].width, bw);
|
self->button[i].width = MAX(self->button[i].width, bw);
|
||||||
self->button[i].height = MAX(self->button[i].height, bh);
|
self->button[i].height = MAX(self->button[i].height, bh);
|
||||||
|
|
||||||
|
|
||||||
self->button[i].width += BUTTON_HMARGIN * 2;
|
self->button[i].width += BUTTON_HMARGIN * 2;
|
||||||
self->button[i].height += BUTTON_VMARGIN * 2;
|
self->button[i].height += BUTTON_VMARGIN * 2;
|
||||||
|
|
||||||
|
|
|
@ -397,7 +397,6 @@ static void sm_save_yourself_2(SmcConn conn, SmPointer data)
|
||||||
SmcSaveYourselfDone(conn, success);
|
SmcSaveYourselfDone(conn, success);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static void sm_save_yourself(SmcConn conn, SmPointer data, gint save_type,
|
static void sm_save_yourself(SmcConn conn, SmPointer data, gint save_type,
|
||||||
Bool shutdown, gint interact_style, Bool fast)
|
Bool shutdown, gint interact_style, Bool fast)
|
||||||
{
|
{
|
||||||
|
|
|
@ -659,7 +659,6 @@ static void gradient_vertical(RrSurface *sf, gint w, gint h)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static void gradient_diagonal(RrSurface *sf, gint w, gint h)
|
static void gradient_diagonal(RrSurface *sf, gint w, gint h)
|
||||||
{
|
{
|
||||||
gint x, y;
|
gint x, y;
|
||||||
|
|
|
@ -333,7 +333,6 @@ void RrAppearanceFree(RrAppearance *a)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static void pixel_data_to_pixmap(RrAppearance *l,
|
static void pixel_data_to_pixmap(RrAppearance *l,
|
||||||
gint x, gint y, gint w, gint h)
|
gint x, gint y, gint w, gint h)
|
||||||
{
|
{
|
||||||
|
|
|
@ -90,7 +90,6 @@ gint main()
|
||||||
exit (0);
|
exit (0);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
RrPaint(look, win, w, h);
|
RrPaint(look, win, w, h);
|
||||||
done = 0;
|
done = 0;
|
||||||
while (!done) {
|
while (!done) {
|
||||||
|
|
|
@ -567,7 +567,6 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name,
|
||||||
theme->def_win_icon_w = OB_DEFAULT_ICON_WIDTH;
|
theme->def_win_icon_w = OB_DEFAULT_ICON_WIDTH;
|
||||||
theme->def_win_icon_h = OB_DEFAULT_ICON_HEIGHT;
|
theme->def_win_icon_h = OB_DEFAULT_ICON_HEIGHT;
|
||||||
|
|
||||||
|
|
||||||
/* read the decoration textures */
|
/* read the decoration textures */
|
||||||
if (!read_appearance(db, inst,
|
if (!read_appearance(db, inst,
|
||||||
"window.active.title.bg", theme->a_focused_title,
|
"window.active.title.bg", theme->a_focused_title,
|
||||||
|
@ -1763,7 +1762,6 @@ static void parse_appearance(gchar *tex, RrSurfaceColorType *grad,
|
||||||
*interlaced = FALSE;
|
*interlaced = FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static gboolean read_appearance(XrmDatabase db, const RrInstance *inst,
|
static gboolean read_appearance(XrmDatabase db, const RrInstance *inst,
|
||||||
const gchar *rname, RrAppearance *value,
|
const gchar *rname, RrAppearance *value,
|
||||||
gboolean allow_trans)
|
gboolean allow_trans)
|
||||||
|
|
|
@ -66,7 +66,6 @@ int main () {
|
||||||
PropModeReplace, (unsigned char*)&num, 1);
|
PropModeReplace, (unsigned char*)&num, 1);
|
||||||
XFlush(display);
|
XFlush(display);
|
||||||
|
|
||||||
|
|
||||||
while (1) {
|
while (1) {
|
||||||
XNextEvent(display, &report);
|
XNextEvent(display, &report);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue