foo

[instimg] / src / widgets.c

diff --git a/src/widgets.c b/src/widgets.c
index 707d515..2ad9983 100644 (file)
--- a/src/widgets.c
+++ b/src/widgets.c
@@ -285,25 +285,12 @@ struct wgt_widget *wgt_checkbox(struct wgt_window *win, const char *text, int on
        return w;
 }
 
-struct wgt_widget *wgt_combo(struct wgt_window *win, const char **items, int num_items,
-                       int sel, int x, int y, int width, int height, wgt_callback modfunc)
+static void combosize(struct wgt_window *win, const char **items, int num_items,
+               int width, int height, struct wgt_rect *sz)
 {
-       int i, max_width, max_height, sum_height, res;
-       struct wgt_widget *w;
+       int i, max_width, max_height, sum_height;
        struct wgt_rect textsz;
 
-       if(!(w = calloc(1, sizeof *w))) {
-               fprintf(stderr, "wgt_combo: failed to allocate widget structure\n");
-               return 0;
-       }
-       w->win = win;
-
-       if(!(w->itemlist = malloc(num_items * sizeof *w->itemlist))) {
-               fprintf(stderr, "wgt_combo: failed to allocate item list\n");
-               free(w);
-               return 0;
-       }
-
        wgt_string_size(win, "00", &textsz);
        max_width = width < 0 && width != WGT_AUTO ? -width : textsz.width;
        max_height = height < 0 && height != WGT_AUTO ? -height : textsz.height;
@@ -318,10 +305,35 @@ struct wgt_widget *wgt_combo(struct wgt_window *win, const char **items, int num
        if(width < 0) width = max_width * 3 / 2;
        if(height < 0) height = sum_height * 2;
 
+       sz->width = width;
+       sz->y = max_height;
+       sz->height = height;
+}
+
+struct wgt_widget *wgt_combo(struct wgt_window *win, const char **items, int num_items,
+                       int sel, int x, int y, int width, int height, wgt_callback modfunc)
+{
+       int i, res;
+       struct wgt_widget *w;
+       struct wgt_rect rect;
+
+       if(!(w = calloc(1, sizeof *w))) {
+               fprintf(stderr, "wgt_combo: failed to allocate widget structure\n");
+               return 0;
+       }
+       w->win = win;
+
+       if(!(w->itemlist = malloc(num_items * sizeof *w->itemlist))) {
+               fprintf(stderr, "wgt_combo: failed to allocate item list\n");
+               free(w);
+               return 0;
+       }
+
+       combosize(win, items, num_items, width, height, &rect);
 
        if(!(w->handle = CreateWindow("COMBOBOX", items[0] ? items[0] : "",
                        WS_CHILD | WS_VISIBLE | CBS_DROPDOWNLIST | CBS_HASSTRINGS,
-                       x, y, width, height, win->handle, 0, GetModuleHandle(0), 0))) {
+                       x, y, rect.width, rect.height, win->handle, 0, GetModuleHandle(0), 0))) {
                fprintf(stderr, "wgt_combo: failed to create window\n");
                free(w);
                return 0;
@@ -350,8 +362,8 @@ struct wgt_widget *wgt_combo(struct wgt_window *win, const char **items, int num
 
        w->rect.x = x;
        w->rect.y = y;
-       w->rect.width = width;
-       w->rect.height = max_height;
+       w->rect.width = rect.width;
+       w->rect.height = rect.y;        /* single line height for layout purposes */
 
        w->cb_modify = modfunc;
        w->next = win->wlist;
@@ -359,6 +371,60 @@ struct wgt_widget *wgt_combo(struct wgt_window *win, const char **items, int num
        return w;
 }
 
+void wgt_checkbox_check(struct wgt_widget *w)
+{
+       SendMessage(w->handle, BM_SETCHECK, BST_CHECKED, 0);
+}
+
+void wgt_checkbox_uncheck(struct wgt_widget *w)
+{
+       SendMessage(w->handle, BM_SETCHECK, BST_UNCHECKED, 0);
+}
+
+int wgt_checkbox_checked(struct wgt_widget *w)
+{
+       return SendMessage(w->handle, BM_GETCHECK, 0, 0) == BST_CHECKED;
+}
+
+int wgt_combo_setitems(struct wgt_widget *w, const char **items, int num_items)
+{
+       int i;
+       char **newit;
+       struct wgt_rect size;
+
+       if(!(newit = malloc(num_items * sizeof *newit))) {
+               fprintf(stderr, "wgt_combo_setitems: failed to allocate item list\n");
+               return -1;
+       }
+       for(i=0; i<num_items; i++) {
+               if(!(newit[i] = strdup(items[i]))) {
+                       fprintf(stderr, "wgt_combo_setitems: failed to allocate item\n");
+                       while(--i >= 0) {
+                               free(newit[i]);
+                       }
+                       free(newit);
+                       return -1;
+               }
+       }
+
+       for(i=0; i<w->num_items; i++) {
+               free(w->itemlist[i]);
+       }
+       free(w->itemlist);
+       SendMessage(w->handle, CB_RESETCONTENT, 0, 0);
+
+       w->itemlist = newit;
+       w->num_items = num_items;
+
+       for(i=0; i<num_items; i++) {
+               SendMessage(w->handle, CB_ADDSTRING, 0, (long)w->itemlist[i]);
+       }
+
+       combosize(w->win, items, num_items, w->rect.width, WGT_AUTO, &size);
+       MoveWindow(w->handle, w->rect.x, w->rect.y, w->rect.width, size.height, TRUE);
+       return 0;
+}
+
 int wgt_combo_selected(struct wgt_widget *w)
 {
        int sel = SendMessage(w->handle, CB_GETCURSEL, 0, 0);