mangavalk/lcdproc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

code & style cleanup

Browse Source
This commit is contained in:
marschap
2007-06-23 21:41:50 +00:00
parent 2f9f70e87e
commit a5bdc61ad8
12 changed files with 665 additions and 696 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/commands/widget_commands.c
+132 -141
View File
@@ -1,5 +1,8 @@
/* \file widget_commands.c
* Defines handlers for client commands concerning widgets.
*/
/*
* widget_commands.c
* This file is part of LCDd, the lcdproc server.
*
* This file is released under the GNU General Public License. Refer to the
@@ -14,9 +17,6 @@
*
* The client's available function set is defined here, as is the syntax
* for each command.
*
* This particular file defines actions concerning widgets.
*
*/
#include <unistd.h>
@@ -42,7 +42,7 @@
* Usage: widget_add <screenid> <widgetid> <widgettype> [-in <id>]
*/
int
widget_add_func (Client * c, int argc, char **argv)
widget_add_func(Client *c, int argc, char **argv)
{
int err;
char *sid;
@@ -62,14 +62,14 @@ widget_add_func (Client * c, int argc, char **argv)
sid = argv[1];
wid = argv[2];
s = client_find_screen (c, sid);
if (!s) {
s = client_find_screen(c, sid);
if (s == NULL) {
sock_send_error(c->sock, "Invalid screen id\n");
return 0;
}
/* Find widget type */
wtype = widget_typename_to_type (argv[3]);
wtype = widget_typename_to_type(argv[3]);
if (wtype == WID_NONE) {
sock_send_error(c->sock, "Invalid widget type\n");
return 0;
@@ -77,15 +77,15 @@ widget_add_func (Client * c, int argc, char **argv)
/* Check for additional flags...*/
if (argc > 4) {
char *p;
char *p = argv[4];
p = argv[4];
/* ignore leading '-' in options: we allow both forms */
if (*p == '-')
p++;
/* Handle the "in" flag to place widgets in a container...*/
if (strcmp (p, "in")==0) {
Widget * frame;
if (strcmp(p, "in") == 0) {
Widget *frame;
if (argc < 6) {
sock_send_error(c->sock, "Specify a frame to place widget in\n");
@@ -97,7 +97,7 @@ widget_add_func (Client * c, int argc, char **argv)
* but in the framescreen.
*/
frame = screen_find_widget(s, argv[5]);
if (!frame) {
if (frame == NULL) {
sock_send_error(c->sock, "Error finding frame\n");
return 0;
}
@@ -106,19 +106,18 @@ widget_add_func (Client * c, int argc, char **argv)
}
/* Create the widget */
w = widget_create (wid, wtype, s);
if (!w) {
w = widget_create(wid, wtype, s);
if (w == NULL) {
sock_send_error(c->sock, "Error adding widget\n");
return 0;
}
/* Add the widget to the screen */
err = screen_add_widget (s, w);
err = screen_add_widget(s, w);
if (err == 0)
sock_send_string(c->sock, "success\n");
else {
else
sock_send_error(c->sock, "Error adding widget\n");
}
return 0;
}
@@ -129,14 +128,14 @@ widget_add_func (Client * c, int argc, char **argv)
* Usage: widget_del <screenid> <widgetid>
*/
int
widget_del_func (Client * c, int argc, char **argv)
widget_del_func(Client *c, int argc, char **argv)
{
int err = 0;
char *sid;
char *wid;
Screen * s;
Widget * w;
Screen *s;
Widget *w;
if (!c->ack)
return 1;
@@ -149,26 +148,25 @@ widget_del_func (Client * c, int argc, char **argv)
sid = argv[1];
wid = argv[2];
debug (RPT_DEBUG, "screen_del: Deleting widget %s.%s", sid, wid);
debug(RPT_DEBUG, "screen_del: Deleting widget %s.%s", sid, wid);
s = client_find_screen (c, sid);
if (!s) {
s = client_find_screen(c, sid);
if (s == NULL) {
sock_send_error(c->sock, "Invalid screen id\n");
return 0;
}
w = screen_find_widget (s, wid);
if (!w) {
w = screen_find_widget(s, wid);
if (w == NULL) {
sock_send_error(c->sock, "Invalid widget id\n");
return 0;
}
err = screen_remove_widget (s, w);
err = screen_remove_widget(s, w);
if (err == 0)
sock_send_string(c->sock, "success\n");
else {
else
sock_send_error(c->sock, "Error removing widget\n");
}
return 0;
}
@@ -182,19 +180,19 @@ widget_del_func (Client * c, int argc, char **argv)
* widget_set <screenid> <widgetid> <widget-SPECIFIC-data>
*/
int
widget_set_func (Client * c, int argc, char **argv)
widget_set_func(Client *c, int argc, char **argv)
{
int i;
char * wid;
char * sid;
char *wid;
char *sid;
int x, y;
int left, top, right, bottom;
int length, direction;
int width, height;
int speed;
Screen * s;
Widget * w;
Screen *s;
Widget *w;
if (!c->ack)
return 1;
@@ -212,106 +210,107 @@ widget_set_func (Client * c, int argc, char **argv)
/* Find screen */
sid = argv[1];
s = client_find_screen (c, sid);
if (!s) {
s = client_find_screen(c, sid);
if (s == NULL) {
sock_send_error(c->sock, "Unknown screen id\n");
return 0;
}
/* Find widget */
wid = argv[2];
w = screen_find_widget (s, wid);
if (!w) {
w = screen_find_widget(s, wid);
if (w == NULL) {
sock_send_error(c->sock, "Unknown widget id\n");
/* Client Debugging...*/
{
int i;
report( RPT_WARNING, "Unknown widget id (%s)", argv[2]);
report(RPT_WARNING, "Unknown widget id (%s)", argv[2]);
for (i = 0; i < argc; i++)
report( RPT_WARNING, " %.40s ", argv[i]);
report(RPT_WARNING, " %.40s ", argv[i]);
}
return 0;
}
i = 3;
switch (w->type) {
case WID_STRING: /* String takes "x y text"*/
case WID_STRING: /* String takes "x y text" */
if (argc != i + 3)
sock_send_error(c->sock, "Wrong number of arguments\n");
else {
if ((!isdigit ((unsigned int) argv[i][0])) ||
(!isdigit ((unsigned int) argv[i + 1][0]))) {
if ((!isdigit((unsigned int) argv[i][0])) ||
(!isdigit((unsigned int) argv[i + 1][0]))) {
sock_send_error(c->sock, "Invalid coordinates\n");
} else /* Set all the data...*/
{
x = atoi (argv[i]);
y = atoi (argv[i + 1]);
}
else { /* Set all the data...*/
x = atoi(argv[i]);
y = atoi(argv[i + 1]);
w->x = x;
w->y = y;
if (w->text)
free (w->text);
w->text = strdup (argv[i + 2]);
if (!w->text) {
debug (RPT_DEBUG, "Widget %s set to %s", wid, w->text);
report( RPT_WARNING, "widget_set_func: Allocation error");
if (w->text != NULL)
free(w->text);
w->text = strdup(argv[i + 2]);
if (w->text == NULL) {
report(RPT_WARNING, "widget_set_func: Allocation error");
return -1;
}
debug (RPT_DEBUG, "Widget %s set to %s", wid, w->text);
debug(RPT_DEBUG, "Widget %s set to %s", wid, w->text);
sock_send_string(c->sock, "success\n");
}
}
break;
case WID_HBAR: /* Hbar takes "x y length"*/
case WID_HBAR: /* Hbar takes "x y length" */
if (argc != i + 3)
sock_send_error(c->sock, "Wrong number of arguments\n");
else {
if ((!isdigit ((unsigned int) argv[i][0])) ||
(!isdigit ((unsigned int) argv[i + 1][0]))) {
if ((!isdigit((unsigned int) argv[i][0])) ||
(!isdigit((unsigned int) argv[i + 1][0]))) {
sock_send_error(c->sock, "Invalid coordinates\n");
} else {
x = atoi (argv[i]);
y = atoi (argv[i + 1]);
length = atoi (argv[i + 2]);
x = atoi(argv[i]);
y = atoi(argv[i + 1]);
length = atoi(argv[i + 2]);
w->x = x;
w->y = y;
w->length = length;
}
debug (RPT_DEBUG, "Widget %s set to %i", wid, w->length);
debug(RPT_DEBUG, "Widget %s set to %i", wid, w->length);
sock_send_string(c->sock, "success\n");
}
break;
case WID_VBAR: /* Vbar takes "x y length"*/
case WID_VBAR: /* Vbar takes "x y length" */
if (argc != i + 3)
sock_send_error(c->sock, "Wrong number of arguments\n");
else {
if ((!isdigit ((unsigned int) argv[i][0])) ||
(!isdigit ((unsigned int) argv[i + 1][0]))) {
if ((!isdigit((unsigned int) argv[i][0])) ||
(!isdigit((unsigned int) argv[i + 1][0]))) {
sock_send_error(c->sock, "Invalid coordinates\n");
} else {
x = atoi (argv[i]);
y = atoi (argv[i + 1]);
length = atoi (argv[i + 2]);
x = atoi(argv[i]);
y = atoi(argv[i + 1]);
length = atoi(argv[i + 2]);
w->x = x;
w->y = y;
w->length = length;
}
debug (RPT_DEBUG, "Widget %s set to %i", wid, w->length);
debug(RPT_DEBUG, "Widget %s set to %i", wid, w->length);
sock_send_string(c->sock, "success\n");
}
break;
case WID_ICON: /* Icon takes "x y icon"*/
case WID_ICON: /* Icon takes "x y icon" */
if (argc != i + 3)
sock_send_error(c->sock, "Wrong number of arguments\n");
else {
if ((!isdigit ((unsigned int) argv[i][0])) ||
(!isdigit ((unsigned int) argv[i + 1][0]))) {
if ((!isdigit((unsigned int) argv[i][0])) ||
(!isdigit((unsigned int) argv[i + 1][0]))) {
sock_send_error(c->sock, "Invalid coordinates\n");
} else {
int icon;
x = atoi (argv[i]);
y = atoi (argv[i + 1]);
icon = widget_iconname_to_icon (argv[i + 2]);
x = atoi(argv[i]);
y = atoi(argv[i + 1]);
icon = widget_iconname_to_icon(argv[i + 2]);
if (icon == -1) {
sock_send_error(c->sock, "Invalid icon name\n");
} else {
}
else {
w->x = x;
w->y = y;
w->length = icon;
@@ -320,101 +319,91 @@ widget_set_func (Client * c, int argc, char **argv)
}
}
break;
case WID_TITLE: /* title takes "text"*/
case WID_TITLE: /* title takes "text" */
if (argc != i + 1)
sock_send_error(c->sock, "Wrong number of arguments\n");
else {
if (w->text)
free (w->text);
w->text = strdup (argv[i]);
if (!w->text) {
report( RPT_WARNING, "widget_set_func: Allocation error");
if (w->text != NULL)
free(w->text);
w->text = strdup(argv[i]);
if (w->text == NULL) {
report(RPT_WARNING, "widget_set_func: Allocation error");
return -1;
}
/* Set width too */
w->width = display_props->width;
debug (RPT_DEBUG, "Widget %s set to %s", wid, w->text);
debug(RPT_DEBUG, "Widget %s set to %s", wid, w->text);
sock_send_string(c->sock, "success\n");
}
break;
case WID_SCROLLER: /* Scroller takes "left top right bottom direction speed text"*/
if (argc != i + 7) {
case WID_SCROLLER: /* Scroller takes "left top right bottom direction speed text" */
if (argc != i + 7)
sock_send_error(c->sock, "Wrong number of arguments\n");
} else {
if ((!isdigit ((unsigned int) argv[i][0])) ||
(!isdigit ((unsigned int) argv[i + 1][0])) ||
(!isdigit ((unsigned int) argv[i + 2][0])) ||
(!isdigit ((unsigned int) argv[i + 3][0]))) {
else {
if ((!isdigit((unsigned int) argv[i][0])) ||
(!isdigit((unsigned int) argv[i + 1][0])) ||
(!isdigit((unsigned int) argv[i + 2][0])) ||
(!isdigit((unsigned int) argv[i + 3][0]))) {
sock_send_error(c->sock, "Invalid coordinates\n");
} else {
left = atoi (argv[i]);
/*debug("left: %d",left);*/
top = atoi (argv[i + 1]);
/*debug("top: %d",top);*/
right = atoi (argv[i + 2]);
/*debug("right: %d",right);*/
bottom = atoi (argv[i + 3]);
/*debug("bottom: %d",bottom);*/
}
else {
left = atoi(argv[i]);
top = atoi(argv[i + 1]);
right = atoi(argv[i + 2]);
bottom = atoi(argv[i + 3]);
direction = (int) (argv[i + 4][0]);
/*debug("dir: %c",(char)direction);*/
speed = atoi (argv[i + 5]);
/*debug("speed: %d",speed);*/
speed = atoi(argv[i + 5]);
/* Direction must be m, v or h*/
if (((char) direction != 'h') && ((char) direction != 'v') &&
((char) direction != 'm')) {
sock_send_error(c->sock, "Invalid direction\n");
} else {
}
else {
w->left = left;
w->top = top;
w->right = right;
w->bottom = bottom;
w->length = direction;
w->speed = speed;
if (w->text)
free (w->text);
w->text = strdup (argv[i + 6]);
if (!w->text) {
if (w->text != NULL)
free(w->text);
w->text = strdup(argv[i + 6]);
if (w->text == NULL) {
sock_send_error(c->sock, "Allocation error\n");
return -1;
}
debug (RPT_DEBUG, "Widget %s set to %s", wid, w->text);
debug(RPT_DEBUG, "Widget %s set to %s", wid, w->text);
sock_send_string(c->sock, "success\n");
}
}
}
break;
case WID_FRAME: /* Frame takes "left top right bottom wid hgt direction speed"*/
if (argc != i + 8) {
case WID_FRAME: /* Frame takes "left top right bottom wid hgt direction speed" */
if (argc != i + 8)
sock_send_error(c->sock, "Wrong number of arguments\n");
} else {
if ((!isdigit ((unsigned int) argv[i][0])) ||
(!isdigit ((unsigned int) argv[i + 1][0])) ||
(!isdigit ((unsigned int) argv[i + 2][0])) ||
(!isdigit ((unsigned int) argv[i + 3][0])) ||
(!isdigit ((unsigned int) argv[i + 4][0])) ||
(!isdigit ((unsigned int) argv[i + 5][0]))) {
else {
if ((!isdigit((unsigned int) argv[i][0])) ||
(!isdigit((unsigned int) argv[i + 1][0])) ||
(!isdigit((unsigned int) argv[i + 2][0])) ||
(!isdigit((unsigned int) argv[i + 3][0])) ||
(!isdigit((unsigned int) argv[i + 4][0])) ||
(!isdigit((unsigned int) argv[i + 5][0]))) {
sock_send_error(c->sock, "Invalid coordinates\n");
} else {
left = atoi (argv[i]);
/*debug("left: %d",left);*/
top = atoi (argv[i + 1]);
/*debug("top: %d",top);*/
right = atoi (argv[i + 2]);
/*debug("right: %d",right);*/
bottom = atoi (argv[i + 3]);
/*debug("bottom: %d",bottom);*/
width = atoi (argv[i + 4]);
/*debug("right: %d",right);*/
height = atoi (argv[i + 5]);
/*debug("bottom: %d",bottom);*/
}
else {
left = atoi(argv[i]);
top = atoi(argv[i + 1]);
right = atoi(argv[i + 2]);
bottom = atoi(argv[i + 3]);
width = atoi(argv[i + 4]);
height = atoi(argv[i + 5]);
direction = (int) (argv[i + 6][0]);
/*debug("dir: %c",(char)direction);*/
speed = atoi (argv[i + 7]);
/*debug("speed: %d",speed);*/
speed = atoi(argv[i + 7]);
/* Direction must be v or h*/
if (((char) direction != 'h') && ((char) direction != 'v')) {
sock_send_error(c->sock, "Invalid direction\n");
} else {
}
else {
w->left = left;
w->top = top;
w->right = right;
@@ -423,27 +412,29 @@ widget_set_func (Client * c, int argc, char **argv)
w->height = height;
w->length = direction;
w->speed = speed;
debug (RPT_DEBUG, "Widget %s set to (%i,%i)-(%i,%i) %ix%i", wid, left, top, right, bottom, width, height);
debug(RPT_DEBUG, "Widget %s set to (%i,%i)-(%i,%i) %ix%i", wid, left, top, right, bottom, width, height);
sock_send_string(c->sock, "success\n");
}
}
}
break;
case WID_NUM: /* Num takes "x num"*/
case WID_NUM: /* Num takes "x num" */
if (argc != i + 2)
sock_send_error(c->sock, "Wrong number of arguments\n");
else {
if (!isdigit ((unsigned int) argv[i][0])) {
if (!isdigit((unsigned int) argv[i][0])) {
sock_send_error(c->sock, "Invalid coordinates\n");
} else if (!isdigit ((unsigned int) argv[i + 1][0])) {
}
else if (!isdigit((unsigned int) argv[i + 1][0])) {
sock_send_error(c->sock, "Invalid number\n");
} else {
x = atoi (argv[i]);
y = atoi (argv[i + 1]);
}
else {
x = atoi(argv[i]);
y = atoi(argv[i + 1]);
w->x = x;
w->y = y;
}
debug (RPT_DEBUG, "Widget %s set to %i", wid, w->y);
debug(RPT_DEBUG, "Widget %s set to %i", wid, w->y);
sock_send_string(c->sock, "success\n");
}
break;