80 cols everywhere

diff --git a/openbox/client.c b/openbox/client.c
index 787ed673739e4a72d75d6d4c3074baf1d3f759d7..2b7bdc7a9671369d996676192ae617bb19821f1b 100644 (file)
--- 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 a4843d6ff9f577f5407c57e1120f2cf18f07855b..55fe98f8d0db77484fef68c546b5aece6818ccfd 100644 (file)
--- 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 2010bf8fe4289b799ff96c3d422d41ee92c4245d..7fff8b691263d16c8adb9ad7822c2be9aefae372 100644 (file)
--- 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 00fe6e6e997310ef7b1e60308a6c4bb4bfb2ad16..1b5fbe8cd795efa965d7115cbc2e27707a9fd9c3 100644 (file)
--- 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 3383dd5f16203c389cef89d3a8b2237989cafd63..1cf8da6fd9cd54c7d8579495432dcf87e47fb866 100644 (file)
--- 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);

diff --git a/render/gradient.c b/render/gradient.c
index 4cd3c18fb2bae96df4fca3b20f7fdca5332e4178..e4bfc5404b9a764195458719faff74243c2c4e27 100644 (file)
--- a/render/gradient.c
+++ b/render/gradient.c
@@ -23,7 +23,8 @@
 #include "color.h"
 #include <glib.h>
 
-static void highlight(RrSurface *s, RrPixel32 *x, RrPixel32 *y, gboolean raised);
+static void highlight(RrSurface *s, RrPixel32 *x, RrPixel32 *y,
+                      gboolean raised);
 static void gradient_parentrelative(RrAppearance *a, gint w, gint h);
 static void gradient_solid(RrAppearance *l, gint w, gint h);
 static void gradient_splitvertical(RrAppearance *a, gint w, gint h);

diff --git a/render/icon.h b/render/icon.h
index 0e241562a40d25f120cb1c98d4c98b39960d93bc..13eff8470419169975976fe6bd670baa5b676f35 100644 (file)
--- a/render/icon.h
+++ b/render/icon.h
@@ -22,7 +22,9 @@
 #define OB_DEFAULT_ICON_HEIGHT (48)
 #define OB_DEFAULT_ICON_BYTES_PER_PIXEL (4) /* 3:RGB, 4:RGBA */
 #define OB_DEFAULT_ICON_COMMENT \
-  "To recreate this file, save an image as \"C-Source\" in The Gimp. Use \"ob_default_icon\" as the Prefixed Name. Enable Glib Types. Enable Save Alpha Channel. Enable Use Macros instead of Struct."
+  "To recreate this file, save an image as \"C-Source\" in The Gimp. " \
+   "Use \"ob_default_icon\" as the Prefixed Name. Enable Glib Types. " \
+   "Enable Save Alpha Channel. Enable Use Macros instead of Struct."
 #define OB_DEFAULT_ICON_PIXEL_DATA ((guint8*) OB_DEFAULT_ICON_pixel_data)
 static const guint8 OB_DEFAULT_ICON_pixel_data[48 * 48 * 4 + 1] =
  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"

diff --git a/render/render.h b/render/render.h
index 33c9c0e9a8fc0b88fdefd6049858fd5e938747c4..f021410c8f3bfc0bf89161d421ce47584f9c5849 100644 (file)
--- a/render/render.h
+++ b/render/render.h
@@ -246,8 +246,8 @@ RrAppearance *RrAppearanceCopy (RrAppearance *a);
 void          RrAppearanceFree (RrAppearance *a);
 void          RrAppearanceAddTextures(RrAppearance *a, gint numtex);
 
-RrFont *RrFontOpen          (const RrInstance *inst, const gchar *name, gint size,
-                             RrFontWeight weight, RrFontSlant slant);
+RrFont *RrFontOpen          (const RrInstance *inst, const gchar *name,
+                             gint size, RrFontWeight weight, RrFontSlant slant);
 RrFont *RrFontOpenDefault   (const RrInstance *inst);
 void    RrFontClose         (RrFont *f);
 RrSize *RrFontMeasureString (const RrFont *f, const gchar *str,

diff --git a/tests/focusout.c b/tests/focusout.c
index 1cc7259d09c255a266a9ab5ec9b006326077aa08..df28ce5d256e8401711ab1e4f1375f991a7cf584 100644 (file)
--- a/tests/focusout.c
+++ b/tests/focusout.c
@@ -117,7 +117,8 @@ int main () {
             case NotifyVirtual: detail = "NotifyVirtual"; break;
             case NotifyInferior: detail = "NotifyInferior"; break;
             case NotifyNonlinear: detail = "NotifyNonlinear"; break;
-            case NotifyNonlinearVirtual: detail = "NotifyNonlinearVirtual"; break;
+            case NotifyNonlinearVirtual:
+                detail = "NotifyNonlinearVirtual"; break;
             case NotifyPointer: detail = "NotifyPointer"; break;
             case NotifyPointerRoot: detail = "NotifyPointerRoot"; break;
             case NotifyDetailNone: detail = "NotifyDetailNone"; break;
@@ -144,7 +145,8 @@ int main () {
             case NotifyVirtual: detail = "NotifyVirtual"; break;
             case NotifyInferior: detail = "NotifyInferior"; break;
             case NotifyNonlinear: detail = "NotifyNonlinear"; break;
-            case NotifyNonlinearVirtual: detail = "NotifyNonlinearVirtual"; break;
+            case NotifyNonlinearVirtual:
+                detail = "NotifyNonlinearVirtual"; break;
             case NotifyPointer: detail = "NotifyPointer"; break;
             case NotifyPointerRoot: detail = "NotifyPointerRoot"; break;
             case NotifyDetailNone: detail = "NotifyDetailNone"; break;
@@ -171,7 +173,8 @@ int main () {
             case NotifyVirtual: detail = "NotifyVirtual"; break;
             case NotifyInferior: detail = "NotifyInferior"; break;
             case NotifyNonlinear: detail = "NotifyNonlinear"; break;
-            case NotifyNonlinearVirtual: detail = "NotifyNonlinearVirtual"; break;
+            case NotifyNonlinearVirtual:
+                detail = "NotifyNonlinearVirtual"; break;
             case NotifyPointer: detail = "NotifyPointer"; break;
             case NotifyPointerRoot: detail = "NotifyPointerRoot"; break;
             case NotifyDetailNone: detail = "NotifyDetailNone"; break;
@@ -198,7 +201,8 @@ int main () {
             case NotifyVirtual: detail = "NotifyVirtual"; break;
             case NotifyInferior: detail = "NotifyInferior"; break;
             case NotifyNonlinear: detail = "NotifyNonlinear"; break;
-            case NotifyNonlinearVirtual: detail = "NotifyNonlinearVirtual"; break;
+            case NotifyNonlinearVirtual:
+                detail = "NotifyNonlinearVirtual"; break;
             case NotifyPointer: detail = "NotifyPointer"; break;
             case NotifyPointerRoot: detail = "NotifyPointerRoot"; break;
             case NotifyDetailNone: detail = "NotifyDetailNone"; break;