Index: trunk/doc/TODO =================================================================== --- trunk/doc/TODO (revision 32098) +++ trunk/doc/TODO (revision 32099) @@ -2,7 +2,6 @@ 1. For the upcoming release =============================================================================== - CLEANUP: (TT) propedit revamp: - - switch over to new dialogs in lesstif - CLEANUP: remove Attrbute() and pcb_act_Attributes -> remove; this should be handled by the property editor when lesstif already supports it. - CLEANUP: after the attribute dialog, remove the label argument from the DAD API [report: igor2] - CLEANUP: remove attrib.o from the hidlib objects Index: trunk/scconfig/Rev.h =================================================================== --- trunk/scconfig/Rev.h (revision 32098) +++ trunk/scconfig/Rev.h (revision 32099) @@ -1 +1 @@ -static const int myrev = 31776; +static const int myrev = 32099; Index: trunk/scconfig/Rev.tab =================================================================== --- trunk/scconfig/Rev.tab (revision 32098) +++ trunk/scconfig/Rev.tab (revision 32099) @@ -1,3 +1,4 @@ +32099 configure remove lesstif local dialog implementations: library, netlist 31776 configure new plugin: formula, for impedance calculations 31708 configure query plugin: move the advanced search dialog from dialogs plugin to query to better access of internals 31623 configure query plugin: net length calculations Index: trunk/src_plugins/hid_lesstif/netlist.c =================================================================== --- trunk/src_plugins/hid_lesstif/netlist.c (revision 32098) +++ trunk/src_plugins/hid_lesstif/netlist.c (nonexistent) @@ -1,449 +0,0 @@ -#include "config.h" - -#include -#include -#include -#include - -#include "xincludes.h" - -#include -#include "data.h" - -#include "find.h" -#include "netlist.h" -#include "select.h" -#include "undo.h" -#include "remove.h" -#include "crosshair.h" -#include "draw.h" -#include -#include - -#include -#include -#include "lesstif.h" -#include "ltf_stdarg.h" - -static Widget netlist_dialog = 0; -static Widget netlist_list, netnode_list; - -static XmString *netlist_strings = 0; -static XmString *netnode_strings = 0; -static int n_netnode_strings; -static char *last_pick; - -extern rnd_hidlib_t *ltf_hidlib; - -static void pick_net(XmString *name, int pick) -{ - char *net_name = NULL; - pcb_net_t *net = NULL; - pcb_net_term_t *t; - int i; - - if (name != NULL) { - XmStringGetLtoR(name[0], XmFONTLIST_DEFAULT_TAG, &net_name); - net = pcb_net_get(PCB, &PCB->netlist[PCB_NETLIST_EDITED], net_name, 0); - } - - if ((net_name != NULL) && (last_pick != NULL) && (strcmp(net_name, last_pick) == 0)) - return; - free(last_pick); - if (net_name == NULL) - last_pick = NULL; - else - last_pick = rnd_strdup(net_name); - - if (netnode_strings) - free(netnode_strings); /* XXX leaked all XmStrings??? */ - - if (net == NULL) - return; - - n_netnode_strings = pcb_termlist_length(&net->conns); - if (n_netnode_strings == 0) - return; - - netnode_strings = (XmString *) malloc(n_netnode_strings * sizeof(XmString)); - for(t = pcb_termlist_first(&net->conns), i = 0; t != NULL; t = pcb_termlist_next(t), i++) { - char *tmp = rnd_concat(t->refdes, "-", t->term, NULL); - netnode_strings[i] = XmStringCreatePCB(tmp); - } - - stdarg_n = 0; - stdarg(XmNitems, netnode_strings); - stdarg(XmNitemCount, n_netnode_strings); - XtSetValues(netnode_list, stdarg_args, stdarg_n); -} - -static void netlist_select(Widget w, void *v, XmListCallbackStruct * cbs) -{ -#if 0 - XmString str; - int pos = cbs->item_position; - pcb_lib_menu_t *net = &(PCB->NetlistLib[PCB_NETLIST_EDITED].Menu[pos - 1]); - char *name = net->Name; -TODO("netlist: do not change net name"); - if (name[0] == ' ') { - name[0] = '*'; - net->flag = 0; - } - else { - name[0] = ' '; - net->flag = 1; - } - - str = XmStringCreatePCB(name+2); - XmListReplaceItemsPos(netlist_list, &str, 1, pos); - XmStringFree(str); - XmListSelectPos(netlist_list, pos, False); -#endif -} - -static void netlist_extend(Widget w, void *v, XmListCallbackStruct * cbs) -{ - if (cbs->selected_item_count == 1) - pick_net(cbs->selected_items, cbs->item_position - 1); -} - -typedef void (*Std_Nbcb_Func) (pcb_net_t *, int); - -static void nbcb_rat_on(pcb_net_t *net, int pos) -{ - net->inhibit_rats = 0; -} - -static void nbcb_rat_off(pcb_net_t *net, int pos) -{ - net->inhibit_rats = 1; -} - - - -static void nbcb_select(pcb_net_t *net, int pos) -{ - rnd_actionva(ltf_hidlib, "netlist", "select", net->name, NULL); -} - -static void nbcb_deselect(pcb_net_t *net, int pos) -{ - rnd_actionva(ltf_hidlib, "netlist", "unselect", net->name, NULL); -} - -static void nbcb_find(pcb_net_t *net, int pos) -{ - rnd_actionva(ltf_hidlib, "netlist", "find", net->name, NULL); -} - -static void nbcb_std_callback(Widget w, Std_Nbcb_Func v, XmPushButtonCallbackStruct * cbs) -{ - htsp_entry_t *e; - int *posl, posc, i, n; - XmString **items, **selected; - if (XmListGetSelectedPos(netlist_list, &posl, &posc) == False) - return; - if (v == nbcb_find) - rnd_actionva(ltf_hidlib, "connection", "reset", NULL); - - for(e = htsp_first(&PCB->netlist[PCB_NETLIST_EDITED]), i = 0; e != NULL; e = htsp_next(&PCB->netlist[PCB_NETLIST_EDITED], e), i++) { - pcb_net_t *net = e->value; - for(n = 0; n < posc; n++) - if (posl[n]-1 == i) - v(net, i); - } - stdarg_n = 0; - stdarg(XmNitems, &items); - XtGetValues(netlist_list, stdarg_args, stdarg_n); - selected = (XmString **) malloc(posc * sizeof(XmString *)); - for (i = 0; i < posc; i++) - selected[i] = items[posl[i] - 1]; - - stdarg_n = 0; - stdarg(XmNselectedItems, selected); - XtSetValues(netlist_list, stdarg_args, stdarg_n); -} - -static void nbcb_ripup(Widget w, Std_Nbcb_Func v, XmPushButtonCallbackStruct * cbs) -{ - nbcb_std_callback(w, nbcb_find, cbs); - - PCB_LINE_VISIBLE_LOOP(PCB->Data); - { - if (PCB_FLAG_TEST(PCB_FLAG_FOUND, line) && !PCB_FLAG_TEST(PCB_FLAG_LOCK, line)) - pcb_remove_object(PCB_OBJ_LINE, layer, line, line); - } - PCB_ENDALL_LOOP; - - PCB_ARC_VISIBLE_LOOP(PCB->Data); - { - if (PCB_FLAG_TEST(PCB_FLAG_FOUND, arc) && !PCB_FLAG_TEST(PCB_FLAG_LOCK, arc)) - pcb_remove_object(PCB_OBJ_ARC, layer, arc, arc); - } - PCB_ENDALL_LOOP; - - if (PCB->pstk_on) - PCB_PADSTACK_LOOP(PCB->Data); - { - if (PCB_FLAG_TEST(PCB_FLAG_FOUND, padstack) && !PCB_FLAG_TEST(PCB_FLAG_LOCK, padstack)) - pcb_remove_object(PCB_OBJ_PSTK, padstack, padstack, padstack); - } - PCB_END_LOOP; -} - -static void netnode_browse(Widget w, XtPointer v, XmListCallbackStruct * cbs) -{ -TODO("subc TODO") -#if 0 - pcb_net_t *net; - pcb_lib_menu_t *menu = PCB->NetlistLib[PCB_NETLIST_EDITED].Menu + last_pick; - const char *name = menu->Entry[cbs->item_position - 1].ListEntry; - char *ename, *pname; - - ename = rnd_strdup(name); - pname = strchr(ename, '-'); - if (!pname) { - free(ename); - return; - } - *pname++ = 0; - - PCB_ELEMENT_LOOP(PCB->Data); - { - char *es = element->Name[PCB_ELEMNAME_IDX_REFDES].TextString; - if (es && strcmp(es, ename) == 0) { - PCB_PIN_LOOP(element); - { - if (strcmp(pin->Number, pname) == 0) { - rnd_hidcore_crosshair_move_to(ltf_hidlib, pin->X, pin->Y, 0); - free(ename); - return; - } - } - PCB_END_LOOP; - PCB_PAD_LOOP(element); - { - if (strcmp(pad->Number, pname) == 0) { - rnd_coord_t x = (pad->Point1.X + pad->Point2.X) / 2; - rnd_coord_t y = (pad->Point1.Y + pad->Point2.Y) / 2; - rnd_gui->set_crosshair(rnd_gui, x, y, HID_SC_PAN_VIEWPORT); - free(ename); - return; - } - } - PCB_END_LOOP; - } - } - PCB_END_LOOP; - free(ename); -#endif -} - -#define NLB_FORM ((Widget)(~0)) -static Widget -netlist_button(Widget parent, const char *name, const char *string, - Widget top, Widget bottom, Widget left, Widget right, XtCallbackProc callback, Std_Nbcb_Func user_func) -{ - Widget rv; - XmString str; - -#define NLB_W(w) if (w == NLB_FORM) { stdarg(XmN ## w ## Attachment, XmATTACH_FORM); } \ - else if (w) { stdarg(XmN ## w ## Attachment, XmATTACH_WIDGET); \ - stdarg (XmN ## w ## Widget, w); } - - NLB_W(top); - NLB_W(bottom); - NLB_W(left); - NLB_W(right); - str = XmStringCreatePCB(string); - stdarg(XmNlabelString, str); - rv = XmCreatePushButton(parent, XmStrCast(name), stdarg_args, stdarg_n); - XtManageChild(rv); - if (callback) - XtAddCallback(rv, XmNactivateCallback, callback, (XtPointer)rnd_cast_f2d(user_func)); - XmStringFree(str); - return rv; -} - -static int build_netlist_dialog() -{ - Widget b_sel, b_unsel, b_find, /*b_ripup,*/ b_rat_on, b_rat_off, l_ops; - XmString ops_str; - - if (!mainwind) - return 1; - if (netlist_dialog) - return 0; - - stdarg_n = 0; - stdarg(XmNresizePolicy, XmRESIZE_GROW); - stdarg(XmNtitle, "Netlists"); - stdarg(XmNautoUnmanage, False); - netlist_dialog = XmCreateFormDialog(mainwind, XmStrCast("netlist"), stdarg_args, stdarg_n); - - stdarg_n = 0; - b_rat_on = netlist_button(netlist_dialog, "rat_on", "Enable for rats", - 0, NLB_FORM, NLB_FORM, 0, (XtCallbackProc)nbcb_std_callback, nbcb_rat_on); - XtSetSensitive(b_rat_on, 0); - - stdarg_n = 0; - b_rat_off = netlist_button(netlist_dialog, "rat_off", "Disable for rats", - 0, NLB_FORM, b_rat_on, 0, (XtCallbackProc)nbcb_std_callback, nbcb_rat_off); - XtSetSensitive(b_rat_off, 0); - - stdarg_n = 0; - b_sel = netlist_button(netlist_dialog, "select", "Select", - 0, b_rat_on, NLB_FORM, 0, (XtCallbackProc)nbcb_std_callback, nbcb_select); - - stdarg_n = 0; - b_unsel = netlist_button(netlist_dialog, "deselect", "Deselect", - 0, b_rat_on, b_sel, 0, (XtCallbackProc)nbcb_std_callback, nbcb_deselect); - - stdarg_n = 0; - b_find = netlist_button(netlist_dialog, "find", "Find", - 0, b_rat_on, b_unsel, 0, (XtCallbackProc)nbcb_std_callback, nbcb_find); - - - stdarg_n = 0; - /*b_ripup =*/ netlist_button(netlist_dialog, "ripup", "Rip Up", 0, b_rat_on, b_find, 0, (XtCallbackProc)nbcb_ripup, 0); - - stdarg_n = 0; - stdarg(XmNbottomAttachment, XmATTACH_WIDGET); - stdarg(XmNbottomWidget, b_sel); - stdarg(XmNleftAttachment, XmATTACH_FORM); - ops_str = XmStringCreatePCB("Operations on selected net names:"); - stdarg(XmNlabelString, ops_str); - l_ops = XmCreateLabel(netlist_dialog, XmStrCast("ops"), stdarg_args, stdarg_n); - XtManageChild(l_ops); - - stdarg_n = 0; - stdarg(XmNtopAttachment, XmATTACH_FORM); - stdarg(XmNbottomAttachment, XmATTACH_WIDGET); - stdarg(XmNbottomWidget, l_ops); - stdarg(XmNleftAttachment, XmATTACH_FORM); - stdarg(XmNrightAttachment, XmATTACH_POSITION); - stdarg(XmNrightPosition, 50); - stdarg(XmNvisibleItemCount, 10); - stdarg(XmNselectionPolicy, XmEXTENDED_SELECT); - netlist_list = XmCreateScrolledList(netlist_dialog, XmStrCast("nets"), stdarg_args, stdarg_n); - XtManageChild(netlist_list); - XtAddCallback(netlist_list, XmNdefaultActionCallback, (XtCallbackProc) netlist_select, 0); - XtAddCallback(netlist_list, XmNextendedSelectionCallback, (XtCallbackProc) netlist_extend, 0); - - stdarg_n = 0; - stdarg(XmNtopAttachment, XmATTACH_FORM); - stdarg(XmNbottomAttachment, XmATTACH_WIDGET); - stdarg(XmNbottomWidget, l_ops); - stdarg(XmNrightAttachment, XmATTACH_FORM); - stdarg(XmNleftAttachment, XmATTACH_POSITION); - stdarg(XmNleftPosition, 50); - netnode_list = XmCreateScrolledList(netlist_dialog, XmStrCast("nodes"), stdarg_args, stdarg_n); - XtManageChild(netnode_list); - XtAddCallback(netnode_list, XmNbrowseSelectionCallback, (XtCallbackProc) netnode_browse, 0); - - return 0; -} - -void LesstifNetlistChanged(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) -{ - htsp_entry_t *e; - int i; - if (PCB->netlist[PCB_NETLIST_EDITED].used < 1) - return; - if (build_netlist_dialog()) - return; - free(last_pick); - last_pick = NULL; - if (netlist_strings) - free(netlist_strings); - netlist_strings = (XmString *) malloc(PCB->netlist[PCB_NETLIST_EDITED].used * sizeof(XmString)); - for(e = htsp_first(&PCB->netlist[PCB_NETLIST_EDITED]), i = 0; e != NULL; e = htsp_next(&PCB->netlist[PCB_NETLIST_EDITED], e), i++) { - pcb_net_t *net = e->value; - netlist_strings[i] = XmStringCreatePCB(net->name); - } - stdarg_n = 0; - stdarg(XmNitems, netlist_strings); - stdarg(XmNitemCount, PCB->netlist[PCB_NETLIST_EDITED].used); - XtSetValues(netlist_list, stdarg_args, stdarg_n); - pick_net(NULL, 0); - return; -} - -static const char pcb_acts_LesstifNetlistShow[] = "NetlistShow(pinname|netname)"; -static const char pcb_acth_LesstifNetlistShow[] = "Selects the given pinname or netname in the netlist window."; -static fgw_error_t pcb_act_LesstifNetlistShow(fgw_arg_t *res, int argc, fgw_arg_t *argv) -{ - const char *nn; - - if (build_netlist_dialog()) { - RND_ACT_IRES(0); - return 0; - } - - RND_ACT_CONVARG(1, FGW_STR, LesstifNetlistShow, nn = argv[1].val.str); - - if (argc == 2) { - pcb_net_term_t *term; - - term = pcb_net_find_by_pinname(&PCB->netlist[PCB_NETLIST_EDITED], nn); - if (term != NULL) { - XmString item; - int vis = 0; - - /* Select net first, 'True' causes pick_net() to be invoked */ - item = XmStringCreatePCB(term->parent.net->name); - XmListSelectItem(netlist_list, item, True); - XmListSetItem(netlist_list, item); - XmStringFree(item); - - /* Now the netnode_list has the right contents */ - item = XmStringCreatePCB(nn); - XmListSelectItem(netnode_list, item, False); - - /* - * Only force the item to the top if there are enough to scroll. - * A bug (?) in lesstif will cause the window to get ever wider - * if an XmList that doesn't require a scrollbar is forced to - * have one (when the top item is not the first item). - */ - stdarg_n = 0; - stdarg(XmNvisibleItemCount, &vis); - XtGetValues(netnode_list, stdarg_args, stdarg_n); - if (n_netnode_strings > vis) { - XmListSetItem(netnode_list, item); - } - XmStringFree(item); - } - else { - /* Try the argument as a netname */ - pcb_net_t *net = pcb_net_get(PCB, &PCB->netlist[PCB_NETLIST_EDITED], nn, 0); - if (net != NULL) { - XmString item; - - item = XmStringCreatePCB(net->name); - XmListSetItem(netlist_list, item); - XmListSelectItem(netlist_list, item, True); - XmStringFree(item); - } - } - } - RND_ACT_IRES(0); - return 0; -} - -void lesstif_show_netlist() -{ - build_netlist_dialog(); - XtManageChild(netlist_dialog); - pcb_ltf_winplace(display, XtWindow(XtParent(netlist_dialog)), "netlist", 300, 300); - XtAddEventHandler(XtParent(netlist_dialog), StructureNotifyMask, False, pcb_ltf_wplc_config_cb, "netlist"); -} - -static rnd_action_t ltf_netlist_action_list[] = { - {"NetlistShow", pcb_act_LesstifNetlistShow, pcb_acth_LesstifNetlistShow, pcb_acts_LesstifNetlistShow} -}; - -void pcb_ltf_netlist_init2(void) -{ - RND_REGISTER_ACTIONS(ltf_netlist_action_list, lesstif_cookie); -} Index: trunk/src_plugins/hid_lesstif/library.c =================================================================== --- trunk/src_plugins/hid_lesstif/library.c (revision 32098) +++ trunk/src_plugins/hid_lesstif/library.c (nonexistent) @@ -1,197 +0,0 @@ -#include "xincludes.h" - -#include "config.h" -#include "conf_core.h" - -#include -#include -#include -#include - -#include -#include "data.h" -#include -#include "buffer.h" -#include -#include "plug_footprint.h" - -#include -#include "lesstif.h" -#include "ltf_stdarg.h" -#include -#include - -extern rnd_hidlib_t *ltf_hidlib; - -static Widget library_dialog = 0; -static Widget library_list, libnode_list; - -static XmString *library_strings = 0; -static XmString *libnode_strings = 0; -static int last_pick = -1; - -vtp0_t picks; /* of pcb_fplibrary_t * */ -vtp0_t pick_names; /* of char * */ - -static void pick_net(int pick) -{ - pcb_fplibrary_t *menu = (pcb_fplibrary_t *)picks.array[pick]; - int i, found; - - if (pick == last_pick) - return; - last_pick = pick; - - if (libnode_strings) - free(libnode_strings); - - libnode_strings = (XmString *) malloc(menu->data.dir.children.used * sizeof(XmString)); - for (found = 0, i = 0; i < menu->data.dir.children.used; i++) { - if (menu->data.dir.children.array[i].type == PCB_LIB_FOOTPRINT) { - libnode_strings[i] = XmStringCreatePCB(menu->data.dir.children.array[i].name); - found++; - } - } - - stdarg_n = 0; - stdarg(XmNitems, libnode_strings); - stdarg(XmNitemCount, found); - XtSetValues(libnode_list, stdarg_args, stdarg_n); -} - -static void library_browse(Widget w, void *v, XmListCallbackStruct * cbs) -{ - pick_net(cbs->item_position - 1); -} - -static void libnode_select(Widget w, void *v, XmListCallbackStruct * cbs) -{ - pcb_fplibrary_t *e = picks.array[last_pick]; - e = &e->data.dir.children.array[cbs->item_position - 1]; - if (pcb_buffer_load_footprint(PCB_PASTEBUFFER, e->data.fp.loc_info, NULL)) - rnd_tool_select_by_name(&PCB->hidlib, "buffer"); -} - -static int build_library_dialog() -{ - if (!mainwind) - return 1; - if (library_dialog) - return 0; - - stdarg_n = 0; - stdarg(XmNresizePolicy, XmRESIZE_GROW); - stdarg(XmNtitle, "Element Library"); - library_dialog = XmCreateFormDialog(mainwind, XmStrCast("library"), stdarg_args, stdarg_n); - - stdarg_n = 0; - stdarg(XmNtopAttachment, XmATTACH_FORM); - stdarg(XmNbottomAttachment, XmATTACH_FORM); - stdarg(XmNleftAttachment, XmATTACH_FORM); - stdarg(XmNvisibleItemCount, 10); - library_list = XmCreateScrolledList(library_dialog, XmStrCast("nets"), stdarg_args, stdarg_n); - XtManageChild(library_list); - XtAddCallback(library_list, XmNbrowseSelectionCallback, (XtCallbackProc) library_browse, 0); - - stdarg_n = 0; - stdarg(XmNtopAttachment, XmATTACH_FORM); - stdarg(XmNbottomAttachment, XmATTACH_FORM); - stdarg(XmNrightAttachment, XmATTACH_FORM); - stdarg(XmNleftAttachment, XmATTACH_WIDGET); - stdarg(XmNleftWidget, library_list); - libnode_list = XmCreateScrolledList(library_dialog, XmStrCast("nodes"), stdarg_args, stdarg_n); - XtManageChild(libnode_list); - XtAddCallback(libnode_list, XmNbrowseSelectionCallback, (XtCallbackProc) libnode_select, 0); - - return 0; -} - -static void lib_dfs(pcb_fplibrary_t *parent, int level) -{ - pcb_fplibrary_t *l; - char *s; - int n, len; - - if (parent->type != PCB_LIB_DIR) - return; - - if (parent->name != NULL) { - vtp0_append(&picks, parent); - len = strlen(parent->name); - s = malloc(len+level+1); - if (level > 0) { - for(n = 0; n < level-1; n++) s[n] = ' '; - strcpy(s+level-1, parent->name); - } - else - strcpy(s, parent->name); - vtp0_append(&pick_names, s); - } - - for(l = parent->data.dir.children.array, n = 0; n < parent->data.dir.children.used; n++,l++) - lib_dfs(l, level+1); -} - -void LesstifLibraryChanged(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) -{ - int i; - if (pcb_library.data.dir.children.used == 0) - return; - if (build_library_dialog()) - return; - last_pick = -1; - - for (i = 0; i < pick_names.used; i++) - free(pick_names.array[i]); - - vtp0_truncate(&picks, 0); - vtp0_truncate(&pick_names, 0); - - lib_dfs(&pcb_library, 0); - - - if (library_strings) - free(library_strings); - library_strings = (XmString *) malloc(picks.used * sizeof(XmString)); - for (i = 0; i < picks.used; i++) - library_strings[i] = XmStringCreatePCB(pick_names.array[i]); - - stdarg_n = 0; - stdarg(XmNitems, library_strings); - stdarg(XmNitemCount, picks.used); - XtSetValues(library_list, stdarg_args, stdarg_n); - - pick_net(0); - return; -} - -static const char pcb_acts_LibraryShow[] = "LibraryShow()"; -static const char pcb_acth_LibraryShow[] = "[DEPRECATED] Displays the library window."; -static fgw_error_t pcb_act_LibraryShow(fgw_arg_t *res, int argc, fgw_arg_t *argv) -{ - RND_ACT_IRES(build_library_dialog()); - return 0; -} - -void lesstif_show_library() -{ - if (mainwind) { - if (!library_dialog) - LesstifLibraryChanged(ltf_hidlib, 0, 0, 0); - XtManageChild(library_dialog); - pcb_ltf_winplace(display, XtWindow(XtParent(library_dialog)), "library", 300, 300); - XtAddEventHandler(XtParent(library_dialog), StructureNotifyMask, False, pcb_ltf_wplc_config_cb, "library"); - } -} - -static rnd_action_t ltf_library_action_list[] = { - {"LibraryShow", pcb_act_LibraryShow, pcb_acth_LibraryShow, pcb_acts_LibraryShow} -}; - -void pcb_ltf_library_init2(void) -{ - RND_REGISTER_ACTIONS(ltf_library_action_list, lesstif_cookie); -} - - - Index: trunk/src_plugins/hid_lesstif/Plug.tmpasm =================================================================== --- trunk/src_plugins/hid_lesstif/Plug.tmpasm (revision 32098) +++ trunk/src_plugins/hid_lesstif/Plug.tmpasm (revision 32099) @@ -2,10 +2,8 @@ put /local/pcb/mod/OBJS [@ $(PLUGDIR)/hid_lesstif/dialogs.o $(PLUGDIR)/hid_lesstif/dlg_fileselect.o - $(PLUGDIR)/hid_lesstif/library.o $(PLUGDIR)/hid_lesstif/main.o $(PLUGDIR)/hid_lesstif/menu.o - $(PLUGDIR)/hid_lesstif/netlist.o $(PLUGDIR)/hid_lesstif/ltf_stdarg.o $(PLUGDIR)/hid_lesstif/wt_colorbtn.o $(PLUGDIR)/hid_lesstif/wt_xpm.o Index: trunk/src_plugins/hid_lesstif/lesstif.h =================================================================== --- trunk/src_plugins/hid_lesstif/lesstif.h (revision 32098) +++ trunk/src_plugins/hid_lesstif/lesstif.h (revision 32099) @@ -46,8 +46,6 @@ extern void lesstif_update_widget_flags(rnd_hid_t *hid, const char *cookie); extern int lesstif_call_action(const char *, int, char **); extern void lesstif_pan_fixup(void); -extern void lesstif_show_library(void); -extern void lesstif_show_netlist(void); extern Pixel lesstif_parse_color(const rnd_color_t *value); extern void lesstif_update_layer_groups(); extern void lesstif_update_status_line(); Index: trunk/src_plugins/hid_lesstif/main.c =================================================================== --- trunk/src_plugins/hid_lesstif/main.c (revision 32098) +++ trunk/src_plugins/hid_lesstif/main.c (revision 32099) @@ -422,7 +422,6 @@ XtSetValues(vscroll, stdarg_args, stdarg_n); zoom_max(); - LesstifNetlistChanged(ltf_hidlib, NULL, 0, NULL); lesstif_update_layer_groups(); return; } @@ -3064,9 +3063,6 @@ lesstif_hid.get_dad_hidlib = ltf_attr_get_dad_hidlib; - rnd_event_bind(PCB_EVENT_NETLIST_CHANGED, LesstifNetlistChanged, NULL, lesstif_cookie); - rnd_event_bind(PCB_EVENT_LIBRARY_CHANGED, LesstifLibraryChanged, NULL, lesstif_cookie); - rnd_hid_register_hid(&lesstif_hid); if (lesstif_conf_id < 0) lesstif_conf_id = rnd_conf_hid_reg(lesstif_cookie, &ccb); @@ -3090,10 +3086,8 @@ static void lesstif_begin(void) { - pcb_ltf_library_init2(); lesstif_reg_attrs(); pcb_ltf_dialogs_init2(); - pcb_ltf_netlist_init2(); lesstif_active = 1; }