Changeset 6675

Timestamp:

02/06/10 09:01:31 (2 years ago)

Author:

westram

Message:

• AW_awar / widget interaction
  • replaced AW_INSERT_BUTTON_IN_AWAR_LIST by AW_awar/tie_widget
  • link AW_widget_refresh_cb in AW_awar (leak)
  • use Widget type instead of void*
  • untie_all_widgets() in dtor
• removed deprecated header aw_awar.hxx
• AW_root
  • delete focus_callback_list (leak)
  • method remove_button_from_sens_list replaces AW_remove_button_from_sens_list
  • moved member 'button_list' from AW_root_Motif, renamed it into 'button_sens_list' and destroy it in dtor
  • use Widget type instead of void*

Location:

trunk

Files:

• NTREE/ad_spec.cxx (modified) (1 diff)
• WINDOW/AW_button.cxx (modified) (17 diffs)
• WINDOW/AW_nawar.cxx (modified) (3 diffs)
• WINDOW/AW_window.cxx (modified) (9 diffs)
• WINDOW/Makefile (modified) (3 diffs)
• WINDOW/aw_awar.hxx (deleted)
• WINDOW/aw_nawar.hxx (modified) (1 diff)
• WINDOW/aw_root.hxx (modified) (8 diffs)
• WINDOW/aw_window.hxx (modified) (1 diff)
• WINDOW/aw_window_Xm.hxx (modified) (2 diffs)

trunk/NTREE/ad_spec.cxx

@@ -1175 +1175 @@
 
         cb_info->remap(new_awar); // remap the callback from old awar to new unique awar
-        aww->update_label((int*)di->get_detach_button(), "GET");
+        aww->update_label(di->get_detach_button(), "GET");
 
         *aww_pointer = 0;       // caller window will be recreated on next open after clearing this pointer

trunk/WINDOW/AW_button.cxx

@@ -15 +15 @@
 #include "aw_size.hxx"
 #include "aw_select.hxx"
-#include "aw_awar.hxx"
+#include "aw_nawar.hxx"
 #include "aw_window_Xm.hxx"
 
@@ -39 +39 @@
 #endif // DEBUG
 
-static void aw_cp_awar_2_widget_cb(AW_root *root, AW_widget_list_for_variable *widgetlist) {
-    if (widgetlist->widget == (int *)root->changer_of_variable) {
+struct AW_widget_refresh_cb {
+    AW_widget_refresh_cb(AW_widget_refresh_cb *previous, AW_awar *vs, AW_CL cd1, Widget w, AW_widget_type type, AW_window *awi);
+    ~AW_widget_refresh_cb();
+
+    AW_CL           cd;
+    AW_awar        *awar;
+    Widget          widget;
+    AW_widget_type  widget_type;
+    AW_window      *aw;
+
+    AW_widget_refresh_cb *next;
+};
+
+static void aw_cp_awar_2_widget_cb(AW_root *root, AW_CL cl_widget_refresh_cb) {
+    AW_widget_refresh_cb *widgetlist = (AW_widget_refresh_cb*)cl_widget_refresh_cb;
+    if (widgetlist->widget == root->changer_of_variable) {
         root->changer_of_variable = 0;
         root->value_changed = false;
@@ -81 +95 @@
 }
 
-
-AW_widget_list_for_variable::AW_widget_list_for_variable(AW_awar *vs, AW_CL cd1, int *widgeti, AW_widget_type type, AW_window *awi) {
+AW_widget_refresh_cb::AW_widget_refresh_cb(AW_widget_refresh_cb *previous, AW_awar *vs, AW_CL cd1, Widget w, AW_widget_type type, AW_window *awi) {
     cd          = cd1;
-    widget      = widgeti;
+    widget      = w;
     widget_type = type;
     awar        = vs;
     aw          = awi;
-    next        = 0;
-    awar->add_callback((AW_RCB1)aw_cp_awar_2_widget_cb, (AW_CL)this);
-}
+    next        = previous;
+
+    awar->add_callback(aw_cp_awar_2_widget_cb, (AW_CL)this);
+}
+
+AW_widget_refresh_cb::~AW_widget_refresh_cb() {
+    if (next) delete next;
+    awar->remove_callback(aw_cp_awar_2_widget_cb, (AW_CL)this);
+}
+
+void AW_awar::tie_widget(AW_CL cd1, Widget widget, AW_widget_type type, AW_window *aww) {
+    refresh_list = new AW_widget_refresh_cb(refresh_list, this, cd1, widget, type, aww);
+}
+void AW_awar::untie_all_widgets() {
+    delete refresh_list; refresh_list = NULL;
+}
+
 
 struct AW_variable_update_struct { // used to refresh single items on change
@@ -139 +166 @@
 
     if (root->value_changed) {
-        root->changer_of_variable = (long)vus->widget;
+        root->changer_of_variable = vus->widget;
     }
 
@@ -847 +874 @@
 }
 
-void AW_window::update_label(int *widget, const char *var_value) {
-    Widget w = (Widget) widget;
-
-    if (get_root()->changer_of_variable != (long)widget) {
-        XtVaSetValues(w, RES_CONVERT(XmNlabelString, var_value), NULL);
+void AW_window::update_label(Widget widget, const char *var_value) {
+    if (get_root()->changer_of_variable != widget) {
+        XtVaSetValues(widget, RES_CONVERT(XmNlabelString, var_value), NULL);
     }
     else {
@@ -867 +892 @@
 };
 
-void AW_window::update_toggle(int *wgt, const char *var, AW_CL cd_toggle_data)
-{
+void AW_window::update_toggle(Widget widget, const char *var, AW_CL cd_toggle_data) {
     aw_toggle_data *tdata = (aw_toggle_data*)cd_toggle_data;
     const char     *text  = tdata->bitmapOrText[(var[0] == '0' || var[0] == 'n') ? 0 : 1];
 
     if (tdata->isTextToggle) {
-        XtVaSetValues((Widget)wgt, RES_CONVERT(XmNlabelString, text), NULL);
+        XtVaSetValues(widget, RES_CONVERT(XmNlabelString, text), NULL);
     }
     else {
         char *path = pixmapPath(text+1);
-        XtVaSetValues((Widget)wgt, RES_CONVERT(XmNlabelPixmap, path), NULL);
+        XtVaSetValues(widget, RES_CONVERT(XmNlabelPixmap, path), NULL);
         free(path);
     }
@@ -913 +937 @@
         char *var_value = vs->read_as_string();
 
-        this->update_toggle((int*)p_w->toggle_field, var_value, (AW_CL)tdata);
+        this->update_toggle(p_w->toggle_field, var_value, (AW_CL)tdata);
         free(var_value);
     }
@@ -924 +948 @@
                   (XtPointer) vus);
 
-    AW_INSERT_BUTTON_IN_AWAR_LIST(vs, (AW_CL)tdata, p_w->toggle_field, AW_WIDGET_TOGGLE, this);
+    vs->tie_widget((AW_CL)tdata, p_w->toggle_field, AW_WIDGET_TOGGLE, this);
 }
 
@@ -1060 +1084 @@
                   (XtPointer) root);
 
-    AW_INSERT_BUTTON_IN_AWAR_LIST(vs, 0, textField, AW_WIDGET_INPUT_FIELD, this);
+    vs->tie_widget(0, textField, AW_WIDGET_INPUT_FIELD, this);
     root->make_sensitive(textField, _at->widget_mask);
 
@@ -1088 +1112 @@
 }
 
-
-void AW_window::update_input_field(int *widget, const char *var_value) {
-    Widget w = (Widget) widget;
-
-    XtVaSetValues(w, XmNvalue, var_value, NULL);
-}
-
-
-
+void AW_window::update_input_field(Widget widget, const char *var_value) {
+    XtVaSetValues(widget, XmNvalue, var_value, NULL);
+}
 
 void AW_window::create_text_field(const char *var_name, int columns, int rows) {
@@ -1224 +1242 @@
     XtAddCallback(scrolledText, XmNvalueChangedCallback, (XtCallbackProc) AW_value_changed_callback, (XtPointer) root);
 
-    AW_INSERT_BUTTON_IN_AWAR_LIST(vs, 0, scrolledText, AW_WIDGET_TEXT_FIELD, this);
+    vs->tie_widget(0, scrolledText, AW_WIDGET_TEXT_FIELD, this);
     root->make_sensitive(scrolledText, _at->widget_mask);
 
@@ -1232 +1250 @@
 
 
-void AW_window::update_text_field(int *widget, const char *var_value) {
-    Widget w = (Widget) widget;
-
-    XtVaSetValues(w, XmNvalue, var_value, NULL);
+void AW_window::update_text_field(Widget widget, const char *var_value) {
+    XtVaSetValues(widget, XmNvalue, var_value, NULL);
 }
 
@@ -1399 +1415 @@
                           (XtPointer) _d_callback);
         }
-        AW_INSERT_BUTTON_IN_AWAR_LIST(vs, (AW_CL)p_global->last_selection_list, scrolledList, AW_WIDGET_SELECTION_LIST, this);
+        vs->tie_widget((AW_CL)p_global->last_selection_list, scrolledList, AW_WIDGET_SELECTION_LIST, this);
         root->make_sensitive(scrolledList, _at->widget_mask);
     }
@@ -2209 +2225 @@
     p_global->current_option_menu = p_global->last_option_menu;
 
-    AW_INSERT_BUTTON_IN_AWAR_LIST(vs, (AW_CL)p_global->current_option_menu, optionMenu, AW_WIDGET_CHOICE_MENU, this);
+    vs->tie_widget((AW_CL)p_global->current_option_menu, optionMenu, AW_WIDGET_CHOICE_MENU, this);
     root->make_sensitive(optionMenu1, _at->widget_mask);
 
@@ -2216 +2232 @@
 
 static void remove_option_from_option_menu(AW_root *aw_root, AW_option_struct *os) {
-    AW_remove_button_from_sens_list(aw_root, os->choice_widget);
+    aw_root->remove_button_from_sens_list(os->choice_widget);
     XtDestroyWidget(os->choice_widget);
 }
@@ -2352 +2368 @@
 
 void AW_window::update_option_menu(AW_option_menu_struct *oms) {
-    if (get_root()->changer_of_variable != (long)oms->label_widget) {
+    if (get_root()->changer_of_variable != oms->label_widget) {
         AW_option_struct *active_choice = oms->first_choice;
         {
@@ -2518 +2534 @@
     }
 
-    AW_INSERT_BUTTON_IN_AWAR_LIST(vs, get_root()->number_of_toggle_fields, toggle_field, AW_WIDGET_TOGGLE_FIELD, this);
+    vs->tie_widget(get_root()->number_of_toggle_fields, toggle_field, AW_WIDGET_TOGGLE_FIELD, this);
     root->make_sensitive(toggle_field, _at->widget_mask);
 }

trunk/WINDOW/AW_nawar.cxx

@@ -30 +30 @@
     value_changed_cb_cd2 = cd2;
     next                 = nexti;
+}
+AW_var_callback::~AW_var_callback() {
+    delete next;
 }
 
@@ -244 +247 @@
 
 void AW_awar::remove_all_callbacks() {
-    while (callback_list) {
-        AW_var_callback *del = callback_list;
-        callback_list        = del->next;
-        delete del;
-    }
+    delete callback_list; callback_list = NULL;
 }
 
@@ -629 +628 @@
 
 AW_awar::~AW_awar() {
-    remove_all_target_vars();
     unlink();
+    untie_all_widgets();
     free(awar_name);
 }

trunk/WINDOW/AW_window.cxx

@@ -11 +11 @@
 #include "aw_commn.hxx"
 #include "aw_at.hxx"
-#include "aw_awar.hxx"
+#include "aw_nawar.hxx"
 #include "aw_xfig.hxx"
 #include "aw_Xm.hxx"
@@ -84 +84 @@
 
     if (mask != AWM_ALL) { // no need to make widget sensitive, if its shown unconditionally
-        prvt->button_list = new AW_buttons_struct(mask, w, prvt->button_list);
+        button_sens_list = new AW_buttons_struct(mask, w, button_sens_list);
         if (!(mask & global_mask)) XtSetSensitive(w, False); // disable widget if mask doesn't match
     }
@@ -99 +99 @@
 
 AW_buttons_struct::~AW_buttons_struct() {
-    aw_assert(next == 0); // has to be removed from global list before calling dtor
-}
-
-bool AW_remove_button_from_sens_list(AW_root *root, Widget w) {
+    delete next;
+}
+
+bool AW_root::remove_button_from_sens_list(Widget button) {
     bool removed = false;
-    if (p_global->button_list) {
+    if (button_sens_list) {
         AW_buttons_struct *prev = 0;
-        AW_buttons_struct *bl   = p_global->button_list;
+        AW_buttons_struct *bl   = button_sens_list;
 
         while (bl) {
-            if (bl->button == w) break; // found wanted widget
+            if (bl->button == button) break; // found wanted widget
             prev = bl;
             bl = bl->next;
@@ -116 +116 @@
         if (bl) {
             // remove from list
-            if (prev) prev->next       = bl->next;
-            else p_global->button_list = bl->next;
+            if (prev) prev->next  = bl->next;
+            else button_sens_list = bl->next;
 
             bl->next = 0;
@@ -129 +129 @@
 
 AW_option_struct::AW_option_struct(const char *variable_valuei,
-        Widget choice_widgeti) :
+                                   Widget choice_widgeti) :
     variable_value(strdup(variable_valuei)), choice_widget(choice_widgeti),
             next(0) {
@@ -273 +273 @@
 
 AW_root::~AW_root() {
+    delete focus_callback_list; focus_callback_list = NULL;
+    delete button_sens_list;    button_sens_list    = NULL;
+
     exit_root();
     exit_variables();
     aw_assert(this == AW_root::SINGLETON);
 
-    
     delete prvt;
 
@@ -1464 +1466 @@
     p_r->fontlist = XmFontListCreate(fontstruct, XmSTRING_DEFAULT_CHARSET);
 
-    p_r->button_list = 0;
+    button_sens_list = 0;
 
     p_r->last_option_menu = p_r->current_option_menu = p_r->option_menu_list = NULL;
@@ -1773 +1775 @@
         char *var_value = is_awar->read_as_string();
         if (var_value) {
-            aww->update_label((int*)widget, var_value);
+            aww->update_label(widget, var_value);
         }
         else {
             AW_ERROR("AW_label_in_awar_list:: AWAR %s not found\n", str);
-            aww->update_label((int*)widget, str);
+            aww->update_label(widget, str);
         }
         free(var_value);
-        AW_INSERT_BUTTON_IN_AWAR_LIST(is_awar, 0, widget, AW_WIDGET_LABEL_FIELD, aww);
+        is_awar->tie_widget(0, widget, AW_WIDGET_LABEL_FIELD, aww);
     }
 }
@@ -2654 +2656 @@
 
     global_mask = mask;
-    for (list = p_r->button_list; list; list = list->next) {
+    for (list = button_sens_list; list; list = list->next) {
         XtSetSensitive(list->button, (list->mask & mask) ? True : False);
     }

trunk/WINDOW/Makefile

@@ -95 +95 @@
 
 AW_button.o: aw_at.hxx
-AW_button.o: aw_awar.hxx
 AW_button.o: aw_click.hxx
 AW_button.o: aw_device.hxx
 AW_button.o: aw_keysym.hxx
+AW_button.o: aw_nawar.hxx
 AW_button.o: aw_position.hxx
 AW_button.o: aw_print.hxx
@@ -407 +407 @@
 
 AW_window.o: aw_at.hxx
-AW_window.o: aw_awar.hxx
 AW_window.o: aw_click.hxx
 AW_window.o: aw_commn.hxx
@@ -413 +412 @@
 AW_window.o: aw_global.hxx
 AW_window.o: aw_keysym.hxx
+AW_window.o: aw_nawar.hxx
 AW_window.o: aw_position.hxx
 AW_window.o: aw_print.hxx

trunk/WINDOW/aw_nawar.hxx

@@ -18 +18 @@
 struct AW_var_callback {
     AW_var_callback(void (*vc_cb)(AW_root*, AW_CL, AW_CL), AW_CL cd1, AW_CL cd2, AW_var_callback *next);
+    ~AW_var_callback();
 
     void (*value_changed_cb)(AW_root*, AW_CL, AW_CL);

trunk/WINDOW/aw_root.hxx

@@ -75 +75 @@
 } AW_VARIABLE_TYPE;
 
+
+typedef enum {
+    AW_WIDGET_INPUT_FIELD,
+    AW_WIDGET_TEXT_FIELD,
+    AW_WIDGET_LABEL_FIELD,
+    AW_WIDGET_CHOICE_MENU,
+    AW_WIDGET_TOGGLE_FIELD,
+    AW_WIDGET_SELECTION_LIST,
+    AW_WIDGET_TOGGLE
+} AW_widget_type;
+
+
 typedef struct {
     int t, b, l, r;
@@ -168 +180 @@
 class  AW_root_Motif;
 class  AW_awar;
+struct AW_buttons_struct;
 struct AW_var_callback;
 
@@ -177 +190 @@
 
 class AW_root {
-    AW_default application_database;
-    
+    AW_default         application_database;
+    AW_buttons_struct *button_sens_list;
+
     void init_variables(AW_default database);
     void exit_variables();
@@ -191 +205 @@
     AW_root_Motif *prvt;                            // Do not use !!!
     bool           value_changed;
-    long           changer_of_variable;
+    Widget         changer_of_variable;
     int            y_correction_for_input_labels;
     AW_active      global_mask;
@@ -266 +280 @@
     void apply_sensitivity(AW_active mask);
     void make_sensitive(Widget w, AW_active mask);
+    bool remove_button_from_sens_list(Widget button);
 
     GB_ERROR start_macro_recording(const char *file, const char *application_id, const char *stop_action_name);
@@ -293 +308 @@
 struct AW_var_callback;
 struct AW_var_target;
+struct AW_widget_refresh_cb;
 
 typedef void (*Awar_CB)(AW_root *, AW_CL, AW_CL);
@@ -308 +324 @@
     } pp;
 
-    struct AW_var_callback *callback_list;
-    struct AW_var_target   *target_list;
+    struct AW_var_callback      *callback_list;
+    struct AW_var_target        *target_list;
+    struct AW_widget_refresh_cb *refresh_list;
 
 #if defined(DEBUG)
@@ -342 +359 @@
     AW_awar(AW_VARIABLE_TYPE var_type, const char *var_name, const char *var_value, double var_double_value, AW_default default_file, AW_root *root);
     ~AW_awar();
+
+    void tie_widget(AW_CL cd1, Widget widget, AW_widget_type type, AW_window *aww);
+    void untie_all_widgets();
 
     AW_awar *add_callback(Awar_CB2 f, AW_CL cd1, AW_CL cd2);

trunk/WINDOW/aw_window.hxx

@@ -242 +242 @@
     char *align_string(const char *string, int columns);
 
-    void update_label(int *widget, const char *var_value);
-    void update_toggle(int *widget, const char *var_value, AW_CL cd);
-    void update_input_field(int *widget, const char *var_value);
-    void update_text_field(int *widget, const char *var_value);
+    void update_label(Widget widget, const char *var_value);
+    void update_toggle(Widget widget, const char *var_value, AW_CL cd);
+    void update_input_field(Widget widget, const char *var_value);
+    void update_text_field(Widget widget, const char *var_value);
 
     void  create_invisible(int columns);

trunk/WINDOW/aw_window_Xm.hxx

@@ -16 +16 @@
 #define  p_global   (root->prvt)
 #define  p_aww(aww) (aww->p_w)
-
-bool AW_remove_button_from_sens_list(AW_root *aw_root, Widget w);
 
 #define MAP_ARAM(ar) p_w->areas[ar]
@@ -234 +232 @@
     XmFontList fontlist;
 
-    AW_buttons_struct *button_list;
-
     AW_option_menu_struct *option_menu_list;
     AW_option_menu_struct *last_option_menu;