Merge branch 'release/7.0'

.config/rules.mk

@@ -38,7 +38,7 @@ SPACE := $(EMPTY) $(EMPTY)
 #  recurion rules                             #
 ###############################################
 
-RGOALS = all clean install svnignore
+RGOALS = all clean install svnignore gitignore
 .PHONY : $(RGOALS) $(SUBDIRS)
 $(RGOALS) : $(SUBDIRS)
 
@@ -155,10 +155,14 @@ endif
 endif
 
 ifeq ($(origin CFLAGS),undefined)
-CFLAGS = -O2
+ifeq ($(origin DEBUG),undefined)
+CFLAGS = -O2 -Wall -Werror
+else
+CFLAGS = -O0 -Wall -Werror
+endif
 endif
 ifneq ($(origin DEBUG),undefined)
-override CFLAGS += -g
+override CFLAGS += -g3
 endif
 override CFLAGS += -I$(TOPDIR) $(CFLAGS_EXTRA)
 
@@ -263,7 +267,7 @@ install:
 endef
 
 % : %.in
-	@echo "TEXT    $@"
+	@echo " TEXT   $@"
 	$Q$(TOPDIR)/repl.py < $^ > $@
 
 
@@ -285,7 +289,7 @@ endif
 
 clean:
 ifneq (,$(CLEANLIST))
-	$(call summary,CLEAN  ,)
+	$(call summary,CLEAN ,)
 	$Qrm -rf $(CLEANLIST)
 endif
 
@@ -324,3 +328,11 @@ svnignore:
 	svn propset svn:ignore --file $$prop .; \
 	rm -f $$prop
 
+help_target ::
+	@echo "gitignore - tell git to ignore files in a cleanlist"
+
+gitignore:
+	$Qfor i in $(DISTCLEANLIST) $(CLEANLIST); do echo "$$i"; \
+		done > .gitignore
+	$Qgit add .gitignore
+

.gitignore

@@ -0,0 +1,4 @@
+config.mk
+config.h
+repl.py
+.config/*.pyc

CHANGELOG.md

@@ -0,0 +1,19 @@
+
+## Version: 7.0
+Date: 2015-12-05 08:25:36
+
+ * [#12] fix menu position for top panel
+ * [#11] new plugin: user menu with gravatar icon
+ * [#8] Fix for issue #5 (make battery plugin work with /sys)
+ * [#6] Rounded corners don't work with widthtype=request
+ * [#5] make battery plugin work with /sys
+ * [#4] update README
+ * [#2] Include option for vertical (y) and horizontal (x) margin
+
+[#12]: https://github.com/aanatoly/fbpanel/issues/12
+[#11]: https://github.com/aanatoly/fbpanel/issues/11
+[#8]: https://github.com/aanatoly/fbpanel/pull/8
+[#6]: https://github.com/aanatoly/fbpanel/issues/6
+[#5]: https://github.com/aanatoly/fbpanel/issues/5
+[#4]: https://github.com/aanatoly/fbpanel/issues/4
+[#2]: https://github.com/aanatoly/fbpanel/issues/2

INSTALL.md

@@ -0,0 +1,27 @@
+# Installation:
+
+## User install
+Build and install it
+```
+./configure --prefix=$HOME/.local
+make
+make install
+```
+
+Then add `~/.local/bin/` to your `PATH`. Add this line to `~/.bashrc`
+```
+export PATH=$HOME/.local/bin:$PATH
+```
+
+## System Install
+Build and install it
+```
+./configure
+make
+su -c "make install"
+```
+
+# Dependencies
+Deps:
+ * core - gtk2 2.17 or higher
+ * plugin `foo` - bar 1.0

README.md

@@ -0,0 +1,7 @@
+# fbpanel
+A lightweight gtk2 panel for Linux desktop.
+
+Please visit [project web site](http://aanatoly.github.io/fbpanel/)
+for more information.
+
+![shot](/data/shot.png)

data/config/.gitignore

@@ -0,0 +1,2 @@
+default
+pager

data/man/.gitignore

@@ -0,0 +1 @@
+fbpanel.1

exec/.gitignore

@@ -0,0 +1 @@
+make_profile

panel/.gitignore

@@ -0,0 +1,25 @@
+bg.o
+bg.d
+ev.o
+ev.d
+gconf.o
+gconf.d
+gconf_panel.o
+gconf_panel.d
+gconf_plugins.o
+gconf_plugins.d
+gtkbar.o
+gtkbar.d
+gtkbgbox.o
+gtkbgbox.d
+misc.o
+misc.d
+panel.o
+panel.d
+plugin.o
+plugin.d
+run.o
+run.d
+xconf.o
+xconf.d
+fbpanel

panel/bg.c

@@ -101,7 +101,7 @@ fb_bg_class_init (FbBgClass *klass)
 {
     GObjectClass *object_class = G_OBJECT_CLASS (klass);
     ENTER;
-    signals [CHANGED] = 
+    signals [CHANGED] =
         g_signal_new ("changed",
               G_OBJECT_CLASS_TYPE (object_class),
               G_SIGNAL_RUN_FIRST,
@@ -154,7 +154,7 @@ fb_bg_finalize (GObject *object)
     bg = FB_BG (object);
     XFreeGC(bg->dpy, bg->gc);
     default_bg = NULL;
-    
+
     RET();
 }
 
@@ -190,7 +190,7 @@ fb_bg_get_xrootpmap_real(FbBg *bg)
                     ret = *((Pixmap *)prop);
                     c = -c ; //to quit loop
                 }
-                XFree(prop);           
+                XFree(prop);
             }
         } while (--c > 0);
     }
@@ -206,7 +206,7 @@ fb_bg_get_xroot_pix_for_area(FbBg *bg, gint x, gint y,
 {
     GdkPixmap *gbgpix;
     Pixmap bgpix;
-    
+
     ENTER;
     if (bg->pixmap == None)
         RET(NULL);
@@ -235,7 +235,7 @@ fb_bg_get_xroot_pix_for_win(FbBg *bg, GtkWidget *widget)
     if (bg->pixmap == None)
         RET(NULL);
 
-    win = GDK_WINDOW_XWINDOW(widget->window); 
+    win = GDK_WINDOW_XWINDOW(widget->window);
     if (!XGetGeometry(bg->dpy, win, &dummy, &x, &y, &width, &height, &border,
               &depth)) {
         DBG2("XGetGeometry failed\n");
@@ -263,7 +263,7 @@ fb_bg_composite(GdkDrawable *base, GdkGC *gc, guint32 tintcolor, gint alpha)
     GdkPixbuf *ret, *ret2;
     int w, h;
     static GdkColormap *cmap = NULL;
-    
+
     ENTER;
     gdk_drawable_get_size (base, &w, &h);
     if (!cmap) {
@@ -274,7 +274,7 @@ fb_bg_composite(GdkDrawable *base, GdkGC *gc, guint32 tintcolor, gint alpha)
     if (!ret)
         RET();
     DBG("here w=%d h=%d\n", w, h);
-    ret2 = gdk_pixbuf_composite_color_simple(ret, w, h, 
+    ret2 = gdk_pixbuf_composite_color_simple(ret, w, h,
           GDK_INTERP_HYPER, 255-alpha, MIN(w, h), tintcolor, tintcolor);
     DBG("here\n");
     if (!ret2) {
@@ -297,7 +297,7 @@ fb_bg_changed(FbBg *bg)
     bg->pixmap = fb_bg_get_xrootpmap_real(bg);
     if (bg->pixmap != None) {
         XGCValues  gcv;
-        
+
         gcv.tile = bg->pixmap;
         XChangeGC(bg->dpy, bg->gc, GCTile, &gcv);
         DBG("changed\n");

panel/ev.c

@@ -59,7 +59,7 @@ struct _FbEv {
     Window active_window;
     Window *client_list;
     Window *client_list_stacking;
-    
+
     Window   xroot;
     Atom     id;
     GC       gc;
@@ -113,47 +113,47 @@ fb_ev_class_init (FbEvClass *klass)
 {
     GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-    signals [EV_CURRENT_DESKTOP] = 
+    signals [EV_CURRENT_DESKTOP] =
         g_signal_new ("current_desktop",
               G_OBJECT_CLASS_TYPE (object_class),
               G_SIGNAL_RUN_FIRST,
               G_STRUCT_OFFSET (FbEvClass, current_desktop),
               NULL, NULL,
               g_cclosure_marshal_VOID__VOID,
               G_TYPE_NONE, 0);
-    signals [EV_NUMBER_OF_DESKTOPS] = 
+    signals [EV_NUMBER_OF_DESKTOPS] =
         g_signal_new ("number_of_desktops",
               G_OBJECT_CLASS_TYPE (object_class),
               G_SIGNAL_RUN_FIRST,
               G_STRUCT_OFFSET (FbEvClass, number_of_desktops),
               NULL, NULL,
               g_cclosure_marshal_VOID__VOID,
               G_TYPE_NONE, 0);
-    signals [EV_DESKTOP_NAMES] = 
+    signals [EV_DESKTOP_NAMES] =
         g_signal_new ("desktop_names",
               G_OBJECT_CLASS_TYPE (object_class),
               G_SIGNAL_RUN_FIRST,
               G_STRUCT_OFFSET (FbEvClass, desktop_names),
               NULL, NULL,
               g_cclosure_marshal_VOID__VOID,
               G_TYPE_NONE, 0);
-    signals [EV_ACTIVE_WINDOW] = 
+    signals [EV_ACTIVE_WINDOW] =
         g_signal_new ("active_window",
               G_OBJECT_CLASS_TYPE (object_class),
               G_SIGNAL_RUN_FIRST,
               G_STRUCT_OFFSET (FbEvClass, active_window),
               NULL, NULL,
               g_cclosure_marshal_VOID__VOID,
               G_TYPE_NONE, 0);
-    signals [EV_CLIENT_LIST_STACKING] = 
+    signals [EV_CLIENT_LIST_STACKING] =
         g_signal_new ("client_list_stacking",
               G_OBJECT_CLASS_TYPE (object_class),
               G_SIGNAL_RUN_FIRST,
               G_STRUCT_OFFSET (FbEvClass, client_list_stacking),
               NULL, NULL,
               g_cclosure_marshal_VOID__VOID,
               G_TYPE_NONE, 0);
-    signals [EV_CLIENT_LIST] = 
+    signals [EV_CLIENT_LIST] =
         g_signal_new ("client_list",
               G_OBJECT_CLASS_TYPE (object_class),
               G_SIGNAL_RUN_FIRST,
@@ -191,7 +191,7 @@ fb_ev_new()
 static void
 fb_ev_finalize (GObject *object)
 {
-    FbEv *ev;
+    FbEv *ev G_GNUC_UNUSED;
 
     ev = FB_EV (object);
     //XFreeGC(ev->dpy, ev->gc);
@@ -274,11 +274,11 @@ fb_ev_current_desktop(FbEv *ev)
             ev->current_desktop = *data;
             XFree (data);
         } else
-            ev->current_desktop = 0;              
+            ev->current_desktop = 0;
     }
     RET(ev->current_desktop);
 }
-        
+
 int
 fb_ev_number_of_desktops(FbEv *ev)
 {
@@ -291,7 +291,7 @@ fb_ev_number_of_desktops(FbEv *ev)
             ev->number_of_desktops = *data;
             XFree (data);
         } else
-            ev->number_of_desktops = 0;              
+            ev->number_of_desktops = 0;
     }
     RET(ev->number_of_desktops);