Index: trunk/src/librnd/core/actions.c =================================================================== --- trunk/src/librnd/core/actions.c (revision 34610) +++ trunk/src/librnd/core/actions.c (revision 34611) @@ -254,12 +254,12 @@ } } -int rnd_action(rnd_hidlib_t *hl, const char *name) +int rnd_action(rnd_design_t *hl, const char *name) { return rnd_actionv(hl, name, 0, 0); } -int rnd_actionva(rnd_hidlib_t *hl, const char *name, ...) +int rnd_actionva(rnd_design_t *hl, const char *name, ...) { const char *argv[20]; int argc = 0; @@ -318,7 +318,7 @@ return ret; } -static fgw_error_t rnd_actionv_bin_(rnd_hidlib_t *hl, const char *name, fgw_arg_t *res, int argc, fgw_arg_t *argv, rnd_bool print_error) +static fgw_error_t rnd_actionv_bin_(rnd_design_t *hl, const char *name, fgw_arg_t *res, int argc, fgw_arg_t *argv, rnd_bool print_error) { fgw_func_t *f = rnd_act_lookup(name); @@ -336,12 +336,12 @@ return rnd_actionv_(f, res, argc, argv); } -fgw_error_t rnd_actionv_bin(rnd_hidlib_t *hl, const char *name, fgw_arg_t *res, int argc, fgw_arg_t *argv) +fgw_error_t rnd_actionv_bin(rnd_design_t *hl, const char *name, fgw_arg_t *res, int argc, fgw_arg_t *argv) { return rnd_actionv_bin_(hl, name, res, argc, argv, 0); } -int rnd_actionv(rnd_hidlib_t *hl, const char *name, int argc, const char **argsv) +int rnd_actionv(rnd_design_t *hl, const char *name, int argc, const char **argsv) { fgw_func_t *f; fgw_arg_t res, argv[RND_ACTION_MAX_ARGS+1]; @@ -394,7 +394,7 @@ - any non-last action results a non-zero integer - if last_int_fail is true, the last action results a non-zero integer */ -static int hid_parse_actionstring(rnd_hidlib_t *hl, fgw_arg_t *res_, const char *rstr, char require_parens, int last_int_fail) +static int hid_parse_actionstring(rnd_design_t *hl, fgw_arg_t *res_, const char *rstr, char require_parens, int last_int_fail) { const char **list = NULL; int max = 0; @@ -626,7 +626,7 @@ return -1; } -static int rnd_cli_common(rnd_hidlib_t *hl, fgw_arg_t *args) +static int rnd_cli_common(rnd_design_t *hl, fgw_arg_t *args) { const rnd_action_t *a; fgw_func_t *f; @@ -646,7 +646,7 @@ return 0; } -int rnd_cli_tab(rnd_hidlib_t *hl) +int rnd_cli_tab(rnd_design_t *hl) { fgw_arg_t res, args[2]; @@ -662,7 +662,7 @@ return res.val.nat_int; } -int rnd_cli_edit(rnd_hidlib_t *hl) +int rnd_cli_edit(rnd_design_t *hl) { fgw_arg_t res, args[2]; @@ -678,7 +678,7 @@ return res.val.nat_int; } -int rnd_cli_mouse(rnd_hidlib_t *hl, rnd_bool notify) +int rnd_cli_mouse(rnd_design_t *hl, rnd_bool notify) { fgw_arg_t res, args[3]; @@ -703,7 +703,7 @@ free(cli_pop()); } -static int rnd_parse_command_res_(rnd_hidlib_t *hl, fgw_arg_t *res, const char *str_, rnd_bool force_action_mode, int last_int_fail) +static int rnd_parse_command_res_(rnd_design_t *hl, fgw_arg_t *res, const char *str_, rnd_bool force_action_mode, int last_int_fail) { fgw_arg_t args[2]; fgw_func_t *f; @@ -745,12 +745,12 @@ return rnd_actionv_(f, res, 2, args); } -int rnd_parse_command_res(rnd_hidlib_t *hl, fgw_arg_t *res, const char *str_, rnd_bool force_action_mode) +int rnd_parse_command_res(rnd_design_t *hl, fgw_arg_t *res, const char *str_, rnd_bool force_action_mode) { return rnd_parse_command_res_(hl, res, str_, force_action_mode, 0); } -int rnd_parse_command(rnd_hidlib_t *hl, const char *str, rnd_bool force_action_mode) +int rnd_parse_command(rnd_design_t *hl, const char *str, rnd_bool force_action_mode) { fgw_arg_t res; @@ -761,7 +761,7 @@ return res.val.nat_int; } -int rnd_parse_actions(rnd_hidlib_t *hl, const char *str_) +int rnd_parse_actions(rnd_design_t *hl, const char *str_) { return hid_parse_actionstring(hl, NULL, str_, rnd_true, 1); } @@ -935,7 +935,7 @@ rnd_message(RND_MSG_ERROR, "fungw(%s): %s", obj->name, msg); } -int rnd_act_execute_file(rnd_hidlib_t *hidlib, const char *fn) +int rnd_act_execute_file(rnd_design_t *hidlib, const char *fn) { FILE *f; char *s, line[4096]; Index: trunk/src/librnd/core/actions.h =================================================================== --- trunk/src/librnd/core/actions.h (revision 34610) +++ trunk/src/librnd/core/actions.h (revision 34611) @@ -80,9 +80,9 @@ void rnd_remove_actions(const rnd_action_t *a, int n); void rnd_remove_actions_by_cookie(const char *cookie); -int rnd_action(rnd_hidlib_t *hl, const char *action_); -int rnd_actionva(rnd_hidlib_t *hl, const char *action_, ...); /* NULL terminated */ -int rnd_actionv(rnd_hidlib_t *hl, const char *action_, int argc_, const char **argv_); +int rnd_action(rnd_design_t *hl, const char *action_); +int rnd_actionva(rnd_design_t *hl, const char *action_, ...); /* NULL terminated */ +int rnd_actionv(rnd_design_t *hl, const char *action_, int argc_, const char **argv_); fgw_error_t rnd_actionv_(const fgw_func_t *f, fgw_arg_t *res, int argc, fgw_arg_t *argv); @@ -91,7 +91,7 @@ /* Call an action by name, passing arguments and res in fungw binary format; Caller must leave argv[0] empty for the function designator. */ -fgw_error_t rnd_actionv_bin(rnd_hidlib_t *hl, const char *name, fgw_arg_t *res, int argc, fgw_arg_t *argv); +fgw_error_t rnd_actionv_bin(rnd_design_t *hl, const char *name, fgw_arg_t *res, int argc, fgw_arg_t *argv); /* Parse the given command string into action calls, and call @@ -100,18 +100,18 @@ action in the later case. If force_action_mode is true, str is interpreted as action command despite of the cli mode. Returns nonzero if the action handler(s) return nonzero. */ -int rnd_parse_command(rnd_hidlib_t *hl, const char *str_, rnd_bool force_action_mode); +int rnd_parse_command(rnd_design_t *hl, const char *str_, rnd_bool force_action_mode); /* Same as rnd_parse_command() but actual result is returned in fungw conventions. res is the result of the last action. If there are multiple actions, they are required to result in 0, but then those return values are discarded. */ -int rnd_parse_command_res(rnd_hidlib_t *hl, fgw_arg_t *res, const char *str_, rnd_bool force_action_mode); +int rnd_parse_command_res(rnd_design_t *hl, fgw_arg_t *res, const char *str_, rnd_bool force_action_mode); /* Parse the given string into action calls, and call hid_actionv for each action found. Accepts only "action(arg1, arg2)" */ -int rnd_parse_actions(rnd_hidlib_t *hl, const char *str_); +int rnd_parse_actions(rnd_design_t *hl, const char *str_); /* Return a static buffer with the current prompt plus an optional suffix glued to it. Valid until the next call. */ @@ -126,15 +126,15 @@ int rnd_cli_leave(void); /* Request for tab completion */ -int rnd_cli_tab(rnd_hidlib_t *hl); +int rnd_cli_tab(rnd_design_t *hl); /* Called on each key press so indication can be updated */ -int rnd_cli_edit(rnd_hidlib_t *hl); +int rnd_cli_edit(rnd_design_t *hl); /* Mouse event while the command line is open; returns zero if normal event processing shall be inhibited; notify is true if called in notify mode, false if called in release mode */ -int rnd_cli_mouse(rnd_hidlib_t *hl, rnd_bool notify); +int rnd_cli_mouse(rnd_design_t *hl, rnd_bool notify); /* Discard the cli mode stack */ void rnd_cli_uninit(void); @@ -143,7 +143,7 @@ #define RND_ACTION_MAX_ARGS 16 /* Read and execute an action script from a file; return 0 if all actions returned 0 */ -int rnd_act_execute_file(rnd_hidlib_t *hidlib, const char *fn); +int rnd_act_execute_file(rnd_design_t *hidlib, const char *fn); /* low level action function lookup */ fgw_func_t *rnd_act_lookup(const char *aname); @@ -166,8 +166,8 @@ return res->val.nat_int; } -/* Retrieve the (rnd_hidlib_t *) context from argv[0] within an action */ -#define RND_ACT_HIDLIB ((rnd_hidlib_t *)argv[0].val.argv0.user_call_ctx) +/* Retrieve the (rnd_design_t *) context from argv[0] within an action */ +#define RND_ACT_HIDLIB ((rnd_design_t *)argv[0].val.argv0.user_call_ctx) /* Call an action function directly, bypassing fungw; evaluates to an int that is 0 on success */ Index: trunk/src/librnd/core/anyload.c =================================================================== --- trunk/src/librnd/core/anyload.c (revision 34610) +++ trunk/src/librnd/core/anyload.c (revision 34611) @@ -105,7 +105,7 @@ rnd_event_unbind_allcookie(anyload_cookie); } -static lht_doc_t *load_lht(rnd_hidlib_t *hidlib, const char *path) +static lht_doc_t *load_lht(rnd_design_t *hidlib, const char *path) { lht_doc_t *doc; FILE *f = rnd_fopen(hidlib, path, "r"); @@ -127,7 +127,7 @@ /* call a loader to load a subtree; retruns non-zero on error */ -int rnd_anyload_parse_subtree(rnd_hidlib_t *hidlib, lht_node_t *subtree) +int rnd_anyload_parse_subtree(rnd_design_t *hidlib, lht_node_t *subtree) { rnd_aload_t *al; @@ -139,7 +139,7 @@ return -1; } -int rnd_anyload_ext_file(rnd_hidlib_t *hidlib, const char *path, const char *type, lht_node_t *nd, const char *real_cwd, int real_cwd_len) +int rnd_anyload_ext_file(rnd_design_t *hidlib, const char *path, const char *type, lht_node_t *nd, const char *real_cwd, int real_cwd_len) { rnd_aload_t *al; char *fpath, *tmp; @@ -187,7 +187,7 @@ } /* parse an anyload file, load all roots; retruns non-zero on any error */ -int rnd_anyload_parse_anyload_v1(rnd_hidlib_t *hidlib, lht_node_t *root, const char *cwd) +int rnd_anyload_parse_anyload_v1(rnd_design_t *hidlib, lht_node_t *root, const char *cwd) { lht_node_t *rsc, *n; int res = 0, real_cwd_len = 0; @@ -262,7 +262,7 @@ /* parse the root of a random file, which will either be an anyload pack or a single root one of our backends can handle; retruns non-zero on error */ -int rnd_anyload_parse_root(rnd_hidlib_t *hidlib, lht_node_t *root, const char *cwd) +int rnd_anyload_parse_root(rnd_design_t *hidlib, lht_node_t *root, const char *cwd) { static int applen = -1; if (applen < 0) @@ -298,7 +298,7 @@ anyload_conf_update(); } -int rnd_anyload(rnd_hidlib_t *hidlib, const char *path) +int rnd_anyload(rnd_design_t *hidlib, const char *path) { char *path_free = NULL, *cwd_free = NULL; const char *cwd; @@ -339,7 +339,7 @@ return res; } -static void anyload_persistent_load_dir(rnd_hidlib_t *hidlib, const char *path, int silent_fail) +static void anyload_persistent_load_dir(rnd_design_t *hidlib, const char *path, int silent_fail) { DIR *d = rnd_opendir(hidlib, path); struct dirent *de; @@ -369,7 +369,7 @@ rnd_closedir(d); } -static void anyload_persistent_init(rnd_hidlib_t *hidlib) +static void anyload_persistent_init(rnd_design_t *hidlib) { rnd_conf_listitem_t *ci; @@ -406,7 +406,7 @@ anyload_conf_inhibit_dec(); } -static void anyload_mainloop_perma_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) +static void anyload_mainloop_perma_ev(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) { if (rnd_hid_in_main_loop) anyload_persistent_init(hidlib); Index: trunk/src/librnd/core/anyload.h =================================================================== --- trunk/src/librnd/core/anyload.h (revision 34610) +++ trunk/src/librnd/core/anyload.h (revision 34611) @@ -31,8 +31,8 @@ typedef struct rnd_anyload_s rnd_anyload_t; struct rnd_anyload_s { - int (*load_subtree)(const rnd_anyload_t *al, rnd_hidlib_t *hl, lht_node_t *root); - int (*load_file)(const rnd_anyload_t *al, rnd_hidlib_t *hl, const char *filename, const char *type, lht_node_t *nd); + int (*load_subtree)(const rnd_anyload_t *al, rnd_design_t *hl, lht_node_t *root); + int (*load_file)(const rnd_anyload_t *al, rnd_design_t *hl, const char *filename, const char *type, lht_node_t *nd); const char *cookie; /* Spare: see doc/developer/spare.txt */ @@ -50,7 +50,7 @@ /* Load a file or pack: path may be a lihata file (either anything we can load or a $APP-anyload-v*) or a directory that has an anyload.lht in it. Return 0 on success. */ -int rnd_anyload(rnd_hidlib_t *hidlib, const char *path); +int rnd_anyload(rnd_design_t *hidlib, const char *path); /* if non-zero: merge and update the conf after loading anyloads */ extern int rnd_anyload_conf_needs_update; Index: trunk/src/librnd/core/conf.c =================================================================== --- trunk/src/librnd/core/conf.c (revision 34610) +++ trunk/src/librnd/core/conf.c (revision 34611) @@ -1242,7 +1242,7 @@ return conf_lht_get_first_(rnd_conf_main_root[target]->root, pol, create, RND_POL_OVERWRITE); } -lht_node_t *rnd_pref_ensure_conf_root(rnd_hidlib_t *hidlib, rnd_conf_role_t role) +lht_node_t *rnd_pref_ensure_conf_root(rnd_design_t *hidlib, rnd_conf_role_t role) { lht_node_t *m; @@ -1978,7 +1978,7 @@ } -int rnd_conf_save_file(rnd_hidlib_t *hidlib, const char *project_fn, const char *design_fn, rnd_conf_role_t role, const char *fn) +int rnd_conf_save_file(rnd_design_t *hidlib, const char *project_fn, const char *design_fn, rnd_conf_role_t role, const char *fn) { int fail = 1; lht_node_t *r = rnd_conf_lht_get_first(role, 0); @@ -2058,7 +2058,7 @@ return fail; } -int rnd_conf_export_to_file(rnd_hidlib_t *hidlib, const char *fn, rnd_conf_role_t role, const char *conf_path) +int rnd_conf_export_to_file(rnd_design_t *hidlib, const char *fn, rnd_conf_role_t role, const char *conf_path) { lht_node_t *at = rnd_conf_lht_get_at(role, conf_path, 0); lht_err_t r; @@ -2298,7 +2298,7 @@ /****************/ -static int conf_anyload_subtree(const rnd_anyload_t *al, rnd_hidlib_t *hl, lht_node_t *root) +static int conf_anyload_subtree(const rnd_anyload_t *al, rnd_design_t *hl, lht_node_t *root) { lht_doc_t *doc; int res; Index: trunk/src/librnd/core/conf.h =================================================================== --- trunk/src/librnd/core/conf.h (revision 34610) +++ trunk/src/librnd/core/conf.h (revision 34611) @@ -267,7 +267,7 @@ void rnd_conf_reset(rnd_conf_role_t target, const char *source_fn); /* Save an in-memory lihata representation to the disk */ -int rnd_conf_save_file(rnd_hidlib_t *hidlib, const char *project_fn, const char *design_fn, rnd_conf_role_t role, const char *fn); +int rnd_conf_save_file(rnd_design_t *hidlib, const char *project_fn, const char *design_fn, rnd_conf_role_t role, const char *fn); /* Returns whether a given lihata tree is locked */ int rnd_conf_islocked(rnd_conf_role_t target); @@ -365,7 +365,7 @@ lht_node_t *rnd_conf_lht_get_first_crpol(rnd_conf_role_t target, rnd_conf_policy_t pol, int create); /* Get first config subtree for role, create the file if doesn't exist */ -lht_node_t *rnd_pref_ensure_conf_root(rnd_hidlib_t *hidlib, rnd_conf_role_t role); +lht_node_t *rnd_pref_ensure_conf_root(rnd_design_t *hidlib, rnd_conf_role_t role); /* loop helper */ rnd_conf_listitem_t *rnd_conf_list_first_str(rnd_conflist_t *list, const char **item_str, int *idx); @@ -396,7 +396,7 @@ lht_node_t *rnd_conf_lht_get_at_mainplug(rnd_conf_role_t target, const char *path, int allow_plug, int create); /* Write an existing conf subtree to a file */ -int rnd_conf_export_to_file(rnd_hidlib_t *hidlib, const char *fn, rnd_conf_role_t role, const char *conf_path); +int rnd_conf_export_to_file(rnd_design_t *hidlib, const char *fn, rnd_conf_role_t role, const char *conf_path); /* Determine the policy and priority of a config lihata node; returns 0 on success but may not fill in both values, caller is Index: trunk/src/librnd/core/error.c =================================================================== --- trunk/src/librnd/core/error.c (revision 34610) +++ trunk/src/librnd/core/error.c (revision 34611) @@ -200,7 +200,7 @@ -int rnd_log_export(rnd_hidlib_t *hidlib, const char *fn, int fmt_lihata) +int rnd_log_export(rnd_design_t *hidlib, const char *fn, int fmt_lihata) { FILE *f; rnd_logline_t *n; Index: trunk/src/librnd/core/error.h =================================================================== --- trunk/src/librnd/core/error.h (revision 34610) +++ trunk/src/librnd/core/error.h (revision 34611) @@ -96,7 +96,7 @@ void rnd_log_del_range(unsigned long from, unsigned long to); /* Export the whole log list to a file, in lihata or plain text */ -int rnd_log_export(rnd_hidlib_t *hidlib, const char *fn, int fmt_lihata); +int rnd_log_export(rnd_design_t *hidlib, const char *fn, int fmt_lihata); /* Free all memory and reset the log system */ void rnd_log_uninit(void); Index: trunk/src/librnd/core/event.c =================================================================== --- trunk/src/librnd/core/event.c (revision 34610) +++ trunk/src/librnd/core/event.c (revision 34611) @@ -184,7 +184,7 @@ return rnd_evnames_lib[ev]; } -void rnd_event(rnd_hidlib_t *hidlib, rnd_event_id_t ev, const char *fmt, ...) +void rnd_event(rnd_design_t *hidlib, rnd_event_id_t ev, const char *fmt, ...) { va_list ap; rnd_event_arg_t argv[RND_EVENT_MAX_ARG], *a; Index: trunk/src/librnd/core/event.h =================================================================== --- trunk/src/librnd/core/event.h (revision 34610) +++ trunk/src/librnd/core/event.h (revision 34611) @@ -119,7 +119,7 @@ /* Event callback prototype; user_data is the same as in rnd_event_bind(). argv[0] is always an RND_EVARG_INT with the event id that triggered the event. */ -typedef void (rnd_event_handler_t)(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]); +typedef void (rnd_event_handler_t)(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]); /* Bind: add a handler to the call-list of an event; the cookie is also remembered so that mass-unbind is easier later. user_data is passed to the handler. */ @@ -136,7 +136,7 @@ /* Event trigger: call all handlers for an event. Fmt is a list of format characters (e.g. i for RND_EVARG_INT). */ -void rnd_event(rnd_hidlib_t *hidlib, rnd_event_id_t ev, const char *fmt, ...); +void rnd_event(rnd_design_t *hidlib, rnd_event_id_t ev, const char *fmt, ...); /* Return the name of an event as seen on regisrtation */ const char *rnd_event_name(rnd_event_id_t ev); Index: trunk/src/librnd/core/global_typedefs.h =================================================================== --- trunk/src/librnd/core/global_typedefs.h (revision 34610) +++ trunk/src/librnd/core/global_typedefs.h (revision 34611) @@ -34,7 +34,7 @@ rnd_coord_t X2, Y2; /* and lower right corner */ }; -typedef struct rnd_hidlib_s rnd_hidlib_t; +typedef struct rnd_design_s rnd_design_t; /* typedef ... rnd_coord_t; pcb base unit, typedef'd in config.h */ Index: trunk/src/librnd/core/hid_cfg.c =================================================================== --- trunk/src/librnd/core/hid_cfg.c (revision 34610) +++ trunk/src/librnd/core/hid_cfg.c (revision 34611) @@ -51,7 +51,7 @@ return 1; } -lht_doc_t *rnd_hid_cfg_load_lht(rnd_hidlib_t *hidlib, const char *filename) +lht_doc_t *rnd_hid_cfg_load_lht(rnd_design_t *hidlib, const char *filename) { FILE *f; lht_doc_t *doc; Index: trunk/src/librnd/core/hid_cfg.h =================================================================== --- trunk/src/librnd/core/hid_cfg.h (revision 34610) +++ trunk/src/librnd/core/hid_cfg.h (revision 34611) @@ -63,7 +63,7 @@ }; /* Generic, low level lihata loader */ -lht_doc_t *rnd_hid_cfg_load_lht(rnd_hidlib_t *hidlib, const char *filename); +lht_doc_t *rnd_hid_cfg_load_lht(rnd_design_t *hidlib, const char *filename); lht_doc_t *rnd_hid_cfg_load_str(const char *text); /* Generic, low level lihata text value fetch */ Index: trunk/src/librnd/core/hid_cfg_action.c =================================================================== --- trunk/src/librnd/core/hid_cfg_action.c (revision 34610) +++ trunk/src/librnd/core/hid_cfg_action.c (revision 34611) @@ -29,7 +29,7 @@ #include #include -int rnd_hid_cfg_action(rnd_hidlib_t *hl, const lht_node_t *node) +int rnd_hid_cfg_action(rnd_design_t *hl, const lht_node_t *node) { if (node == NULL) return -1; Index: trunk/src/librnd/core/hid_cfg_action.h =================================================================== --- trunk/src/librnd/core/hid_cfg_action.h (revision 34610) +++ trunk/src/librnd/core/hid_cfg_action.h (revision 34611) @@ -28,4 +28,4 @@ #include /* Run an action node. The node is either a list of text nodes or a text node; returns non-zero on error, the first action that fails in a chain breaks the chain */ -int rnd_hid_cfg_action(rnd_hidlib_t *hl, const lht_node_t *node); +int rnd_hid_cfg_action(rnd_design_t *hl, const lht_node_t *node); Index: trunk/src/librnd/core/hidlib.h =================================================================== --- trunk/src/librnd/core/hidlib.h (revision 34610) +++ trunk/src/librnd/core/hidlib.h (revision 34611) @@ -42,7 +42,7 @@ rnd_coord_t spare_c1, spare_c2, spare_c3, spare_c4; } rnd_mark_t; -struct rnd_hidlib_s { +struct rnd_design_s { rnd_coord_t grid; /* grid resolution */ rnd_coord_t grid_ox, grid_oy; /* grid offset */ rnd_box_t dwg; /* drawing area extents (or design dimensions) */ @@ -126,26 +126,26 @@ /*** callbacks ***/ /* Optional: called to update crosshair-attached object because crosshair coords likely changed; if NULL, rnd_tool_adjust_attached() is called instead (most apps want that) */ - void (*adjust_attached_objects)(rnd_hidlib_t *hl); + void (*adjust_attached_objects)(rnd_design_t *hl); /* Optional: Suspend the crosshair: save all crosshair states in a newly allocated and returned temp buffer, then reset the crosshair to initial state; the returned buffer is used to restore the crosshair states later on. Used in the get location loop. */ - void *(*crosshair_suspend)(rnd_hidlib_t *hl); - void (*crosshair_restore)(rnd_hidlib_t *hl, void *susp_data); + void *(*crosshair_suspend)(rnd_design_t *hl); + void (*crosshair_restore)(rnd_design_t *hl, void *susp_data); /* Optional: move the crosshair to an absolute x;y coord on the design and update the GUI; if mouse_mot is non-zero, the request is a direct result of a mouse motion event */ - void (*crosshair_move_to)(rnd_hidlib_t *hl, rnd_coord_t abs_x, rnd_coord_t abs_y, int mouse_mot); + void (*crosshair_move_to)(rnd_design_t *hl, rnd_coord_t abs_x, rnd_coord_t abs_y, int mouse_mot); /* Optional: draw any fixed mark on XOR overlay; if inhibit_drawing_mode is true, do not call ->set_drawing_mode */ - void (*draw_marks)(rnd_hidlib_t *hidlib, rnd_bool inhibit_drawing_mode); + void (*draw_marks)(rnd_design_t *hidlib, rnd_bool inhibit_drawing_mode); /* Draw any mark following the crosshair on XOR overlay; if inhibit_drawing_mode is true, do not call ->set_drawing_mode */ - void (*draw_attached)(rnd_hidlib_t *hidlib, rnd_bool inhibit_drawing_mode); + void (*draw_attached)(rnd_design_t *hidlib, rnd_bool inhibit_drawing_mode); /*** One of these two functions will be called whenever (parts of) the screen needs redrawing (on screen, print or export, design or preview). The expose Index: trunk/src/librnd/core/paths.c =================================================================== --- trunk/src/librnd/core/paths.c (revision 34610) +++ trunk/src/librnd/core/paths.c (revision 34611) @@ -38,7 +38,7 @@ int rnd_build_fn_cb(void *ctx, gds_t *s, const char **input) { - rnd_hidlib_t *hidlib = ctx; + rnd_design_t *hidlib = ctx; char buff[20]; const char *name = NULL; @@ -112,7 +112,7 @@ return rnd_build_fn_cb(ctx->hidlib, s, input); } -char *rnd_build_fn(rnd_hidlib_t *hidlib, const char *template) +char *rnd_build_fn(rnd_design_t *hidlib, const char *template) { rnd_strdup_subst_t sbs = RND_SUBST_ALL; #ifdef __WIN32__ @@ -307,7 +307,7 @@ return rnd_strdup_subst_(template, cb, ctx, flags, 0); } -void rnd_paths_resolve(rnd_hidlib_t *hidlib, const char **in, char **out, int numpaths, unsigned int extra_room, int quiet) +void rnd_paths_resolve(rnd_design_t *hidlib, const char **in, char **out, int numpaths, unsigned int extra_room, int quiet) { rnd_strdup_subst_t flags = RND_SUBST_ALL; #ifdef __WIN32__ @@ -319,12 +319,12 @@ *out = rnd_strdup_subst_(*in, rnd_build_fn_cb, hidlib, flags, extra_room); } -void rnd_path_resolve(rnd_hidlib_t *hidlib, const char *in, char **out, unsigned int extra_room, int quiet) +void rnd_path_resolve(rnd_design_t *hidlib, const char *in, char **out, unsigned int extra_room, int quiet) { rnd_paths_resolve(hidlib, &in, out, 1, extra_room, quiet); } -char *rnd_path_resolve_inplace(rnd_hidlib_t *hidlib, char *in, unsigned int extra_room, int quiet) +char *rnd_path_resolve_inplace(rnd_design_t *hidlib, char *in, unsigned int extra_room, int quiet) { char *out; rnd_path_resolve(hidlib, in, &out, extra_room, quiet); Index: trunk/src/librnd/core/paths.h =================================================================== --- trunk/src/librnd/core/paths.h (revision 34610) +++ trunk/src/librnd/core/paths.h (revision 34611) @@ -33,15 +33,15 @@ If extra_room is non-zero, allocate this many bytes extra for each slot; this leaves some room to append a file name. If quiet is non-zero, suppress error messages. */ -void rnd_path_resolve(rnd_hidlib_t *hidlib, const char *in, char **out, unsigned int extra_room, int quiet); +void rnd_path_resolve(rnd_design_t *hidlib, const char *in, char **out, unsigned int extra_room, int quiet); /* Same as resolve_path, but it returns the pointer to the new path and calls free() on in */ -char *rnd_path_resolve_inplace(rnd_hidlib_t *hidlib, char *in, unsigned int extra_room, int quiet); +char *rnd_path_resolve_inplace(rnd_design_t *hidlib, char *in, unsigned int extra_room, int quiet); /* Resolve all paths from a in[] into out[](should be large enough) */ -void rnd_paths_resolve(rnd_hidlib_t *hidlib, const char **in, char **out, int numpaths, unsigned int extra_room, int quiet); +void rnd_paths_resolve(rnd_design_t *hidlib, const char **in, char **out, int numpaths, unsigned int extra_room, int quiet); /* Resolve all paths from a char *in[] into a freshly allocated char **out */ #define rnd_paths_resolve_all(hidlib, in, out, extra_room, quiet) \ @@ -63,11 +63,11 @@ %D dirname (load-time file path of the current pcb, without file name, with trailing slash, might be ./) %N name of the current pcb %T wall time (Epoch) - ctx must be the current (rnd_hidlib_t *) + ctx must be the current (rnd_design_t *) */ int rnd_build_fn_cb(void *ctx, gds_t *s, const char **input); -char *rnd_build_fn(rnd_hidlib_t *hidlib, const char *template); +char *rnd_build_fn(rnd_design_t *hidlib, const char *template); /* Same as above, but also replaces lower case formatting to the members of @@ -74,7 +74,7 @@ the array if they are not NULL; use with rnd_build_argfn() */ typedef struct { const char *params['z' - 'a' + 1]; /* [0] for 'a' */ - rnd_hidlib_t *hidlib; /* if NULL, some of the substitutions (e.g. %B, %D, %N) won't be performed */ + rnd_design_t *hidlib; /* if NULL, some of the substitutions (e.g. %B, %D, %N) won't be performed */ } rnd_build_argfn_t; char *rnd_build_argfn(const char *template, rnd_build_argfn_t *arg); Index: trunk/src/librnd/core/safe_fs.c =================================================================== --- trunk/src/librnd/core/safe_fs.c (revision 34610) +++ trunk/src/librnd/core/safe_fs.c (revision 34611) @@ -62,7 +62,7 @@ } \ } while(0) -FILE *rnd_fopen_fn(rnd_hidlib_t *hidlib, const char *path, const char *mode, char **fn_out) +FILE *rnd_fopen_fn(rnd_design_t *hidlib, const char *path, const char *mode, char **fn_out) { FILE *f; char *path_exp; @@ -99,12 +99,12 @@ return NULL; } -FILE *rnd_fopen(rnd_hidlib_t *hidlib, const char *path, const char *mode) +FILE *rnd_fopen(rnd_design_t *hidlib, const char *path, const char *mode) { return rnd_fopen_fn(hidlib, path, mode, NULL); } -FILE *rnd_fopen_askovr(rnd_hidlib_t *hidlib, const char *path, const char *mode, int *all) +FILE *rnd_fopen_askovr(rnd_design_t *hidlib, const char *path, const char *mode, int *all) { if (hidlib->batch_ask_ovr != NULL) all = hidlib->batch_ask_ovr; @@ -142,7 +142,7 @@ return rnd_fopen(hidlib, path, mode); } -int *rnd_batched_ask_ovr_init(rnd_hidlib_t *hidlib, int *storage) +int *rnd_batched_ask_ovr_init(rnd_design_t *hidlib, int *storage) { int *old = hidlib->batch_ask_ovr; if (hidlib->batch_ask_ovr != NULL) @@ -151,7 +151,7 @@ return old; } -void rnd_batched_ask_ovr_uninit(rnd_hidlib_t *hidlib, int *init_retval) +void rnd_batched_ask_ovr_uninit(rnd_design_t *hidlib, int *init_retval) { if (init_retval != NULL) *init_retval = *hidlib->batch_ask_ovr; @@ -158,7 +158,7 @@ hidlib->batch_ask_ovr = init_retval; } -char *rnd_fopen_check(rnd_hidlib_t *hidlib, const char *path, const char *mode) +char *rnd_fopen_check(rnd_design_t *hidlib, const char *path, const char *mode) { char *path_exp = rnd_build_fn(hidlib, path); @@ -171,7 +171,7 @@ return NULL; } -FILE *rnd_popen(rnd_hidlib_t *hidlib, const char *cmd, const char *mode) +FILE *rnd_popen(rnd_design_t *hidlib, const char *cmd, const char *mode) { FILE *f = NULL; char *cmd_exp = rnd_build_fn(hidlib, cmd); @@ -193,7 +193,7 @@ } -int rnd_file_readable(rnd_hidlib_t *hidlib, const char *path) +int rnd_file_readable(rnd_design_t *hidlib, const char *path) { CHECK("access", "file_readable", path, "r", return 0); CHECK("access", "access", path, "r", return 0); @@ -201,7 +201,7 @@ } -int rnd_system(rnd_hidlib_t *hidlib, const char *cmd) +int rnd_system(rnd_design_t *hidlib, const char *cmd) { int res = -1; char *cmd_exp = rnd_build_fn(hidlib, cmd); @@ -217,7 +217,7 @@ return res; } -int rnd_remove(rnd_hidlib_t *hidlib, const char *path) +int rnd_remove(rnd_design_t *hidlib, const char *path) { int res = -1; char *path_exp = rnd_build_fn(hidlib, path); @@ -232,7 +232,7 @@ return res; } -int rnd_rename(rnd_hidlib_t *hidlib, const char *old_path, const char *new_path) +int rnd_rename(rnd_design_t *hidlib, const char *old_path, const char *new_path) { int res = -1; char *old_path_exp = rnd_build_fn(hidlib, old_path); @@ -250,7 +250,7 @@ return res; } -int rnd_unlink(rnd_hidlib_t *hidlib, const char *path) +int rnd_unlink(rnd_design_t *hidlib, const char *path) { int res; char *path_exp = rnd_build_fn(hidlib, path); @@ -260,7 +260,7 @@ } -DIR *rnd_opendir(rnd_hidlib_t *hidlib, const char *name) +DIR *rnd_opendir(rnd_design_t *hidlib, const char *name) { DIR *d; char *path_exp = rnd_build_fn(hidlib, name); @@ -282,7 +282,7 @@ } -static FILE *rnd_fopen_at_(rnd_hidlib_t *hidlib, const char *from, const char *fn, const char *mode, char **full_path, int recursive) +static FILE *rnd_fopen_at_(rnd_design_t *hidlib, const char *from, const char *fn, const char *mode, char **full_path, int recursive) { char tmp[RND_PATH_MAX]; DIR *d; @@ -328,7 +328,7 @@ return NULL; } -FILE *rnd_fopen_at(rnd_hidlib_t *hidlib, const char *dir, const char *fn, const char *mode, char **full_path, int recursive) +FILE *rnd_fopen_at(rnd_design_t *hidlib, const char *dir, const char *fn, const char *mode, char **full_path, int recursive) { if (full_path != NULL) *full_path = NULL; @@ -336,7 +336,7 @@ return rnd_fopen_at_(hidlib, dir, fn, mode, full_path, recursive); } -FILE *rnd_fopen_first(rnd_hidlib_t *hidlib, const rnd_conflist_t *paths, const char *fn, const char *mode, char **full_path, int recursive) +FILE *rnd_fopen_first(rnd_design_t *hidlib, const rnd_conflist_t *paths, const char *fn, const char *mode, char **full_path, int recursive) { FILE *res; char *real_fn = rnd_build_fn(hidlib, fn); @@ -389,7 +389,7 @@ } extern int rnd_mkdir_(const char *path, int mode); -int rnd_mkdir(rnd_hidlib_t *hidlib, const char *path, int mode) +int rnd_mkdir(rnd_design_t *hidlib, const char *path, int mode) { CHECK("mkdir", "access", path, NULL, return -1); CHECK("mkdir", "mkdir", path, NULL, return -1); @@ -399,7 +399,7 @@ extern long rnd_file_size_(const char *path); -long rnd_file_size(rnd_hidlib_t *hidlib, const char *path) +long rnd_file_size(rnd_design_t *hidlib, const char *path) { CHECK("file_size", "access", path, NULL, return -1); CHECK("file_size", "stat", path, NULL, return -1); @@ -407,7 +407,7 @@ } extern int rnd_is_dir_(const char *path); -int rnd_is_dir(rnd_hidlib_t *hidlib, const char *path) +int rnd_is_dir(rnd_design_t *hidlib, const char *path) { CHECK("is_dir", "access", path, NULL, return -1); CHECK("is_dir", "stat", path, NULL, return -1); @@ -415,7 +415,7 @@ } extern double rnd_file_mtime_(const char *path); -double rnd_file_mtime(rnd_hidlib_t *hidlib, const char *path) +double rnd_file_mtime(rnd_design_t *hidlib, const char *path) { CHECK("file_mtime", "access", path, NULL, return -1); CHECK("file_mtime", "stat", path, NULL, return -1); @@ -422,7 +422,7 @@ return rnd_file_mtime_(path); } -int rnd_file_stat(rnd_hidlib_t *hidlib, const char *path, int *is_dir, long *size, double *mtime) +int rnd_file_stat(rnd_design_t *hidlib, const char *path, int *is_dir, long *size, double *mtime) { CHECK("file_stat", "access", path, NULL, return -1); CHECK("file_stat", "stat", path, NULL, return -1); Index: trunk/src/librnd/core/safe_fs.h =================================================================== --- trunk/src/librnd/core/safe_fs.h (revision 34610) +++ trunk/src/librnd/core/safe_fs.h (revision 34611) @@ -38,59 +38,59 @@ /* file name templating wrappers around file system calls; later they will also execute checks to avoid unsafe access */ -FILE *rnd_fopen(rnd_hidlib_t *hidlib, const char *path, const char *mode); -FILE *rnd_fopen_askovr(rnd_hidlib_t *hidlib, const char *path, const char *mode, int *all); -FILE *rnd_popen(rnd_hidlib_t *hidlib, const char *cmd, const char *mode); +FILE *rnd_fopen(rnd_design_t *hidlib, const char *path, const char *mode); +FILE *rnd_fopen_askovr(rnd_design_t *hidlib, const char *path, const char *mode, int *all); +FILE *rnd_popen(rnd_design_t *hidlib, const char *cmd, const char *mode); int rnd_pclose(FILE *f); -int rnd_system(rnd_hidlib_t *hidlib, const char *cmd); -int rnd_remove(rnd_hidlib_t *hidlib, const char *path); -int rnd_rename(rnd_hidlib_t *hidlib, const char *old_path, const char *new_path); -int rnd_mkdir(rnd_hidlib_t *hidlib, const char *path, int mode); -int rnd_unlink(rnd_hidlib_t *hidlib, const char *path); +int rnd_system(rnd_design_t *hidlib, const char *cmd); +int rnd_remove(rnd_design_t *hidlib, const char *path); +int rnd_rename(rnd_design_t *hidlib, const char *old_path, const char *new_path); +int rnd_mkdir(rnd_design_t *hidlib, const char *path, int mode); +int rnd_unlink(rnd_design_t *hidlib, const char *path); /* Query multiple stat fields at once. Returns 0 on success. Output fields must not be NULL. */ -int rnd_file_stat(rnd_hidlib_t *hidlib, const char *path, int *is_dir, long *size, double *mtime); +int rnd_file_stat(rnd_design_t *hidlib, const char *path, int *is_dir, long *size, double *mtime); /* Batched ask-overwrite in storage provided by the caller; the return value of the init() call needs to be passed to the uninit() so nested batching is possible. */ -int *rnd_batched_ask_ovr_init(rnd_hidlib_t *hidlib, int *storage); -void rnd_batched_ask_ovr_uninit(rnd_hidlib_t *hidlib, int *init_retval); +int *rnd_batched_ask_ovr_init(rnd_design_t *hidlib, int *storage); +void rnd_batched_ask_ovr_uninit(rnd_design_t *hidlib, int *init_retval); /* Return the size of non-large files; on error or for large files (size larger than the value long can hold) return -1 */ -long rnd_file_size(rnd_hidlib_t *hidlib, const char *path); +long rnd_file_size(rnd_design_t *hidlib, const char *path); /* Return -1 on error or the last modification time (in sec from epoch) */ -double rnd_file_mtime(rnd_hidlib_t *hidlib, const char *path); +double rnd_file_mtime(rnd_design_t *hidlib, const char *path); /* This is going to be available only in 3.1.0: Query is_dir, size and mtime with a single syscall; Return 0 on success. -int rnd_file_stat(rnd_hidlib_t *hidlib, const char *path, int *is_dir, long *size, double *mtime); +int rnd_file_stat(rnd_design_t *hidlib, const char *path, int *is_dir, long *size, double *mtime); */ /* Return non-zero if path is a directory */ -int rnd_is_dir(rnd_hidlib_t *hidlib, const char *path); +int rnd_is_dir(rnd_design_t *hidlib, const char *path); /* Check if path could be open with mode; if yes, return the substituted/expanded file name, if no, return NULL */ -char *rnd_fopen_check(rnd_hidlib_t *hidlib, const char *path, const char *mode); +char *rnd_fopen_check(rnd_design_t *hidlib, const char *path, const char *mode); /* Same as rnd_fopen(), but on success load fn_out() with the malloc()'d file name as it looked after the substitution */ -FILE *rnd_fopen_fn(rnd_hidlib_t *hidlib, const char *path, const char *mode, char **fn_out); +FILE *rnd_fopen_fn(rnd_design_t *hidlib, const char *path, const char *mode, char **fn_out); /* Open a file given as a basename fn, under the directory dir, optionally doing a recusrive search in the directory tree. If full_path is not NULL, and the call succeeds, load it with the full path of the file opened. */ -FILE *rnd_fopen_at(rnd_hidlib_t *hidlib, const char *dir, const char *fn, const char *mode, char **full_path, int recursive); +FILE *rnd_fopen_at(rnd_design_t *hidlib, const char *dir, const char *fn, const char *mode, char **full_path, int recursive); /* Return 1 if path is a file that can be opened for read */ -int rnd_file_readable(rnd_hidlib_t *hidlib, const char *path); +int rnd_file_readable(rnd_design_t *hidlib, const char *path); #include @@ -101,6 +101,6 @@ (or NULL on failure); the caller needs to call free() on it. If recursive is set, all subcirectories under each path is also searched for the file. */ -FILE *rnd_fopen_first(rnd_hidlib_t *hidlib, const rnd_conflist_t *paths, const char *fn, const char *mode, char **full_path, int recursive); +FILE *rnd_fopen_first(rnd_design_t *hidlib, const rnd_conflist_t *paths, const char *fn, const char *mode, char **full_path, int recursive); #endif Index: trunk/src/librnd/core/safe_fs_dir.h =================================================================== --- trunk/src/librnd/core/safe_fs_dir.h (revision 34610) +++ trunk/src/librnd/core/safe_fs_dir.h (revision 34611) @@ -1,4 +1,4 @@ #include -DIR *rnd_opendir(rnd_hidlib_t *hidlib, const char *name); +DIR *rnd_opendir(rnd_design_t *hidlib, const char *name); struct dirent *rnd_readdir(DIR *dir); int rnd_closedir(DIR *dir); Index: trunk/src/librnd/font/font_lht.h =================================================================== --- trunk/src/librnd/font/font_lht.h (revision 34610) +++ trunk/src/librnd/font/font_lht.h (revision 34611) @@ -169,7 +169,7 @@ return err; } -static int rnd_font_load(rnd_hidlib_t *hidlib, rnd_font_t *dst, const char *fn, int quiet) +static int rnd_font_load(rnd_design_t *hidlib, rnd_font_t *dst, const char *fn, int quiet) { int res = 0; char *errmsg = NULL, *realfn; Index: trunk/src/librnd/hid/grid.c =================================================================== --- trunk/src/librnd/hid/grid.c (revision 34610) +++ trunk/src/librnd/hid/grid.c (revision 34611) @@ -170,7 +170,7 @@ return tmp.array; /* do not uninit tmp */ } -void rnd_grid_set(rnd_hidlib_t *hidlib, const rnd_grid_t *src) +void rnd_grid_set(rnd_design_t *hidlib, const rnd_grid_t *src) { rnd_hidlib_set_grid(hidlib, src->size, rnd_true, src->ox, src->oy); if (src->unit != NULL) @@ -183,7 +183,7 @@ dst->name = NULL; } -rnd_bool_t rnd_grid_list_jump(rnd_hidlib_t *hidlib, int dst) +rnd_bool_t rnd_grid_list_jump(rnd_design_t *hidlib, int dst) { const rnd_conf_listitem_t *li; rnd_grid_t g; @@ -218,7 +218,7 @@ return rnd_true; } -rnd_bool_t rnd_grid_list_step(rnd_hidlib_t *hidlib, int stp) +rnd_bool_t rnd_grid_list_step(rnd_design_t *hidlib, int stp) { int dst = rnd_conf.editor.grids_idx; if (dst < 0) @@ -284,7 +284,7 @@ } /* sets cursor grid with respect to grid offset values */ -void rnd_hidlib_set_grid(rnd_hidlib_t *hidlib, rnd_coord_t Grid, rnd_bool align, rnd_coord_t ox, rnd_coord_t oy) +void rnd_hidlib_set_grid(rnd_design_t *hidlib, rnd_coord_t Grid, rnd_bool align, rnd_coord_t ox, rnd_coord_t oy) { if (Grid >= 1 && Grid <= RND_MAX_GRID) { if (align) { @@ -298,7 +298,7 @@ } } -void rnd_hidlib_set_unit(rnd_hidlib_t *hidlib, const rnd_unit_t *new_unit) +void rnd_hidlib_set_unit(rnd_design_t *hidlib, const rnd_unit_t *new_unit) { if (new_unit != NULL && new_unit->allow != RND_UNIT_NO_PRINT) rnd_conf_set(RND_CFR_DESIGN, "editor/grid_unit", -1, new_unit->suffix, RND_POL_OVERWRITE); Index: trunk/src/librnd/hid/grid.h =================================================================== --- trunk/src/librnd/hid/grid.h (revision 34610) +++ trunk/src/librnd/hid/grid.h (revision 34611) @@ -63,13 +63,13 @@ char *rnd_grid_print(const rnd_grid_t *src); /* Apply grid settings from src to the pcb */ -void rnd_grid_set(rnd_hidlib_t *hidlib, const rnd_grid_t *src); +void rnd_grid_set(rnd_design_t *hidlib, const rnd_grid_t *src); /* Jump to grid index dst (clamped); absolute set */ -rnd_bool_t rnd_grid_list_jump(rnd_hidlib_t *hidlib, int dst); +rnd_bool_t rnd_grid_list_jump(rnd_design_t *hidlib, int dst); /* Step stp steps (can be 0) on the grids list and set the resulting grid; relative set */ -rnd_bool_t rnd_grid_list_step(rnd_hidlib_t *hidlib, int stp); +rnd_bool_t rnd_grid_list_step(rnd_design_t *hidlib, int stp); /* invalidate the grid index; call this when changing the grid settings */ void rnd_grid_inval(void); @@ -81,7 +81,7 @@ void rnd_grid_uninit(void); /* sets cursor grid with respect to grid spacing, offset and unit values */ -void rnd_hidlib_set_grid(rnd_hidlib_t *hidlib, rnd_coord_t Grid, rnd_bool align, rnd_coord_t ox, rnd_coord_t oy); -void rnd_hidlib_set_unit(rnd_hidlib_t *hidlib, const rnd_unit_t *new_unit); +void rnd_hidlib_set_grid(rnd_design_t *hidlib, rnd_coord_t Grid, rnd_bool align, rnd_coord_t ox, rnd_coord_t oy); +void rnd_hidlib_set_unit(rnd_design_t *hidlib, const rnd_unit_t *new_unit); #endif Index: trunk/src/librnd/hid/hid.c =================================================================== --- trunk/src/librnd/hid/hid.c (revision 34610) +++ trunk/src/librnd/hid/hid.c (revision 34611) @@ -34,7 +34,7 @@ int rnd_hid_enable_per_dialog_hidlib = 0; -void rnd_hid_notify_crosshair_change(rnd_hidlib_t *hl, rnd_bool changes_complete) +void rnd_hid_notify_crosshair_change(rnd_design_t *hl, rnd_bool changes_complete) { if (rnd_gui->notify_crosshair_change) rnd_gui->notify_crosshair_change(rnd_gui, changes_complete); @@ -58,7 +58,7 @@ static int btmr_timer_active = 0; static rnd_hidval_t btmr_timer; -static rnd_hidlib_t *btmr_hidlib; +static rnd_design_t *btmr_hidlib; static void btmr_cb(rnd_hidval_t user_data) { @@ -68,7 +68,7 @@ rnd_hid_menu_merge_inhibit_dec(); } -void rnd_hid_gui_batch_timer(rnd_hidlib_t *hidlib) +void rnd_hid_gui_batch_timer(rnd_design_t *hidlib) { rnd_hidval_t timerdata; Index: trunk/src/librnd/hid/hid.h =================================================================== --- trunk/src/librnd/hid/hid.h (revision 34610) +++ trunk/src/librnd/hid/hid.h (revision 34611) @@ -223,11 +223,11 @@ /* called by core when the global hidlib context changes (e.g. design changed) The HID should store the hidlib pointer for knowing drawing area dimensions */ - void (*set_hidlib)(rnd_hid_t *hid, rnd_hidlib_t *hidlib); + void (*set_hidlib)(rnd_hid_t *hid, rnd_design_t *hidlib); /* Return the hidlib the given GUI HID is currently showing (not implemented in export HIDs) */ - rnd_hidlib_t *(*get_hidlib)(rnd_hid_t *hid); + rnd_design_t *(*get_hidlib)(rnd_hid_t *hid); /* Returns a set of resources describing options the export or print HID supports. In GUI mode, the print/export dialogs use this to @@ -533,7 +533,7 @@ is different from ->get_hidlib because this returns the hidlib associated with the dialog, which (for multi-instance local dialogs) may be different from the hidlib what's currently show by the GUI */ - rnd_hidlib_t *(*get_dad_hidlib)(void *hid_ctx); + rnd_design_t *(*get_dad_hidlib)(void *hid_ctx); /*** (these should be upper, but the struct has to be extended at spares for binary compatibility) ***/ @@ -593,13 +593,13 @@ value. "msg" is printed above the query. The optional title is the window title. Returns NULL on cancel. The caller needs to free the returned string */ -char *rnd_hid_prompt_for(rnd_hidlib_t *hl, const char *msg, const char *default_string, const char *title); +char *rnd_hid_prompt_for(rnd_design_t *hl, const char *msg, const char *default_string, const char *title); /* Present a dialog box with a message and variable number of buttons. If icon is not NULL, attempt to draw the named icon on the left. The vararg part is one or more buttons, as a list of "char *label, int retval", terminated with NULL. */ -int rnd_hid_message_box(rnd_hidlib_t *hl, const char *icon, const char *title, const char *label, ...); +int rnd_hid_message_box(rnd_design_t *hl, const char *icon, const char *title, const char *label, ...); /* Show modal progressbar to the user, offering cancel long running processes. Pass all zeros to flush display and remove the dialog. @@ -637,7 +637,7 @@ * They should initiate a redraw of the crosshair attached objects - which may * (if necessary) mean repainting the whole screen if the GUI hasn't tracked the * location of existing attached drawing. */ -void rnd_hid_notify_crosshair_change(rnd_hidlib_t *hl, rnd_bool changes_complete); +void rnd_hid_notify_crosshair_change(rnd_design_t *hl, rnd_bool changes_complete); /* Plugin helper: timed batch updates; any plugin may trigger the update, multiple triggers are batched and only a single RND_EVENT_GUI_BATCH_TIMER is emitted @@ -644,7 +644,7 @@ after a certain time passed since the last trigger. The event is emitted with the last hidlib argument passed. If there's no GUI available, no event is emitted. */ -void rnd_hid_gui_batch_timer(rnd_hidlib_t *hidlib); +void rnd_hid_gui_batch_timer(rnd_design_t *hidlib); /* Run the file selection dialog. Return a string the caller needs to free(). * title may be used as a dialog box title. Ignored if NULL. Index: trunk/src/librnd/hid/hid_cfg_input.c =================================================================== --- trunk/src/librnd/hid/hid_cfg_input.c (revision 34610) +++ trunk/src/librnd/hid/hid_cfg_input.c (revision 34611) @@ -183,7 +183,7 @@ return NULL; } -void rnd_hid_cfg_mouse_action(rnd_hidlib_t *hl, rnd_hid_cfg_mouse_t *mouse, rnd_hid_cfg_mod_t button_and_mask, rnd_bool cmd_entry_active) +void rnd_hid_cfg_mouse_action(rnd_design_t *hl, rnd_hid_cfg_mouse_t *mouse, rnd_hid_cfg_mod_t button_and_mask, rnd_bool cmd_entry_active) { rnd_conf.temp.click_cmd_entry_active = cmd_entry_active; rnd_hid_cfg_action(hl, find_best_action(mouse, button_and_mask)); @@ -589,7 +589,7 @@ } -int rnd_hid_cfg_keys_input_(rnd_hidlib_t *hl, rnd_hid_cfg_keys_t *km, rnd_hid_cfg_mod_t mods, unsigned short int key_raw, unsigned short int key_tr, rnd_hid_cfg_keyseq_t **seq, int *seq_len) +int rnd_hid_cfg_keys_input_(rnd_design_t *hl, rnd_hid_cfg_keys_t *km, rnd_hid_cfg_mod_t mods, unsigned short int key_raw, unsigned short int key_tr, rnd_hid_cfg_keyseq_t **seq, int *seq_len) { rnd_hid_cfg_keyseq_t *ns; rnd_hid_cfg_keyhash_t addr; @@ -710,7 +710,7 @@ xlate_avail = 1; } -int rnd_hid_cfg_keys_input(rnd_hidlib_t *hl, rnd_hid_cfg_keys_t *km, rnd_hid_cfg_mod_t mods, unsigned short int key_raw, unsigned short int key_tr) +int rnd_hid_cfg_keys_input(rnd_design_t *hl, rnd_hid_cfg_keys_t *km, rnd_hid_cfg_mod_t mods, unsigned short int key_raw, unsigned short int key_tr) { rnd_hid_cfg_keyhash_t ck, *cv; @@ -752,7 +752,7 @@ /*** key translation hash ends **/ -int rnd_hid_cfg_keys_action_(rnd_hidlib_t *hl, rnd_hid_cfg_keyseq_t **seq, int seq_len) +int rnd_hid_cfg_keys_action_(rnd_design_t *hl, rnd_hid_cfg_keyseq_t **seq, int seq_len) { int res; @@ -764,7 +764,7 @@ return res; } -int rnd_hid_cfg_keys_action(rnd_hidlib_t *hl, rnd_hid_cfg_keys_t *km) +int rnd_hid_cfg_keys_action(rnd_design_t *hl, rnd_hid_cfg_keys_t *km) { int ret = rnd_hid_cfg_keys_action_(hl, km->seq, km->seq_len_action); km->seq_len_action = 0; Index: trunk/src/librnd/hid/hid_cfg_input.h =================================================================== --- trunk/src/librnd/hid/hid_cfg_input.h (revision 34610) +++ trunk/src/librnd/hid/hid_cfg_input.h (revision 34611) @@ -14,7 +14,7 @@ } rnd_hid_cfg_mouse_t; int rnd_hid_cfg_mouse_init(rnd_hid_cfg_t *hr, rnd_hid_cfg_mouse_t *mouse); -void rnd_hid_cfg_mouse_action(rnd_hidlib_t *hl, rnd_hid_cfg_mouse_t *mouse, rnd_hid_cfg_mod_t button_and_mask, rnd_bool cmd_entry_active); +void rnd_hid_cfg_mouse_action(rnd_design_t *hl, rnd_hid_cfg_mouse_t *mouse, rnd_hid_cfg_mod_t button_and_mask, rnd_bool cmd_entry_active); /************************** KEYBOARD ***************************/ @@ -127,13 +127,13 @@ + a positive integer means the lookup succeeded and the return value is the length of the resulting sequence. */ -int rnd_hid_cfg_keys_input(rnd_hidlib_t *hl, rnd_hid_cfg_keys_t *km, rnd_hid_cfg_mod_t mods, unsigned short int key_raw, unsigned short int key_tr); -int rnd_hid_cfg_keys_input_(rnd_hidlib_t *hl, rnd_hid_cfg_keys_t *km, rnd_hid_cfg_mod_t mods, unsigned short int key_raw, unsigned short int key_tr, rnd_hid_cfg_keyseq_t **seq, int *seq_len); +int rnd_hid_cfg_keys_input(rnd_design_t *hl, rnd_hid_cfg_keys_t *km, rnd_hid_cfg_mod_t mods, unsigned short int key_raw, unsigned short int key_tr); +int rnd_hid_cfg_keys_input_(rnd_design_t *hl, rnd_hid_cfg_keys_t *km, rnd_hid_cfg_mod_t mods, unsigned short int key_raw, unsigned short int key_tr, rnd_hid_cfg_keyseq_t **seq, int *seq_len); /* Run the action for a key sequence looked up by rnd_hid_cfg_keys_input(). Returns: the result of the action or -1 on error */ -int rnd_hid_cfg_keys_action(rnd_hidlib_t *hl, rnd_hid_cfg_keys_t *km); -int rnd_hid_cfg_keys_action_(rnd_hidlib_t *hl, rnd_hid_cfg_keyseq_t **seq, int seq_len); +int rnd_hid_cfg_keys_action(rnd_design_t *hl, rnd_hid_cfg_keys_t *km); +int rnd_hid_cfg_keys_action_(rnd_design_t *hl, rnd_hid_cfg_keyseq_t **seq, int seq_len); /* Print a squence into dst in human readable form; returns strlen(dst) */ int rnd_hid_cfg_keys_seq(rnd_hid_cfg_keys_t *km, char *dst, int dst_len); Index: trunk/src/librnd/hid/hid_dlg.c =================================================================== --- trunk/src/librnd/hid/hid_dlg.c (revision 34610) +++ trunk/src/librnd/hid/hid_dlg.c (revision 34611) @@ -66,7 +66,7 @@ return call_dialog("promptfor", res, argc, argv); } -char *rnd_hid_prompt_for(rnd_hidlib_t *hl, const char *msg, const char *default_string, const char *title) +char *rnd_hid_prompt_for(rnd_design_t *hl, const char *msg, const char *default_string, const char *title) { fgw_arg_t res, argv[4]; @@ -91,7 +91,7 @@ return call_dialog("messagebox", res, argc, argv); } -int rnd_hid_message_box(rnd_hidlib_t *hl, const char *icon, const char *title, const char *label, ...) +int rnd_hid_message_box(rnd_design_t *hl, const char *icon, const char *title, const char *label, ...) { fgw_arg_t res, argv[128]; int argc; @@ -273,7 +273,7 @@ static const char *event_dlg_cookie = "hid_dlg"; -static void hid_dlg_log_gui_init_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) +static void hid_dlg_log_gui_init_ev(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) { hid_dlg_gui_inited = 1; } Index: trunk/src/librnd/hid/hid_init.c =================================================================== --- trunk/src/librnd/hid/hid_init.c (revision 34610) +++ trunk/src/librnd/hid/hid_init.c (revision 34611) @@ -360,7 +360,7 @@ } } -rnd_hid_t *rnd_hid_find_gui(rnd_hidlib_t *hidlib, const char *preference) +rnd_hid_t *rnd_hid_find_gui(rnd_design_t *hidlib, const char *preference) { rnd_hid_t *gui; int i; @@ -587,7 +587,7 @@ return exec_prefix; } -static void hidlib_gui_init_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) +static void hidlib_gui_init_ev(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) { rnd_tool_gui_init(); rnd_gui->set_mouse_cursor(rnd_gui, rnd_conf.editor.mode); /* make sure the mouse cursor is set up now that it is registered */ @@ -1052,7 +1052,7 @@ return 0; } -int rnd_main_exported(rnd_main_args_t *ga, rnd_hidlib_t *hidlib, rnd_bool is_empty) +int rnd_main_exported(rnd_main_args_t *ga, rnd_design_t *hidlib, rnd_bool is_empty) { if (!rnd_main_exporting) return 0; @@ -1068,7 +1068,7 @@ return 1; } -void rnd_mainloop_interactive(rnd_main_args_t *ga, rnd_hidlib_t *hidlib) +void rnd_mainloop_interactive(rnd_main_args_t *ga, rnd_design_t *hidlib) { rnd_hid_in_main_loop = 1; rnd_event(hidlib, RND_EVENT_MAINLOOP_CHANGE, "i", rnd_hid_in_main_loop); Index: trunk/src/librnd/hid/hid_init.h =================================================================== --- trunk/src/librnd/hid/hid_init.h (revision 34610) +++ trunk/src/librnd/hid/hid_init.h (revision 34611) @@ -60,7 +60,7 @@ /* When the application runs in interactive mode, this is called to instantiate one GUI HID which happens to be the GUI. This HID is the one that interacts with the mouse and keyboard. */ -rnd_hid_t *rnd_hid_find_gui(rnd_hidlib_t *hidlib, const char *preference); +rnd_hid_t *rnd_hid_find_gui(rnd_design_t *hidlib, const char *preference); /* Finds the one printer HID and instantiates it. */ rnd_hid_t *rnd_hid_find_printer(void); @@ -158,11 +158,11 @@ /* if -x was specified, do the export and return 1 (the caller should exit); else return 0 */ -int rnd_main_exported(rnd_main_args_t *ga, rnd_hidlib_t *hidlib, rnd_bool is_empty); +int rnd_main_exported(rnd_main_args_t *ga, rnd_design_t *hidlib, rnd_bool is_empty); /* launches the GUI or CLI; after it returns, if rnd_gui is not NULL, the user has selected another GUI to switch to. */ -void rnd_mainloop_interactive(rnd_main_args_t *ga, rnd_hidlib_t *hidlib); +void rnd_mainloop_interactive(rnd_main_args_t *ga, rnd_design_t *hidlib); /* parse arguments using the gui; if fails and fallback is enabled, try the next gui */ int rnd_gui_parse_arguments(int autopick_gui, int *hid_argc, char **hid_argv[]); Index: trunk/src/librnd/hid/hid_menu.c =================================================================== --- trunk/src/librnd/hid/hid_menu.c (revision 34610) +++ trunk/src/librnd/hid/hid_menu.c (revision 34611) @@ -823,7 +823,7 @@ return menu; } -rnd_menu_patch_t *rnd_hid_menu_load(rnd_hid_t *hid, rnd_hidlib_t *hidlib, const char *cookie, int prio, const char *fn, int exact_fn, const char *embedded_fallback, const char *desc) +rnd_menu_patch_t *rnd_hid_menu_load(rnd_hid_t *hid, rnd_design_t *hidlib, const char *cookie, int prio, const char *fn, int exact_fn, const char *embedded_fallback, const char *desc) { lht_doc_t *doc = NULL; int has_file = 0; @@ -1420,7 +1420,7 @@ rnd_hid_menu_merge_inhibit_dec(); } -static int menu_anyload_subtree(const rnd_anyload_t *al, rnd_hidlib_t *hl, lht_node_t *root) +static int menu_anyload_subtree(const rnd_anyload_t *al, rnd_design_t *hl, lht_node_t *root) { lht_doc_t *doc; rnd_menu_patch_t *menu; Index: trunk/src/librnd/hid/hid_menu.h =================================================================== --- trunk/src/librnd/hid/hid_menu.h (revision 34610) +++ trunk/src/librnd/hid/hid_menu.h (revision 34611) @@ -33,7 +33,7 @@ not found, parse embedded_fallback instead (if it is not NULL). Prio is ignored when loading a menu patch file with priority specified in the file. Returns NULL on error. */ -rnd_menu_patch_t *rnd_hid_menu_load(rnd_hid_t *hid, rnd_hidlib_t *hidlib, const char *cookie, int prio, const char *fn, int exact_fn, const char *embedded_fallback, const char *desc); +rnd_menu_patch_t *rnd_hid_menu_load(rnd_hid_t *hid, rnd_design_t *hidlib, const char *cookie, int prio, const char *fn, int exact_fn, const char *embedded_fallback, const char *desc); /* Unload a menu patch by cookie */ void rnd_hid_menu_unload(rnd_hid_t *hid, const char *cookie); Index: trunk/src/librnd/hid/pixmap.c =================================================================== --- trunk/src/librnd/hid/pixmap.c (revision 34610) +++ trunk/src/librnd/hid/pixmap.c (revision 34611) @@ -144,7 +144,7 @@ rnd_message(RND_MSG_ERROR, "rnd_pixmap_chain is not empty: %s. Fix your plugins!\n", i->cookie); } -int rnd_old_pixmap_load(rnd_hidlib_t *hidlib, rnd_pixmap_t *pxm, const char *fn) +int rnd_old_pixmap_load(rnd_design_t *hidlib, rnd_pixmap_t *pxm, const char *fn) { rnd_pixmap_import_t *i; for(i = rnd_pixmap_chain; i != NULL; i = i->next) @@ -153,7 +153,7 @@ return -1; } -rnd_pixmap_t *rnd_pixmap_load(rnd_hidlib_t *hidlib, const char *fn) +rnd_pixmap_t *rnd_pixmap_load(rnd_design_t *hidlib, const char *fn) { rnd_pixmap_t *p = calloc(sizeof(rnd_pixmap_t), 1); if (rnd_old_pixmap_load(hidlib, p, fn) == 0) @@ -162,7 +162,7 @@ return NULL; } -rnd_pixmap_t *rnd_pixmap_alloc(rnd_hidlib_t *hidlib, long sx, long sy) +rnd_pixmap_t *rnd_pixmap_alloc(rnd_design_t *hidlib, long sx, long sy) { rnd_pixmap_t *p = calloc(sizeof(rnd_pixmap_t), 1); p->sx = sx; @@ -172,7 +172,7 @@ return p; } -rnd_pixmap_t *rnd_pixmap_dup(rnd_hidlib_t *hidlib, const rnd_pixmap_t *pxm) +rnd_pixmap_t *rnd_pixmap_dup(rnd_design_t *hidlib, const rnd_pixmap_t *pxm) { rnd_pixmap_t *r = malloc(sizeof(rnd_pixmap_t)); memcpy(r, pxm, sizeof(rnd_pixmap_t)); Index: trunk/src/librnd/hid/pixmap.h =================================================================== --- trunk/src/librnd/hid/pixmap.h (revision 34610) +++ trunk/src/librnd/hid/pixmap.h (revision 34611) @@ -36,7 +36,7 @@ struct rnd_pixmap_import_s { /* configured by the caller at registration */ const char *name; - int (*load)(rnd_hidlib_t *hidlib, rnd_pixmap_t *pxm, const char *fn); + int (*load)(rnd_design_t *hidlib, rnd_pixmap_t *pxm, const char *fn); /* filled in by code */ rnd_pixmap_import_t *next; @@ -85,10 +85,10 @@ void rnd_pixmap_unreg_import_all(const char *cookie); void rnd_pixmap_uninit(void); -int rnd_old_pixmap_load(rnd_hidlib_t *hidlib, rnd_pixmap_t *pxm, const char *fn); /* legacy API, should be removed */ -rnd_pixmap_t *rnd_pixmap_load(rnd_hidlib_t *hidlib, const char *fn); -rnd_pixmap_t *rnd_pixmap_alloc(rnd_hidlib_t *hidlib, long sx, long sy); -rnd_pixmap_t *rnd_pixmap_dup(rnd_hidlib_t *hidlib, const rnd_pixmap_t *pxm); +int rnd_old_pixmap_load(rnd_design_t *hidlib, rnd_pixmap_t *pxm, const char *fn); /* legacy API, should be removed */ +rnd_pixmap_t *rnd_pixmap_load(rnd_design_t *hidlib, const char *fn); +rnd_pixmap_t *rnd_pixmap_alloc(rnd_design_t *hidlib, long sx, long sy); +rnd_pixmap_t *rnd_pixmap_dup(rnd_design_t *hidlib, const rnd_pixmap_t *pxm); unsigned int rnd_pixmap_hash_meta(const void *key); unsigned int rnd_pixmap_hash_pixels(const void *key); Index: trunk/src/librnd/hid/tool.c =================================================================== --- trunk/src/librnd/hid/tool.c (revision 34610) +++ trunk/src/librnd/hid/tool.c (revision 34611) @@ -67,7 +67,7 @@ vtp0_uninit(&rnd_tools); } -void rnd_tool_chg_mode(rnd_hidlib_t *hl) +void rnd_tool_chg_mode(rnd_design_t *hl) { if ((hl != NULL) && (!tool_select_lock)) rnd_tool_select_by_id(hl, rnd_conf.editor.mode); @@ -110,7 +110,7 @@ return RND_TOOLID_INVALID; } -int rnd_tool_select_by_name(rnd_hidlib_t *hidlib, const char *name) +int rnd_tool_select_by_name(rnd_design_t *hidlib, const char *name) { rnd_toolid_t id = rnd_tool_lookup(name); if (id == RND_TOOLID_INVALID) @@ -118,7 +118,7 @@ return rnd_tool_select_by_id(hidlib, id); } -int rnd_tool_select_by_id(rnd_hidlib_t *hidlib, rnd_toolid_t id) +int rnd_tool_select_by_id(rnd_design_t *hidlib, rnd_toolid_t id) { char id_s[32]; static rnd_bool recursing = rnd_false; @@ -157,7 +157,7 @@ return 0; } -int rnd_tool_select_highest(rnd_hidlib_t *hidlib) +int rnd_tool_select_highest(rnd_design_t *hidlib) { rnd_toolid_t n, bestn = RND_TOOLID_INVALID; unsigned int bestp = -1; @@ -173,7 +173,7 @@ return rnd_tool_select_by_id(hidlib, bestn); } -int rnd_tool_save(rnd_hidlib_t *hidlib) +int rnd_tool_save(rnd_design_t *hidlib) { save_stack[save_position] = rnd_conf.editor.mode; if (save_position < RND_MAX_MODESTACK_DEPTH - 1) @@ -183,7 +183,7 @@ return 0; } -int rnd_tool_restore(rnd_hidlib_t *hidlib) +int rnd_tool_restore(rnd_design_t *hidlib) { if (save_position == 0) { rnd_message(RND_MSG_ERROR, "hace: underflow of restore mode\n"); @@ -230,37 +230,37 @@ wrap_void(uninit, ()); } -void rnd_tool_press(rnd_hidlib_t *hidlib) +void rnd_tool_press(rnd_design_t *hidlib) { wrap_void(press, (hidlib)); } -void rnd_tool_release(rnd_hidlib_t *hidlib) +void rnd_tool_release(rnd_design_t *hidlib) { wrap_void(release, (hidlib)); } -void rnd_tool_adjust_attached(rnd_hidlib_t *hl) +void rnd_tool_adjust_attached(rnd_design_t *hl) { wrap_void(adjust_attached, (hl)); } -void rnd_tool_draw_attached(rnd_hidlib_t *hl) +void rnd_tool_draw_attached(rnd_design_t *hl) { wrap_void(draw_attached, (hl)); } -rnd_bool rnd_tool_undo_act(rnd_hidlib_t *hl) +rnd_bool rnd_tool_undo_act(rnd_design_t *hl) { wrap_retv(undo_act, return rnd_true, (hl)); } -rnd_bool rnd_tool_redo_act(rnd_hidlib_t *hl) +rnd_bool rnd_tool_redo_act(rnd_design_t *hl) { wrap_retv(redo_act, return rnd_true, (hl)); } -static void do_release(rnd_hidlib_t *hidlib) +static void do_release(rnd_design_t *hidlib) { if (rnd_conf.temp.click_cmd_entry_active && (rnd_cli_mouse(hidlib, 0) == 0)) return; @@ -275,7 +275,7 @@ rnd_event(hidlib, RND_EVENT_TOOL_RELEASE, NULL); } -void rnd_tool_do_press(rnd_hidlib_t *hidlib) +void rnd_tool_do_press(rnd_design_t *hidlib) { if (rnd_conf.temp.click_cmd_entry_active && (rnd_cli_mouse(hidlib, 1) == 0)) return; @@ -296,7 +296,7 @@ /* DOC: tool.html */ static fgw_error_t rnd_act_Tool(fgw_arg_t *res, int argc, fgw_arg_t *argv) { - rnd_hidlib_t *hidlib = RND_ACT_HIDLIB; + rnd_design_t *hidlib = RND_ACT_HIDLIB; const char *cmd; RND_ACT_IRES(0); RND_ACT_CONVARG(1, FGW_STR, Tool, cmd = argv[1].val.str); Index: trunk/src/librnd/hid/tool.h =================================================================== --- trunk/src/librnd/hid/tool.h (revision 34610) +++ trunk/src/librnd/hid/tool.h (revision 34611) @@ -60,13 +60,13 @@ /* tool implementation */ void (*init)(void); void (*uninit)(void); - void (*press)(rnd_hidlib_t *hl); - void (*release)(rnd_hidlib_t *hl); - void (*adjust_attached)(rnd_hidlib_t *hl); - void (*draw_attached)(rnd_hidlib_t *hl); - rnd_bool (*undo_act)(rnd_hidlib_t *hl); - rnd_bool (*redo_act)(rnd_hidlib_t *hl); - void (*escape)(rnd_hidlib_t *hl); + void (*press)(rnd_design_t *hl); + void (*release)(rnd_design_t *hl); + void (*adjust_attached)(rnd_design_t *hl); + void (*draw_attached)(rnd_design_t *hl); + rnd_bool (*undo_act)(rnd_design_t *hl); + rnd_bool (*redo_act)(rnd_design_t *hl); + void (*escape)(rnd_design_t *hl); unsigned long user_flags; @@ -88,7 +88,7 @@ void rnd_tool_uninit(void); /* call this when the mode (tool) config node changes */ -void rnd_tool_chg_mode(rnd_hidlib_t *hl); +void rnd_tool_chg_mode(rnd_design_t *hl); /* Insert a new tool in rnd_tools; returns -1 on failure */ rnd_toolid_t rnd_tool_reg(rnd_tool_t *tool, const char *cookie); @@ -101,12 +101,12 @@ /* Select a tool by name, id or pick the highest prio tool; return 0 on success */ -int rnd_tool_select_by_name(rnd_hidlib_t *hidlib, const char *name); -int rnd_tool_select_by_id(rnd_hidlib_t *hidlib, rnd_toolid_t id); -int rnd_tool_select_highest(rnd_hidlib_t *hidlib); +int rnd_tool_select_by_name(rnd_design_t *hidlib, const char *name); +int rnd_tool_select_by_id(rnd_design_t *hidlib, rnd_toolid_t id); +int rnd_tool_select_highest(rnd_design_t *hidlib); -int rnd_tool_save(rnd_hidlib_t *hidlib); -int rnd_tool_restore(rnd_hidlib_t *hidlib); +int rnd_tool_save(rnd_design_t *hidlib); +int rnd_tool_restore(rnd_design_t *hidlib); /* Called after GUI_INIT; registers all mouse cursors in the GUI */ void rnd_tool_gui_init(void); @@ -115,16 +115,16 @@ /**** Tool function wrappers; calling these will operate on the current tool as defined in rnd_conf.editor.mode ****/ -void rnd_tool_press(rnd_hidlib_t *hidlib); -void rnd_tool_release(rnd_hidlib_t *hidlib); -void rnd_tool_adjust_attached(rnd_hidlib_t *hl); -void rnd_tool_draw_attached(rnd_hidlib_t *hl); -rnd_bool rnd_tool_undo_act(rnd_hidlib_t *hl); -rnd_bool rnd_tool_redo_act(rnd_hidlib_t *hl); +void rnd_tool_press(rnd_design_t *hidlib); +void rnd_tool_release(rnd_design_t *hidlib); +void rnd_tool_adjust_attached(rnd_design_t *hl); +void rnd_tool_draw_attached(rnd_design_t *hl); +rnd_bool rnd_tool_undo_act(rnd_design_t *hl); +rnd_bool rnd_tool_redo_act(rnd_design_t *hl); /* fake a click */ -void rnd_tool_do_press(rnd_hidlib_t *hidlib); +void rnd_tool_do_press(rnd_design_t *hidlib); /**** Low level, for internal use ****/ Index: trunk/src/librnd/plugins/hid_batch/batch.c =================================================================== --- trunk/src/librnd/plugins/hid_batch/batch.c (revision 34610) +++ trunk/src/librnd/plugins/hid_batch/batch.c (revision 34611) @@ -58,7 +58,7 @@ } } -static void ev_design_changed(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) +static void ev_design_changed(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) { if (prompt != NULL) free(prompt); @@ -92,7 +92,7 @@ line->seen = 1; } -static void ev_log_append(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) +static void ev_log_append(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) { if (!batch_active) return; @@ -312,12 +312,12 @@ { } -static void batch_set_hidlib(rnd_hid_t *hid, rnd_hidlib_t *hidlib) +static void batch_set_hidlib(rnd_hid_t *hid, rnd_design_t *hidlib) { hid->hid_data = hidlib; } -static rnd_hidlib_t *batch_get_hidlib(rnd_hid_t *hid) +static rnd_design_t *batch_get_hidlib(rnd_hid_t *hid) { return hid->hid_data; } @@ -325,7 +325,7 @@ static void batch_view_get(rnd_hid_t *hid, rnd_box_t *viewbox) { - rnd_hidlib_t *hidlib = hid->hid_data; + rnd_design_t *hidlib = hid->hid_data; viewbox->X1 = hidlib->dwg.X1; viewbox->Y1 = hidlib->dwg.Y1; viewbox->X2 = hidlib->dwg.X2; Index: trunk/src/librnd/plugins/hid_gtk2_gdk/gtkhid-gdk.c =================================================================== --- trunk/src/librnd/plugins/hid_gtk2_gdk/gtkhid-gdk.c (revision 34610) +++ trunk/src/librnd/plugins/hid_gtk2_gdk/gtkhid-gdk.c (revision 34611) @@ -136,7 +136,7 @@ gdk_gc_set_clip_mask(gc, NULL); } -static inline void ghid_gdk_draw_grid_global(rnd_hidlib_t *hidlib) +static inline void ghid_gdk_draw_grid_global(rnd_design_t *hidlib) { render_priv_t *priv = ghidgui->port.render_priv; rnd_coord_t x, y, x1, y1, x2, y2, grd; @@ -233,7 +233,7 @@ } } -static void ghid_gdk_draw_grid_local_(rnd_hidlib_t *hidlib, rnd_coord_t cx, rnd_coord_t cy, int radius) +static void ghid_gdk_draw_grid_local_(rnd_design_t *hidlib, rnd_coord_t cx, rnd_coord_t cy, int radius) { render_priv_t *priv = ghidgui->port.render_priv; static GdkPoint *points_base = NULL; @@ -316,7 +316,7 @@ static int grid_local_have_old = 0, grid_local_old_r = 0; static rnd_coord_t grid_local_old_x, grid_local_old_y; -static void ghid_gdk_draw_grid_local(rnd_hidlib_t *hidlib, rnd_coord_t cx, rnd_coord_t cy) +static void ghid_gdk_draw_grid_local(rnd_design_t *hidlib, rnd_coord_t cx, rnd_coord_t cy) { if (grid_local_have_old) { ghid_gdk_draw_grid_local_(hidlib, grid_local_old_x, grid_local_old_y, grid_local_old_r); @@ -340,7 +340,7 @@ grid_local_old_r = rnd_gtk_conf_hid.plugins.hid_gtk.local_grid.radius; } -static void ghid_gdk_draw_grid(rnd_hidlib_t *hidlib) +static void ghid_gdk_draw_grid(rnd_design_t *hidlib) { static GdkColormap *colormap = NULL; render_priv_t *priv = ghidgui->port.render_priv; @@ -397,7 +397,7 @@ } } -static void ghid_gdk_uninit_pixmap(rnd_hidlib_t *hidlib, rnd_gtk_pixmap_t *gpm) +static void ghid_gdk_uninit_pixmap(rnd_design_t *hidlib, rnd_gtk_pixmap_t *gpm) { if (gpm->cache.gdk.pb != NULL) { g_object_unref(G_OBJECT(gpm->cache.gdk.pb)); @@ -409,7 +409,7 @@ } } -static void ghid_gdk_draw_pixmap(rnd_hidlib_t *hidlib, rnd_gtk_pixmap_t *gpm, rnd_coord_t ox, rnd_coord_t oy, rnd_coord_t dw, rnd_coord_t dh) +static void ghid_gdk_draw_pixmap(rnd_design_t *hidlib, rnd_gtk_pixmap_t *gpm, rnd_coord_t ox, rnd_coord_t oy, rnd_coord_t dw, rnd_coord_t dh) { GdkInterpType interp_type; gint src_x, src_y, dst_x, dst_y, w, h, w_src, h_src; @@ -471,7 +471,7 @@ } } -static void ghid_gdk_draw_bg_image(rnd_hidlib_t *hidlib) +static void ghid_gdk_draw_bg_image(rnd_design_t *hidlib) { if (ghidgui->bg_pixmap.image != NULL) ghid_gdk_draw_pixmap(hidlib, &ghidgui->bg_pixmap, hidlib->dwg.X1, hidlib->dwg.Y2, hidlib->dwg.X2, hidlib->dwg.Y2); @@ -1132,7 +1132,7 @@ gdk_draw_rectangle(priv->out_clip, priv->clip_gc, TRUE, x1, y1, x2 - x1 + 1, y2 - y1 + 1); } -static void redraw_region(rnd_hidlib_t *hidlib, GdkRectangle *rect) +static void redraw_region(rnd_design_t *hidlib, GdkRectangle *rect) { int eleft, eright, etop, ebottom; rnd_hid_expose_ctx_t ctx; @@ -1223,7 +1223,7 @@ static int preview_lock = 0; static void ghid_gdk_invalidate_lr(rnd_hid_t *hid, rnd_coord_t left, rnd_coord_t right, rnd_coord_t top, rnd_coord_t bottom) { - rnd_hidlib_t *hidlib = ghidgui->hidlib; + rnd_design_t *hidlib = ghidgui->hidlib; int dleft, dright, dtop, dbottom; int minx, maxx, miny, maxy; GdkRectangle rect; @@ -1256,7 +1256,7 @@ static void ghid_gdk_invalidate_all(rnd_hid_t *hid) { - rnd_hidlib_t *hidlib = ghidgui->hidlib; + rnd_design_t *hidlib = ghidgui->hidlib; if (ghidgui && ghidgui->topwin.menu.menu_bar) { redraw_region(hidlib, NULL); if (!preview_lock) { @@ -1270,7 +1270,7 @@ static void ghid_gdk_notify_crosshair_change(rnd_hid_t *hid, rnd_bool changes_complete) { - rnd_hidlib_t *hidlib = ghidgui->hidlib; + rnd_design_t *hidlib = ghidgui->hidlib; render_priv_t *priv = ghidgui->port.render_priv; /* We sometimes get called before the GUI is up */ @@ -1305,7 +1305,7 @@ static void ghid_gdk_notify_mark_change(rnd_hid_t *hid, rnd_bool changes_complete) { - rnd_hidlib_t *hidlib = ghidgui->hidlib; + rnd_design_t *hidlib = ghidgui->hidlib; render_priv_t *priv = ghidgui->port.render_priv; /* We sometimes get called before the GUI is up */ Index: trunk/src/librnd/plugins/hid_gtk2_gl/gtkhid-gl.c =================================================================== --- trunk/src/librnd/plugins/hid_gtk2_gl/gtkhid-gl.c (revision 34610) +++ trunk/src/librnd/plugins/hid_gtk2_gl/gtkhid-gl.c (revision 34611) @@ -291,7 +291,7 @@ GdkGLContext *pGlContext = gtk_widget_get_gl_context(widget); GdkGLDrawable *pGlDrawable = gtk_widget_get_gl_drawable(widget); GtkAllocation allocation; - rnd_hidlib_t *hidlib = ghidgui->hidlib; + rnd_design_t *hidlib = ghidgui->hidlib; rnd_gtk_preview_t *preview = RND_GTK_PREVIEW(widget); gtkc_widget_get_allocation(widget, &allocation); Index: trunk/src/librnd/plugins/hid_gtk4_gl/gtkhid-gl.c =================================================================== --- trunk/src/librnd/plugins/hid_gtk4_gl/gtkhid-gl.c (revision 34610) +++ trunk/src/librnd/plugins/hid_gtk4_gl/gtkhid-gl.c (revision 34611) @@ -141,7 +141,7 @@ static gboolean ghid_gl_preview_expose(GtkWidget *widget, rnd_gtk_expose_t *ev, rnd_hid_expose_t expcall, rnd_hid_expose_ctx_t *ctx) { GtkAllocation allocation; - rnd_hidlib_t *hidlib = ghidgui->hidlib; + rnd_design_t *hidlib = ghidgui->hidlib; rnd_gtk_preview_t *preview = RND_GTK_PREVIEW(widget); gtkc_widget_get_allocation(widget, &allocation); Index: trunk/src/librnd/plugins/hid_lesstif/dialogs.c =================================================================== --- trunk/src/librnd/plugins/hid_lesstif/dialogs.c (revision 34610) +++ trunk/src/librnd/plugins/hid_lesstif/dialogs.c (revision 34611) @@ -26,7 +26,7 @@ int rnd_ltf_ok; -extern rnd_hidlib_t *ltf_hidlib; +extern rnd_design_t *ltf_hidlib; #define COMPONENT_SIDE_NAME "(top)" @@ -952,7 +952,7 @@ TODO("layer: call a redraw on the edit group") } -rnd_hidlib_t *ltf_attr_get_dad_hidlib(void *hid_ctx) +rnd_design_t *ltf_attr_get_dad_hidlib(void *hid_ctx) { lesstif_attr_dlg_t *ctx = hid_ctx; if (rnd_hid_enable_per_dialog_hidlib) Index: trunk/src/librnd/plugins/hid_lesstif/dialogs.h =================================================================== --- trunk/src/librnd/plugins/hid_lesstif/dialogs.h (revision 34610) +++ trunk/src/librnd/plugins/hid_lesstif/dialogs.h (revision 34611) @@ -2,7 +2,7 @@ typedef struct { void *caller_data; /* WARNING: for now, this must be the first field (see core spinbox enter_cb) */ - rnd_hidlib_t *hidlib; /* the hidlib that was active at the moment the dialog was created */ + rnd_design_t *hidlib; /* the hidlib that was active at the moment the dialog was created */ rnd_hid_attribute_t *attrs; int n_attrs; Widget *wl; /* content widget */ Index: trunk/src/librnd/plugins/hid_lesstif/lesstif.h =================================================================== --- trunk/src/librnd/plugins/hid_lesstif/lesstif.h (revision 34610) +++ trunk/src/librnd/plugins/hid_lesstif/lesstif.h (revision 34611) @@ -42,7 +42,7 @@ extern void lesstif_update_status_line(); void *lesstif_attr_sub_new(Widget parent_box, rnd_hid_attribute_t *attrs, int n_attrs, void *caller_data); char *rnd_ltf_fileselect(rnd_hid_t *hid, const char *title, const char *descr, const char *default_file, const char *default_ext, const rnd_hid_fsd_filter_t *flt, const char *history_tag, rnd_hid_fsd_flags_t flags, rnd_hid_dad_subdialog_t *sub); -rnd_hidlib_t *ltf_attr_get_dad_hidlib(void *hid_ctx); +rnd_design_t *ltf_attr_get_dad_hidlib(void *hid_ctx); extern int rnd_ltf_ok; int rnd_ltf_wait_for_dialog(Widget w); Index: trunk/src/librnd/plugins/hid_lesstif/main.c =================================================================== --- trunk/src/librnd/plugins/hid_lesstif/main.c (revision 34610) +++ trunk/src/librnd/plugins/hid_lesstif/main.c (revision 34611) @@ -53,7 +53,7 @@ const char *lesstif_cookie = "lesstif HID"; -rnd_hidlib_t *ltf_hidlib; +rnd_design_t *ltf_hidlib; rnd_hid_cfg_mouse_t lesstif_mouse; rnd_hid_cfg_keys_t lesstif_keymap; @@ -416,11 +416,11 @@ old_cursor_mode = -1; } -extern void LesstifNetlistChanged(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]); -extern void LesstifLibraryChanged(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]); +extern void LesstifNetlistChanged(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]); +extern void LesstifLibraryChanged(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]); -static void ltf_set_hidlib(rnd_hid_t *hid, rnd_hidlib_t *hidlib) +static void ltf_set_hidlib(rnd_hid_t *hid, rnd_design_t *hidlib) { rnd_coord_t siz; ltf_hidlib = hidlib; @@ -448,7 +448,7 @@ return; } -static rnd_hidlib_t *ltf_get_hidlib(rnd_hid_t *hid) +static rnd_design_t *ltf_get_hidlib(rnd_hid_t *hid) { return ltf_hidlib; } @@ -661,7 +661,7 @@ unsigned flip_y:1; } rnd_ltf_pixmap_t; -static void rnd_ltf_draw_pixmap_(rnd_hidlib_t *hidlib, rnd_ltf_pixmap_t *lpm, rnd_coord_t ox, rnd_coord_t oy, rnd_coord_t dw, rnd_coord_t dh) +static void rnd_ltf_draw_pixmap_(rnd_design_t *hidlib, rnd_ltf_pixmap_t *lpm, rnd_coord_t ox, rnd_coord_t oy, rnd_coord_t dw, rnd_coord_t dh) { int w, h, sx3, done = 0; Index: trunk/src/librnd/plugins/hid_lesstif/menu.c =================================================================== --- trunk/src/librnd/plugins/hid_lesstif/menu.c (revision 34610) +++ trunk/src/librnd/plugins/hid_lesstif/menu.c (revision 34611) @@ -27,7 +27,7 @@ #include -extern rnd_hidlib_t *ltf_hidlib; +extern rnd_design_t *ltf_hidlib; Widget lesstif_menubar; rnd_conf_hid_id_t lesstif_menuconf_id = -1; Index: trunk/src/librnd/plugins/hid_remote/remote.c =================================================================== --- trunk/src/librnd/plugins/hid_remote/remote.c (revision 34610) +++ trunk/src/librnd/plugins/hid_remote/remote.c (revision 34611) @@ -36,7 +36,7 @@ /* ----------------------------------------------------------------------------- */ -static void ev_board_changed(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) +static void ev_board_changed(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) { } @@ -48,9 +48,9 @@ /* ----------------------------------------------------------------------------- */ static int remote_stay; -rnd_hidlib_t *remote_hidlib; +rnd_design_t *remote_hidlib; -static void remote_set_hidlib(rnd_hid_t *hid, rnd_hidlib_t *hidlib) +static void remote_set_hidlib(rnd_hid_t *hid, rnd_design_t *hidlib) { remote_hidlib = hidlib; } @@ -58,7 +58,7 @@ static void remote_do_export(rnd_hid_t *hid, rnd_hid_attr_val_t *options) { rnd_hid_expose_ctx_t ctx; - rnd_hidlib_t *hidlib = remote_hidlib; + rnd_design_t *hidlib = remote_hidlib; ctx.view.X1 = hidlib->dwg.X1; ctx.view.Y1 = hidlib->dwg.Y1; Index: trunk/src/librnd/plugins/import_pixmap_gd/import_pixmap_gd.c =================================================================== --- trunk/src/librnd/plugins/import_pixmap_gd/import_pixmap_gd.c (revision 34610) +++ trunk/src/librnd/plugins/import_pixmap_gd/import_pixmap_gd.c (revision 34611) @@ -39,7 +39,7 @@ static const char *import_pixmap_gd_cookie = "import_pixmap_gd"; -static int gd_load(rnd_hidlib_t *hidlib, rnd_pixmap_t *pxm, const char *fn, gdImagePtr (*loader)(FILE *f)) +static int gd_load(rnd_design_t *hidlib, rnd_pixmap_t *pxm, const char *fn, gdImagePtr (*loader)(FILE *f)) { int x, y; gdImagePtr gdi; @@ -88,7 +88,7 @@ } #ifdef RND_HAVE_GDIMAGEPNG -static int gd_png_load(rnd_hidlib_t *hidlib, rnd_pixmap_t *pxm, const char *fn) +static int gd_png_load(rnd_design_t *hidlib, rnd_pixmap_t *pxm, const char *fn) { return gd_load(hidlib, pxm, fn, gdImageCreateFromPng); } @@ -100,7 +100,7 @@ #endif #ifdef RND_HAVE_GDIMAGEJPEG -static int gd_jpg_load(rnd_hidlib_t *hidlib, rnd_pixmap_t *pxm, const char *fn) +static int gd_jpg_load(rnd_design_t *hidlib, rnd_pixmap_t *pxm, const char *fn) { return gd_load(hidlib, pxm, fn, gdImageCreateFromJpeg); } @@ -112,7 +112,7 @@ #endif #ifdef RND_HAVE_GDIMAGEGIF -static int gd_gif_load(rnd_hidlib_t *hidlib, rnd_pixmap_t *pxm, const char *fn) +static int gd_gif_load(rnd_design_t *hidlib, rnd_pixmap_t *pxm, const char *fn) { return gd_load(hidlib, pxm, fn, gdImageCreateFromGif); } Index: trunk/src/librnd/plugins/import_pixmap_pnm/import_pixmap_pnm.c =================================================================== --- trunk/src/librnd/plugins/import_pixmap_pnm/import_pixmap_pnm.c (revision 34610) +++ trunk/src/librnd/plugins/import_pixmap_pnm/import_pixmap_pnm.c (revision 34611) @@ -82,7 +82,7 @@ break; \ } -static int pnm_load(rnd_hidlib_t *hidlib, rnd_pixmap_t *pxm, const char *fn) +static int pnm_load(rnd_design_t *hidlib, rnd_pixmap_t *pxm, const char *fn) { FILE *f; char *s, line[1024]; Index: trunk/src/librnd/plugins/irc/irc.c =================================================================== --- trunk/src/librnd/plugins/irc/irc.c (revision 34610) +++ trunk/src/librnd/plugins/irc/irc.c (revision 34611) @@ -229,7 +229,7 @@ static void btn_savelog_cb(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr) { - rnd_hidlib_t *hidlib = rnd_gui->get_dad_hidlib(hid_ctx); + rnd_design_t *hidlib = rnd_gui->get_dad_hidlib(hid_ctx); char *fn, *fn_in = rnd_concat(rnd_app.package, ".irc-log.txt", NULL); fn = rnd_hid_fileselect(rnd_gui, "Export IRC log", NULL, fn_in, NULL, NULL, "log", 0, NULL); Index: trunk/src/librnd/plugins/lib_exp_pixmap/draw_pixmap.c =================================================================== --- trunk/src/librnd/plugins/lib_exp_pixmap/draw_pixmap.c (revision 34610) +++ trunk/src/librnd/plugins/lib_exp_pixmap/draw_pixmap.c (revision 34611) @@ -54,7 +54,7 @@ #define FROM_DRAW_PIXMAP_C #include "draw_pixmap.h" -void rnd_drwpx_init(rnd_drwpx_t *pctx, rnd_hidlib_t *hidlib) +void rnd_drwpx_init(rnd_drwpx_t *pctx, rnd_design_t *hidlib) { memset(pctx, 0, sizeof(rnd_drwpx_t)); pctx->hidlib = hidlib; Index: trunk/src/librnd/plugins/lib_exp_pixmap/draw_pixmap.h =================================================================== --- trunk/src/librnd/plugins/lib_exp_pixmap/draw_pixmap.h (revision 34610) +++ trunk/src/librnd/plugins/lib_exp_pixmap/draw_pixmap.h (revision 34611) @@ -39,7 +39,7 @@ typedef struct rnd_drwpx_s { /* public: config */ - rnd_hidlib_t *hidlib; + rnd_design_t *hidlib; double scale; /* should be 1 by default */ double bloat; rnd_coord_t x_shift, y_shift; @@ -71,7 +71,7 @@ double spare_d1, spare_d2, spare_d3, spare_d4; } rnd_drwpx_t; -void rnd_drwpx_init(rnd_drwpx_t *pctx, rnd_hidlib_t *hidlib); +void rnd_drwpx_init(rnd_drwpx_t *pctx, rnd_design_t *hidlib); void rnd_drwpx_uninit(rnd_drwpx_t *pctx); void rnd_drwpx_parse_bloat(rnd_drwpx_t *pctx, const char *str); Index: trunk/src/librnd/plugins/lib_exp_text/draw_ps.c =================================================================== --- trunk/src/librnd/plugins/lib_exp_text/draw_ps.c (revision 34610) +++ trunk/src/librnd/plugins/lib_exp_text/draw_ps.c (revision 34611) @@ -136,7 +136,7 @@ fprintf(f, "%%%%EOF\n"); } -void rnd_ps_init(rnd_ps_t *pctx, rnd_hidlib_t *hidlib, FILE *f, int media_idx, int fillpage, double scale_factor) +void rnd_ps_init(rnd_ps_t *pctx, rnd_design_t *hidlib, FILE *f, int media_idx, int fillpage, double scale_factor) { memset(pctx, 0, sizeof(rnd_ps_t)); Index: trunk/src/librnd/plugins/lib_exp_text/draw_ps.h =================================================================== --- trunk/src/librnd/plugins/lib_exp_text/draw_ps.h (revision 34610) +++ trunk/src/librnd/plugins/lib_exp_text/draw_ps.h (revision 34611) @@ -2,7 +2,7 @@ typedef struct rnd_ps_s { /* public: config */ - rnd_hidlib_t *hidlib; + rnd_design_t *hidlib; FILE *outf; double calibration_x, calibration_y; double fade_ratio; @@ -39,7 +39,7 @@ } rnd_ps_t; /* Set up context before the file is open */ -void rnd_ps_init(rnd_ps_t *pctx, rnd_hidlib_t *hidlib, FILE *f, int media_idx, int fillpage, double scale_factor); +void rnd_ps_init(rnd_ps_t *pctx, rnd_design_t *hidlib, FILE *f, int media_idx, int fillpage, double scale_factor); /* Call these whenever a new file is written */ void rnd_ps_start_file(rnd_ps_t *pctx, const char *swver); Index: trunk/src/librnd/plugins/lib_exp_text/draw_svg.c =================================================================== --- trunk/src/librnd/plugins/lib_exp_text/draw_svg.c (revision 34610) +++ trunk/src/librnd/plugins/lib_exp_text/draw_svg.c (revision 34611) @@ -104,7 +104,7 @@ y = pctx->hidlib->dwg.Y2 - y; \ } while(0) -void rnd_svg_init(rnd_svg_t *pctx, rnd_hidlib_t *hidlib, FILE *f, int opacity, int flip, int true_size) +void rnd_svg_init(rnd_svg_t *pctx, rnd_design_t *hidlib, FILE *f, int opacity, int flip, int true_size) { memset(pctx, 0, sizeof(rnd_svg_t)); pctx->hidlib = hidlib; Index: trunk/src/librnd/plugins/lib_exp_text/draw_svg.h =================================================================== --- trunk/src/librnd/plugins/lib_exp_text/draw_svg.h (revision 34610) +++ trunk/src/librnd/plugins/lib_exp_text/draw_svg.h (revision 34611) @@ -2,7 +2,7 @@ typedef struct { /* public: config */ - rnd_hidlib_t *hidlib; + rnd_design_t *hidlib; FILE *outf; gds_t sbright, sdark, snormal, sclip; /* accumulators for various groups generated parallel */ int opacity; @@ -27,7 +27,7 @@ } rnd_svg_t; -void rnd_svg_init(rnd_svg_t *pctx, rnd_hidlib_t *hidlib, FILE *f, int opacity, int flip, int true_size); +void rnd_svg_init(rnd_svg_t *pctx, rnd_design_t *hidlib, FILE *f, int opacity, int flip, int true_size); void rnd_svg_uninit(rnd_svg_t *pctx); /* Write header or footer. Footer also writes cached groups and closes them. */ Index: trunk/src/librnd/plugins/lib_gtk2_common/bu_menu.c =================================================================== --- trunk/src/librnd/plugins/lib_gtk2_common/bu_menu.c (revision 34610) +++ trunk/src/librnd/plugins/lib_gtk2_common/bu_menu.c (revision 34611) @@ -384,7 +384,7 @@ } /* callback for rnd_gtk_main_menu_update_toggle_state() */ -static void menu_toggle_update_cb(rnd_hidlib_t *hidlib, GtkAction *act, const char *tflag, const char *aflag) +static void menu_toggle_update_cb(rnd_design_t *hidlib, GtkAction *act, const char *tflag, const char *aflag) { if (tflag != NULL) { int v = rnd_hid_get_flag(hidlib, tflag); @@ -401,7 +401,7 @@ } } -void rnd_gtk_main_menu_update_toggle_state(rnd_hidlib_t *hidlib, GtkWidget *menubar) +void rnd_gtk_main_menu_update_toggle_state(rnd_design_t *hidlib, GtkWidget *menubar) { GList *list; RndGtkMainMenu *menu = RND_GTK_MAIN_MENU(menubar); @@ -479,7 +479,7 @@ } -GtkWidget *rnd_gtk_load_menus(rnd_gtk_menu_ctx_t *menu, rnd_hidlib_t *hidlib) +GtkWidget *rnd_gtk_load_menus(rnd_gtk_menu_ctx_t *menu, rnd_design_t *hidlib) { const lht_node_t *mr; GtkWidget *menu_bar = NULL; Index: trunk/src/librnd/plugins/lib_gtk2_common/bu_menu.h =================================================================== --- trunk/src/librnd/plugins/lib_gtk2_common/bu_menu.h (revision 34610) +++ trunk/src/librnd/plugins/lib_gtk2_common/bu_menu.h (revision 34611) @@ -13,12 +13,12 @@ GtkWidget *menu_bar; rnd_conf_hid_id_t rnd_gtk_menuconf_id; void (*confchg_checkbox)(rnd_conf_native_t *cfg, int arr_idx); - rnd_hidlib_t *hidlib; + rnd_design_t *hidlib; } rnd_gtk_menu_ctx_t; /* Updates the toggle/active state of all items: loops through all actions, passing the action (checkboxes) to update them to match current core state */ -void rnd_gtk_main_menu_update_toggle_state(rnd_hidlib_t *hidlib, GtkWidget *menubar); +void rnd_gtk_main_menu_update_toggle_state(rnd_design_t *hidlib, GtkWidget *menubar); /* Menu widget create/remove for main menu, popup or submenu as descending the path */ int rnd_gtk_create_menu_widget(void *ctx_, int is_popup, const char *name, int is_main, lht_node_t *parent, lht_node_t *ins_after, lht_node_t *menu_item); @@ -25,7 +25,7 @@ int rnd_gtk_remove_menu_widget(void *ctx, lht_node_t *nd); /* Load and build all menus (main menu and popups) from the rnd_gui->menu */ -GtkWidget *rnd_gtk_load_menus(rnd_gtk_menu_ctx_t *menu, rnd_hidlib_t *hidlib); +GtkWidget *rnd_gtk_load_menus(rnd_gtk_menu_ctx_t *menu, rnd_design_t *hidlib); /* Return the gtk widget (if already created, else NULL) for a popup menu node */ GtkWidget *rnd_gtk_menu_popup_pre(lht_node_t *node); Index: trunk/src/librnd/plugins/lib_gtk4_common/bu_menu.c =================================================================== --- trunk/src/librnd/plugins/lib_gtk4_common/bu_menu.c (revision 34610) +++ trunk/src/librnd/plugins/lib_gtk4_common/bu_menu.c (revision 34611) @@ -58,7 +58,7 @@ gtk_check_button_set_active(GTK_CHECK_BUTTON(chk), v); } -static void menu_item_update_chkbox(rnd_hidlib_t *hidlib, lht_node_t *mnd, GtkWidget *real_row) +static void menu_item_update_chkbox(rnd_design_t *hidlib, lht_node_t *mnd, GtkWidget *real_row) { int v; GtkWidget *w, *lab, *chk, *hbox = gtk_widget_get_first_child(real_row); @@ -90,7 +90,7 @@ maybe_set_chkbtn(chk, !!v); } -static void menu_update_toggle_state(rnd_hidlib_t *hidlib, open_menu_t *om) +static void menu_update_toggle_state(rnd_design_t *hidlib, open_menu_t *om) { int n; GtkWidget *real_row; @@ -104,7 +104,7 @@ } } -void rnd_gtk_main_menu_update_toggle_state(rnd_hidlib_t *hidlib, GtkWidget *menubar) +void rnd_gtk_main_menu_update_toggle_state(rnd_design_t *hidlib, GtkWidget *menubar) { open_menu_t *om; for(om = gdl_first(&open_menu); om != NULL; om = om->link.next) @@ -707,7 +707,7 @@ } } -GtkWidget *rnd_gtk_load_menus(rnd_gtk_menu_ctx_t *menu, rnd_hidlib_t *hidlib) +GtkWidget *rnd_gtk_load_menus(rnd_gtk_menu_ctx_t *menu, rnd_design_t *hidlib) { const lht_node_t *mr; GtkWidget *menu_bar = NULL; Index: trunk/src/librnd/plugins/lib_gtk4_common/bu_menu.h =================================================================== --- trunk/src/librnd/plugins/lib_gtk4_common/bu_menu.h (revision 34610) +++ trunk/src/librnd/plugins/lib_gtk4_common/bu_menu.h (revision 34611) @@ -13,7 +13,7 @@ GtkWidget *menu_bar; rnd_conf_hid_id_t rnd_gtk_menuconf_id; void (*confchg_checkbox)(rnd_conf_native_t *cfg, int arr_idx); - rnd_hidlib_t *hidlib; + rnd_design_t *hidlib; GtkWidget *main_open_w; /* set to the menu popover widget that is open from the main menu at the moment */ lht_node_t *main_open_n; /* set to the maun submenu node that is open from the main menu at the moment */ @@ -25,7 +25,7 @@ /* Updates the toggle/active state of all items: loops through all actions, passing the action (checkboxes) to update them to match current core state */ -void rnd_gtk_main_menu_update_toggle_state(rnd_hidlib_t *hidlib, GtkWidget *menubar); +void rnd_gtk_main_menu_update_toggle_state(rnd_design_t *hidlib, GtkWidget *menubar); /* Menu widget create/remove for main menu, popup or submenu as descending the path */ int rnd_gtk_create_menu_widget(void *ctx_, int is_popup, const char *name, int is_main, lht_node_t *parent, lht_node_t *ins_after, lht_node_t *menu_item); @@ -32,7 +32,7 @@ int rnd_gtk_remove_menu_widget(void *ctx, lht_node_t *nd); /* Load and build all menus (main menu and popups) from the rnd_gui->menu */ -GtkWidget *rnd_gtk_load_menus(rnd_gtk_menu_ctx_t *menu, rnd_hidlib_t *hidlib); +GtkWidget *rnd_gtk_load_menus(rnd_gtk_menu_ctx_t *menu, rnd_design_t *hidlib); /* Dummy; returns node because the popup will always be created fresh */ lht_node_t *rnd_gtk_menu_popup_pre(lht_node_t *node); Index: trunk/src/librnd/plugins/lib_gtk_common/bu_command.c =================================================================== --- trunk/src/librnd/plugins/lib_gtk_common/bu_command.c (revision 34610) +++ trunk/src/librnd/plugins/lib_gtk_common/bu_command.c (revision 34611) @@ -229,7 +229,7 @@ } -void rnd_gtk_handle_user_command(rnd_hidlib_t *hl, rnd_gtk_command_t *ctx, rnd_bool raise) +void rnd_gtk_handle_user_command(rnd_design_t *hl, rnd_gtk_command_t *ctx, rnd_bool raise) { char *command; Index: trunk/src/librnd/plugins/lib_gtk_common/bu_command.h =================================================================== --- trunk/src/librnd/plugins/lib_gtk_common/bu_command.h (revision 34610) +++ trunk/src/librnd/plugins/lib_gtk_common/bu_command.h (revision 34611) @@ -22,7 +22,7 @@ gtkc_event_xyz_t kpress, krelease; } rnd_gtk_command_t; -void rnd_gtk_handle_user_command(rnd_hidlib_t *hl, rnd_gtk_command_t *ctx, rnd_bool raise); +void rnd_gtk_handle_user_command(rnd_design_t *hl, rnd_gtk_command_t *ctx, rnd_bool raise); char *rnd_gtk_command_entry_get(rnd_gtk_command_t *ctx, const char *prompt, const char *command); /* Update the prompt text before the command entry - call it when any of conf_core.rc.cli_* change */ Index: trunk/src/librnd/plugins/lib_gtk_common/bu_dwg_tooltip.c =================================================================== --- trunk/src/librnd/plugins/lib_gtk_common/bu_dwg_tooltip.c (revision 34610) +++ trunk/src/librnd/plugins/lib_gtk_common/bu_dwg_tooltip.c (revision 34611) @@ -39,7 +39,7 @@ #define TOOLTIP_UPDATE_DELAY 200 static int tooltip_update_timeout_id = 0; -gboolean rnd_gtk_dwg_tooltip_check_object(rnd_hidlib_t *hl, GtkWidget *drawing_area, rnd_coord_t crosshairx, rnd_coord_t crosshairy) +gboolean rnd_gtk_dwg_tooltip_check_object(rnd_design_t *hl, GtkWidget *drawing_area, rnd_coord_t crosshairx, rnd_coord_t crosshairy) { const char *description; fgw_arg_t res, argv[3]; Index: trunk/src/librnd/plugins/lib_gtk_common/bu_dwg_tooltip.h =================================================================== --- trunk/src/librnd/plugins/lib_gtk_common/bu_dwg_tooltip.h (revision 34610) +++ trunk/src/librnd/plugins/lib_gtk_common/bu_dwg_tooltip.h (revision 34611) @@ -1,5 +1,5 @@ #include -gboolean rnd_gtk_dwg_tooltip_check_object(rnd_hidlib_t *hl, GtkWidget *drawing_area, rnd_coord_t crosshairx, rnd_coord_t crosshairy); +gboolean rnd_gtk_dwg_tooltip_check_object(rnd_design_t *hl, GtkWidget *drawing_area, rnd_coord_t crosshairx, rnd_coord_t crosshairy); void rnd_gtk_dwg_tooltip_cancel_update(void); void rnd_gtk_dwg_tooltip_queue(GtkWidget *drawing_area, GSourceFunc cb, void *ctx); Index: trunk/src/librnd/plugins/lib_gtk_common/dlg_attribute.c =================================================================== --- trunk/src/librnd/plugins/lib_gtk_common/dlg_attribute.c (revision 34610) +++ trunk/src/librnd/plugins/lib_gtk_common/dlg_attribute.c (revision 34611) @@ -51,7 +51,7 @@ typedef struct attr_dlg_s { void *caller_data; /* WARNING: for now, this must be the first field (see core spinbox enter_cb) */ rnd_gtk_t *gctx; - rnd_hidlib_t *hidlib; /* active hidlib at the moment the dialog box was created */ + rnd_design_t *hidlib; /* active hidlib at the moment the dialog box was created */ rnd_hid_attribute_t *attrs; GtkWidget **wl; /* content widget */ GtkWidget **wltop; /* the parent widget, which is different from wl if reparenting (extra boxes, e.g. for framing or scrolling) was needed */ @@ -1137,7 +1137,7 @@ } } -int rnd_gtk_winplace_cfg(rnd_hidlib_t *hidlib, GtkWidget *widget, void *ctx, const char *id) +int rnd_gtk_winplace_cfg(rnd_design_t *hidlib, GtkWidget *widget, void *ctx, const char *id) { GtkAllocation allocation; @@ -1152,7 +1152,7 @@ return 0; } -rnd_hidlib_t *rnd_gtk_attr_get_dad_hidlib(void *hid_ctx) +rnd_design_t *rnd_gtk_attr_get_dad_hidlib(void *hid_ctx) { attr_dlg_t *ctx = hid_ctx; Index: trunk/src/librnd/plugins/lib_gtk_common/dlg_attribute.h =================================================================== --- trunk/src/librnd/plugins/lib_gtk_common/dlg_attribute.h (revision 34610) +++ trunk/src/librnd/plugins/lib_gtk_common/dlg_attribute.h (revision 34611) @@ -25,9 +25,9 @@ /* Report new window coords to the central window placement code emitting an event */ -int rnd_gtk_winplace_cfg(rnd_hidlib_t *hidlib, GtkWidget *widget, void *ctx, const char *id); +int rnd_gtk_winplace_cfg(rnd_design_t *hidlib, GtkWidget *widget, void *ctx, const char *id); -rnd_hidlib_t *rnd_gtk_attr_get_dad_hidlib(void *hid_ctx); +rnd_design_t *rnd_gtk_attr_get_dad_hidlib(void *hid_ctx); /* Close and free all open DAD dialogs */ void rnd_gtk_attr_dlg_free_all(rnd_gtk_t *gctx); Index: trunk/src/librnd/plugins/lib_gtk_common/dlg_topwin.c =================================================================== --- trunk/src/librnd/plugins/lib_gtk_common/dlg_topwin.c (revision 34610) +++ trunk/src/librnd/plugins/lib_gtk_common/dlg_topwin.c (revision 34611) @@ -175,7 +175,7 @@ /*** static top window code ***/ /* sync the menu checkboxes with actual pcb state */ -void rnd_gtk_update_toggle_flags(rnd_hidlib_t *hidlib, rnd_gtk_topwin_t *tw, const char *cookie) +void rnd_gtk_update_toggle_flags(rnd_design_t *hidlib, rnd_gtk_topwin_t *tw, const char *cookie) { if (rnd_menu_sys.inhibit) return; Index: trunk/src/librnd/plugins/lib_gtk_common/dlg_topwin.h =================================================================== --- trunk/src/librnd/plugins/lib_gtk_common/dlg_topwin.h (revision 34610) +++ trunk/src/librnd/plugins/lib_gtk_common/dlg_topwin.h (revision 34611) @@ -11,7 +11,7 @@ #include "rnd_gtk.h" #include "bu_command.h" -void rnd_gtk_update_toggle_flags(rnd_hidlib_t *hidlib, rnd_gtk_topwin_t *tw, const char *cookie); +void rnd_gtk_update_toggle_flags(rnd_design_t *hidlib, rnd_gtk_topwin_t *tw, const char *cookie); void rnd_gtk_create_topwin_widgets(rnd_gtk_t *ctx, rnd_gtk_topwin_t *tw, GtkWidget *in_top_window); void rnd_gtk_fullscreen_apply(rnd_gtk_topwin_t *tw); void rnd_gtk_tw_layer_vis_update(rnd_gtk_topwin_t *tw); Index: trunk/src/librnd/plugins/lib_gtk_common/glue_hid.c =================================================================== --- trunk/src/librnd/plugins/lib_gtk_common/glue_hid.c (revision 34610) +++ trunk/src/librnd/plugins/lib_gtk_common/glue_hid.c (revision 34611) @@ -186,7 +186,7 @@ static void rnd_gtkg_do_exit(rnd_hid_t *hid); -void rnd_gtk_topwinplace(rnd_hidlib_t *hidlib, GtkWidget *dialog, const char *id) +void rnd_gtk_topwinplace(rnd_design_t *hidlib, GtkWidget *dialog, const char *id) { int plc[4] = {-1, -1, -1, -1}; @@ -457,7 +457,7 @@ return 0; } -static void rnd_gtkg_set_hidlib(rnd_hid_t *hid, rnd_hidlib_t *hidlib) +static void rnd_gtkg_set_hidlib(rnd_hid_t *hid, rnd_design_t *hidlib) { rnd_gtk_t *gctx = hid->hid_data; @@ -479,7 +479,7 @@ rnd_gtk_zoom_view_win(&gctx->port.view, hidlib->dwg.X1, hidlib->dwg.Y1, hidlib->dwg.X2, hidlib->dwg.Y2, 0); } -static rnd_hidlib_t *rnd_gtkg_get_hidlib(rnd_hid_t *hid) +static rnd_design_t *rnd_gtkg_get_hidlib(rnd_hid_t *hid) { rnd_gtk_t *gctx = hid->hid_data; Index: trunk/src/librnd/plugins/lib_gtk_common/gtk_gl_common.c =================================================================== --- trunk/src/librnd/plugins/lib_gtk_common/gtk_gl_common.c (revision 34610) +++ trunk/src/librnd/plugins/lib_gtk_common/gtk_gl_common.c (revision 34611) @@ -66,7 +66,7 @@ int ghid_gl_set_layer_group(rnd_hid_t *hid, rnd_layergrp_id_t group, const char *purpose, int purpi, rnd_layer_id_t layer, unsigned int flags, int is_empty, rnd_xform_t **xform) { - rnd_hidlib_t *hidlib = ghidgui->hidlib; + rnd_design_t *hidlib = ghidgui->hidlib; render_priv_t *priv = ghidgui->port.render_priv; double tx, ty, zx, zy, zz; @@ -108,7 +108,7 @@ return rv; } -void ghid_gl_draw_grid_local(rnd_hidlib_t *hidlib, rnd_coord_t cx, rnd_coord_t cy) +void ghid_gl_draw_grid_local(rnd_design_t *hidlib, rnd_coord_t cx, rnd_coord_t cy) { if (hidlib->grid <= 0) return; @@ -119,7 +119,7 @@ grid_local_radius = rnd_gtk_conf_hid.plugins.hid_gtk.local_grid.radius; } -static void ghid_gl_draw_grid(rnd_hidlib_t *hidlib, rnd_box_t *drawn_area) +static void ghid_gl_draw_grid(rnd_design_t *hidlib, rnd_box_t *drawn_area) { render_priv_t *priv = ghidgui->port.render_priv; rnd_coord_t grd = hidlib->grid; @@ -141,18 +141,18 @@ hidgl_draw_grid(hidlib, grd, drawn_area, ghidgui->port.view.coord_per_px, rnd_conf.editor.cross_grid); } -static void rnd_gl_draw_texture(rnd_hidlib_t *hidlib, rnd_gtk_pixmap_t *gpm, rnd_coord_t ox, rnd_coord_t oy, rnd_coord_t bw, rnd_coord_t bh) +static void rnd_gl_draw_texture(rnd_design_t *hidlib, rnd_gtk_pixmap_t *gpm, rnd_coord_t ox, rnd_coord_t oy, rnd_coord_t bw, rnd_coord_t bh) { hidgl_draw_texture_rect(ox, oy, ox+bw, oy+bh, gpm->cache.lng); } -static void ghid_gl_uninit_pixmap(rnd_hidlib_t *hidlib, rnd_gtk_pixmap_t *gpm) +static void ghid_gl_uninit_pixmap(rnd_design_t *hidlib, rnd_gtk_pixmap_t *gpm) { if (gpm->cache.lng != 0) hidgl_texture_free(gpm->cache.lng); } -static void ghid_gl_draw_pixmap(rnd_hidlib_t *hidlib, rnd_gtk_pixmap_t *gpm, rnd_coord_t ox, rnd_coord_t oy, rnd_coord_t bw, rnd_coord_t bh) +static void ghid_gl_draw_pixmap(rnd_design_t *hidlib, rnd_gtk_pixmap_t *gpm, rnd_coord_t ox, rnd_coord_t oy, rnd_coord_t bw, rnd_coord_t bh) { if (gpm->cache.lng == 0) { int width = gpm->pxm->sx; @@ -175,7 +175,7 @@ rnd_gl_draw_texture(hidlib, gpm, ox, oy, bw, bh); } -static void ghid_gl_draw_bg_image(rnd_hidlib_t *hidlib) +static void ghid_gl_draw_bg_image(rnd_design_t *hidlib) { if (ghidgui->bg_pixmap.image != NULL) ghid_gl_draw_pixmap(hidlib, &ghidgui->bg_pixmap, 0, 0, hidlib->dwg.X2, hidlib->dwg.Y2); @@ -374,7 +374,7 @@ ghid_gl_invalidate_all(hid); } -static void ghid_gl_show_crosshair(rnd_hidlib_t *hidlib, gboolean paint_new_location, rnd_coord_t minx, rnd_coord_t miny, rnd_coord_t maxx, rnd_coord_t maxy) +static void ghid_gl_show_crosshair(rnd_design_t *hidlib, gboolean paint_new_location, rnd_coord_t minx, rnd_coord_t miny, rnd_coord_t maxx, rnd_coord_t maxy) { static int done_once = 0; static rnd_gtk_color_t cross_color; @@ -432,7 +432,7 @@ static gboolean ghid_gl_drawing_area_expose_cb_common(rnd_hid_t *hid, GtkWidget *widget, rnd_gtk_expose_t *ev, void *vport) { rnd_gtk_port_t *port = vport; - rnd_hidlib_t *hidlib = ghidgui->hidlib; + rnd_design_t *hidlib = ghidgui->hidlib; render_priv_t *priv = port->render_priv; GtkAllocation allocation; rnd_hid_expose_ctx_t ctx; @@ -486,7 +486,7 @@ } /* Assumes gl context is set up for drawing in the target widget */ -static void ghid_gl_preview_expose_common(rnd_hid_t *hid, rnd_hidlib_t *hidlib, rnd_gtk_expose_t *ev, rnd_hid_expose_t expcall, rnd_hid_expose_ctx_t *ctx, long widget_xs, long widget_ys) +static void ghid_gl_preview_expose_common(rnd_hid_t *hid, rnd_design_t *hidlib, rnd_gtk_expose_t *ev, rnd_hid_expose_t expcall, rnd_hid_expose_ctx_t *ctx, long widget_xs, long widget_ys) { render_priv_t *priv = ghidgui->port.render_priv; double xz, yz, vw, vh; Index: trunk/src/librnd/plugins/lib_gtk_common/rnd_gtk.h =================================================================== --- trunk/src/librnd/plugins/lib_gtk_common/rnd_gtk.h (revision 34610) +++ trunk/src/librnd/plugins/lib_gtk_common/rnd_gtk.h (revision 34611) @@ -61,7 +61,7 @@ gboolean (*preview_expose)(GtkWidget *widget, rnd_gtk_expose_t *p, rnd_hid_expose_t expcall, rnd_hid_expose_ctx_t *ctx); /* p == NULL when called from the code, not from a GUI expose event */ void (*load_bg_image)(void); void (*init_renderer)(int *argc, char ***argv, void *port); - void (*draw_grid_local)(rnd_hidlib_t *hidlib, rnd_coord_t cx, rnd_coord_t cy); + void (*draw_grid_local)(rnd_design_t *hidlib, rnd_coord_t cx, rnd_coord_t cy); /* screen */ void (*screen_update)(void); @@ -71,8 +71,8 @@ const gchar *(*get_color_name)(rnd_gtk_color_t *color); void (*set_special_colors)(rnd_conf_native_t *cfg); - void (*draw_pixmap)(rnd_hidlib_t *hidlib, rnd_gtk_pixmap_t *gpm, rnd_coord_t ox, rnd_coord_t oy, rnd_coord_t dw, rnd_coord_t dh); - void (*uninit_pixmap)(rnd_hidlib_t *hidlib, rnd_gtk_pixmap_t *gpm); + void (*draw_pixmap)(rnd_design_t *hidlib, rnd_gtk_pixmap_t *gpm, rnd_coord_t ox, rnd_coord_t oy, rnd_coord_t dw, rnd_coord_t dh); + void (*uninit_pixmap)(rnd_design_t *hidlib, rnd_gtk_pixmap_t *gpm); }; #include @@ -199,7 +199,7 @@ rnd_gtk_impl_t impl; rnd_gtk_port_t port; - rnd_hidlib_t *hidlib; + rnd_design_t *hidlib; GtkWidget *wtop_window; Index: trunk/src/librnd/plugins/lib_gtk_common/ui_zoompan.h =================================================================== --- trunk/src/librnd/plugins/lib_gtk_common/ui_zoompan.h (revision 34610) +++ trunk/src/librnd/plugins/lib_gtk_common/ui_zoompan.h (revision 34611) @@ -76,7 +76,7 @@ struct rnd_gtk_s *ctx; unsigned local_hidlib:1; /* if 1, use local hidlib instead of current GUI hidlib (for local dialogs) */ - rnd_hidlib_t *hidlib; /* remember the hidlib the dialog was opened for */ + rnd_design_t *hidlib; /* remember the hidlib the dialog was opened for */ } rnd_gtk_view_t; #include "in_mouse.h" Index: trunk/src/librnd/plugins/lib_hid_common/act_dad.c =================================================================== --- trunk/src/librnd/plugins/lib_hid_common/act_dad.c (revision 34610) +++ trunk/src/librnd/plugins/lib_hid_common/act_dad.c (revision 34611) @@ -62,7 +62,7 @@ typedef struct { RND_DAD_DECL_NOINIT(dlg) - rnd_hidlib_t *hidlib; + rnd_design_t *hidlib; char *name; const char *row_domain; int level; @@ -73,7 +73,7 @@ htsp_t dads; -static int dad_new(rnd_hidlib_t *hl, const char *name) +static int dad_new(rnd_design_t *hl, const char *name) { dad_t *dad; @@ -131,10 +131,10 @@ typedef struct { char *act_expose, *act_mouse, *act_free; char *udata; - rnd_hidlib_t *hidlib; + rnd_design_t *hidlib; } dad_prv_t; -static int prv_action(rnd_hidlib_t *hl, const char *actname, rnd_hid_gc_t gc, const char *udata) +static int prv_action(rnd_design_t *hl, const char *actname, rnd_hid_gc_t gc, const char *udata) { fgw_arg_t r = {0}; fgw_arg_t args[3]; Index: trunk/src/librnd/plugins/lib_hid_common/dlg_comm_m.c =================================================================== --- trunk/src/librnd/plugins/lib_hid_common/dlg_comm_m.c (revision 34610) +++ trunk/src/librnd/plugins/lib_hid_common/dlg_comm_m.c (revision 34611) @@ -219,7 +219,7 @@ fgw_error_t rnd_act_gui_MayOverwriteFile(fgw_arg_t *res, int argc, fgw_arg_t *argv) { - rnd_hidlib_t *hidlib; + rnd_design_t *hidlib; const char *fn; const char *rnd_acts_gui_MayOverwriteFile = nope; const char **xpm; Index: trunk/src/librnd/plugins/lib_hid_common/dlg_export.c =================================================================== --- trunk/src/librnd/plugins/lib_hid_common/dlg_export.c (revision 34610) +++ trunk/src/librnd/plugins/lib_hid_common/dlg_export.c (revision 34611) @@ -68,7 +68,7 @@ static void export_cb(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr) { export_ctx_t *export_ctx = caller_data; - rnd_hidlib_t *hl = rnd_gui->get_dad_hidlib(hid_ctx); + rnd_design_t *hl = rnd_gui->get_dad_hidlib(hid_ctx); int h, wid; Index: trunk/src/librnd/plugins/lib_hid_common/dlg_fileselect.c =================================================================== --- trunk/src/librnd/plugins/lib_hid_common/dlg_fileselect.c (revision 34610) +++ trunk/src/librnd/plugins/lib_hid_common/dlg_fileselect.c (revision 34611) @@ -89,7 +89,7 @@ char *cwd; int cwd_offs[FSD_MAX_DIRS]; /* string lengths for each dir button within ->cwd */ vtde_t des; - rnd_hidlib_t *hidlib; + rnd_design_t *hidlib; rnd_hid_fsd_flags_t flags; const rnd_hid_fsd_filter_t *flt; const char *history_tag; Index: trunk/src/librnd/plugins/lib_hid_common/dlg_fileselect_io.c =================================================================== --- trunk/src/librnd/plugins/lib_hid_common/dlg_fileselect_io.c (revision 34610) +++ trunk/src/librnd/plugins/lib_hid_common/dlg_fileselect_io.c (revision 34611) @@ -45,7 +45,7 @@ } /* mkdir -p on arg - writes (but restores) the string in arg */ -static void rnd_mkdir_p(rnd_hidlib_t *hidlib, char *arg) +static void rnd_mkdir_p(rnd_design_t *hidlib, char *arg) { char *curr, *next, save; Index: trunk/src/librnd/plugins/lib_hid_common/dlg_log.c =================================================================== --- trunk/src/librnd/plugins/lib_hid_common/dlg_log.c (revision 34610) +++ trunk/src/librnd/plugins/lib_hid_common/dlg_log.c (revision 34611) @@ -42,7 +42,7 @@ int active; int wtxt, wscroll; int gui_inited; - rnd_hidlib_t *hidlib; + rnd_design_t *hidlib; } log_ctx_t; static log_ctx_t log_ctx; @@ -130,7 +130,7 @@ txt->hid_scroll_to_bottom(atxt, log_ctx.dlg_hid_ctx); } -static void log_window_create(rnd_hidlib_t *hidlib) +static void log_window_create(rnd_design_t *hidlib) { log_ctx_t *ctx = &log_ctx; rnd_hid_attr_val_t hv; @@ -194,7 +194,7 @@ return 0; } -static void log_append_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) +static void log_append_ev(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) { rnd_logline_t *line = argv[1].d.p; @@ -214,7 +214,7 @@ } } -static void log_clear_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) +static void log_clear_ev(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) { if (log_ctx.active) { rnd_hid_attribute_t *atxt = &log_ctx.dlg[log_ctx.wtxt]; @@ -225,7 +225,7 @@ } } -static void log_gui_init_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) +static void log_gui_init_ev(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) { rnd_logline_t *n; Index: trunk/src/librnd/plugins/lib_hid_common/dlg_pref.c =================================================================== --- trunk/src/librnd/plugins/lib_hid_common/dlg_pref.c (revision 34610) +++ trunk/src/librnd/plugins/lib_hid_common/dlg_pref.c (revision 34611) @@ -73,18 +73,18 @@ static const char *role_names[] = { "user", "project", "design", "cli", NULL }; static const rnd_conf_role_t roles[] = { RND_CFR_USER, RND_CFR_PROJECT, RND_CFR_DESIGN, RND_CFR_CLI, 0 }; -pref_ctx_t *rnd_pref_get_ctx(rnd_hidlib_t *hidlib) +pref_ctx_t *rnd_pref_get_ctx(rnd_design_t *hidlib) { return &pref_ctx; } -lht_node_t *rnd_pref_dlg2conf_pre(rnd_hidlib_t *hidlib, pref_ctx_t *ctx) +lht_node_t *rnd_pref_dlg2conf_pre(rnd_design_t *hidlib, pref_ctx_t *ctx) { return rnd_pref_ensure_conf_root(hidlib, ctx->role); } -void rnd_pref_dlg2conf_post(rnd_hidlib_t *hidlib, pref_ctx_t *ctx) +void rnd_pref_dlg2conf_post(rnd_design_t *hidlib, pref_ctx_t *ctx) { if ((ctx->role == RND_CFR_USER) || (ctx->role == RND_CFR_PROJECT)) rnd_conf_save_file(hidlib, NULL, (hidlib == NULL ? NULL : hidlib->filename), ctx->role, NULL); @@ -383,7 +383,7 @@ pref_tab_chosen(&pref_ctx, 0); } -static void pref_ev_design_replaced(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) +static void pref_ev_design_replaced(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) { pref_ctx_t *ctx = user_data; if (!pref_ctx.active) @@ -397,7 +397,7 @@ rnd_dlg_pref_win_design_replaced(ctx); } -static void pref_ev_board_meta_changed(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) +static void pref_ev_board_meta_changed(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) { pref_ctx_t *ctx = user_data; if (!pref_ctx.active) @@ -407,7 +407,7 @@ pref_win_brd2dlg(ctx); } -static void pref_ev_menu_changed(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) +static void pref_ev_menu_changed(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) { pref_ctx_t *ctx = user_data; if (!pref_ctx.active) Index: trunk/src/librnd/plugins/lib_hid_common/dlg_pref.h =================================================================== --- trunk/src/librnd/plugins/lib_hid_common/dlg_pref.h (revision 34610) +++ trunk/src/librnd/plugins/lib_hid_common/dlg_pref.h (revision 34611) @@ -118,14 +118,14 @@ /*** public API for the caller ***/ -lht_node_t *rnd_pref_dlg2conf_pre(rnd_hidlib_t *hidlib, pref_ctx_t *ctx); -void rnd_pref_dlg2conf_post(rnd_hidlib_t *hidlib, pref_ctx_t *ctx); +lht_node_t *rnd_pref_dlg2conf_pre(rnd_design_t *hidlib, pref_ctx_t *ctx); +void rnd_pref_dlg2conf_post(rnd_design_t *hidlib, pref_ctx_t *ctx); void rnd_pref_init_func_dummy(pref_ctx_t *ctx, int tab); /* In event callbacks no context is available; return context baed on hidlib */ -pref_ctx_t *rnd_pref_get_ctx(rnd_hidlib_t *hidlib); +pref_ctx_t *rnd_pref_get_ctx(rnd_design_t *hidlib); #define PREF_INIT_FUNC rnd_pref_init_func_dummy Index: trunk/src/librnd/plugins/lib_hid_common/dlg_pref_confedit.c =================================================================== --- trunk/src/librnd/plugins/lib_hid_common/dlg_pref_confedit.c (revision 34610) +++ trunk/src/librnd/plugins/lib_hid_common/dlg_pref_confedit.c (revision 34611) @@ -125,7 +125,7 @@ static void pref_conf_editval_cb(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *trigger_attr) { - rnd_hidlib_t *hidlib = rnd_gui->get_dad_hidlib(hid_ctx); + rnd_design_t *hidlib = rnd_gui->get_dad_hidlib(hid_ctx); confedit_ctx_t *ctx = caller_data; rnd_hid_attribute_t *attr; char buf[128]; @@ -210,7 +210,7 @@ static void pref_conf_editval_edit(void *hid_ctx, confedit_ctx_t *ctx, rnd_hid_attribute_t *attr, rnd_hid_row_t *r) { - rnd_hidlib_t *hidlib = rnd_gui->get_dad_hidlib(hid_ctx); + rnd_design_t *hidlib = rnd_gui->get_dad_hidlib(hid_ctx); char *nv = rnd_hid_prompt_for(hidlib, "list item value:", r->cell[0], "Edit config list item"); if (nv == NULL) return; @@ -248,7 +248,7 @@ static void pref_conf_editval_hlist_cb(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *trigger_attr) { - rnd_hidlib_t *hidlib = rnd_gui->get_dad_hidlib(hid_ctx); + rnd_design_t *hidlib = rnd_gui->get_dad_hidlib(hid_ctx); confedit_ctx_t *ctx = caller_data; rnd_actionva(hidlib, ctx->nat->gui_edit_act, rnd_conf_role_name(ctx->role), ctx->nat->hash_path, trigger_attr->val.str, Index: trunk/src/librnd/plugins/lib_hid_common/dlg_pref_win.c =================================================================== --- trunk/src/librnd/plugins/lib_hid_common/dlg_pref_win.c (revision 34610) +++ trunk/src/librnd/plugins/lib_hid_common/dlg_pref_win.c (revision 34611) @@ -68,7 +68,7 @@ static void pref_win_project_cb(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr) { pref_ctx_t *ctx = caller_data; - rnd_hidlib_t *hidlib = rnd_gui->get_dad_hidlib(rnd_gui); + rnd_design_t *hidlib = rnd_gui->get_dad_hidlib(rnd_gui); if (rnd_pref_dlg2conf_pre(hidlib, ctx) == NULL) return; Index: trunk/src/librnd/plugins/lib_hid_common/grid_menu.c =================================================================== --- trunk/src/librnd/plugins/lib_hid_common/grid_menu.c (revision 34610) +++ trunk/src/librnd/plugins/lib_hid_common/grid_menu.c (revision 34611) @@ -102,7 +102,7 @@ grid_lock--; } -void rnd_grid_update_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) +void rnd_grid_update_ev(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) { if (grid_lock) return; grid_lock++; Index: trunk/src/librnd/plugins/lib_hid_common/grid_menu.h =================================================================== --- trunk/src/librnd/plugins/lib_hid_common/grid_menu.h (revision 34610) +++ trunk/src/librnd/plugins/lib_hid_common/grid_menu.h (revision 34611) @@ -2,4 +2,4 @@ #include void rnd_grid_update_conf(rnd_conf_native_t *cfg, int arr_idx); -void rnd_grid_update_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]); +void rnd_grid_update_ev(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]); Index: trunk/src/librnd/plugins/lib_hid_common/gui_act.c =================================================================== --- trunk/src/librnd/plugins/lib_hid_common/gui_act.c (revision 34610) +++ trunk/src/librnd/plugins/lib_hid_common/gui_act.c (revision 34611) @@ -45,7 +45,7 @@ #include #include -void rnd_hidcore_crosshair_move_to(rnd_hidlib_t *hidlib, rnd_coord_t abs_x, rnd_coord_t abs_y, int mouse_mot) +void rnd_hidcore_crosshair_move_to(rnd_design_t *hidlib, rnd_coord_t abs_x, rnd_coord_t abs_y, int mouse_mot) { if (mouse_mot) rnd_event(hidlib, RND_EVENT_STROKE_RECORD, "cc", abs_x, abs_y); @@ -81,7 +81,7 @@ /* DOC: cursor.html */ static fgw_error_t rnd_act_Cursor(fgw_arg_t *res, int argc, fgw_arg_t *argv) { - rnd_hidlib_t *hidlib = RND_ACT_HIDLIB; + rnd_design_t *hidlib = RND_ACT_HIDLIB; rnd_unit_list_t extra_units_x = { {"grid", 0, 0}, {"view", 0, RND_UNIT_PERCENT}, @@ -186,7 +186,7 @@ static const char rnd_acth_MoveCursorTo[] = "Move the cursor to absolute coords, pan the view as needed."; static fgw_error_t rnd_act_MoveCursorTo(fgw_arg_t *res, int argc, fgw_arg_t *argv) { - rnd_hidlib_t *hidlib = RND_ACT_HIDLIB; + rnd_design_t *hidlib = RND_ACT_HIDLIB; rnd_coord_t x, y; RND_ACT_CONVARG(1, FGW_COORD, Cursor, x = fgw_coord(&argv[1])); Index: trunk/src/librnd/plugins/lib_hid_common/lead_user.c =================================================================== --- trunk/src/librnd/plugins/lib_hid_common/lead_user.c (revision 34610) +++ trunk/src/librnd/plugins/lib_hid_common/lead_user.c (revision 34611) @@ -41,7 +41,7 @@ static rnd_coord_t leadx, leady, step; static rnd_bool lead; static rnd_hidval_t lead_timer; -static rnd_hidlib_t *lead_hidlib; +static rnd_design_t *lead_hidlib; static void lead_cb(rnd_hidval_t user_data) { @@ -56,7 +56,7 @@ lead_timer = rnd_gui->add_timer(rnd_gui, lead_cb, LEAD_PERIOD_MS, user_data); } -static void rnd_lead_user_to_location(rnd_hidlib_t *hidlib, rnd_coord_t x, rnd_coord_t y, rnd_bool enabled) +static void rnd_lead_user_to_location(rnd_design_t *hidlib, rnd_coord_t x, rnd_coord_t y, rnd_bool enabled) { rnd_hidval_t user_data; @@ -75,7 +75,7 @@ lead_timer = rnd_gui->add_timer(rnd_gui, lead_cb, LEAD_PERIOD_MS, user_data); } -void rnd_lead_user_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) +void rnd_lead_user_ev(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) { if (argc < 4) return; @@ -88,7 +88,7 @@ #define ARL LEAD_ARROW_LEN/3 -void rnd_lead_user_draw_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) +void rnd_lead_user_draw_ev(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) { if (lead) { rnd_hid_gc_t *gc = argv[1].d.p; Index: trunk/src/librnd/plugins/lib_hid_common/lead_user.h =================================================================== --- trunk/src/librnd/plugins/lib_hid_common/lead_user.h (revision 34610) +++ trunk/src/librnd/plugins/lib_hid_common/lead_user.h (revision 34611) @@ -1,5 +1,5 @@ -void rnd_lead_user_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]); -void rnd_lead_user_draw_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]); +void rnd_lead_user_ev(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]); +void rnd_lead_user_draw_ev(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]); Index: trunk/src/librnd/plugins/lib_hid_common/lib_hid_common.c =================================================================== --- trunk/src/librnd/plugins/lib_hid_common/lib_hid_common.c (revision 34610) +++ trunk/src/librnd/plugins/lib_hid_common/lib_hid_common.c (revision 34611) @@ -53,7 +53,7 @@ conf_dialogs_t dialogs_conf; -void rnd_hid_announce_gui_init(rnd_hidlib_t *hidlib) +void rnd_hid_announce_gui_init(rnd_design_t *hidlib) { rnd_hid_menu_merge_inhibit_inc(); rnd_event(hidlib, RND_EVENT_GUI_INIT, NULL); Index: trunk/src/librnd/plugins/lib_hid_common/lib_hid_common.h =================================================================== --- trunk/src/librnd/plugins/lib_hid_common/lib_hid_common.h (revision 34610) +++ trunk/src/librnd/plugins/lib_hid_common/lib_hid_common.h (revision 34611) @@ -5,6 +5,6 @@ /* HID implementations shall call this to announce GUI init - this will send out the event and try to minimize the noise by setting up inhibits */ -void rnd_hid_announce_gui_init(rnd_hidlib_t *hidlib); +void rnd_hid_announce_gui_init(rnd_design_t *hidlib); -void rnd_hidcore_crosshair_move_to(rnd_hidlib_t *hidlib, rnd_coord_t abs_x, rnd_coord_t abs_y, int mouse_mot); +void rnd_hidcore_crosshair_move_to(rnd_design_t *hidlib, rnd_coord_t abs_x, rnd_coord_t abs_y, int mouse_mot); Index: trunk/src/librnd/plugins/lib_hid_common/menu_helper.c =================================================================== --- trunk/src/librnd/plugins/lib_hid_common/menu_helper.c (revision 34610) +++ trunk/src/librnd/plugins/lib_hid_common/menu_helper.c (revision 34611) @@ -40,7 +40,7 @@ #include "menu_helper.h" -int rnd_hid_get_flag(rnd_hidlib_t *hidlib, const char *name) +int rnd_hid_get_flag(rnd_design_t *hidlib, const char *name) { const char *cp; Index: trunk/src/librnd/plugins/lib_hid_common/menu_helper.h =================================================================== --- trunk/src/librnd/plugins/lib_hid_common/menu_helper.h (revision 34610) +++ trunk/src/librnd/plugins/lib_hid_common/menu_helper.h (revision 34611) @@ -33,7 +33,7 @@ an action (if name has a parenthesis). When an action is run, it has 0 or 1 argument only and the return value of the action is returned. On error, returns -1. */ -int rnd_hid_get_flag(rnd_hidlib_t *hidlib, const char *name); +int rnd_hid_get_flag(rnd_design_t *hidlib, const char *name); /* Return non-zero if submenu has further submenus; generate rnd_message(RND_MSG_ERROR, ) if there is a submenu field with the wrong lihata type */ Index: trunk/src/librnd/plugins/lib_hid_common/place.c =================================================================== --- trunk/src/librnd/plugins/lib_hid_common/place.c (revision 34610) +++ trunk/src/librnd/plugins/lib_hid_common/place.c (revision 34611) @@ -115,7 +115,7 @@ htsi_set(&e->value.panes, rnd_strdup(pane_id), new_val); } -void rnd_dialog_place(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) +void rnd_dialog_place(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) { const char *id; int *geo; @@ -137,7 +137,7 @@ /* rnd_trace("dialog place: %p '%s'\n", hid_ctx, id);*/ } -void rnd_dialog_resize(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) +void rnd_dialog_resize(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) { if ((argc < 7) || (argv[1].type != RND_EVARG_PTR) || (argv[2].type != RND_EVARG_STR)) return; @@ -246,9 +246,9 @@ } } -lht_node_t *rnd_pref_ensure_conf_root(rnd_hidlib_t *hidlib, rnd_conf_role_t role); +lht_node_t *rnd_pref_ensure_conf_root(rnd_design_t *hidlib, rnd_conf_role_t role); -static void place_maybe_save(rnd_hidlib_t *hidlib, rnd_conf_role_t role, int force) +static void place_maybe_save(rnd_design_t *hidlib, rnd_conf_role_t role, int force) { htsw_entry_t *e; char path[128 + sizeof(BASEPATH)]; @@ -346,19 +346,19 @@ /* event handlers that run before the current design is saved to save win geo in the design conf and after loading a new board to fetch window placement info. */ -static void place_save_pre(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) +static void place_save_pre(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) { place_maybe_save(hidlib, RND_CFR_PROJECT, 0); place_maybe_save(hidlib, RND_CFR_DESIGN, 0); } -static void place_load_post(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) +static void place_load_post(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) { rnd_wplc_load(RND_CFR_PROJECT); rnd_wplc_load(RND_CFR_DESIGN); } -static void place_pane_changed(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) +static void place_pane_changed(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) { if ((argv[1].type != RND_EVARG_STR) || (argv[2].type != RND_EVARG_STR) || (argv[3].type != RND_EVARG_DOUBLE)) return; @@ -366,7 +366,7 @@ rnd_pane_store(argv[1].d.s, argv[2].d.s, argv[3].d.d); } -static void place_new_pane(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) +static void place_new_pane(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) { htsw_entry_t *e; htsi_entry_t *i; @@ -387,12 +387,12 @@ *pos = (double)i->value / (double)PANE_INT2DBL; } -void rnd_wplc_save_to_role(rnd_hidlib_t *hidlib, rnd_conf_role_t role) +void rnd_wplc_save_to_role(rnd_design_t *hidlib, rnd_conf_role_t role) { place_maybe_save(hidlib, role, 1); } -int rnd_wplc_save_to_file(rnd_hidlib_t *hidlib, const char *fn) +int rnd_wplc_save_to_file(rnd_design_t *hidlib, const char *fn) { htsw_entry_t *e; FILE *f; Index: trunk/src/librnd/plugins/lib_hid_common/place.h =================================================================== --- trunk/src/librnd/plugins/lib_hid_common/place.h (revision 34610) +++ trunk/src/librnd/plugins/lib_hid_common/place.h (revision 34611) @@ -1,13 +1,13 @@ #include void rnd_wplc_load(rnd_conf_role_t role); -void rnd_wplc_save_to_role(rnd_hidlib_t *hidlib, rnd_conf_role_t role); -int rnd_wplc_save_to_file(rnd_hidlib_t *hidlib, const char *fn); +void rnd_wplc_save_to_role(rnd_design_t *hidlib, rnd_conf_role_t role); +int rnd_wplc_save_to_file(rnd_design_t *hidlib, const char *fn); /*** for internal use ***/ void rnd_dialog_place_uninit(void); void rnd_dialog_place_init(void); -void rnd_dialog_resize(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]); -void rnd_dialog_place(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]); +void rnd_dialog_resize(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]); +void rnd_dialog_place(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]); Index: trunk/src/librnd/plugins/lib_hid_common/toolbar.c =================================================================== --- trunk/src/librnd/plugins/lib_hid_common/toolbar.c (revision 34610) +++ trunk/src/librnd/plugins/lib_hid_common/toolbar.c (revision 34611) @@ -181,13 +181,13 @@ } } -void rnd_toolbar_gui_init_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) +void rnd_toolbar_gui_init_ev(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) { if ((RND_HAVE_GUI_ATTR_DLG) && (rnd_gui->get_menu_cfg != NULL)) toolbar_create(); } -void rnd_toolbar_reg_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) +void rnd_toolbar_reg_ev(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) { if ((toolbar.sub_inited) && (argv[1].type == RND_EVARG_PTR)) { rnd_tool_t *tool = argv[1].d.p; Index: trunk/src/librnd/plugins/lib_hid_common/toolbar.h =================================================================== --- trunk/src/librnd/plugins/lib_hid_common/toolbar.h (revision 34610) +++ trunk/src/librnd/plugins/lib_hid_common/toolbar.h (revision 34611) @@ -7,8 +7,8 @@ /* Alternatively, the caller can bind these */ -void rnd_toolbar_gui_init_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]); -void rnd_toolbar_reg_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]); +void rnd_toolbar_gui_init_ev(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]); +void rnd_toolbar_reg_ev(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]); void rnd_toolbar_update_conf(rnd_conf_native_t *cfg, int arr_idx); Index: trunk/src/librnd/plugins/lib_hid_common/zoompan.c =================================================================== --- trunk/src/librnd/plugins/lib_hid_common/zoompan.c (revision 34610) +++ trunk/src/librnd/plugins/lib_hid_common/zoompan.c (revision 34611) @@ -40,7 +40,7 @@ const char rnd_acts_Zoom_default[] = rnd_gui_acts_zoom; fgw_error_t rnd_gui_act_zoom(fgw_arg_t *res, int argc, fgw_arg_t *argv) { - rnd_hidlib_t *hidlib = RND_ACT_HIDLIB; + rnd_design_t *hidlib = RND_ACT_HIDLIB; const char *vp, *ovp; double v; rnd_coord_t x = 0, y = 0; Index: trunk/src/librnd/plugins/lib_hid_gl/hidgl.c =================================================================== --- trunk/src/librnd/plugins/lib_hid_gl/hidgl.c (revision 34610) +++ trunk/src/librnd/plugins/lib_hid_gl/hidgl.c (revision 34611) @@ -265,7 +265,7 @@ } } -void hidgl_draw_local_grid(rnd_hidlib_t *hidlib, rnd_coord_t grd, rnd_coord_t cx, rnd_coord_t cy, int radius, double scale, rnd_bool cross_grid) +void hidgl_draw_local_grid(rnd_design_t *hidlib, rnd_coord_t grd, rnd_coord_t cx, rnd_coord_t cy, int radius, double scale, rnd_bool cross_grid) { int npoints = 0; rnd_coord_t x, y; @@ -309,7 +309,7 @@ hidgl_draw.xor_end(); } -void hidgl_draw_grid(rnd_hidlib_t *hidlib, rnd_coord_t grd, rnd_box_t *drawn_area, double scale, rnd_bool cross_grid) +void hidgl_draw_grid(rnd_design_t *hidlib, rnd_coord_t grd, rnd_box_t *drawn_area, double scale, rnd_bool cross_grid) { rnd_coord_t x1, y1, x2, y2, n, i, n3; double x, y; Index: trunk/src/librnd/plugins/lib_hid_gl/hidgl.h =================================================================== --- trunk/src/librnd/plugins/lib_hid_gl/hidgl.h (revision 34610) +++ trunk/src/librnd/plugins/lib_hid_gl/hidgl.h (revision 34611) @@ -33,8 +33,8 @@ #include /*extern float global_depth;*/ -void hidgl_draw_local_grid(rnd_hidlib_t *hidlib, rnd_coord_t grd, rnd_coord_t cx, rnd_coord_t cy, int radius, double scale, rnd_bool cross_grid); -void hidgl_draw_grid(rnd_hidlib_t *hidlib, rnd_coord_t grd, rnd_box_t *drawn_area, double scale, rnd_bool cross_grid); +void hidgl_draw_local_grid(rnd_design_t *hidlib, rnd_coord_t grd, rnd_coord_t cx, rnd_coord_t cy, int radius, double scale, rnd_bool cross_grid); +void hidgl_draw_grid(rnd_design_t *hidlib, rnd_coord_t grd, rnd_box_t *drawn_area, double scale, rnd_bool cross_grid); void hidgl_set_depth(float depth); void hidgl_draw_line(rnd_cap_style_t cap, rnd_coord_t width, rnd_coord_t x1, rnd_coord_t y1, rnd_coord_t x2, rnd_coord_t y2, double scale); void hidgl_draw_arc(rnd_coord_t width, rnd_coord_t vx, rnd_coord_t vy, rnd_coord_t vrx, rnd_coord_t vry, rnd_angle_t start_angle, rnd_angle_t delta_angle, double scale); Index: trunk/src/librnd/plugins/lib_mbtk_common/attr_dlg.c =================================================================== --- trunk/src/librnd/plugins/lib_mbtk_common/attr_dlg.c (revision 34610) +++ trunk/src/librnd/plugins/lib_mbtk_common/attr_dlg.c (revision 34611) @@ -93,12 +93,12 @@ } -int rnd_mbtk_winplace_cfg(rnd_hidlib_t *hidlib, mbtk_widget_t *widget, void *ctx, const char *id) +int rnd_mbtk_winplace_cfg(rnd_design_t *hidlib, mbtk_widget_t *widget, void *ctx, const char *id) { } -rnd_hidlib_t *rnd_mbtk_attr_get_dad_hidlib(void *hid_ctx) +rnd_design_t *rnd_mbtk_attr_get_dad_hidlib(void *hid_ctx) { } Index: trunk/src/librnd/plugins/lib_mbtk_common/attr_dlg.h =================================================================== --- trunk/src/librnd/plugins/lib_mbtk_common/attr_dlg.h (revision 34610) +++ trunk/src/librnd/plugins/lib_mbtk_common/attr_dlg.h (revision 34611) @@ -19,10 +19,10 @@ /* Report new window coords to the central window placement code emitting an event */ -int rnd_mbtk_winplace_cfg(rnd_hidlib_t *hidlib, mbtk_widget_t *widget, void *ctx, const char *id); +int rnd_mbtk_winplace_cfg(rnd_design_t *hidlib, mbtk_widget_t *widget, void *ctx, const char *id); -rnd_hidlib_t *rnd_mbtk_attr_get_dad_hidlib(void *hid_ctx); +rnd_design_t *rnd_mbtk_attr_get_dad_hidlib(void *hid_ctx); /* Close and free all open DAD dialogs */ void rnd_mbtk_attr_dlg_free_all(rnd_mbtk_t *gctx); Index: trunk/src/librnd/plugins/lib_mbtk_common/glue_hid.c =================================================================== --- trunk/src/librnd/plugins/lib_mbtk_common/glue_hid.c (revision 34610) +++ trunk/src/librnd/plugins/lib_mbtk_common/glue_hid.c (revision 34611) @@ -155,7 +155,7 @@ TODO("in mbtk this can be done when creating the window"); #if 0 -void rnd_mbtk_topwinplace(rnd_hidlib_t *hidlib, *dialog, const char *id) +void rnd_mbtk_topwinplace(rnd_design_t *hidlib, *dialog, const char *id) { } #endif @@ -420,7 +420,7 @@ return 0; } -static void rnd_mbtk_set_hidlib(rnd_hid_t *hid, rnd_hidlib_t *hidlib) +static void rnd_mbtk_set_hidlib(rnd_hid_t *hid, rnd_design_t *hidlib) { rnd_mbtk_t *mctx = hid->hid_data; @@ -445,7 +445,7 @@ #endif } -static rnd_hidlib_t *rnd_mbtk_get_hidlib(rnd_hid_t *hid) +static rnd_design_t *rnd_mbtk_get_hidlib(rnd_hid_t *hid) { rnd_mbtk_t *mctx = hid->hid_data; Index: trunk/src/librnd/plugins/lib_mbtk_common/mbtk_common.h =================================================================== --- trunk/src/librnd/plugins/lib_mbtk_common/mbtk_common.h (revision 34610) +++ trunk/src/librnd/plugins/lib_mbtk_common/mbtk_common.h (revision 34611) @@ -29,7 +29,7 @@ struct rnd_mbtk_s *ctx; unsigned local_hidlib:1; /* if 1, use local hidlib instead of current GUI hidlib (for local dialogs) */ - rnd_hidlib_t *hidlib; /* remember the hidlib the dialog was opened for */ + rnd_design_t *hidlib; /* remember the hidlib the dialog was opened for */ } rnd_mbtk_view_t; typedef struct rnd_mbtk_topwin_s rnd_mbtk_topwin_t; /* opaque so that libmbtk/widgets.h doesn't need to be included here */ @@ -42,7 +42,7 @@ rnd_bool drawing_allowed; /* track if a drawing area is available for rendering */ rnd_mbtk_view_t view; /* top window's ddrawing area */ - rnd_hidlib_t *hidlib; + rnd_design_t *hidlib; unsigned hid_active:1; unsigned gui_is_up:1; rnd_mbtk_topwin_t *topwin; Index: trunk/src/librnd/plugins/lib_mbtk_common/menu.c =================================================================== --- trunk/src/librnd/plugins/lib_mbtk_common/menu.c (revision 34610) +++ trunk/src/librnd/plugins/lib_mbtk_common/menu.c (revision 34611) @@ -18,7 +18,7 @@ menu_handle_t *hand = user_data; if (hand->action != NULL) { - rnd_hidlib_t *hidlib = rnd_gui->get_hidlib(rnd_gui); + rnd_design_t *hidlib = rnd_gui->get_hidlib(rnd_gui); rnd_hid_cfg_action(hidlib, hand->action); /* GUI updates to reflect the result of the above action */ @@ -52,7 +52,7 @@ /* update the checkbox of a menu item */ static void menu_chkbox_update(rnd_mbtk_t *mctx, menu_handle_t *m) { - rnd_hidlib_t *hidlib = mctx->hidlib; + rnd_design_t *hidlib = mctx->hidlib; if (m->checked != NULL) { int v = rnd_hid_get_flag(hidlib, m->checked); @@ -72,7 +72,7 @@ } -static void rnd_mbtk_menu_update_checkboxes(rnd_mbtk_t *mctx, rnd_hidlib_t *hidlib) +static void rnd_mbtk_menu_update_checkboxes(rnd_mbtk_t *mctx, rnd_design_t *hidlib) { menu_handle_t *m; for(m = gdl_first(&mctx->topwin->menu_chk); m != NULL; m = gdl_next(&mctx->topwin->menu_chk, m)) Index: trunk/src/librnd/plugins/script/glue_undo.c =================================================================== --- trunk/src/librnd/plugins/script/glue_undo.c (revision 34610) +++ trunk/src/librnd/plugins/script/glue_undo.c (revision 34611) @@ -1,7 +1,7 @@ /* Live scripting needs to undo using the host app; to make this host app API independent, the action interface should be used */ -static long script_undo_action(rnd_hidlib_t *hl, const char *cmd) +static long script_undo_action(rnd_design_t *hl, const char *cmd) { fgw_arg_t res, argv[2]; @@ -16,22 +16,22 @@ return res.val.nat_long; } -static long get_undo_serial(rnd_hidlib_t *hl) +static long get_undo_serial(rnd_design_t *hl) { return script_undo_action(hl, "GetSerial"); } -static long get_num_undo(rnd_hidlib_t *hl) +static long get_num_undo(rnd_design_t *hl) { return script_undo_action(hl, "GetNum"); } -static void inc_undo_serial(rnd_hidlib_t *hl) +static void inc_undo_serial(rnd_design_t *hl) { script_undo_action(hl, "IncSerial"); } -static void undo_above(rnd_hidlib_t *hl, long ser) +static void undo_above(rnd_design_t *hl, long ser) { fgw_arg_t res, argv[3]; Index: trunk/src/librnd/plugins/script/guess_lang.c =================================================================== --- trunk/src/librnd/plugins/script/guess_lang.c (revision 34610) +++ trunk/src/librnd/plugins/script/guess_lang.c (revision 34611) @@ -203,7 +203,7 @@ return eng; } -const char *rnd_script_guess_lang(rnd_hidlib_t *hl, const char *fn, int is_filename) +const char *rnd_script_guess_lang(rnd_design_t *hl, const char *fn, int is_filename) { rnd_script_guess_lang_init(); Index: trunk/src/librnd/plugins/script/live_script.c =================================================================== --- trunk/src/librnd/plugins/script/live_script.c (revision 34610) +++ trunk/src/librnd/plugins/script/live_script.c (revision 34611) @@ -53,7 +53,7 @@ typedef struct { RND_DAD_DECL_NOINIT(dlg) - rnd_hidlib_t *hidlib; + rnd_design_t *hidlib; char *name, *longname, *fn; char **langs; char **lang_engines; @@ -151,7 +151,7 @@ } -static int lvs_list_langs(rnd_hidlib_t *hl, live_script_t *lvs) +static int lvs_list_langs(rnd_design_t *hl, live_script_t *lvs) { const char *paths[2]; pup_list_parse_pup_t ctx = {0}; @@ -173,7 +173,7 @@ return lctx.vl.used; } #else -static int lvs_list_langs(rnd_hidlib_t *hl, live_script_t *lvs) +static int lvs_list_langs(rnd_design_t *hl, live_script_t *lvs) { vtp0_t vl, ve; @@ -213,7 +213,7 @@ rnd_actionva(lvs->hidlib, "livescript", arg, lvs->name, NULL); } -static live_script_t *rnd_dlg_live_script(rnd_hidlib_t *hidlib, const char *name) +static live_script_t *rnd_dlg_live_script(rnd_design_t *hidlib, const char *name) { rnd_hid_dad_buttons_t clbtn[] = {{"Close", 0}, {NULL, 0}}; char *title; @@ -301,7 +301,7 @@ #include "glue_undo.c" -static int live_run(rnd_hidlib_t *hl, live_script_t *lvs) +static int live_run(rnd_design_t *hl, live_script_t *lvs) { rnd_hid_attribute_t *atxt = &lvs->dlg[lvs->wtxt]; rnd_hid_text_t *txt = atxt->wdata; @@ -361,7 +361,7 @@ return NULL; } -static int live_undo(rnd_hidlib_t *hl, live_script_t *lvs) +static int live_undo(rnd_design_t *hl, live_script_t *lvs) { if (lvs->undo_pre == lvs->undo_post) return 0; /* the script did nothing */ @@ -375,7 +375,7 @@ } -static int live_load(rnd_hidlib_t *hl, live_script_t *lvs, const char *fn) +static int live_load(rnd_design_t *hl, live_script_t *lvs, const char *fn) { rnd_hid_attribute_t *atxt = &lvs->dlg[lvs->wtxt]; rnd_hid_text_t *txt = atxt->wdata; @@ -417,7 +417,7 @@ return 0; } -static int live_save(rnd_hidlib_t *hl, live_script_t *lvs, const char *fn) +static int live_save(rnd_design_t *hl, live_script_t *lvs, const char *fn) { rnd_hid_attribute_t *atxt = &lvs->dlg[lvs->wtxt]; rnd_hid_text_t *txt = atxt->wdata; Index: trunk/src/librnd/plugins/script/perma.c =================================================================== --- trunk/src/librnd/plugins/script/perma.c (revision 34610) +++ trunk/src/librnd/plugins/script/perma.c (revision 34611) @@ -34,7 +34,7 @@ #include #include -static int perma_load(rnd_hidlib_t *hl, const char *dir, const char *id, const char *path_in, const char *lang) +static int perma_load(rnd_design_t *hl, const char *dir, const char *id, const char *path_in, const char *lang) { char spath[RND_PATH_MAX]; const char *path; @@ -49,7 +49,7 @@ return rnd_script_load(hl, id, path, lang); } -static void perma_script_load_conf(rnd_hidlib_t *hl, const char *dir) +static void perma_script_load_conf(rnd_design_t *hl, const char *dir) { char path[RND_PATH_MAX], *errmsg; lht_doc_t *doc; @@ -117,7 +117,7 @@ lht_dom_uninit(doc); } -static void perma_script_init(rnd_hidlib_t *hl) +static void perma_script_init(rnd_design_t *hl) { static int inited = 0; @@ -129,7 +129,7 @@ inited = 1; } -static void script_mainloop_perma_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) +static void script_mainloop_perma_ev(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) { if (rnd_hid_in_main_loop) perma_script_init(hidlib); Index: trunk/src/librnd/plugins/script/script.c =================================================================== --- trunk/src/librnd/plugins/script/script.c (revision 34610) +++ trunk/src/librnd/plugins/script/script.c (revision 34611) @@ -261,7 +261,7 @@ return rnd_strdup_printf("%s%c%s", rnd_conf.rc.path.home, RND_DIR_SEPARATOR_C, fn+1); } -int rnd_script_load(rnd_hidlib_t *hl, const char *id, const char *fn, const char *lang) +int rnd_script_load(rnd_design_t *hl, const char *id, const char *fn, const char *lang) { pup_plugin_t *pup = NULL; script_t *s; @@ -330,7 +330,7 @@ return 0; } -static int script_reload(rnd_hidlib_t *hl, const char *id) +static int script_reload(rnd_design_t *hl, const char *id) { int ret; char *fn, *lang, *cookie; @@ -398,7 +398,7 @@ } } -int script_oneliner(rnd_hidlib_t *hl, const char *lang, const char *src) +int script_oneliner(rnd_design_t *hl, const char *lang, const char *src) { FILE *f; char *fn; @@ -436,7 +436,7 @@ static rnd_anyload_t script_anyload = {0}; -static int script_anyload_file(const rnd_anyload_t *al, rnd_hidlib_t *hl, const char *filename, const char *type, lht_node_t *nd) +static int script_anyload_file(const rnd_anyload_t *al, rnd_design_t *hl, const char *filename, const char *type, lht_node_t *nd) { lht_node_t *nlang, *nid; const char *lang, *id; Index: trunk/src/librnd/plugins/script/script.h =================================================================== --- trunk/src/librnd/plugins/script/script.h (revision 34610) +++ trunk/src/librnd/plugins/script/script.h (revision 34611) @@ -1,4 +1,4 @@ -extern int rnd_script_load(rnd_hidlib_t *hl, const char *id, const char *fn, const char *lang); +extern int rnd_script_load(rnd_design_t *hl, const char *id, const char *fn, const char *lang); extern int rnd_script_unload(const char *id, const char *preunload); -const char *rnd_script_guess_lang(rnd_hidlib_t *hl, const char *fn, int is_filename); +const char *rnd_script_guess_lang(rnd_design_t *hl, const char *fn, int is_filename); Index: trunk/src/librnd/plugins/script/script_act.c =================================================================== --- trunk/src/librnd/plugins/script/script_act.c (revision 34610) +++ trunk/src/librnd/plugins/script/script_act.c (revision 34611) @@ -143,7 +143,7 @@ static void btn_reload_cb(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr) { script_dlg_t *ctx = caller_data; - rnd_hidlib_t *hl = rnd_gui->get_dad_hidlib(hid_ctx); + rnd_design_t *hl = rnd_gui->get_dad_hidlib(hid_ctx); rnd_hid_row_t *row = rnd_dad_tree_get_selected(&ctx->dlg[ctx->wslist]); if (row == NULL) return; @@ -161,7 +161,7 @@ static void btn_load_cb(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr) { script_dlg_t *ctx = caller_data; - rnd_hidlib_t *hl = rnd_gui->get_dad_hidlib(hid_ctx); + rnd_design_t *hl = rnd_gui->get_dad_hidlib(hid_ctx); int failed; char *tmp, *fn = rnd_hid_fileselect(rnd_gui, "script to load", "Select a script file to load", NULL, NULL, NULL, "script", RND_HID_FSD_READ, NULL); rnd_hid_dad_buttons_t clbtn[] = {{"Cancel", -1}, {"ok", 0}, {NULL, 0}}; Index: trunk/src/librnd/plugins/script/timer.c =================================================================== --- trunk/src/librnd/plugins/script/timer.c (revision 34610) +++ trunk/src/librnd/plugins/script/timer.c (revision 34611) @@ -35,7 +35,7 @@ double next, period; long count; char *user_data; - rnd_hidlib_t *hidlib; + rnd_design_t *hidlib; char aname[1]; } script_timer_t; @@ -120,7 +120,7 @@ rnd_gui->add_timer(rnd_gui, timer_cb, 100, hv); } -static void script_timer_gui_init_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) +static void script_timer_gui_init_ev(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) { if (want_timer && !timer_running) /* script created a timer before gui init */ start_timer(); Index: trunk/src/librnd/plugins/stroke/stroke.c =================================================================== --- trunk/src/librnd/plugins/stroke/stroke.c (revision 34610) +++ trunk/src/librnd/plugins/stroke/stroke.c (revision 34611) @@ -51,7 +51,7 @@ static rnd_coord_t stroke_first_x, stroke_first_y, stroke_last_x, stroke_last_y; static rnd_bool rnd_mid_stroke = rnd_false; -static int rnd_stroke_exec(rnd_hidlib_t *hl, const char *seq) +static int rnd_stroke_exec(rnd_design_t *hl, const char *seq) { rnd_conf_listitem_t *item; int idx; @@ -65,7 +65,7 @@ return 0; } -static void rnd_stroke_finish(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) +static void rnd_stroke_finish(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) { char msg[255]; int *handled = argv[1].d.p; @@ -78,7 +78,7 @@ *handled = rnd_stroke_exec(hidlib, msg); } -static void rnd_stroke_record(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) +static void rnd_stroke_record(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) { rnd_coord_t ev_x = argv[1].d.c, ev_y = argv[2].d.c; @@ -93,7 +93,7 @@ return; } -static void rnd_stroke_start(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) +static void rnd_stroke_start(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) { rnd_coord_t ev_x = argv[1].d.c, ev_y = argv[2].d.c; rnd_mid_stroke = rnd_true; Index: trunk/src/test-rnd.c =================================================================== --- trunk/src/test-rnd.c (revision 34610) +++ trunk/src/test-rnd.c (revision 34611) @@ -57,7 +57,7 @@ /*** the data model ***/ #include struct { - rnd_hidlib_t hidlib; + rnd_design_t hidlib; int whatever_data; } foobar; @@ -77,7 +77,7 @@ rnd_hid_destroy_gc(foobar_crosshair_gc); } -static void my_draw_attached(rnd_hidlib_t *hidlib, rnd_bool inhibit_drawing_mode) +static void my_draw_attached(rnd_design_t *hidlib, rnd_bool inhibit_drawing_mode) { rnd_render->set_drawing_mode(rnd_render, RND_HID_COMP_RESET, 1, NULL); rnd_render->set_drawing_mode(rnd_render, RND_HID_COMP_POSITIVE_XOR, 1, NULL); @@ -88,7 +88,7 @@ rnd_render->set_drawing_mode(rnd_render, RND_HID_COMP_FLUSH, 1, NULL); } -static void my_crosshair_move_to(rnd_hidlib_t *hl, rnd_coord_t abs_x, rnd_coord_t abs_y, int mouse_mot) +static void my_crosshair_move_to(rnd_design_t *hl, rnd_coord_t abs_x, rnd_coord_t abs_y, int mouse_mot) { /* do the grid fit/snap then: update the GUI */ rnd_hid_notify_crosshair_change(hl, rnd_false); Index: trunk/tests/librnd/glue.c =================================================================== --- trunk/tests/librnd/glue.c (revision 34610) +++ trunk/tests/librnd/glue.c (revision 34611) @@ -1,7 +1,7 @@ /*** hidlib glue ***/ typedef struct design_s { - rnd_hidlib_t hidlib; /* shall be the first */ + rnd_design_t hidlib; /* shall be the first */ } design_t; design_t CTX;