80 cols everywhere

5 files changed, 24 insertions, 15 deletions

diff --git a/openbox/client.c b/openbox/client.c
index 787ed673..2b7bdc7a 100644
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -1884,10 +1884,10 @@ void client_update_title(ObClient *self)
         if (!(PROP_GETS(self->window, wm_name, locale, &data)
               || PROP_GETS(self->window, wm_name, utf8, &data))) {
             if (self->transient) {
-                /*
-                  GNOME alert windows are not given titles:
-                  http://developer.gnome.org/projects/gup/hig/draft_hig_new/windows-alert.html
-                */
+    /*
+    GNOME alert windows are not given titles:
+    http://developer.gnome.org/projects/gup/hig/draft_hig_new/windows-alert.html
+    */
                 data = g_strdup("");
             } else
                 data = g_strdup("Unnamed Window");
diff --git a/openbox/frame.c b/openbox/frame.c
index a4843d6f..55fe98f8 100644
--- a/openbox/frame.c
+++ b/openbox/frame.c
@@ -368,7 +368,8 @@ void frame_adjust_area(ObFrame *self, gboolean moved,
                   self->cbwidth_l + (!self->max_horz ? self->bwidth : 0),
                   self->cbwidth_t + self->bwidth,
                   self->cbwidth_r + (!self->max_horz ? self->bwidth : 0),
-                  self->cbwidth_b + (!self->max_horz || !self->max_vert ? self->bwidth : 0));
+                  self->cbwidth_b +
+                    (!self->max_horz || !self->max_vert ? self->bwidth : 0));
 
         if (self->decorations & OB_FRAME_DECOR_TITLEBAR)
             self->size.top += ob_rr_theme->title_height + self->bwidth;
@@ -725,8 +726,8 @@ void frame_adjust_area(ObFrame *self, gboolean moved,
 
             if (self->bwidth && !self->max_horz) {
                 XMoveResizeWindow(ob_display, self->right,
-                                  self->client->area.width +
-                                  self->cbwidth_l + self->cbwidth_r + self->bwidth,
+                                  self->client->area.width + self->cbwidth_l +
+                                  self->cbwidth_r + self->bwidth,
                                   self->bwidth + ob_rr_theme->grip_width,
                                   self->bwidth,
                                   self->client->area.height +
diff --git a/openbox/menuframe.c b/openbox/menuframe.c
index 2010bf8f..7fff8b69 100644
--- a/openbox/menuframe.c
+++ b/openbox/menuframe.c
@@ -694,7 +694,8 @@ void menu_frame_render(ObMenuFrame *self)
         }
 
         RECT_SET_POINT(e->area, 0, h+e->border);
-        XMoveWindow(ob_display, e->window, e->area.x-e->border, e->area.y-e->border);
+        XMoveWindow(ob_display, e->window,
+                    e->area.x-e->border, e->area.y-e->border);
         XSetWindowBorderWidth(ob_display, e->window, e->border);
         XSetWindowBorder(ob_display, e->window,
                          RrColorPixel(ob_rr_theme->menu_border_color));
diff --git a/openbox/openbox.c b/openbox/openbox.c
index 00fe6e6e..1b5fbe8c 100644
--- a/openbox/openbox.c
+++ b/openbox/openbox.c
@@ -147,7 +147,8 @@ gint main(gint argc, gchar **argv)
 
     ob_display = XOpenDisplay(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."));
     if (fcntl(ConnectionNumber(ob_display), F_SETFD, 1) == -1)
         ob_exit_with_error("Failed to set display as close-on-exec");
 
@@ -249,7 +250,8 @@ gint main(gint argc, gchar **argv)
                     parse_tree(i, doc, node->xmlChildrenNode);
                     parse_close(doc);
                 } else
-                    g_message(_("Unable to find a valid config file, using some simple defaults"));
+                    g_message(_("Unable to find a valid config file, "
+                                "using some simple defaults"));
 
 /*
                 if (config_type != NULL)
@@ -487,16 +489,20 @@ static void print_help()
     g_print(_("\nOptions:\n"));
     g_print(_("  --help              Display this help and exit\n"));
     g_print(_("  --version           Display the version and exit\n"));
-    g_print(_("  --replace           Replace the currently running window manager\n"));
-    g_print(_("  --sm-disable        Disable connection to the session manager\n"));
+    g_print(_("  --replace           Replace the currently running "
+                                     "window manager\n"));
+    g_print(_("  --sm-disable        Disable connection to the "
+                                     "session manager\n"));
     g_print(_("\nPassing messages to a running Openbox instance:\n"));
     g_print(_("  --reconfigure       Reload Openbox's configuration\n"));
     g_print(_("  --restart           Restart Openbox\n"));
     g_print(_("\nDebugging options:\n"));
     g_print(_("  --sync              Run in synchronous mode\n"));
     g_print(_("  --debug             Display debugging output\n"));
-    g_print(_("  --debug-focus       Display debugging output for focus handling\n"));
-    g_print(_("  --debug-xinerama    Split the display into fake xinerama screens\n"));
+    g_print(_("  --debug-focus       Display debugging output for "
+                                     "focus handling\n"));
+    g_print(_("  --debug-xinerama    Split the display into fake "
+                                     "xinerama screens\n"));
     g_print(_("\nPlease report bugs at %s\n"), PACKAGE_BUGREPORT);
 }
 
diff --git a/openbox/startupnotify.c b/openbox/startupnotify.c
index 3383dd5f..1cf8da6f 100644
--- a/openbox/startupnotify.c
+++ b/openbox/startupnotify.c
@@ -243,7 +243,8 @@ void sn_setup_spawn_environment(gchar *program, gchar *name,
 
     sn_launcher_context_set_name(sn_launcher, name ? name : program);
     sn_launcher_context_set_description(sn_launcher, desc);
-    sn_launcher_context_set_icon_name(sn_launcher, icon_name ? icon_name : program);
+    sn_launcher_context_set_icon_name(sn_launcher, icon_name ?
+                                      icon_name : program);
     sn_launcher_context_set_binary_name(sn_launcher, program);
     if (desktop >= 0 && (unsigned) desktop < screen_num_desktops)
         sn_launcher_context_set_workspace(sn_launcher, (signed) desktop);