Index: trunk/src/crosshair.c =================================================================== --- trunk/src/crosshair.c (revision 31000) +++ trunk/src/crosshair.c (revision 31001) @@ -67,7 +67,7 @@ static char crosshair_cookie[] = "crosshair"; pcb_crosshair_t pcb_crosshair; /* information about cursor settings */ -pcb_mark_t pcb_marked; +rnd_mark_t pcb_marked; pcb_crosshair_note_t pcb_crosshair_note; @@ -486,7 +486,7 @@ rnd_event(&PCB->hidlib, PCB_EVENT_RUBBER_MOVE_DRAW, "icc", 0, dx, dy ); } -void pcbhl_draw_attached(rnd_hidlib_t *hidlib, rnd_bool inhibit_drawing_mode) +void rnd_draw_attached(rnd_hidlib_t *hidlib, rnd_bool inhibit_drawing_mode) { if (!inhibit_drawing_mode) { rnd_render->set_drawing_mode(rnd_gui, RND_HID_COMP_RESET, 1, NULL); @@ -512,7 +512,7 @@ } -void pcbhl_draw_marks(rnd_hidlib_t *hidlib, rnd_bool inhibit_drawing_mode) +void rnd_draw_marks(rnd_hidlib_t *hidlib, rnd_bool inhibit_drawing_mode) { rnd_coord_t ms = conf_core.appearance.mark_size, ms2 = ms / 2; @@ -1099,7 +1099,7 @@ void pcb_crosshair_set_local_ref(rnd_coord_t X, rnd_coord_t Y, rnd_bool Showing) { - static pcb_mark_t old; + static rnd_mark_t old; static int count = 0; if (Showing) { @@ -1135,7 +1135,7 @@ int obj, line, box; } old_crosshair_t; -void *pcb_hidlib_crosshair_suspend(rnd_hidlib_t *hl) +void *rnd_hidlib_crosshair_suspend(rnd_hidlib_t *hl) { old_crosshair_t *buf = malloc(sizeof(old_crosshair_t)); @@ -1150,7 +1150,7 @@ return buf; } -void pcb_hidlib_crosshair_restore(rnd_hidlib_t *hl, void *susp_data) +void rnd_hidlib_crosshair_restore(rnd_hidlib_t *hl, void *susp_data) { old_crosshair_t *buf = susp_data; @@ -1164,7 +1164,7 @@ } -void pcb_hidlib_crosshair_move_to(rnd_hidlib_t *hl, rnd_coord_t abs_x, rnd_coord_t abs_y, int mouse_mot) +void rnd_hidlib_crosshair_move_to(rnd_hidlib_t *hl, rnd_coord_t abs_x, rnd_coord_t abs_y, int mouse_mot) { if (!mouse_mot) { rnd_hid_notify_crosshair_change(hl, pcb_false); Index: trunk/src/crosshair.h =================================================================== --- trunk/src/crosshair.h (revision 31000) +++ trunk/src/crosshair.h (revision 31001) @@ -94,7 +94,7 @@ #define PCB_CH_STATE_THIRD 2 extern pcb_crosshair_t pcb_crosshair; -extern pcb_mark_t pcb_marked; /* the point the user explicitly marked, or in some operations where the operation originally started */ +extern rnd_mark_t pcb_marked; /* the point the user explicitly marked, or in some operations where the operation originally started */ void pcb_notify_mark_change(rnd_bool changes_complete); void pcb_crosshair_move_relative(rnd_coord_t, rnd_coord_t); Index: trunk/src/draw.c =================================================================== --- trunk/src/draw.c (revision 31000) +++ trunk/src/draw.c (revision 31001) @@ -1155,7 +1155,7 @@ } } -void pcbhl_expose_main(rnd_hid_t * hid, const rnd_hid_expose_ctx_t *ctx, rnd_xform_t *xform_caller) +void rnd_expose_main(rnd_hid_t * hid, const rnd_hid_expose_ctx_t *ctx, rnd_xform_t *xform_caller) { if (!pcb_draw_inhibit) { pcb_output_t save; @@ -1175,7 +1175,7 @@ } } -void pcbhl_expose_preview(rnd_hid_t *hid, const rnd_hid_expose_ctx_t *e) +void rnd_expose_preview(rnd_hid_t *hid, const rnd_hid_expose_ctx_t *e) { pcb_output_t save; expose_begin(&save, hid); Index: trunk/src/hidlib_pcb.c =================================================================== --- trunk/src/hidlib_pcb.c (revision 31000) +++ trunk/src/hidlib_pcb.c (revision 31001) @@ -27,7 +27,7 @@ #include "board.h" #include -void pcb_hidlib_adjust_attached_objects(rnd_hidlib_t *hl) +void rnd_hidlib_adjust_attached_objects(rnd_hidlib_t *hl) { pcb_tool_adjust_attached(hl); } Index: trunk/src/librnd/core/conf.c =================================================================== --- trunk/src/librnd/core/conf.c (revision 31000) +++ trunk/src/librnd/core/conf.c (revision 31001) @@ -452,7 +452,7 @@ const char *rnd_conf_get_user_conf_name() { - return pcphl_conf_user_path; + return rnd_pcphl_conf_user_path; } const char *rnd_conf_get_project_conf_name(const char *project_fn, const char *pcb_fn, const char **try) @@ -1252,8 +1252,8 @@ rnd_conf_load_as(RND_CFR_INTERNAL, pcb_conf_internal, 1); /* load config files */ - rnd_conf_load_as(RND_CFR_SYSTEM, pcbhl_conf_sys_path, 0); - rnd_conf_load_as(RND_CFR_USER, pcphl_conf_user_path, 0); + rnd_conf_load_as(RND_CFR_SYSTEM, rnd_conf_sys_path, 0); + rnd_conf_load_as(RND_CFR_USER, rnd_pcphl_conf_user_path, 0); pc = rnd_conf_get_project_conf_name(project_fn, pcb_fn, &try); if (pc != NULL) rnd_conf_load_as(RND_CFR_PROJECT, pc, 0); @@ -1263,7 +1263,7 @@ this is needed so if the user makes config changes from the GUI things get saved. */ if (pcb_conf_main_root[RND_CFR_USER] == NULL) - rnd_conf_reset(RND_CFR_USER, pcphl_conf_user_path); + rnd_conf_reset(RND_CFR_USER, rnd_pcphl_conf_user_path); rnd_conf_in_production = 1; } @@ -1271,8 +1271,8 @@ void rnd_conf_load_extra(const char *project_fn, const char *pcb_fn) { int cnt; - cnt = conf_load_plug_files(RND_CFR_SYSTEM, pcbhl_conf_sysdir_path); - cnt += conf_load_plug_files(RND_CFR_USER, pcbhl_conf_userdir_path); + cnt = conf_load_plug_files(RND_CFR_SYSTEM, rnd_conf_sysdir_path); + cnt += conf_load_plug_files(RND_CFR_USER, rnd_conf_userdir_path); cnt += conf_load_plug_interns(RND_CFR_INTERNAL); if (cnt > 0) pcb_conf_merge_all(NULL); @@ -1892,7 +1892,7 @@ if (fn == NULL) { switch(role) { case RND_CFR_USER: - fn = pcphl_conf_user_path; + fn = rnd_pcphl_conf_user_path; break; case RND_CFR_PROJECT: fn = rnd_conf_get_project_conf_name(project_fn, pcb_fn, &try); Index: trunk/src/librnd/core/gui_act.c =================================================================== --- trunk/src/librnd/core/gui_act.c (revision 31000) +++ trunk/src/librnd/core/gui_act.c (revision 31001) @@ -219,7 +219,7 @@ dy += radius; } - pcb_hidcore_crosshair_move_to(hidlib, dx, dy, 1); + rnd_hidcore_crosshair_move_to(hidlib, dx, dy, 1); rnd_gui->set_crosshair(rnd_gui, hidlib->ch_x, hidlib->ch_y, pan_warp); RND_ACT_IRES(0); @@ -236,7 +236,7 @@ RND_PCB_ACT_CONVARG(1, FGW_COORD, Cursor, x = fgw_coord(&argv[1])); RND_PCB_ACT_CONVARG(2, FGW_COORD, Cursor, y = fgw_coord(&argv[2])); - pcb_hidcore_crosshair_move_to(RND_ACT_HIDLIB, x, y, 0); + rnd_hidcore_crosshair_move_to(RND_ACT_HIDLIB, x, y, 0); rnd_gui->set_crosshair(rnd_gui, hidlib->ch_x, hidlib->ch_y, HID_SC_PAN_VIEWPORT); RND_ACT_IRES(0); Index: trunk/src/librnd/core/hid_cfg.c =================================================================== --- trunk/src/librnd/core/hid_cfg.c (revision 31000) +++ trunk/src/librnd/core/hid_cfg.c (revision 31001) @@ -135,7 +135,7 @@ rnd_hid_cfg_t *hr; if (embedded_fallback == NULL) - embedded_fallback = pcb_hidlib_default_embedded_menu; + embedded_fallback = rnd_hidlib_default_embedded_menu; /* override HID defaults with the configured path */ if ((pcbhl_conf.rc.menu_file != NULL) && (*pcbhl_conf.rc.menu_file != '\0')) { @@ -149,11 +149,11 @@ int fn_len = strlen(fn); doc = NULL; - pcb_paths_resolve_all(hidlib, pcbhl_menu_file_paths, paths, fn_len+32, pcb_false); + pcb_paths_resolve_all(hidlib, rnd_menu_file_paths, paths, fn_len+32, pcb_false); for(p = paths; *p != NULL; p++) { if (doc == NULL) { char *end = *p + strlen(*p); - sprintf(end, pcbhl_menu_name_fmt, fn); + sprintf(end, rnd_menu_name_fmt, fn); doc = rnd_hid_cfg_load_lht(hidlib, *p); if (doc != NULL) rnd_file_loaded_set_at("menu", "HID main", *p, "main menu system"); Index: trunk/src/librnd/core/hid_init.c =================================================================== --- trunk/src/librnd/core/hid_init.c (revision 31000) +++ trunk/src/librnd/core/hid_init.c (revision 31001) @@ -310,7 +310,7 @@ conf_core_init(); pcbhl_conf_postproc(); pcb_hidlib_conf_init(); - pcb_hidlib_event_init(); + rnd_hidlib_event_init(); pcb_hid_dlg_init(); rnd_hid_init(); rnd_color_init(); @@ -380,7 +380,7 @@ void rnd_hidlib_uninit(void) { - pcb_hidlib_event_uninit(); + rnd_hidlib_event_uninit(); pcb_hid_dlg_uninit(); if (rnd_conf_isdirty(RND_CFR_USER)) @@ -666,7 +666,7 @@ int res = rnd_parse_command(NULL, ga->main_action, pcb_true); /* hidlib is NULL because there is no context yet */ if ((res != 0) && (ga->main_action_hint != NULL)) rnd_message(RND_MSG_ERROR, "\nHint: %s\n", ga->main_action_hint); - pcbhl_log_print_uninit_errs("main_action parse error"); + rnd_log_print_uninit_errs("main_action parse error"); *exitval = res; return 1; } @@ -673,7 +673,7 @@ if (rnd_gui_parse_arguments(ga->autopick_gui, &ga->hid_argc, &ga->hid_argv) != 0) { - pcbhl_log_print_uninit_errs("Export plugin argument parse error"); + rnd_log_print_uninit_errs("Export plugin argument parse error"); return 1; } @@ -692,7 +692,7 @@ rnd_event(hidlib, RND_EVENT_EXPORT_SESSION_BEGIN, NULL); rnd_gui->do_export(rnd_gui, 0); rnd_event(hidlib, RND_EVENT_EXPORT_SESSION_END, NULL); - pcbhl_log_print_uninit_errs("Exporting"); + rnd_log_print_uninit_errs("Exporting"); return 1; } Index: trunk/src/librnd/core/hidlib.c =================================================================== --- trunk/src/librnd/core/hidlib.c (revision 31000) +++ trunk/src/librnd/core/hidlib.c (revision 31001) @@ -33,11 +33,11 @@ static const char *hidlib_cookie = "hidlib"; -void pcb_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_hidlib_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); - pcb_hidlib_crosshair_move_to(hidlib, abs_x, abs_y, mouse_mot); + rnd_hidlib_crosshair_move_to(hidlib, abs_x, abs_y, mouse_mot); } @@ -47,7 +47,7 @@ rnd_gui->set_mouse_cursor(rnd_gui, pcbhl_conf.editor.mode); /* make sure the mouse cursor is set up now that it is registered */ } -void pcbhl_log_print_uninit_errs(const char *title) +void rnd_log_print_uninit_errs(const char *title) { rnd_logline_t *n, *from = rnd_log_find_first_unseen(); int printed = 0; @@ -65,12 +65,12 @@ } -void pcb_hidlib_event_uninit(void) +void rnd_hidlib_event_uninit(void) { rnd_event_unbind_allcookie(hidlib_cookie); } -void pcb_hidlib_event_init(void) +void rnd_hidlib_event_init(void) { rnd_event_bind(RND_EVENT_GUI_INIT, hidlib_gui_init_ev, NULL, hidlib_cookie); } Index: trunk/src/librnd/core/hidlib.h =================================================================== --- trunk/src/librnd/core/hidlib.h (revision 31000) +++ trunk/src/librnd/core/hidlib.h (revision 31001) @@ -24,16 +24,16 @@ * mailing list: pcb-rnd (at) list.repo.hu (send "subscribe") */ -#ifndef PCB_HIDLIB_H -#define PCB_HIDLIB_H +#ifndef RND_HIDLIB_H +#define RND_HIDLIB_H #include -typedef struct pcb_mark_s { +typedef struct rnd_mark_s { rnd_bool status; rnd_coord_t X, Y; unsigned user_placed:1; /* if 1, the user has explicitly placed the mark - do not move it */ -} pcb_mark_t; +} rnd_mark_t; struct rnd_hidlib_s { rnd_coord_t grid; /* grid resolution */ @@ -44,9 +44,9 @@ /* tool state */ rnd_coord_t ch_x, ch_y, tool_x, tool_y; /* ch is crosshair */ - unsigned int tool_hit; /* optional: type of a hit object of PCB_MOVE_TYPES; 0 if there was no PCB_MOVE_TYPES object under the crosshair */ + unsigned int tool_hit; /* optional: type of a hit object of RND_MOVE_TYPES; 0 if there was no RND_MOVE_TYPES object under the crosshair */ unsigned int tool_click:1; /* optional: true if clicked somewhere with the arrow tool */ - pcb_mark_t tool_grabbed; /* point where a drag&drop operation started */ + rnd_mark_t tool_grabbed; /* point where a drag&drop operation started */ rnd_rnd_box_t *tool_snapped_obj_bbox; /* internal */ @@ -59,41 +59,38 @@ void *pspare[8]; }; -void pcb_hidlib_event_uninit(void); -void pcb_hidlib_event_init(void); +void rnd_hidlib_event_uninit(void); +void rnd_hidlib_event_init(void); /* print pending log messages to stderr after gui uninit */ -void pcbhl_log_print_uninit_errs(const char *title); +void rnd_log_print_uninit_errs(const char *title); /*** The following API is implemented by the host application ***/ /* update crosshair-attached object because crosshair coords likely changed */ -void pcb_hidlib_adjust_attached_objects(rnd_hidlib_t *hl); +void rnd_hidlib_adjust_attached_objects(rnd_hidlib_t *hl); -/* This indicates that the API has hidlib first argument in every crosshair related call */ -#define PCB_HIDLIB_ADJUST_ATTACHED_OBJECTS_HAS_HL 1 - /* 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 *pcb_hidlib_crosshair_suspend(rnd_hidlib_t *hl); -void pcb_hidlib_crosshair_restore(rnd_hidlib_t *hl, void *susp_data); +void *rnd_hidlib_crosshair_suspend(rnd_hidlib_t *hl); +void rnd_hidlib_crosshair_restore(rnd_hidlib_t *hl, void *susp_data); /* Move the crosshair to an absolute x;y coord on the board and update the GUI; if mouse_mot is non-zero, the request is a direct result of a mouse motion event */ -void pcb_hidlib_crosshair_move_to(rnd_hidlib_t *hl, rnd_coord_t abs_x, rnd_coord_t abs_y, int mouse_mot); +void rnd_hidlib_crosshair_move_to(rnd_hidlib_t *hl, rnd_coord_t abs_x, rnd_coord_t abs_y, int mouse_mot); /* The whole default menu file embedded in the executable; NULL if not present */ -extern const char *pcb_hidlib_default_embedded_menu; +extern const char *rnd_hidlib_default_embedded_menu; /* Draw any fixed mark on XOR overlay; if inhibit_drawing_mode is true, do not call ->set_drawing_mode */ -void pcbhl_draw_marks(rnd_hidlib_t *hidlib, rnd_bool inhibit_drawing_mode); +void rnd_draw_marks(rnd_hidlib_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 pcbhl_draw_attached(rnd_hidlib_t *hidlib, rnd_bool inhibit_drawing_mode); +void rnd_draw_attached(rnd_hidlib_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, board or preview). The expose @@ -106,34 +103,34 @@ /* Main expose: draw the design in the top window (pcb-rnd: all layers with all flags (no .content is used) */ -void pcbhl_expose_main(rnd_hid_t *hid, const rnd_hid_expose_ctx_t *region, rnd_xform_t *xform_caller); +void rnd_expose_main(rnd_hid_t *hid, const rnd_hid_expose_ctx_t *region, rnd_xform_t *xform_caller); /* Preview expose: generic, dialog based, used in preview widgets */ -void pcbhl_expose_preview(rnd_hid_t *hid, const rnd_hid_expose_ctx_t *e); +void rnd_expose_preview(rnd_hid_t *hid, const rnd_hid_expose_ctx_t *e); /* NULL terminated list of paths where the menu file should be looked at for */ -extern const char *pcbhl_menu_file_paths[]; +extern const char *rnd_menu_file_paths[]; /* printf format string for the menu file name; may contain one %s that will be substituted with "default" or the HID's short name. */ -extern const char *pcbhl_menu_name_fmt; +extern const char *rnd_menu_name_fmt; /* path to the user's config directory and main config file (RND_CFR_USER) */ -extern const char *pcbhl_conf_userdir_path; -extern const char *pcphl_conf_user_path; +extern const char *rnd_conf_userdir_path; +extern const char *rnd_pcphl_conf_user_path; /* path to the system (installed) config directory and main config file (RND_CFR_SYSTEM) */ -extern const char *pcbhl_conf_sysdir_path; -extern const char *pcbhl_conf_sys_path; +extern const char *rnd_conf_sysdir_path; +extern const char *rnd_conf_sys_path; /* application information (to be displayed on the UI) */ -extern const char *pcbhl_app_package; -extern const char *pcbhl_app_version; -extern const char *pcbhl_app_url; +extern const char *rnd_app_package; +extern const char *rnd_app_version; +extern const char *rnd_app_url; /*** API wrappers provided for plugins (these are translated into calls to the app within the hidlib) ***/ -void pcb_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_hidlib_t *hidlib, rnd_coord_t abs_x, rnd_coord_t abs_y, int mouse_mot); #endif Index: trunk/src/librnd/pcb_compat.h =================================================================== --- trunk/src/librnd/pcb_compat.h (revision 31000) +++ trunk/src/librnd/pcb_compat.h (revision 31001) @@ -8,6 +8,12 @@ a new epoch is defined and all ringdove apps must use the rnd_ prefixed symbols only (and this file will be removed). */ + + +/* This indicates that the API has hidlib first argument in every crosshair related call */ +#define PCB_HIDLIB_ADJUST_ATTACHED_OBJECTS_HAS_HL 1 + + #define pcb_register_action rnd_register_action #define pcb_register_actions rnd_register_actions #define PCB_REGISTER_ACTIONS RND_REGISTER_ACTIONS @@ -932,3 +938,27 @@ #define pcb_hid_nogui_init rnd_hid_nogui_init #define pcb_hid_nogui_get_hid rnd_hid_nogui_get_hid #define pcb_nogui_progress rnd_nogui_progress +#define pcb_mark_s rnd_mark_s +#define pcb_mark_t rnd_mark_t +#define pcb_hidlib_event_uninit rnd_hidlib_event_uninit +#define pcb_hidlib_event_init rnd_hidlib_event_init +#define pcbhl_log_print_uninit_errs rnd_log_print_uninit_errs +#define pcb_hidlib_adjust_attached_objects rnd_hidlib_adjust_attached_objects +#define pcbhl_draw_marks rnd_draw_marks +#define pcbhl_draw_attached rnd_draw_attached +#define pcbhl_expose_main rnd_expose_main +#define pcbhl_expose_preview rnd_expose_preview +#define pcb_hidlib_crosshair_suspend rnd_hidlib_crosshair_suspend +#define pcb_hidlib_crosshair_restore rnd_hidlib_crosshair_restore +#define pcb_hidlib_crosshair_move_to rnd_hidlib_crosshair_move_to +#define pcbhl_menu_file_paths rnd_menu_file_paths +#define pcbhl_menu_name_fmt rnd_menu_name_fmt +#define pcbhl_conf_userdir_path rnd_conf_userdir_path +#define pcphl_conf_user_path rnd_pcphl_conf_user_path +#define pcbhl_conf_sysdir_path rnd_conf_sysdir_path +#define pcbhl_conf_sys_path rnd_conf_sys_path +#define pcbhl_app_package rnd_app_package +#define pcbhl_app_version rnd_app_version +#define pcbhl_app_url rnd_app_url +#define pcb_hidcore_crosshair_move_to rnd_hidcore_crosshair_move_to +#define pcb_hidlib_default_embedded_menu rnd_hidlib_default_embedded_menu Index: trunk/src/main.c =================================================================== --- trunk/src/main.c (revision 31000) +++ trunk/src/main.c (revision 31001) @@ -77,15 +77,15 @@ #include "tool_logic.h" #include "pixmap_pcb.h" -const char *pcbhl_menu_file_paths[4]; -const char *pcbhl_menu_name_fmt = "pcb-menu-%s.lht"; +const char *rnd_menu_file_paths[4]; +const char *rnd_menu_name_fmt = "pcb-menu-%s.lht"; #define CONF_USER_DIR "~/" DOT_PCB_RND -const char *pcbhl_conf_userdir_path, *pcphl_conf_user_path; -const char *pcbhl_conf_sysdir_path, *pcbhl_conf_sys_path; -const char *pcbhl_app_package = PCB_PACKAGE; -const char *pcbhl_app_version = PCB_VERSION; -const char *pcbhl_app_url = "http://repo.hu/projects/pcb-rnd"; +const char *rnd_conf_userdir_path, *rnd_pcphl_conf_user_path; +const char *rnd_conf_sysdir_path, *rnd_conf_sys_path; +const char *rnd_app_package = PCB_PACKAGE; +const char *rnd_app_version = PCB_VERSION; +const char *rnd_app_url = "http://repo.hu/projects/pcb-rnd"; /* Figure out the canonical name of the executed program and fix up the defaults for various paths; returns exec prefix that @@ -188,15 +188,15 @@ if (se != 0) fprintf(stderr, "WARNING: setenv() failed - external commands such as parametric footprints may not have a proper environment\n"); - pcbhl_menu_file_paths[0] = "./"; - pcbhl_menu_file_paths[1] = "~/.pcb-rnd/"; - pcbhl_menu_file_paths[2] = pcb_concat(PCBCONFDIR, "/", NULL); - pcbhl_menu_file_paths[3] = NULL; + rnd_menu_file_paths[0] = "./"; + rnd_menu_file_paths[1] = "~/.pcb-rnd/"; + rnd_menu_file_paths[2] = pcb_concat(PCBCONFDIR, "/", NULL); + rnd_menu_file_paths[3] = NULL; - pcbhl_conf_userdir_path = CONF_USER_DIR; - pcphl_conf_user_path = pcb_concat(CONF_USER_DIR, "/pcb-conf.lht", NULL); - pcbhl_conf_sysdir_path = PCBCONFDIR; - pcbhl_conf_sys_path = pcb_concat(PCBCONFDIR, "/pcb-conf.lht", NULL); + rnd_conf_userdir_path = CONF_USER_DIR; + rnd_pcphl_conf_user_path = pcb_concat(CONF_USER_DIR, "/pcb-conf.lht", NULL); + rnd_conf_sysdir_path = PCBCONFDIR; + rnd_conf_sys_path = pcb_concat(PCBCONFDIR, "/pcb-conf.lht", NULL); free(bindir); return exec_prefix; @@ -205,9 +205,9 @@ static void main_path_uninit(void) { /* const for all other parts of the code, but we had to concat (alloc) it above */ - free((char *)pcbhl_menu_file_paths[2]); - free((char *)pcphl_conf_user_path); - free((char *)pcbhl_conf_sys_path); + free((char *)rnd_menu_file_paths[2]); + free((char *)rnd_pcphl_conf_user_path); + free((char *)rnd_conf_sys_path); } @@ -362,7 +362,7 @@ pcb_tool_uninit(); pcb_poly_uninit(); - pcbhl_log_print_uninit_errs("Log produced during uninitialization"); + rnd_log_print_uninit_errs("Log produced during uninitialization"); rnd_log_uninit(); main_path_uninit(); conf_core_uninit(); @@ -500,7 +500,7 @@ if (PCB == NULL) { rnd_message(RND_MSG_ERROR, "Can't create an empty layout, exiting\n"); - pcbhl_log_print_uninit_errs("Initialization"); + rnd_log_print_uninit_errs("Initialization"); exit(1); } @@ -521,7 +521,7 @@ if (pcb_load_pcb(command_line_pcb, NULL, pcb_true, how) != 0) { if (rnd_main_exporting) { rnd_message(RND_MSG_ERROR, "Can not load file '%s' (specified on command line) for exporting or printing\n", command_line_pcb); - pcbhl_log_print_uninit_errs("Export load error"); + rnd_log_print_uninit_errs("Export load error"); exit(1); } /* keep filename if load failed: file might not exist, save it by that name */ Index: trunk/src_plugins/dialogs/dlg_netlist.c =================================================================== --- trunk/src_plugins/dialogs/dlg_netlist.c (revision 31000) +++ trunk/src_plugins/dialogs/dlg_netlist.c (revision 31001) @@ -290,7 +290,7 @@ /* draw the board */ memset(&xform, 0, sizeof(xform)); xform.layer_faded = 1; - pcbhl_expose_main(rnd_gui, e, &xform); + rnd_expose_main(rnd_gui, e, &xform); if (net != NULL) {/* restore object color */ for(n = 0, p = netlist_color_save.array; n < netlist_color_save.used; n+=2,p+=2) { Index: trunk/src_plugins/dialogs/dlg_view.c =================================================================== --- trunk/src_plugins/dialogs/dlg_view.c (revision 31000) +++ trunk/src_plugins/dialogs/dlg_view.c (revision 31001) @@ -243,7 +243,7 @@ pcb_draw_force_termlab = 1; memset(&xform, 0, sizeof(xform)); xform.layer_faded = 1; - pcbhl_expose_main(rnd_gui, e, &xform); + rnd_expose_main(rnd_gui, e, &xform); pcb_draw_force_termlab = old_termlab; /* restore object color */ Index: trunk/src_plugins/export_dxf/dxf.c =================================================================== --- trunk/src_plugins/export_dxf/dxf.c (revision 31000) +++ trunk/src_plugins/export_dxf/dxf.c (revision 31001) @@ -230,7 +230,7 @@ dxf_ctx.drill_fill = options[HA_drill_fill].lng; dxf_ctx.drill_contour = options[HA_drill_contour].lng; - pcbhl_expose_main(&dxf_hid, &hectx, xform); + rnd_expose_main(&dxf_hid, &hectx, xform); rnd_conf_update(NULL, -1); /* restore forced sets */ } Index: trunk/src_plugins/export_excellon/excellon.c =================================================================== --- trunk/src_plugins/export_excellon/excellon.c (revision 31000) +++ trunk/src_plugins/export_excellon/excellon.c (revision 31001) @@ -253,11 +253,11 @@ lastwidth = -1; finding_apertures = 1; - pcbhl_expose_main(&excellon_hid, &ctx, &xform); + rnd_expose_main(&excellon_hid, &ctx, &xform); lastwidth = -1; finding_apertures = 0; - pcbhl_expose_main(&excellon_hid, &ctx, &xform); + rnd_expose_main(&excellon_hid, &ctx, &xform); rnd_conf_update(NULL, -1); /* resotre forced sets */ Index: trunk/src_plugins/export_gerber/gerber.c =================================================================== --- trunk/src_plugins/export_gerber/gerber.c (revision 31000) +++ trunk/src_plugins/export_gerber/gerber.c (revision 31001) @@ -387,12 +387,12 @@ lastgroup = -1; layer_list_idx = 0; finding_apertures = 1; - pcbhl_expose_main(&gerber_hid, &ctx, &xform); + rnd_expose_main(&gerber_hid, &ctx, &xform); lastgroup = -2; layer_list_idx = 0; finding_apertures = 0; - pcbhl_expose_main(&gerber_hid, &ctx, &xform); + rnd_expose_main(&gerber_hid, &ctx, &xform); memcpy(pcb_layer_stack, saved_layer_stack, sizeof(pcb_layer_stack)); Index: trunk/src_plugins/export_openems/export_openems.c =================================================================== --- trunk/src_plugins/export_openems/export_openems.c (revision 31000) +++ trunk/src_plugins/export_openems/export_openems.c (revision 31001) @@ -620,7 +620,7 @@ openems_write_outline(&wctx); fprintf(wctx.f, "%%%%%% Copper objects\n"); - pcbhl_expose_main(&openems_hid, &ctx, NULL); + rnd_expose_main(&openems_hid, &ctx, NULL); fprintf(wctx.f, "%%%%%% Port(s) on terminals\n"); openems_write_testpoints(&wctx, wctx.pcb->Data); Index: trunk/src_plugins/export_openscad/export_openscad.c =================================================================== --- trunk/src_plugins/export_openscad/export_openscad.c (revision 31000) +++ trunk/src_plugins/export_openscad/export_openscad.c (revision 31001) @@ -157,7 +157,7 @@ rnd_conf_force_set_bool(conf_core.editor.show_solder_side, 0); - pcbhl_expose_main(&openscad_hid, &ctx, NULL); + rnd_expose_main(&openscad_hid, &ctx, NULL); rnd_conf_update(NULL, -1); /* restore forced sets */ } Index: trunk/src_plugins/export_png/png.c =================================================================== --- trunk/src_plugins/export_png/png.c (revision 31000) +++ trunk/src_plugins/export_png/png.c (revision 31001) @@ -574,7 +574,7 @@ } ctx.view = *bounds; - pcbhl_expose_main(&png_hid, &ctx, xform); + rnd_expose_main(&png_hid, &ctx, xform); memcpy(pcb_layer_stack, saved_layer_stack, sizeof(pcb_layer_stack)); rnd_conf_update(NULL, -1); /* restore forced sets */ Index: trunk/src_plugins/export_ps/eps.c =================================================================== --- trunk/src_plugins/export_ps/eps.c (revision 31000) +++ trunk/src_plugins/export_ps/eps.c (revision 31001) @@ -299,7 +299,7 @@ } ctx.view = *bounds; - pcbhl_expose_main(&eps_hid, &ctx, xform); + rnd_expose_main(&eps_hid, &ctx, xform); eps_print_footer(f); Index: trunk/src_plugins/export_ps/ps.c =================================================================== --- trunk/src_plugins/export_ps/ps.c (revision 31000) +++ trunk/src_plugins/export_ps/ps.c (revision 31001) @@ -586,14 +586,14 @@ fprintf(the_file, "/tocp { /y y 12 sub def 90 y moveto rightshow } bind def\n"); global.doing_toc = 1; - global.pagecount = 1; /* 'pagecount' is modified by pcbhl_expose_main() call */ - pcbhl_expose_main(&ps_hid, &global.exps, xform); + global.pagecount = 1; /* 'pagecount' is modified by rnd_expose_main() call */ + rnd_expose_main(&ps_hid, &global.exps, xform); } global.pagecount = 1; /* Reset 'pagecount' if single file */ global.doing_toc = 0; ps_set_layer_group(rnd_render, -1, NULL, -1, -1, 0, -1, NULL); /* reset static vars */ - pcbhl_expose_main(&ps_hid, &global.exps, xform); + rnd_expose_main(&ps_hid, &global.exps, xform); if (the_file) fprintf(the_file, "showpage\n"); Index: trunk/src_plugins/export_svg/svg.c =================================================================== --- trunk/src_plugins/export_svg/svg.c (revision 31000) +++ trunk/src_plugins/export_svg/svg.c (revision 31001) @@ -256,7 +256,7 @@ xform->omit_overlay = 0; } - pcbhl_expose_main(&svg_hid, &ctx, xform); + rnd_expose_main(&svg_hid, &ctx, xform); rnd_conf_update(NULL, -1); /* restore forced sets */ } Index: trunk/src_plugins/hid_batch/batch.c =================================================================== --- trunk/src_plugins/hid_batch/batch.c (revision 31000) +++ trunk/src_plugins/hid_batch/batch.c (revision 31001) @@ -130,8 +130,8 @@ log_import(); if ((interactive) && (!pcbhl_conf.rc.quiet)) { - printf("Entering %s version %s batch mode.\n", pcbhl_app_package, pcbhl_app_version); - printf("See %s for project information\n", pcbhl_app_url); + printf("Entering %s version %s batch mode.\n", rnd_app_package, rnd_app_version); + printf("See %s for project information\n", rnd_app_url); } batch_stay = 1; Index: trunk/src_plugins/hid_gtk2_gdk/gtkhid-gdk.c =================================================================== --- trunk/src_plugins/hid_gtk2_gdk/gtkhid-gdk.c (revision 31000) +++ trunk/src_plugins/hid_gtk2_gdk/gtkhid-gdk.c (revision 31001) @@ -1087,16 +1087,16 @@ ghid_gdk_draw_bg_image(hidlib); - pcbhl_expose_main(>k2_gdk_hid, &ctx, NULL); + rnd_expose_main(>k2_gdk_hid, &ctx, NULL); ghid_gdk_draw_grid(hidlib); /* In some cases we are called with the crosshair still off */ if (priv->attached_invalidate_depth == 0) - pcbhl_draw_attached(hidlib, 0); + rnd_draw_attached(hidlib, 0); /* In some cases we are called with the mark still off */ if (priv->mark_invalidate_depth == 0) - pcbhl_draw_marks(hidlib, 0); + rnd_draw_marks(hidlib, 0); priv->clip_rect_valid = pcb_false; @@ -1176,7 +1176,7 @@ } if (priv->attached_invalidate_depth == 0) - pcbhl_draw_attached(hidlib, 0); + rnd_draw_attached(hidlib, 0); if (!changes_complete) { priv->attached_invalidate_depth++; @@ -1210,7 +1210,7 @@ } if (priv->mark_invalidate_depth == 0) - pcbhl_draw_marks(hidlib, 0); + rnd_draw_marks(hidlib, 0); if (!changes_complete) { priv->mark_invalidate_depth++; Index: trunk/src_plugins/hid_gtk2_gl/gtkhid-gl.c =================================================================== --- trunk/src_plugins/hid_gtk2_gl/gtkhid-gl.c (revision 31000) +++ trunk/src_plugins/hid_gtk2_gl/gtkhid-gl.c (revision 31001) @@ -785,7 +785,7 @@ ghid_gl_invalidate_current_gc(); glMatrixMode(GL_PROJECTION); glPushMatrix(); - pcbhl_expose_main(>k2_gl_hid, &ctx, NULL); + rnd_expose_main(>k2_gl_hid, &ctx, NULL); drawgl_flush(); glMatrixMode(GL_PROJECTION); glPopMatrix(); @@ -794,8 +794,8 @@ ghid_gl_invalidate_current_gc(); - pcbhl_draw_attached(hidlib, 0); - pcbhl_draw_marks(hidlib, 0); + rnd_draw_attached(hidlib, 0); + rnd_draw_marks(hidlib, 0); drawgl_flush(); ghid_gl_show_crosshair(hidlib, TRUE, ctx.view.X1, ctx.view.Y1, ctx.view.X2, ctx.view.Y2); Index: trunk/src_plugins/hid_lesstif/main.c =================================================================== --- trunk/src_plugins/hid_lesstif/main.c (revision 31000) +++ trunk/src_plugins/hid_lesstif/main.c (revision 31001) @@ -486,8 +486,8 @@ rnd_hid_notify_crosshair_change(ltf_hidlib, pcb_false); if (panning) Pan(2, e->x, e->y); - pcb_hidcore_crosshair_move_to(ltf_hidlib, Px(e->x), Py(e->y), 1); - pcb_hidlib_adjust_attached_objects(ltf_hidlib); + rnd_hidcore_crosshair_move_to(ltf_hidlib, Px(e->x), Py(e->y), 1); + rnd_hidlib_adjust_attached_objects(ltf_hidlib); rnd_hid_notify_crosshair_change(ltf_hidlib, pcb_true); in_move_event = 0; } @@ -590,7 +590,7 @@ time(&start); do { XFillRectangle(display, pixmap, bg_gc, 0, 0, view_width, view_height); - pcbhl_expose_main(&lesstif_hid, &ctx, NULL); + rnd_expose_main(&lesstif_hid, &ctx, NULL); XSync(display, 0); time(&end); i++; @@ -923,7 +923,7 @@ lesstif_pan_fixup(); if (setch) - pcb_hidcore_crosshair_move_to(ltf_hidlib, (x1+x2)/2, (y1+y2)/2, 0); + rnd_hidcore_crosshair_move_to(ltf_hidlib, (x1+x2)/2, (y1+y2)/2, 0); } void zoom_by(double factor, rnd_coord_t x, rnd_coord_t y) @@ -1078,7 +1078,7 @@ in_move_event = 1; if (panning) Pan(2, pos_x, pos_y); - pcb_hidcore_crosshair_move_to(ltf_hidlib, Px(pos_x), Py(pos_y), 1); + rnd_hidcore_crosshair_move_to(ltf_hidlib, Px(pos_x), Py(pos_y), 1); in_move_event = 0; } break; @@ -1086,8 +1086,8 @@ case LeaveNotify: crosshair_in_window = 0; if (crosshair_on) - pcbhl_draw_attached(ltf_hidlib, 1); - pcbhl_draw_marks(ltf_hidlib, 1); + rnd_draw_attached(ltf_hidlib, 1); + rnd_draw_marks(ltf_hidlib, 1); ShowCrosshair(pcb_false); need_idle_proc(); break; @@ -1095,7 +1095,7 @@ case EnterNotify: crosshair_in_window = 1; in_move_event = 1; - pcb_hidcore_crosshair_move_to(ltf_hidlib, Px(e->xcrossing.x), Py(e->xcrossing.y), 1); + rnd_hidcore_crosshair_move_to(ltf_hidlib, Px(e->xcrossing.x), Py(e->xcrossing.y), 1); ShowCrosshair(pcb_true); in_move_event = 0; need_redraw = 1; @@ -1783,7 +1783,7 @@ err = setjmp(lesstif_err_jmp); if (err != 0) return err; - appwidget = XtAppInitialize(&app_context, pcbhl_app_package, new_options, amax, argc, *argv, 0, stdarg_args, stdarg_n); + appwidget = XtAppInitialize(&app_context, rnd_app_package, new_options, amax, argc, *argv, 0, stdarg_args, stdarg_n); if (appwidget == NULL) return 1; XtSetErrorMsgHandler(NULL); /* restore the default handler */ @@ -2019,7 +2019,7 @@ } } DrawBackgroundImage(); - pcbhl_expose_main(&lesstif_hid, &ctx, NULL); + rnd_expose_main(&lesstif_hid, &ctx, NULL); lesstif_drawing_mode = RND_HID_COMP_POSITIVE; draw_grid(); show_crosshair(0); /* To keep the drawn / not drawn info correct */ @@ -2028,8 +2028,8 @@ pixmap = window; need_redraw = 0; if (crosshair_on) { - pcbhl_draw_attached(ltf_hidlib, 1); - pcbhl_draw_marks(ltf_hidlib, 1); + rnd_draw_attached(ltf_hidlib, 1); + rnd_draw_marks(ltf_hidlib, 1); } pcb_ltf_preview_invalidate(NULL); @@ -2037,13 +2037,13 @@ { static int c_x = -2, c_y = -2; - static pcb_mark_t saved_mark; + static rnd_mark_t saved_mark; static const rnd_unit_t *old_grid_unit = NULL; - if (crosshair_x != c_x || crosshair_y != c_y || pcbhl_conf.editor.grid_unit != old_grid_unit || memcmp(&saved_mark, &pcb_marked, sizeof(pcb_mark_t))) { + if (crosshair_x != c_x || crosshair_y != c_y || pcbhl_conf.editor.grid_unit != old_grid_unit || memcmp(&saved_mark, &pcb_marked, sizeof(rnd_mark_t))) { c_x = crosshair_x; c_y = crosshair_y; - memcpy(&saved_mark, &pcb_marked, sizeof(pcb_mark_t)); + memcpy(&saved_mark, &pcb_marked, sizeof(rnd_mark_t)); if (old_grid_unit != pcbhl_conf.editor.grid_unit) old_grid_unit = pcbhl_conf.editor.grid_unit; @@ -2118,7 +2118,7 @@ if (invalidate_depth == 0 && crosshair_on) { save_pixmap = pixmap; pixmap = window; - pcbhl_draw_attached(ltf_hidlib, 1); + rnd_draw_attached(ltf_hidlib, 1); pixmap = save_pixmap; } @@ -2148,7 +2148,7 @@ if (invalidate_depth == 0 && crosshair_on) { save_pixmap = pixmap; pixmap = window; - pcbhl_draw_marks(ltf_hidlib, 1); + rnd_draw_marks(ltf_hidlib, 1); pixmap = save_pixmap; } Index: trunk/src_plugins/hid_lesstif/menu.c =================================================================== --- trunk/src_plugins/hid_lesstif/menu.c (revision 31000) +++ trunk/src_plugins/hid_lesstif/menu.c (revision 31001) @@ -156,7 +156,7 @@ XmString ls = XmStringCreatePCB(message); void *chst; - chst = pcb_hidlib_crosshair_suspend(ltf_hidlib); + chst = rnd_hidlib_crosshair_suspend(ltf_hidlib); XtManageChild(m_click); stdarg_n = 0; stdarg(XmNlabelString, ls); @@ -172,7 +172,7 @@ need_xy = 0; have_xy = 1; XtUnmanageChild(m_click); - pcb_hidlib_crosshair_restore(ltf_hidlib, chst); + rnd_hidlib_crosshair_restore(ltf_hidlib, chst); } void lesstif_get_coords(rnd_hid_t *hid, const char *msg, rnd_coord_t *px, rnd_coord_t *py, int force) Index: trunk/src_plugins/hid_lesstif/netlist.c =================================================================== --- trunk/src_plugins/hid_lesstif/netlist.c (revision 31000) +++ trunk/src_plugins/hid_lesstif/netlist.c (revision 31001) @@ -215,7 +215,7 @@ PCB_PIN_LOOP(element); { if (strcmp(pin->Number, pname) == 0) { - pcb_hidcore_crosshair_move_to(ltf_hidlib, pin->X, pin->Y, 0); + rnd_hidcore_crosshair_move_to(ltf_hidlib, pin->X, pin->Y, 0); free(ename); return; } Index: trunk/src_plugins/hid_lesstif/wt_preview.c =================================================================== --- trunk/src_plugins/hid_lesstif/wt_preview.c (revision 31000) +++ trunk/src_plugins/hid_lesstif/wt_preview.c (revision 31001) @@ -136,7 +136,7 @@ pd->exp_ctx.view.Y2 = pd->y2; rnd_gui->coord_per_pix = view_zoom; - pcbhl_expose_preview(&lesstif_hid, &pd->exp_ctx); + rnd_expose_preview(&lesstif_hid, &pd->exp_ctx); XCopyArea(lesstif_display, pixmap, XtWindow(pd->pw), gc, 0, 0, pd->v_width, pd->v_height, 0, 0); XtReleaseGC(pd->pw, gc); Index: trunk/src_plugins/hid_remote/remote.c =================================================================== --- trunk/src_plugins/hid_remote/remote.c (revision 31000) +++ trunk/src_plugins/hid_remote/remote.c (revision 31001) @@ -106,7 +106,7 @@ if (remote_proto_send_ready() != 0) exit(1); - pcbhl_expose_main(&remote_hid, &ctx, NULL); + rnd_expose_main(&remote_hid, &ctx, NULL); /* main loop, parser */ if (remote_proto_parse_all() != 0) Index: trunk/src_plugins/lib_gtk_common/bu_menu.c =================================================================== --- trunk/src_plugins/lib_gtk_common/bu_menu.c (revision 31000) +++ trunk/src_plugins/lib_gtk_common/bu_menu.c (revision 31001) @@ -457,7 +457,7 @@ rnd_hid_cfg_action(ghidgui->hidlib, node); /* GUI updates to reflect the result of the above action */ - pcb_hidlib_adjust_attached_objects(ghidgui->hidlib); + rnd_hidlib_adjust_attached_objects(ghidgui->hidlib); rnd_gui->invalidate_all(rnd_gui); } Index: trunk/src_plugins/lib_gtk_common/dlg_topwin.c =================================================================== --- trunk/src_plugins/lib_gtk_common/dlg_topwin.c (revision 31000) +++ trunk/src_plugins/lib_gtk_common/dlg_topwin.c (revision 31001) @@ -179,7 +179,7 @@ if (ghid_is_modifier_key_sym(ksym)) pcb_gtk_note_event_location(NULL); - pcb_hidlib_adjust_attached_objects(ghidgui->hidlib); + rnd_hidlib_adjust_attached_objects(ghidgui->hidlib); rnd_gui->invalidate_all(rnd_gui); g_idle_add(ghid_idle_cb, tw); return FALSE; Index: trunk/src_plugins/lib_gtk_common/glue_common.c =================================================================== --- trunk/src_plugins/lib_gtk_common/glue_common.c (revision 31000) +++ trunk/src_plugins/lib_gtk_common/glue_common.c (revision 31001) @@ -332,7 +332,7 @@ pcb_gtk_coords_event2pcb(&ghidgui->port.view, event_x, event_y, &ghidgui->port.view.pcb_x, &ghidgui->port.view.pcb_y); - pcb_hidcore_crosshair_move_to(ghidgui->port.view.ctx->hidlib, ghidgui->port.view.pcb_x, ghidgui->port.view.pcb_y, 1); + rnd_hidcore_crosshair_move_to(ghidgui->port.view.ctx->hidlib, ghidgui->port.view.pcb_x, ghidgui->port.view.pcb_y, 1); } /*** init ***/ Index: trunk/src_plugins/lib_gtk_common/glue_hid.c =================================================================== --- trunk/src_plugins/lib_gtk_common/glue_hid.c (revision 31000) +++ trunk/src_plugins/lib_gtk_common/glue_hid.c (revision 31001) @@ -238,7 +238,7 @@ gctx->wtop_window = window = gctx->port.top_window = gtk_window_new(GTK_WINDOW_TOPLEVEL); pcb_gtk_topwinplace(gctx->hidlib, window, "top"); - gtk_window_set_title(GTK_WINDOW(window), pcbhl_app_package); + gtk_window_set_title(GTK_WINDOW(window), rnd_app_package); gtk_widget_show_all(gctx->port.top_window); return 0; Index: trunk/src_plugins/lib_gtk_common/in_mouse.c =================================================================== --- trunk/src_plugins/lib_gtk_common/in_mouse.c (revision 31000) +++ trunk/src_plugins/lib_gtk_common/in_mouse.c (revision 31001) @@ -176,7 +176,7 @@ rnd_actionva(ctx->hidlib, "StatusSetText", message, NULL); - chst = pcb_hidlib_crosshair_suspend(ctx->hidlib); + chst = rnd_hidlib_crosshair_suspend(ctx->hidlib); ghid_hand_cursor(ctx); /* Stop the top level GMainLoop from getting user input from keyboard @@ -206,7 +206,7 @@ pcb_gtk_interface_input_signals_connect(); /* return to normal */ pcb_gtk_interface_set_sensitive(TRUE); - pcb_hidlib_crosshair_restore(ctx->hidlib, chst); + rnd_hidlib_crosshair_restore(ctx->hidlib, chst); ghid_restore_cursor(ctx); rnd_actionva(ctx->hidlib, "StatusSetText", NULL); @@ -289,7 +289,7 @@ rnd_hid_cfg_mouse_action(ctx->hidlib, &ghid_mouse, ghid_mouse_button(ev->button) | mk | RND_M_Release, ctx->topwin.cmd.command_entry_status_line_active); - pcb_hidlib_adjust_attached_objects(ctx->hidlib); + rnd_hidlib_adjust_attached_objects(ctx->hidlib); rnd_gui->invalidate_all(rnd_gui); g_idle_add(ghid_idle_cb, &ctx->topwin); Index: trunk/src_plugins/lib_gtk_common/ui_zoompan.c =================================================================== --- trunk/src_plugins/lib_gtk_common/ui_zoompan.c (revision 31000) +++ trunk/src_plugins/lib_gtk_common/ui_zoompan.c (revision 31001) @@ -195,7 +195,7 @@ if (setch) { v->pcb_x = (x1+x2)/2; v->pcb_y = (y1+y2)/2; - pcb_hidcore_crosshair_move_to(v->ctx->hidlib, v->pcb_x, v->pcb_y, 0); + rnd_hidcore_crosshair_move_to(v->ctx->hidlib, v->pcb_x, v->pcb_y, 0); } } Index: trunk/src_plugins/lib_gtk_common/wt_preview.c =================================================================== --- trunk/src_plugins/lib_gtk_common/wt_preview.c (revision 31000) +++ trunk/src_plugins/lib_gtk_common/wt_preview.c (revision 31001) @@ -235,7 +235,7 @@ rnd_conf_force_set_bool(pcbhl_conf.editor.view.flip_x, 0); rnd_conf_force_set_bool(pcbhl_conf.editor.view.flip_y, 0); - res = preview->expose(widget, ev, pcbhl_expose_preview, &preview->expose_data); + res = preview->expose(widget, ev, rnd_expose_preview, &preview->expose_data); rnd_conf_force_set_bool(pcbhl_conf.editor.view.flip_x, save_fx); rnd_conf_force_set_bool(pcbhl_conf.editor.view.flip_y, save_fy); Index: trunk/src_plugins/lib_hid_common/dlg_comm_m.c =================================================================== --- trunk/src_plugins/lib_hid_common/dlg_comm_m.c (revision 31000) +++ trunk/src_plugins/lib_hid_common/dlg_comm_m.c (revision 31001) @@ -68,7 +68,7 @@ RND_DAD_END(dlg); if (title == NULL) { - title = pcb_concat(pcbhl_app_package, " user input", NULL); + title = pcb_concat(rnd_app_package, " user input", NULL); ft = 1; } RND_DAD_NEW("prompt_for", dlg, title, NULL, pcb_true, NULL); Index: trunk/src_plugins/lib_hid_common/dlg_log.c =================================================================== --- trunk/src_plugins/lib_hid_common/dlg_log.c (revision 31000) +++ trunk/src_plugins/lib_hid_common/dlg_log.c (revision 31001) @@ -168,7 +168,7 @@ ctx->active = 1; ctx->last_added = -1; RND_DAD_DEFSIZE(ctx->dlg, 200, 300); - title = pcb_concat(pcbhl_app_package, " message log", NULL); + title = pcb_concat(rnd_app_package, " message log", NULL); RND_DAD_NEW("log", ctx->dlg, title, ctx, pcb_false, log_close_cb); free(title); Index: trunk/src_plugins/script/perma.c =================================================================== --- trunk/src_plugins/script/perma.c (revision 31000) +++ trunk/src_plugins/script/perma.c (revision 31001) @@ -121,6 +121,6 @@ static void perma_script_init(void) { - perma_script_load_conf(pcbhl_conf_userdir_path); - perma_script_load_conf(pcbhl_conf_sysdir_path); + perma_script_load_conf(rnd_conf_userdir_path); + perma_script_load_conf(rnd_conf_sysdir_path); } Index: trunk/tests/conf/conftest.c =================================================================== --- trunk/tests/conf/conftest.c (revision 31000) +++ trunk/tests/conf/conftest.c (revision 31001) @@ -15,15 +15,15 @@ rnd_conf_hid_id_t hid_id; const char *hid_cookie = "conftest cookie"; rnd_hid_t *rnd_gui = NULL; -const char *pcb_hidlib_default_embedded_menu = ""; -const char *pcbhl_menu_file_paths[] = { "./", "~/.pcb-rnd/", PCBSHAREDIR "/", NULL }; -const char *pcbhl_menu_name_fmt = "pcb-menu-%s.lht"; +const char *rnd_hidlib_default_embedded_menu = ""; +const char *rnd_menu_file_paths[] = { "./", "~/.pcb-rnd/", PCBSHAREDIR "/", NULL }; +const char *rnd_menu_name_fmt = "pcb-menu-%s.lht"; #define CONF_USER_DIR "~/" DOT_PCB_RND -const char *pcbhl_conf_userdir_path = CONF_USER_DIR; -const char *pcphl_conf_user_path = CONF_USER_DIR "/pcb-conf.lht"; -const char *pcbhl_conf_sysdir_path = PCBSHAREDIR; -const char *pcbhl_conf_sys_path = PCBSHAREDIR "/pcb-conf.lht"; +const char *rnd_conf_userdir_path = CONF_USER_DIR; +const char *rnd_pcphl_conf_user_path = CONF_USER_DIR "/pcb-conf.lht"; +const char *rnd_conf_sysdir_path = PCBSHAREDIR; +const char *rnd_conf_sys_path = PCBSHAREDIR "/pcb-conf.lht"; void pcbhl_conf_postproc(void) { Index: trunk/tests/librnd/glue.c =================================================================== --- trunk/tests/librnd/glue.c (revision 31000) +++ trunk/tests/librnd/glue.c (revision 31001) @@ -1,20 +1,20 @@ /*** hidlib glue ***/ -const char *pcb_hidlib_default_embedded_menu = ""; +const char *rnd_hidlib_default_embedded_menu = ""; const char *pcb_conf_internal = ""; -const char *pcbhl_menu_file_paths[] = { "./", NULL }; -const char *pcbhl_menu_name_fmt = "menu.lht"; +const char *rnd_menu_file_paths[] = { "./", NULL }; +const char *rnd_menu_name_fmt = "menu.lht"; -const char *pcbhl_conf_userdir_path = "./"; -const char *pcphl_conf_user_path = "./conf.lht"; +const char *rnd_conf_userdir_path = "./"; +const char *rnd_pcphl_conf_user_path = "./conf.lht"; /* hack for running from ./ without internal version of the conf */ -const char *pcbhl_conf_sysdir_path = "./"; -const char *pcbhl_conf_sys_path = "./conf.lht"; +const char *rnd_conf_sysdir_path = "./"; +const char *rnd_conf_sys_path = "./conf.lht"; -const char *pcbhl_app_package = "librnd_test"; -const char *pcbhl_app_version = "0.0.0"; -const char *pcbhl_app_url = "n/a"; +const char *rnd_app_package = "librnd_test"; +const char *rnd_app_version = "0.0.0"; +const char *rnd_app_url = "n/a"; typedef struct design_s { @@ -36,35 +36,35 @@ rnd_conf_reg_field_(NULL, 1, RND_CFN_COORD, "should_never_match", "dummy", 0); } -void pcb_hidlib_adjust_attached_objects(rnd_hidlib_t *hl) +void rnd_hidlib_adjust_attached_objects(rnd_hidlib_t *hl) { } -void *pcb_hidlib_crosshair_suspend(rnd_hidlib_t *hl) +void *rnd_hidlib_crosshair_suspend(rnd_hidlib_t *hl) { return NULL; } -void pcb_hidlib_crosshair_restore(rnd_hidlib_t *hl, void *susp_data) +void rnd_hidlib_crosshair_restore(rnd_hidlib_t *hl, void *susp_data) { } -void pcb_hidlib_crosshair_move_to(rnd_hidlib_t *hl, rnd_coord_t abs_x, rnd_coord_t abs_y, int mouse_mot) +void rnd_hidlib_crosshair_move_to(rnd_hidlib_t *hl, rnd_coord_t abs_x, rnd_coord_t abs_y, int mouse_mot) { } -void pcbhl_draw_marks(rnd_hidlib_t *hidlib, rnd_bool inhibit_drawing_mode) +void rnd_draw_marks(rnd_hidlib_t *hidlib, rnd_bool inhibit_drawing_mode) { } -void pcbhl_draw_attached(rnd_hidlib_t *hidlib, rnd_bool inhibit_drawing_mode) +void rnd_draw_attached(rnd_hidlib_t *hidlib, rnd_bool inhibit_drawing_mode) { } -void pcbhl_expose_main(rnd_hid_t *hid, const rnd_hid_expose_ctx_t *region, rnd_xform_t *xform_caller) +void rnd_expose_main(rnd_hid_t *hid, const rnd_hid_expose_ctx_t *region, rnd_xform_t *xform_caller) { } -void pcbhl_expose_preview(rnd_hid_t *hid, const rnd_hid_expose_ctx_t *e) +void rnd_expose_preview(rnd_hid_t *hid, const rnd_hid_expose_ctx_t *e) { } Index: trunk/util/gsch2pcb-rnd/glue.c =================================================================== --- trunk/util/gsch2pcb-rnd/glue.c (revision 31000) +++ trunk/util/gsch2pcb-rnd/glue.c (revision 31001) @@ -30,11 +30,11 @@ /* glue for pcb-rnd core */ -const char *pcbhl_menu_file_paths[4]; -const char *pcbhl_menu_name_fmt = "pcb-menu-%s.lht"; +const char *rnd_menu_file_paths[4]; +const char *rnd_menu_name_fmt = "pcb-menu-%s.lht"; -const char *pcb_hidlib_default_embedded_menu = ""; +const char *rnd_hidlib_default_embedded_menu = ""; -void pcb_hidlib_crosshair_move_to(rnd_hidlib_t *hl, rnd_coord_t abs_x, rnd_coord_t abs_y, int mouse_mot) { } +void rnd_hidlib_crosshair_move_to(rnd_hidlib_t *hl, rnd_coord_t abs_x, rnd_coord_t abs_y, int mouse_mot) { } Index: trunk/util/gsch2pcb-rnd/gsch2pcb.c =================================================================== --- trunk/util/gsch2pcb-rnd/gsch2pcb.c (revision 31000) +++ trunk/util/gsch2pcb-rnd/gsch2pcb.c (revision 31001) @@ -56,10 +56,10 @@ static const char *want_method_default = "import"; #define CONF_USER_DIR "~/" DOT_PCB_RND -const char *pcbhl_conf_userdir_path; -const char *pcphl_conf_user_path; -const char *pcbhl_conf_sysdir_path; -const char *pcbhl_conf_sys_path; +const char *rnd_conf_userdir_path; +const char *rnd_pcphl_conf_user_path; +const char *rnd_conf_sysdir_path; +const char *rnd_conf_sys_path; gdl_list_t pcb_element_list; /* initialized to 0 */ gadl_list_t schematics, extra_gnetlist_arg_list, extra_gnetlist_list; @@ -389,14 +389,14 @@ method_import_register(); - pcbhl_conf_userdir_path = CONF_USER_DIR; - pcphl_conf_user_path = pcb_concat(CONF_USER_DIR, "/pcb-conf.lht", NULL); - pcbhl_conf_sysdir_path = PCBCONFDIR; - pcbhl_conf_sys_path = pcb_concat(PCBCONFDIR, "/pcb-conf.lht", NULL); - pcbhl_menu_file_paths[0] = "./"; - pcbhl_menu_file_paths[1] = "~/.pcb-rnd/"; - pcbhl_menu_file_paths[2] = pcb_concat(PCBCONFDIR, "/", NULL); - pcbhl_menu_file_paths[3] = NULL; + rnd_conf_userdir_path = CONF_USER_DIR; + rnd_pcphl_conf_user_path = pcb_concat(CONF_USER_DIR, "/pcb-conf.lht", NULL); + rnd_conf_sysdir_path = PCBCONFDIR; + rnd_conf_sys_path = pcb_concat(PCBCONFDIR, "/pcb-conf.lht", NULL); + rnd_menu_file_paths[0] = "./"; + rnd_menu_file_paths[1] = "~/.pcb-rnd/"; + rnd_menu_file_paths[2] = pcb_concat(PCBCONFDIR, "/", NULL); + rnd_menu_file_paths[3] = NULL; rnd_file_loaded_init(); rnd_conf_init();