Change glob() API to accept a dir parameter.

[lyx.git] / src / frontends / xforms / combox.c

diff --git a/src/frontends/xforms/combox.c b/src/frontends/xforms/combox.c
index 1cda3e0b1909d379d6edc92a8ece822a3e88a6da..05e270f111c0f8e182282e5960de12578f9fdb30 100644 (file)
--- a/src/frontends/xforms/combox.c
+++ b/src/frontends/xforms/combox.c
@@ -4,6 +4,8 @@
  * Licence details can be found in the file COPYING.
  *
  * \author Alejandro Aguilar Sierra
+ * \author Lars Gullik Bjønnes
+ * \author Jean-Marc Lasgouttes
  * \author Angus Leeming
  *
  * Full author contact details are available in file CREDITS
@@ -13,7 +15,7 @@
  */
 #include <config.h>
 
-#include FORMS_H_LOCATION
+#include "lyx_forms.h"
 #include "combox.h"
 #include "freebrowser.h"
 
@@ -25,7 +27,7 @@ typedef struct {
      /** A pointer to the parent widget */
     FL_OBJECT * combox;
 
-    FL_FREEBROWSER * browser;
+    FL_FREEBROWSER * freebrowser;
     int browser_height;
 
     /** The browser will be displayed either below or above the main body. */
@@ -64,9 +66,10 @@ static void set_state_label(COMBOX_SPEC * sp, int state);
 static void attrib_change(COMBOX_SPEC * sp);
 
 
-FL_OBJECT * fl_create_combox(FL_COMBOX_TYPE type,
-                            FL_Coord x, FL_Coord y, FL_Coord w, FL_Coord h,
-                            char const * label)
+FL_OBJECT *
+fl_create_combox(FL_COMBOX_TYPE type,
+                FL_Coord x, FL_Coord y, FL_Coord w, FL_Coord h,
+                char const * label)
 {
     FL_OBJECT * ob;
     FL_OBJECT * button;
@@ -87,8 +90,8 @@ FL_OBJECT * fl_create_combox(FL_COMBOX_TYPE type,
     sp->browser_height = 100;
     sp->browser_position = FL_FREEBROWSER_BELOW;
 
-    sp->browser = fl_create_freebrowser(sp);
-    sp->browser->callback = update_button_chosen;
+    sp->freebrowser = fl_create_freebrowser(sp);
+    sp->freebrowser->callback = update_button_chosen;
 
     sp->button_state = 0;
     if (type == FL_DROPLIST_COMBOX) {
@@ -122,9 +125,10 @@ FL_OBJECT * fl_create_combox(FL_COMBOX_TYPE type,
 }
 
 
-FL_OBJECT * fl_add_combox(FL_COMBOX_TYPE type,
-                         FL_Coord x, FL_Coord y, FL_Coord w, FL_Coord h,
-                         char const * label)
+FL_OBJECT *
+fl_add_combox(FL_COMBOX_TYPE type,
+             FL_Coord x, FL_Coord y, FL_Coord w, FL_Coord h,
+             char const * label)
 {
     FL_OBJECT * ob = fl_create_combox(type, x, y, w, h, label);
     COMBOX_SPEC * sp = ob->spec;
@@ -138,7 +142,8 @@ FL_OBJECT * fl_add_combox(FL_COMBOX_TYPE type,
 }
 
 
-void fl_set_combox_browser_height(FL_OBJECT * ob, int bh)
+void
+fl_set_combox_browser_height(FL_OBJECT * ob, int bh)
 {
     COMBOX_SPEC * sp;
 
@@ -150,7 +155,8 @@ void fl_set_combox_browser_height(FL_OBJECT * ob, int bh)
 }
 
 
-void fl_set_combox_position(FL_OBJECT * ob, FL_COMBOX_POSITION position)
+void
+fl_set_combox_position(FL_OBJECT * ob, FL_COMBOX_POSITION position)
 {
     COMBOX_SPEC * sp;
 
@@ -165,7 +171,8 @@ void fl_set_combox_position(FL_OBJECT * ob, FL_COMBOX_POSITION position)
 }
 
 
-void fl_clear_combox(FL_OBJECT * ob)
+void
+fl_clear_combox(FL_OBJECT * ob)
 {
     COMBOX_SPEC * sp;
     FL_OBJECT * browser;
@@ -174,14 +181,15 @@ void fl_clear_combox(FL_OBJECT * ob)
        return;
 
     sp = ob->spec;
-    browser = fl_get_freebrowser_browser(sp->browser);
+    browser = sp->freebrowser->browser;
 
     fl_clear_browser(browser);
     fl_set_object_label(sp->button_chosen, "");
 }
 
 
-void fl_addto_combox(FL_OBJECT * ob, char const * text)
+void
+fl_addto_combox(FL_OBJECT * ob, char const * text)
 {
     COMBOX_SPEC * sp;
     FL_OBJECT * browser;
@@ -193,7 +201,7 @@ void fl_addto_combox(FL_OBJECT * ob, char const * text)
        return;
 
     sp = ob->spec;
-    browser = fl_get_freebrowser_browser(sp->browser);
+    browser = sp->freebrowser->browser;
 
     /* Split the string on '|' boundaries. */
     i = j = 0;
@@ -207,15 +215,16 @@ void fl_addto_combox(FL_OBJECT * ob, char const * text)
        }
     }
 
-    if (j != 0)
-       {
+    if (j != 0) {
            line[j] = '\0';
            fl_add_browser_line(browser, line);
-       }
+    }
 
     /* By default the first item is selected */
-    if (!fl_get_browser(browser)) {
-       fl_set_object_label(sp->button_chosen, text);
+    if (fl_get_browser_maxline(browser)) {
+       char const * const label = fl_get_browser_line(browser, 1);
+       fl_set_object_label(sp->button_chosen, label);
+       fl_select_browser_line(browser, 1);
        set_activation(sp->button_chosen, ACTIVATE);
        if (sp->button_state)
            set_activation(sp->button_state,  ACTIVATE);
@@ -223,7 +232,8 @@ void fl_addto_combox(FL_OBJECT * ob, char const * text)
 }
 
 
-void fl_set_combox(FL_OBJECT * ob, int sel)
+void
+fl_set_combox(FL_OBJECT * ob, int sel)
 {
     COMBOX_SPEC * sp;
     FL_OBJECT * browser;
@@ -232,7 +242,7 @@ void fl_set_combox(FL_OBJECT * ob, int sel)
        return;
 
     sp = ob->spec;
-    browser = fl_get_freebrowser_browser(sp->browser);
+    browser = sp->freebrowser->browser;
 
     if (sel < 1 || sel > fl_get_browser_maxline(browser))
        return;
@@ -242,7 +252,8 @@ void fl_set_combox(FL_OBJECT * ob, int sel)
 }
 
 
-int fl_get_combox(FL_OBJECT * ob)
+int
+fl_get_combox(FL_OBJECT * ob)
 {
     COMBOX_SPEC * sp;
     FL_OBJECT * browser;
@@ -251,12 +262,13 @@ int fl_get_combox(FL_OBJECT * ob)
        return 0;
 
     sp = ob->spec;
-    browser = fl_get_freebrowser_browser(sp->browser);
+    browser = sp->freebrowser->browser;
     return fl_get_browser(browser);
 }
 
 
-char const * fl_get_combox_text(FL_OBJECT * ob)
+char const *
+fl_get_combox_text(FL_OBJECT * ob)
 {
     COMBOX_SPEC * sp;
 
@@ -268,7 +280,8 @@ char const * fl_get_combox_text(FL_OBJECT * ob)
 }
 
 
-char const * fl_get_combox_line(FL_OBJECT * ob, int line)
+char const *
+fl_get_combox_line(FL_OBJECT * ob, int line)
 {
     COMBOX_SPEC * sp;
     FL_OBJECT * browser;
@@ -278,7 +291,7 @@ char const * fl_get_combox_line(FL_OBJECT * ob, int line)
        return 0;
 
     sp = ob->spec;
-    browser = fl_get_freebrowser_browser(sp->browser);
+    browser = sp->freebrowser->browser;
 
     maxlines = fl_get_browser_maxline(browser);
     if (line > maxlines)
@@ -288,7 +301,8 @@ char const * fl_get_combox_line(FL_OBJECT * ob, int line)
 }
 
 
-int fl_get_combox_maxitems(FL_OBJECT * ob)
+int
+fl_get_combox_maxitems(FL_OBJECT * ob)
 {
     COMBOX_SPEC * sp;
     FL_OBJECT * browser;
@@ -297,12 +311,13 @@ int fl_get_combox_maxitems(FL_OBJECT * ob)
        return 0;
 
     sp = ob->spec;
-    browser = fl_get_freebrowser_browser(sp->browser);
+    browser = sp->freebrowser->browser;
     return fl_get_browser_maxline(browser);
 }
 
 
-void fl_show_combox_browser(FL_OBJECT * ob)
+void
+fl_show_combox_browser(FL_OBJECT * ob)
 {
     if (!ob || ob->objclass != FL_COMBOX)
        return;
@@ -311,7 +326,8 @@ void fl_show_combox_browser(FL_OBJECT * ob)
 }
 
 
-void fl_hide_combox_browser(FL_OBJECT * ob)
+void
+fl_hide_combox_browser(FL_OBJECT * ob)
 {
     COMBOX_SPEC * sp;
 
@@ -319,12 +335,13 @@ void fl_hide_combox_browser(FL_OBJECT * ob)
        return;
 
     sp = ob->spec;
-    fl_free_freebrowser(sp->browser);
+    fl_free_freebrowser(sp->freebrowser);
 }
 
 
-static int combox_pre(FL_OBJECT * ob, int ev, FL_Coord mx, FL_Coord my,
-                     int key, void *xev)
+static int
+combox_pre(FL_OBJECT * ob, int ev, FL_Coord mx, FL_Coord my, int key,
+          void * xev)
 {
     COMBOX_SPEC * sp = ob->u_vdata;
     FL_OBJECT * combox = sp->combox;
@@ -334,8 +351,9 @@ static int combox_pre(FL_OBJECT * ob, int ev, FL_Coord mx, FL_Coord my,
 }
 
 
-static int combox_post(FL_OBJECT * ob, int ev, FL_Coord mx, FL_Coord my,
-                      int key, void *xev)
+static int
+combox_post(FL_OBJECT * ob, int ev, FL_Coord mx, FL_Coord my, int key,
+           void * xev)
 {
     COMBOX_SPEC * sp = ob->u_vdata;
     FL_OBJECT * combox = sp->combox;
@@ -345,8 +363,9 @@ static int combox_post(FL_OBJECT * ob, int ev, FL_Coord mx, FL_Coord my,
 }
 
 
-static int combox_handle(FL_OBJECT * ob, int event, FL_Coord mx, FL_Coord my,
-                        int key, void * ev)
+static int
+combox_handle(FL_OBJECT * ob, int event, FL_Coord mx, FL_Coord my, int key,
+             void * ev)
 {
     if (!ob || ob->objclass != FL_COMBOX)
        return 0;
@@ -355,15 +374,37 @@ static int combox_handle(FL_OBJECT * ob, int event, FL_Coord mx, FL_Coord my,
     case FL_DRAW:
        attrib_change(ob->spec);
        /* Fall through */
-    case FL_DRAWLABEL:
+    case FL_DRAWLABEL: {
+       COMBOX_SPEC * sp = ob->spec;
+
+       int change =
+           ob->x != sp->button_chosen->x ||
+           ob->y != sp->button_chosen->y;
+
+       FL_Coord xbs = 0;
+       if (sp->button_state) {
+           xbs = ob->x + (sp->button_state->x - sp->button_chosen->x);
+           change = change ||
+               xbs   != sp->button_state->x ||
+               ob->y != sp->button_state->y;
+       }
+
+       if (change) {
+           fl_freeze_form(ob->form);
+           fl_set_object_position(sp->button_chosen, ob->x, ob->y);
+           if (sp->button_state)
+               fl_set_object_position(sp->button_state, xbs, ob->y);
+           fl_unfreeze_form(ob->form);
+       }
+
        fl_draw_object_label(ob);
-       break;
-    case FL_SHORTCUT:
+       break;
+    } case FL_SHORTCUT:
        show_browser(ob->spec);
        break;
     case FL_FREEMEM: {
        COMBOX_SPEC * sp = ob->spec;
-       fl_free_freebrowser(sp->browser);
+       fl_free_freebrowser(sp->freebrowser);
        /* children take care of themselves, but we must make sure that
           sp itself is free-d eventually. */
        fl_addto_freelist(sp);
@@ -374,7 +415,8 @@ static int combox_handle(FL_OBJECT * ob, int event, FL_Coord mx, FL_Coord my,
 }
 
 
-static void set_activation(FL_OBJECT * ob, int activation)
+static void
+set_activation(FL_OBJECT * ob, int activation)
 {
     switch (activation) {
     case ACTIVATE:
@@ -388,7 +430,8 @@ static void set_activation(FL_OBJECT * ob, int activation)
 }
 
 
-static void show_browser(COMBOX_SPEC * sp)
+static void
+show_browser(COMBOX_SPEC * sp)
 {
     FL_OBJECT * ob = sp->combox;
 
@@ -402,27 +445,30 @@ static void show_browser(COMBOX_SPEC * sp)
     abs_y += (sp->browser_position == FL_FREEBROWSER_BELOW) ? ob->h : -bh;
 
     set_state_label(sp, COMBOX_OPEN);
-    fl_show_freebrowser(sp->browser, abs_x, abs_y, bw, bh);
+    fl_show_freebrowser(sp->freebrowser, abs_x, abs_y, bw, bh);
 }
 
 
-static void state_cb(FL_OBJECT * ob, long data)
+static void
+state_cb(FL_OBJECT * ob, long data)
 {
     show_browser(ob->u_vdata);
 }
 
 
-static void chosen_cb(FL_OBJECT * ob, long data)
+static void
+chosen_cb(FL_OBJECT * ob, long data)
 {
     show_browser(ob->u_vdata);
 }
 
 
-static void update_button_chosen(FL_FREEBROWSER * fb, int action)
+static void
+update_button_chosen(FL_FREEBROWSER * fb, int action)
 {
     COMBOX_SPEC * sp = fb->parent;
 
-    FL_OBJECT * browser = fl_get_freebrowser_browser(sp->browser);
+    FL_OBJECT * browser = sp->freebrowser->browser;
     FL_OBJECT * combox = sp->combox;
     if (!browser || !combox) return;
 
@@ -437,7 +483,8 @@ static void update_button_chosen(FL_FREEBROWSER * fb, int action)
 }
 
 
-static void set_state_label(COMBOX_SPEC * sp, int state)
+static void
+set_state_label(COMBOX_SPEC * sp, int state)
 {
     char const * const up   = "@2<-";
     char const * const down = "@2->";
@@ -456,7 +503,8 @@ static void set_state_label(COMBOX_SPEC * sp, int state)
 }
 
 
-static void attrib_change(COMBOX_SPEC * sp)
+static void
+attrib_change(COMBOX_SPEC * sp)
 {
     FL_OBJECT * parent = sp->combox;
     FL_OBJECT * button = sp->button_chosen;