From 5323648965918e0f4ac7e9db2acecf94599802fd Mon Sep 17 00:00:00 2001 From: Pierre Pronchery Date: Mon, 2 Dec 2013 04:37:51 +0100 Subject: [PATCH] Preparing support for panel windows on the left and right sides --- doc/panelctl.xml | 29 +++++++++++++++++++++++++++++ include/Panel.h | 4 +++- src/panel.c | 6 ++++++ src/panelctl.c | 24 ++++++++++++++++++++++-- 4 files changed, 60 insertions(+), 3 deletions(-) diff --git a/doc/panelctl.xml b/doc/panelctl.xml index 318bc52..ef1c672 100644 --- a/doc/panelctl.xml +++ b/doc/panelctl.xml @@ -28,6 +28,7 @@ 2012 + 2013 &firstname; &surname; <&email;> @@ -51,9 +52,13 @@ &name; -B + -L + -R -S -T -b + -l + -r -t @@ -74,6 +79,18 @@ Show the bottom panel. + + + + Show the left panel. + + + + + + Show the right panel. + + @@ -92,6 +109,18 @@ Hide the bottom panel. + + + + Hide the left panel. + + + + + + Hide the right panel. + + diff --git a/include/Panel.h b/include/Panel.h index f17a6c6..9306b72 100644 --- a/include/Panel.h +++ b/include/Panel.h @@ -77,7 +77,9 @@ typedef enum _PanelMessageShow { PANEL_MESSAGE_SHOW_PANEL_BOTTOM = 0x1, PANEL_MESSAGE_SHOW_PANEL_TOP = 0x2, - PANEL_MESSAGE_SHOW_SETTINGS = 0x4 + PANEL_MESSAGE_SHOW_PANEL_LEFT = 0x4, + PANEL_MESSAGE_SHOW_PANEL_RIGHT = 0x8, + PANEL_MESSAGE_SHOW_SETTINGS = 0x10 } PanelMessageShow; diff --git a/src/panel.c b/src/panel.c index 21388ca..789c7c5 100644 --- a/src/panel.c +++ b/src/panel.c @@ -410,6 +410,12 @@ static int _new_on_message(void * data, uint32_t value1, uint32_t value2, if(what & PANEL_MESSAGE_SHOW_PANEL_BOTTOM && panel->bottom != NULL) panel_window_show(panel->bottom, show); + if(what & PANEL_MESSAGE_SHOW_PANEL_LEFT + && panel->left != NULL) + panel_window_show(panel->left, show); + if(what & PANEL_MESSAGE_SHOW_PANEL_RIGHT + && panel->right != NULL) + panel_window_show(panel->right, show); if(what & PANEL_MESSAGE_SHOW_PANEL_TOP && panel->top != NULL) panel_window_show(panel->top, show); diff --git a/src/panelctl.c b/src/panelctl.c index e7371fc..267aa63 100644 --- a/src/panelctl.c +++ b/src/panelctl.c @@ -60,11 +60,15 @@ static int _panelctl(PanelMessageShow what, gboolean show) /* usage */ static int _usage(void) { - fprintf(stderr, _("Usage: %s [-B|-S|-T|-b|-t]\n" + fprintf(stderr, _("Usage: %s [-B|-L|-R|-S|-T|-b|-l|-r|-t]\n" " -B Show the bottom panel\n" +" -L Show the left panel\n" +" -R Show the right panel\n" " -S Display or change settings\n" " -T Show the top panel\n" " -b Hide the bottom panel\n" +" -l Hide the left panel\n" +" -r Hide the right panel\n" " -t Hide the top panel\n"), PROGNAME); return 1; } @@ -83,13 +87,21 @@ int main(int argc, char * argv[]) bindtextdomain(PACKAGE, LOCALEDIR); textdomain(PACKAGE); gtk_init(&argc, &argv); - while((o = getopt(argc, argv, "BSTbt")) != -1) + while((o = getopt(argc, argv, "BLRSTblrt")) != -1) switch(o) { case 'B': what = PANEL_MESSAGE_SHOW_PANEL_BOTTOM; show = TRUE; break; + case 'L': + what = PANEL_MESSAGE_SHOW_PANEL_LEFT; + show = TRUE; + break; + case 'R': + what = PANEL_MESSAGE_SHOW_PANEL_RIGHT; + show = TRUE; + break; case 'S': what = PANEL_MESSAGE_SHOW_SETTINGS; show = TRUE; @@ -102,6 +114,14 @@ int main(int argc, char * argv[]) what = PANEL_MESSAGE_SHOW_PANEL_BOTTOM; show = FALSE; break; + case 'l': + what = PANEL_MESSAGE_SHOW_PANEL_LEFT; + show = FALSE; + break; + case 'r': + what = PANEL_MESSAGE_SHOW_PANEL_RIGHT; + show = FALSE; + break; case 't': what = PANEL_MESSAGE_SHOW_PANEL_TOP; show = FALSE;