Index: trunk/src/librnd/core/hid.h
===================================================================
--- trunk/src/librnd/core/hid.h	(revision 30989)
+++ trunk/src/librnd/core/hid.h	(revision 30990)
@@ -509,7 +509,7 @@
 	/* run redraw-benchmark and return an FPS value (optional) */
 	double (*benchmark)(rnd_hid_t *hid);
 
-	/* (pcb_hid_cfg_keys_t *): key state */
+	/* (rnd_hid_cfg_keys_t *): key state */
 	void *key_state;
 
 	/*** zoom/pan calls ***/
Index: trunk/src/librnd/core/hid_cfg_input.c
===================================================================
--- trunk/src/librnd/core/hid_cfg_input.c	(revision 30989)
+++ trunk/src/librnd/core/hid_cfg_input.c	(revision 30990)
@@ -43,9 +43,9 @@
 
 /* split value into a list of '-' separated words; examine each word
    and set the bitmask of modifiers */
-static pcb_hid_cfg_mod_t parse_mods(const char *value, const char **last, unsigned int vlen)
+static rnd_hid_cfg_mod_t parse_mods(const char *value, const char **last, unsigned int vlen)
 {
-	pcb_hid_cfg_mod_t m = 0;
+	rnd_hid_cfg_mod_t m = 0;
 	int press = 0;
 	const char *next;
 
@@ -53,10 +53,10 @@
 
 	if (*value != '<') {
 	for(;;) {
-		if ((vlen >= 5) && (rnd_strncasecmp(value, "shift", 5) == 0))        m |= PCB_M_Shift;
-		else if ((vlen >= 4) && (rnd_strncasecmp(value, "ctrl", 4) == 0))    m |= PCB_M_Ctrl;
-		else if ((vlen >= 3) && (rnd_strncasecmp(value, "alt", 3) == 0))     m |= PCB_M_Alt;
-		else if ((vlen >= 7) && (rnd_strncasecmp(value, "release", 7) == 0)) m |= PCB_M_Release;
+		if ((vlen >= 5) && (rnd_strncasecmp(value, "shift", 5) == 0))        m |= RND_M_Shift;
+		else if ((vlen >= 4) && (rnd_strncasecmp(value, "ctrl", 4) == 0))    m |= RND_M_Ctrl;
+		else if ((vlen >= 3) && (rnd_strncasecmp(value, "alt", 3) == 0))     m |= RND_M_Alt;
+		else if ((vlen >= 7) && (rnd_strncasecmp(value, "release", 7) == 0)) m |= RND_M_Release;
 		else if ((vlen >= 5) && (rnd_strncasecmp(value, "press", 5) == 0))   press = 1;
 		else
 			rnd_message(RND_MSG_ERROR, "Unknown modifier: %s\n", value);
@@ -74,26 +74,26 @@
 	if (last != NULL)
 		*last = value;
 
-	if (press && (m & PCB_M_Release))
+	if (press && (m & RND_M_Release))
 		rnd_message(RND_MSG_ERROR, "Bogus modifier: both press and release\n");
 
 	return m;
 }
 
-static pcb_hid_cfg_mod_t button_name2mask(const char *name)
+static rnd_hid_cfg_mod_t button_name2mask(const char *name)
 {
 	/* All mouse-related resources must be named.  The name is the
 	   mouse button number.  */
 	if (!name)
 		return 0;
-	else if (rnd_strcasecmp(name, "left") == 0)   return PCB_MB_LEFT;
-	else if (rnd_strcasecmp(name, "middle") == 0) return PCB_MB_MIDDLE;
-	else if (rnd_strcasecmp(name, "right") == 0)  return PCB_MB_RIGHT;
+	else if (rnd_strcasecmp(name, "left") == 0)   return RND_MB_LEFT;
+	else if (rnd_strcasecmp(name, "middle") == 0) return RND_MB_MIDDLE;
+	else if (rnd_strcasecmp(name, "right") == 0)  return RND_MB_RIGHT;
 
-	else if (rnd_strcasecmp(name, "scroll-up") == 0)     return PCB_MB_SCROLL_UP;
-	else if (rnd_strcasecmp(name, "scroll-down") == 0)   return PCB_MB_SCROLL_DOWN;
-	else if (rnd_strcasecmp(name, "scroll-left") == 0)   return PCB_MB_SCROLL_UP;
-	else if (rnd_strcasecmp(name, "scroll-right") == 0)  return PCB_MB_SCROLL_DOWN;
+	else if (rnd_strcasecmp(name, "scroll-up") == 0)     return RND_MB_SCROLL_UP;
+	else if (rnd_strcasecmp(name, "scroll-down") == 0)   return RND_MB_SCROLL_DOWN;
+	else if (rnd_strcasecmp(name, "scroll-left") == 0)   return RND_MB_SCROLL_UP;
+	else if (rnd_strcasecmp(name, "scroll-right") == 0)  return RND_MB_SCROLL_DOWN;
 	else {
 		rnd_message(RND_MSG_ERROR, "Error: unknown mouse button: %s\n", name);
 		return 0;
@@ -104,7 +104,7 @@
 
 static unsigned int keyb_hash(const void *key_)
 {
-	const hid_cfg_keyhash_t *key = key_;
+	const rnd_hid_cfg_keyhash_t *key = key_;
 	unsigned int i = 0;
 	i += key->key_raw; i <<= 8;
 	i += ((unsigned int)key->key_tr) << 4;
@@ -114,13 +114,13 @@
 
 static int keyb_eq(const void *keya_, const void *keyb_)
 {
-	const hid_cfg_keyhash_t *keya = keya_, *keyb = keyb_;
+	const rnd_hid_cfg_keyhash_t *keya = keya_, *keyb = keyb_;
 	return (keya->key_raw == keyb->key_raw) && (keya->key_tr == keyb->key_tr) && (keya->mods == keyb->mods);
 }
 
 /************************** MOUSE ***************************/
 
-int hid_cfg_mouse_init(rnd_hid_cfg_t *hr, pcb_hid_cfg_mouse_t *mouse)
+int rnd_hid_cfg_mouse_init(rnd_hid_cfg_t *hr, rnd_hid_cfg_mouse_t *mouse)
 {
 	lht_node_t *btn, *m;
 
@@ -142,7 +142,7 @@
 		htip_clear(mouse->mouse_mask);
 
 	for(btn = mouse->mouse->data.list.first; btn != NULL; btn = btn->next) {
-		pcb_hid_cfg_mod_t btn_mask = button_name2mask(btn->name);
+		rnd_hid_cfg_mod_t btn_mask = button_name2mask(btn->name);
 		if (btn_mask == 0) {
 			rnd_hid_cfg_error(btn, "unknown mouse button");
 			continue;
@@ -152,7 +152,7 @@
 			continue;
 		}
 		for(m = btn->data.list.first; m != NULL; m = m->next) {
-			pcb_hid_cfg_mod_t mod_mask = parse_mods(m->name, NULL, -1);
+			rnd_hid_cfg_mod_t mod_mask = parse_mods(m->name, NULL, -1);
 			htip_set(mouse->mouse_mask, btn_mask|mod_mask, m);
 		}
 	}
@@ -159,7 +159,7 @@
 	return 0;
 }
 
-static lht_node_t *find_best_action(pcb_hid_cfg_mouse_t *mouse, pcb_hid_cfg_mod_t button_and_mask)
+static lht_node_t *find_best_action(rnd_hid_cfg_mouse_t *mouse, rnd_hid_cfg_mod_t button_and_mask)
 {
 	lht_node_t *n;
 
@@ -171,9 +171,9 @@
 	if (n != NULL)
 		return n;
 
-	if (button_and_mask & PCB_M_Release) {
+	if (button_and_mask & RND_M_Release) {
 		/* look for plain release for the given button */
-		n = htip_get(mouse->mouse_mask, (button_and_mask & PCB_M_ANY) | PCB_M_Release);
+		n = htip_get(mouse->mouse_mask, (button_and_mask & RND_M_ANY) | RND_M_Release);
 		if (n != NULL)
 			return n;
 	}
@@ -181,7 +181,7 @@
 	return NULL;
 }
 
-void hid_cfg_mouse_action(rnd_hidlib_t *hl, pcb_hid_cfg_mouse_t *mouse, pcb_hid_cfg_mod_t button_and_mask, rnd_bool cmd_entry_active)
+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)
 {
 	pcbhl_conf.temp.click_cmd_entry_active = cmd_entry_active;
 	rnd_hid_cfg_action(hl, find_best_action(mouse, button_and_mask));
@@ -191,13 +191,13 @@
 
 
 /************************** KEYBOARD ***************************/
-int pcb_hid_cfg_keys_init(pcb_hid_cfg_keys_t *km)
+int rnd_hid_cfg_keys_init(rnd_hid_cfg_keys_t *km)
 {
 	htpp_init(&km->keys, keyb_hash, keyb_eq);
 	return 0;
 }
 
-int pcb_hid_cfg_keys_uninit(pcb_hid_cfg_keys_t *km)
+int rnd_hid_cfg_keys_uninit(rnd_hid_cfg_keys_t *km)
 {
 TODO(": recursive free of nodes")
 	htpp_uninit(&km->keys);
@@ -204,10 +204,10 @@
 	return 0;
 }
 
-pcb_hid_cfg_keyseq_t *pcb_hid_cfg_keys_add_under(pcb_hid_cfg_keys_t *km, pcb_hid_cfg_keyseq_t *parent, pcb_hid_cfg_mod_t mods, unsigned short int key_raw, unsigned short int key_tr, int terminal, const char **errmsg)
+rnd_hid_cfg_keyseq_t *rnd_hid_cfg_keys_add_under(rnd_hid_cfg_keys_t *km, rnd_hid_cfg_keyseq_t *parent, rnd_hid_cfg_mod_t mods, unsigned short int key_raw, unsigned short int key_tr, int terminal, const char **errmsg)
 {
-	pcb_hid_cfg_keyseq_t *ns;
-	hid_cfg_keyhash_t addr;
+	rnd_hid_cfg_keyseq_t *ns;
+	rnd_hid_cfg_keyhash_t addr;
 	htpp_t *phash = (parent == NULL) ? &km->keys : &parent->seq_next;
 
 	/* do not grow the tree under actions */
@@ -233,7 +233,7 @@
 	}
 
 	/* new node on this level */
-	ns = calloc(sizeof(pcb_hid_cfg_keyseq_t), 1);
+	ns = calloc(sizeof(rnd_hid_cfg_keyseq_t), 1);
 	if (!terminal)
 		htpp_init(&ns->seq_next, keyb_hash, keyb_eq);
 
@@ -245,12 +245,12 @@
 	return ns;
 }
 
-const pcb_hid_cfg_keytrans_t hid_cfg_key_default_trans[] = {
+const rnd_hid_cfg_keytrans_t rnd_hid_cfg_key_default_trans[] = {
 	{ "semicolon", ';'  },
 	{ NULL,        0    },
 };
 
-static unsigned short int translate_key(pcb_hid_cfg_keys_t *km, const char *desc, int len)
+static unsigned short int translate_key(rnd_hid_cfg_keys_t *km, const char *desc, int len)
 {
 	char tmp[256];
 
@@ -265,7 +265,7 @@
 	tmp[len] = '\0';
 
 	if (km->auto_tr != NULL) {
-		const pcb_hid_cfg_keytrans_t *t;
+		const rnd_hid_cfg_keytrans_t *t;
 		for(t = km->auto_tr; t->name != NULL; t++) {
 			if (rnd_strcasecmp(tmp, t->name) == 0) {
 				tmp[0] = t->sym;
@@ -279,7 +279,7 @@
 	return km->translate_key(tmp, len);
 }
 
-static int parse_keydesc(pcb_hid_cfg_keys_t *km, const char *keydesc, pcb_hid_cfg_mod_t *mods, unsigned short int *key_raws, unsigned short int *key_trs, int arr_len, const lht_node_t *loc)
+static int parse_keydesc(rnd_hid_cfg_keys_t *km, const char *keydesc, rnd_hid_cfg_mod_t *mods, unsigned short int *key_raws, unsigned short int *key_trs, int arr_len, const lht_node_t *loc)
 {
 	const char *curr, *next, *last, *k;
 	int slen, len;
@@ -344,16 +344,16 @@
 	return slen;
 }
 
-int pcb_hid_cfg_keys_add_by_strdesc_(pcb_hid_cfg_keys_t *km, const char *keydesc, const lht_node_t *action_node, pcb_hid_cfg_keyseq_t **out_seq, int out_seq_len)
+int rnd_hid_cfg_keys_add_by_strdesc_(rnd_hid_cfg_keys_t *km, const char *keydesc, const lht_node_t *action_node, rnd_hid_cfg_keyseq_t **out_seq, int out_seq_len)
 {
-	pcb_hid_cfg_mod_t mods[HIDCFG_MAX_KEYSEQ_LEN];
-	unsigned short int key_raws[HIDCFG_MAX_KEYSEQ_LEN];
-	unsigned short int key_trs[HIDCFG_MAX_KEYSEQ_LEN];
-	pcb_hid_cfg_keyseq_t *lasts;
+	rnd_hid_cfg_mod_t mods[RND_HIDCFG_MAX_KEYSEQ_LEN];
+	unsigned short int key_raws[RND_HIDCFG_MAX_KEYSEQ_LEN];
+	unsigned short int key_trs[RND_HIDCFG_MAX_KEYSEQ_LEN];
+	rnd_hid_cfg_keyseq_t *lasts;
 	int slen, n;
 	const char *errmsg;
 
-	slen = parse_keydesc(km, keydesc, mods, key_raws, key_trs, HIDCFG_MAX_KEYSEQ_LEN, action_node);
+	slen = parse_keydesc(km, keydesc, mods, key_raws, key_trs, RND_HIDCFG_MAX_KEYSEQ_LEN, action_node);
 	if (slen <= 0)
 		return slen;
 
@@ -364,12 +364,12 @@
 
 	lasts = NULL;
 	for(n = 0; n < slen; n++) {
-		pcb_hid_cfg_keyseq_t *s;
+		rnd_hid_cfg_keyseq_t *s;
 		int terminal = (n == slen-1);
 
 /*		printf(" mods=%x sym=%x\n", mods[n], key_chars[n]);*/
 
-		s = pcb_hid_cfg_keys_add_under(km, lasts, mods[n], key_raws[n], key_trs[n], terminal, &errmsg);
+		s = rnd_hid_cfg_keys_add_under(km, lasts, mods[n], key_raws[n], key_trs[n], terminal, &errmsg);
 		if (s == NULL) {
 			rnd_message(RND_MSG_ERROR, "Failed to add hotkey binding: %s: %s\n", keydesc, errmsg);
 TODO(": free stuff?")
@@ -386,15 +386,15 @@
 	return slen;
 }
 
-int pcb_hid_cfg_keys_add_by_strdesc(pcb_hid_cfg_keys_t *km, const char *keydesc, const lht_node_t *action_node)
+int rnd_hid_cfg_keys_add_by_strdesc(rnd_hid_cfg_keys_t *km, const char *keydesc, const lht_node_t *action_node)
 {
-	return pcb_hid_cfg_keys_add_by_strdesc_(km, keydesc, action_node, NULL, 0);
+	return rnd_hid_cfg_keys_add_by_strdesc_(km, keydesc, action_node, NULL, 0);
 }
 
-int pcb_hid_cfg_keys_add_by_desc_(pcb_hid_cfg_keys_t *km, const lht_node_t *keydescn, const lht_node_t *action_node, pcb_hid_cfg_keyseq_t **out_seq, int out_seq_len)
+int rnd_hid_cfg_keys_add_by_desc_(rnd_hid_cfg_keys_t *km, const lht_node_t *keydescn, const lht_node_t *action_node, rnd_hid_cfg_keyseq_t **out_seq, int out_seq_len)
 {
 	switch(keydescn->type) {
-		case LHT_TEXT: return pcb_hid_cfg_keys_add_by_strdesc_(km, keydescn->data.text.value, action_node, out_seq, out_seq_len);
+		case LHT_TEXT: return rnd_hid_cfg_keys_add_by_strdesc_(km, keydescn->data.text.value, action_node, out_seq, out_seq_len);
 		case LHT_LIST:
 		{
 			int ret = -1, cnt;
@@ -403,9 +403,9 @@
 				if (n->type != LHT_TEXT)
 					break;
 				if (cnt == 0)
-					ret = pcb_hid_cfg_keys_add_by_strdesc_(km, n->data.text.value, action_node, out_seq, out_seq_len);
+					ret = rnd_hid_cfg_keys_add_by_strdesc_(km, n->data.text.value, action_node, out_seq, out_seq_len);
 				else
-					pcb_hid_cfg_keys_add_by_strdesc_(km, n->data.text.value, action_node, NULL, 0);
+					rnd_hid_cfg_keys_add_by_strdesc_(km, n->data.text.value, action_node, NULL, 0);
 			}
 			return ret;
 		}
@@ -414,22 +414,22 @@
 	return -1;
 }
 
-int pcb_hid_cfg_keys_add_by_desc(pcb_hid_cfg_keys_t *km, const lht_node_t *keydescn, const lht_node_t *action_node)
+int rnd_hid_cfg_keys_add_by_desc(rnd_hid_cfg_keys_t *km, const lht_node_t *keydescn, const lht_node_t *action_node)
 {
-	return pcb_hid_cfg_keys_add_by_desc_(km, keydescn, action_node, NULL, 0);
+	return rnd_hid_cfg_keys_add_by_desc_(km, keydescn, action_node, NULL, 0);
 }
 
-int pcb_hid_cfg_keys_del_by_strdesc(pcb_hid_cfg_keys_t *km, const char *keydesc)
+int pcb_hid_cfg_keys_del_by_strdesc(rnd_hid_cfg_keys_t *km, const char *keydesc)
 {
-	pcb_hid_cfg_mod_t mods[HIDCFG_MAX_KEYSEQ_LEN];
-	unsigned short int key_raws[HIDCFG_MAX_KEYSEQ_LEN];
-	unsigned short int key_trs[HIDCFG_MAX_KEYSEQ_LEN];
+	rnd_hid_cfg_mod_t mods[RND_HIDCFG_MAX_KEYSEQ_LEN];
+	unsigned short int key_raws[RND_HIDCFG_MAX_KEYSEQ_LEN];
+	unsigned short int key_trs[RND_HIDCFG_MAX_KEYSEQ_LEN];
 	int slen, n;
 	htpp_t *phash = &km->keys;
-	pcb_hid_cfg_keyseq_t *ns;
-	hid_cfg_keyhash_t addr;
+	rnd_hid_cfg_keyseq_t *ns;
+	rnd_hid_cfg_keyhash_t addr;
 
-	slen = parse_keydesc(km, keydesc, mods, key_raws, key_trs, HIDCFG_MAX_KEYSEQ_LEN, NULL);
+	slen = parse_keydesc(km, keydesc, mods, key_raws, key_trs, RND_HIDCFG_MAX_KEYSEQ_LEN, NULL);
 	if (slen <= 0)
 		return slen;
 
@@ -453,7 +453,7 @@
 	return 0;
 }
 
-int pcb_hid_cfg_keys_del_by_desc(pcb_hid_cfg_keys_t *km, const lht_node_t *keydescn)
+int rnd_hid_cfg_keys_del_by_desc(rnd_hid_cfg_keys_t *km, const lht_node_t *keydescn)
 {
 	switch(keydescn->type) {
 		case LHT_TEXT: return pcb_hid_cfg_keys_del_by_strdesc(km, keydescn->data.text.value);
@@ -474,14 +474,14 @@
 }
 
 
-static void gen_accel(gds_t *s, pcb_hid_cfg_keys_t *km, const char *keydesc, int *cnt, const char *sep, const lht_node_t *loc)
+static void gen_accel(gds_t *s, rnd_hid_cfg_keys_t *km, const char *keydesc, int *cnt, const char *sep, const lht_node_t *loc)
 {
-	pcb_hid_cfg_mod_t mods[HIDCFG_MAX_KEYSEQ_LEN];
-	unsigned short int key_raws[HIDCFG_MAX_KEYSEQ_LEN];
-	unsigned short int key_trs[HIDCFG_MAX_KEYSEQ_LEN];
+	rnd_hid_cfg_mod_t mods[RND_HIDCFG_MAX_KEYSEQ_LEN];
+	unsigned short int key_raws[RND_HIDCFG_MAX_KEYSEQ_LEN];
+	unsigned short int key_trs[RND_HIDCFG_MAX_KEYSEQ_LEN];
 	int slen, n;
 
-	slen = parse_keydesc(km, keydesc, mods, key_raws, key_trs, HIDCFG_MAX_KEYSEQ_LEN, loc);
+	slen = parse_keydesc(km, keydesc, mods, key_raws, key_trs, RND_HIDCFG_MAX_KEYSEQ_LEN, loc);
 	if (slen <= 0)
 		return;
 
@@ -506,14 +506,14 @@
 		else
 			strcpy(buff, "<empty?>");
 
-		if (mods[n] & PCB_M_Alt)   gds_append_str(s, "Alt-");
-		if (mods[n] & PCB_M_Ctrl)  gds_append_str(s, "Ctrl-");
-		if (mods[n] & PCB_M_Shift) gds_append_str(s, "Shift-");
+		if (mods[n] & RND_M_Alt)   gds_append_str(s, "Alt-");
+		if (mods[n] & RND_M_Ctrl)  gds_append_str(s, "Ctrl-");
+		if (mods[n] & RND_M_Shift) gds_append_str(s, "Shift-");
 		gds_append_str(s, buff);
 	}
 }
 
-char *pcb_hid_cfg_keys_gen_accel(pcb_hid_cfg_keys_t *km, const lht_node_t *keydescn, unsigned long mask, const char *sep)
+char *rnd_hid_cfg_keys_gen_accel(rnd_hid_cfg_keys_t *km, const lht_node_t *keydescn, unsigned long mask, const char *sep)
 {
 	gds_t s;
 	int cnt = 0;
@@ -543,10 +543,10 @@
 }
 
 
-int pcb_hid_cfg_keys_input_(pcb_hid_cfg_keys_t *km, pcb_hid_cfg_mod_t mods, unsigned short int key_raw, unsigned short int key_tr, pcb_hid_cfg_keyseq_t **seq, int *seq_len)
+int rnd_hid_cfg_keys_input_(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)
 {
-	pcb_hid_cfg_keyseq_t *ns;
-	hid_cfg_keyhash_t addr;
+	rnd_hid_cfg_keyseq_t *ns;
+	rnd_hid_cfg_keyhash_t addr;
 	htpp_t *phash = (*seq_len == 0) ? &km->keys : &((seq[(*seq_len)-1])->seq_next);
 
 	if (key_raw == 0) {
@@ -560,7 +560,7 @@
 		if (isalpha(key_tr)) {
 			if (isupper(key_tr)) {
 				key_raw = tolower(key_tr);
-				mods |= PCB_M_Shift;
+				mods |= RND_M_Shift;
 			}
 			else
 				key_raw = key_tr;
@@ -579,7 +579,7 @@
 
 	/* if not found, try with translated key + limited mods */
 	if (ns == NULL) {
-		addr.mods = mods & PCB_M_Ctrl;
+		addr.mods = mods & RND_M_Ctrl;
 		addr.key_raw = 0;
 		addr.key_tr = key_tr;
 		ns = htpp_get(phash, &addr);
@@ -606,12 +606,12 @@
 	return 0;
 }
 
-int pcb_hid_cfg_keys_input(pcb_hid_cfg_keys_t *km, pcb_hid_cfg_mod_t mods, unsigned short int key_raw, unsigned short int key_tr)
+int rnd_hid_cfg_keys_input(rnd_hid_cfg_keys_t *km, rnd_hid_cfg_mod_t mods, unsigned short int key_raw, unsigned short int key_tr)
 {
-	return pcb_hid_cfg_keys_input_(km, mods, key_raw, key_tr, km->seq, &km->seq_len);
+	return rnd_hid_cfg_keys_input_(km, mods, key_raw, key_tr, km->seq, &km->seq_len);
 }
 
-int pcb_hid_cfg_keys_action_(rnd_hidlib_t *hl, pcb_hid_cfg_keyseq_t **seq, int seq_len)
+int rnd_hid_cfg_keys_action_(rnd_hidlib_t *hl, rnd_hid_cfg_keyseq_t **seq, int seq_len)
 {
 	int res;
 
@@ -623,14 +623,14 @@
 	return res;
 }
 
-int pcb_hid_cfg_keys_action(rnd_hidlib_t *hl, pcb_hid_cfg_keys_t *km)
+int rnd_hid_cfg_keys_action(rnd_hidlib_t *hl, rnd_hid_cfg_keys_t *km)
 {
-	int ret = pcb_hid_cfg_keys_action_(hl, km->seq, km->seq_len_action);
+	int ret = rnd_hid_cfg_keys_action_(hl, km->seq, km->seq_len_action);
 	km->seq_len_action = 0;
 	return ret;
 }
 
-int pcb_hid_cfg_keys_seq_(pcb_hid_cfg_keys_t *km, pcb_hid_cfg_keyseq_t **seq, int seq_len, char *dst, int dst_len)
+int rnd_hid_cfg_keys_seq_(rnd_hid_cfg_keys_t *km, rnd_hid_cfg_keyseq_t **seq, int seq_len, char *dst, int dst_len)
 {
 	int n, sum = 0;
 	char *end = dst;
@@ -646,9 +646,9 @@
 			ll = 1;
 		}
 
-		if (mods & PCB_M_Alt)   { strncpy(end, "Alt-", dst_len); end += 4; ll += 4; }
-		if (mods & PCB_M_Ctrl)  { strncpy(end, "Ctrl-", dst_len); end += 5; ll += 5; }
-		if (mods & PCB_M_Shift) { strncpy(end, "Shift-", dst_len); end += 6; ll += 6; }
+		if (mods & RND_M_Alt)   { strncpy(end, "Alt-", dst_len); end += 4; ll += 4; }
+		if (mods & RND_M_Ctrl)  { strncpy(end, "Ctrl-", dst_len); end += 5; ll += 5; }
+		if (mods & RND_M_Shift) { strncpy(end, "Shift-", dst_len); end += 6; ll += 6; }
 
 		if (k == 0)
 			k = seq[n]->addr.key_tr;
@@ -679,10 +679,10 @@
 	return sum;
 }
 
-int pcb_hid_cfg_keys_seq(pcb_hid_cfg_keys_t *km, char *dst, int dst_len)
+int rnd_hid_cfg_keys_seq(rnd_hid_cfg_keys_t *km, char *dst, int dst_len)
 {
 	if (km->seq_len_action > 0)
-		return pcb_hid_cfg_keys_seq_(km, km->seq, km->seq_len_action, dst, dst_len);
+		return rnd_hid_cfg_keys_seq_(km, km->seq, km->seq_len_action, dst, dst_len);
 	else
-		return pcb_hid_cfg_keys_seq_(km, km->seq, km->seq_len, dst, dst_len);
+		return rnd_hid_cfg_keys_seq_(km, km->seq, km->seq_len, dst, dst_len);
 }
Index: trunk/src/librnd/core/hid_cfg_input.h
===================================================================
--- trunk/src/librnd/core/hid_cfg_input.h	(revision 30989)
+++ trunk/src/librnd/core/hid_cfg_input.h	(revision 30990)
@@ -1,5 +1,5 @@
-#ifndef PCB_HID_CFG_INPUT_H
-#define PCB_HID_CFG_INPUT_H
+#ifndef RND_HID_CFG_INPUT_H
+#define RND_HID_CFG_INPUT_H
 
 #include <liblihata/dom.h>
 #include <genht/htip.h>
@@ -6,30 +6,30 @@
 #include <genht/htpp.h>
 #include <librnd/core/hid_cfg.h>
 
-#define PCB_M_Mod0(n)  (1u<<(n))
+#define RND_M_Mod0(n)  (1u<<(n))
 typedef enum {
-	PCB_M_Shift   = PCB_M_Mod0(0),
-	PCB_M_Ctrl    = PCB_M_Mod0(1),
-	PCB_M_Alt     = PCB_M_Mod0(2),
-	PCB_M_Mod1    = PCB_M_Alt,
-	/* PCB_M_Mod(3) is PCB_M_Mod0(4) */
-	/* PCB_M_Mod(4) is PCB_M_Mod0(5) */
-	PCB_M_Release = PCB_M_Mod0(6), /* there might be a random number of modkeys, but hopefully not this many */
+	RND_M_Shift   = RND_M_Mod0(0),
+	RND_M_Ctrl    = RND_M_Mod0(1),
+	RND_M_Alt     = RND_M_Mod0(2),
+	RND_M_Mod1    = RND_M_Alt,
+	/* RND_M_Mod(3) is RND_M_Mod0(4) */
+	/* RND_M_Mod(4) is RND_M_Mod0(5) */
+	RND_M_Release = RND_M_Mod0(6), /* there might be a random number of modkeys, but hopefully not this many */
 
-	PCB_MB_LEFT   = PCB_M_Mod0(7),
-	PCB_MB_MIDDLE = PCB_M_Mod0(8),
-	PCB_MB_RIGHT  = PCB_M_Mod0(9),
+	RND_MB_LEFT   = RND_M_Mod0(7),
+	RND_MB_MIDDLE = RND_M_Mod0(8),
+	RND_MB_RIGHT  = RND_M_Mod0(9),
 
 /* scroll wheel */
-	PCB_MB_SCROLL_UP     = PCB_M_Mod0(10),
-	PCB_MB_SCROLL_DOWN   = PCB_M_Mod0(11),
-	PCB_MB_SCROLL_LEFT   = PCB_M_Mod0(12),
-	PCB_MB_SCROLL_RIGHT  = PCB_M_Mod0(13)
-} pcb_hid_cfg_mod_t;
-#undef PCB_M_Mod0
+	RND_MB_SCROLL_UP     = RND_M_Mod0(10),
+	RND_MB_SCROLL_DOWN   = RND_M_Mod0(11),
+	RND_MB_SCROLL_LEFT   = RND_M_Mod0(12),
+	RND_MB_SCROLL_RIGHT  = RND_M_Mod0(13)
+} rnd_hid_cfg_mod_t;
+#undef RND_M_Mod0
 
-#define PCB_MB_ANY (PCB_MB_LEFT | PCB_MB_MIDDLE | PCB_MB_RIGHT | PCB_MB_SCROLL_UP | PCB_MB_SCROLL_DOWN | PCB_MB_SCROLL_LEFT | PCB_MB_SCROLL_RIGHT)
-#define PCB_M_ANY  (PCB_M_Release-1)
+#define RND_MB_ANY (RND_MB_LEFT | RND_MB_MIDDLE | RND_MB_RIGHT | RND_MB_SCROLL_UP | RND_MB_SCROLL_DOWN | RND_MB_SCROLL_LEFT | RND_MB_SCROLL_RIGHT)
+#define RND_M_ANY  (RND_M_Release-1)
 
 /************************** MOUSE ***************************/
 
@@ -36,24 +36,24 @@
 typedef struct {
 	lht_node_t *mouse;
 	htip_t *mouse_mask;
-} pcb_hid_cfg_mouse_t;
+} rnd_hid_cfg_mouse_t;
 
-int hid_cfg_mouse_init(rnd_hid_cfg_t *hr, pcb_hid_cfg_mouse_t *mouse);
-void hid_cfg_mouse_action(rnd_hidlib_t *hl, pcb_hid_cfg_mouse_t *mouse, pcb_hid_cfg_mod_t button_and_mask, rnd_bool cmd_entry_active);
+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);
 
 
 /************************** KEYBOARD ***************************/
-#define HIDCFG_MAX_KEYSEQ_LEN 32
+#define RND_HIDCFG_MAX_KEYSEQ_LEN 32
 typedef struct hid_cfg_keyhash_s {
-	unsigned short int mods;          /* of pcb_hid_cfg_mod_t */
+	unsigned short int mods;          /* of rnd_hid_cfg_mod_t */
 	unsigned short int key_raw;
 	unsigned short int key_tr;
-} hid_cfg_keyhash_t;
+} rnd_hid_cfg_keyhash_t;
 
 
-typedef struct pcb_hid_cfg_keyseq_s  pcb_hid_cfg_keyseq_t;
-struct pcb_hid_cfg_keyseq_s {
-	hid_cfg_keyhash_t addr;
+typedef struct rnd_hid_cfg_keyseq_s  rnd_hid_cfg_keyseq_t;
+struct rnd_hid_cfg_keyseq_s {
+	rnd_hid_cfg_keyhash_t addr;
 
 	unsigned long int keysym;  /* optional 32 bit long storage the GUI hid should cast to whatever the GUI backend supports */
 
@@ -60,21 +60,21 @@
 	const lht_node_t *action_node; /* terminal node: end of sequence, run actions */
 
 	htpp_t seq_next; /* ... or if node is NULL, a hash for each key that may follow the current one */
-	pcb_hid_cfg_keyseq_t *parent;
+	rnd_hid_cfg_keyseq_t *parent;
 };
 
 /* Translate symbolic name to single-char keysym before processing; useful
    for shortcuts like "Return -> '\r'" which are otherwise hard to describe
    in text format */
-typedef struct pcb_hid_cfg_keytrans_s {
+typedef struct rnd_hid_cfg_keytrans_s {
 		const char *name;
 		char sym;
-} pcb_hid_cfg_keytrans_t;
+} rnd_hid_cfg_keytrans_t;
 
-extern const pcb_hid_cfg_keytrans_t hid_cfg_key_default_trans[];
+extern const rnd_hid_cfg_keytrans_t rnd_hid_cfg_key_default_trans[];
 
 /* A complete tree of keyboard shortcuts/hotkeys */
-typedef struct pcb_hid_cfg_keys_s {
+typedef struct rnd_hid_cfg_keys_s {
 	htpp_t keys;
 
 	/* translate key sym description (the portion after <Key>) to key_char;
@@ -88,30 +88,30 @@
 
 
 	int auto_chr;                       /* if non-zero: don't call translate_key() for 1-char symbols, handle the default way */
-	const pcb_hid_cfg_keytrans_t *auto_tr;  /* apply this table before calling translate_key() */
+	const rnd_hid_cfg_keytrans_t *auto_tr;  /* apply this table before calling translate_key() */
 
 	/* current sequence state */
-	pcb_hid_cfg_keyseq_t *seq[HIDCFG_MAX_KEYSEQ_LEN];
+	rnd_hid_cfg_keyseq_t *seq[RND_HIDCFG_MAX_KEYSEQ_LEN];
 	int seq_len;
 	int seq_len_action; /* when an action node is hit, save sequence length for executing the action while seq_len is reset */
-} pcb_hid_cfg_keys_t;
+} rnd_hid_cfg_keys_t;
 
 
 /* Initialize a new keyboard context
    Returns 0 on success.
 */
-int pcb_hid_cfg_keys_init(pcb_hid_cfg_keys_t *km);
+int rnd_hid_cfg_keys_init(rnd_hid_cfg_keys_t *km);
 
 /* Free km's fields recursively */
-int pcb_hid_cfg_keys_uninit(pcb_hid_cfg_keys_t *km);
+int rnd_hid_cfg_keys_uninit(rnd_hid_cfg_keys_t *km);
 
 /* Add the next key of a key sequence; key sequences form a tree. A key starting
    a new key sequence should have parent set NULL, subsequent calls should have
    parent set to the previously returned keyseq value. Terminal is non-zero if
    this is the last key of the sequence.
-   Raw vs. translated keys are desribed at pcb_hid_cfg_keys_input().
+   Raw vs. translated keys are desribed at rnd_hid_cfg_keys_input().
    Returns NULL on error and loads errmsg if not NULL */
-pcb_hid_cfg_keyseq_t *pcb_hid_cfg_keys_add_under(pcb_hid_cfg_keys_t *km, pcb_hid_cfg_keyseq_t *parent, pcb_hid_cfg_mod_t mods, unsigned short int key_raw, unsigned short int key_tr, int terminal, const char **errmsg);
+rnd_hid_cfg_keyseq_t *rnd_hid_cfg_keys_add_under(rnd_hid_cfg_keys_t *km, rnd_hid_cfg_keyseq_t *parent, rnd_hid_cfg_mod_t mods, unsigned short int key_raw, unsigned short int key_tr, int terminal, const char **errmsg);
 
 /* Add a new key using a description (read from a lihata file usually)
    If out_seq is not NULL, load the array with pointers pointing to each
@@ -120,13 +120,13 @@
    same action). In this case return value and seq are set using the first key.
    Returns -1 on failure or the length of the sequence.
 */
-int pcb_hid_cfg_keys_add_by_desc(pcb_hid_cfg_keys_t *km, const lht_node_t *keydesc, const lht_node_t *action_node);
-int pcb_hid_cfg_keys_add_by_desc_(pcb_hid_cfg_keys_t *km, const lht_node_t *keydesc, const lht_node_t *action_node, pcb_hid_cfg_keyseq_t **out_seq, int out_seq_len);
-int pcb_hid_cfg_keys_add_by_strdesc(pcb_hid_cfg_keys_t *km, const char *keydesc, const lht_node_t *action_node);
-int pcb_hid_cfg_keys_add_by_strdesc_(pcb_hid_cfg_keys_t *km, const char *keydesc, const lht_node_t *action_node, pcb_hid_cfg_keyseq_t **out_seq, int out_seq_len);
+int rnd_hid_cfg_keys_add_by_desc(rnd_hid_cfg_keys_t *km, const lht_node_t *keydesc, const lht_node_t *action_node);
+int rnd_hid_cfg_keys_add_by_desc_(rnd_hid_cfg_keys_t *km, const lht_node_t *keydesc, const lht_node_t *action_node, rnd_hid_cfg_keyseq_t **out_seq, int out_seq_len);
+int rnd_hid_cfg_keys_add_by_strdesc(rnd_hid_cfg_keys_t *km, const char *keydesc, const lht_node_t *action_node);
+int rnd_hid_cfg_keys_add_by_strdesc_(rnd_hid_cfg_keys_t *km, const char *keydesc, const lht_node_t *action_node, rnd_hid_cfg_keyseq_t **out_seq, int out_seq_len);
 
 
-int pcb_hid_cfg_keys_del_by_desc(pcb_hid_cfg_keys_t *km, const lht_node_t *keydesc);
+int rnd_hid_cfg_keys_del_by_desc(rnd_hid_cfg_keys_t *km, const lht_node_t *keydesc);
 
 /* Allocate a new string and generate a human readable accel-text; mask determines
    which keys on the list are generated (when multiple key sequences are
@@ -133,7 +133,7 @@
    specified for the same action; from LSB to MSB, at most 32 keys)
    Caller needs to free the string; returns NULL on error.
    */
-char *pcb_hid_cfg_keys_gen_accel(pcb_hid_cfg_keys_t *km, const lht_node_t *keydescn, unsigned long mask, const char *sep);
+char *rnd_hid_cfg_keys_gen_accel(rnd_hid_cfg_keys_t *km, const lht_node_t *keydescn, unsigned long mask, const char *sep);
 
 /* Process next input key stroke.
    Seq and seq_len must not be NULL as they are the internal state of multi-key
@@ -148,16 +148,16 @@
      + a positive integer means the lookup succeeded and the return value
        is the length of the resulting sequence.
 */
-int pcb_hid_cfg_keys_input(pcb_hid_cfg_keys_t *km, pcb_hid_cfg_mod_t mods, unsigned short int key_raw, unsigned short int key_tr);
-int pcb_hid_cfg_keys_input_(pcb_hid_cfg_keys_t *km, pcb_hid_cfg_mod_t mods, unsigned short int key_raw, unsigned short int key_tr, pcb_hid_cfg_keyseq_t **seq, int *seq_len);
+int rnd_hid_cfg_keys_input(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_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 pcb_hid_cfg_keys_input().
+/* 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 pcb_hid_cfg_keys_action(rnd_hidlib_t *hl, pcb_hid_cfg_keys_t *km);
-int pcb_hid_cfg_keys_action_(rnd_hidlib_t *hl, pcb_hid_cfg_keyseq_t **seq, int seq_len);
+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);
 
 /* Print a squence into dst in human readable form; returns strlen(dst) */
-int pcb_hid_cfg_keys_seq(pcb_hid_cfg_keys_t *km, char *dst, int dst_len);
-int pcb_hid_cfg_keys_seq_(pcb_hid_cfg_keys_t *km, pcb_hid_cfg_keyseq_t **seq, int seq_len, char *dst, int dst_len);
+int rnd_hid_cfg_keys_seq(rnd_hid_cfg_keys_t *km, char *dst, int dst_len);
+int rnd_hid_cfg_keys_seq_(rnd_hid_cfg_keys_t *km, rnd_hid_cfg_keyseq_t **seq, int seq_len, char *dst, int dst_len);
 
 #endif
Index: trunk/src/librnd/pcb_compat.h
===================================================================
--- trunk/src/librnd/pcb_compat.h	(revision 30989)
+++ trunk/src/librnd/pcb_compat.h	(revision 30990)
@@ -695,3 +695,45 @@
 #define pcb_hid_cfg_map_anchor_menus rnd_hid_cfg_map_anchor_menus
 #define pcb_hid_cfg_del_anchor_menus rnd_hid_cfg_del_anchor_menus
 #define pcb_hid_cfg_action rnd_hid_cfg_action
+#define hid_cfg_mouse_init rnd_hid_cfg_mouse_init
+#define hid_cfg_mouse_action rnd_hid_cfg_mouse_action
+#define pcb_hid_cfg_keys_init rnd_hid_cfg_keys_init
+#define pcb_hid_cfg_keys_uninit rnd_hid_cfg_keys_uninit
+#define pcb_hid_cfg_keys_add_under rnd_hid_cfg_keys_add_under
+#define pcb_hid_cfg_keys_add_by_desc rnd_hid_cfg_keys_add_by_desc
+#define pcb_hid_cfg_keys_add_by_desc_ rnd_hid_cfg_keys_add_by_desc_
+#define pcb_hid_cfg_keys_add_by_strdesc rnd_hid_cfg_keys_add_by_strdesc
+#define pcb_hid_cfg_keys_add_by_strdesc_ rnd_hid_cfg_keys_add_by_strdesc_
+#define pcb_hid_cfg_keys_del_by_desc rnd_hid_cfg_keys_del_by_desc
+#define pcb_hid_cfg_keys_gen_accel rnd_hid_cfg_keys_gen_accel
+#define pcb_hid_cfg_keys_input rnd_hid_cfg_keys_input
+#define pcb_hid_cfg_keys_input_ rnd_hid_cfg_keys_input_
+#define pcb_hid_cfg_keys_action rnd_hid_cfg_keys_action
+#define pcb_hid_cfg_keys_action_ rnd_hid_cfg_keys_action_
+#define pcb_hid_cfg_keys_seq rnd_hid_cfg_keys_seq
+#define pcb_hid_cfg_keys_seq_ rnd_hid_cfg_keys_seq_
+#define PCB_M_Shift RND_M_Shift
+#define PCB_M_Ctrl RND_M_Ctrl
+#define PCB_M_Alt RND_M_Alt
+#define PCB_M_Mod1 RND_M_Mod1
+#define PCB_M_Release RND_M_Release
+#define PCB_MB_LEFT RND_MB_LEFT
+#define PCB_MB_MIDDLE RND_MB_MIDDLE
+#define PCB_MB_RIGHT RND_MB_RIGHT
+#define PCB_MB_SCROLL_UP RND_MB_SCROLL_UP
+#define PCB_MB_SCROLL_DOWN RND_MB_SCROLL_DOWN
+#define PCB_MB_SCROLL_LEFT RND_MB_SCROLL_LEFT
+#define PCB_MB_SCROLL_RIGHT RND_MB_SCROLL_RIGHT
+#define PCB_MB_ANY RND_MB_ANY
+#define PCB_M_ANY RND_M_ANY
+#define pcb_hid_cfg_mouse_t rnd_hid_cfg_mouse_t
+#define hid_cfg_keyhash_t rnd_hid_cfg_keyhash_t
+#define HIDCFG_MAX_KEYSEQ_LEN RND_HIDCFG_MAX_KEYSEQ_LEN
+#define pcb_hid_cfg_keyseq_s rnd_hid_cfg_keyseq_s
+#define pcb_hid_cfg_keyseq_t rnd_hid_cfg_keyseq_t
+#define pcb_hid_cfg_keytrans_s rnd_hid_cfg_keytrans_s
+#define pcb_hid_cfg_keytrans_t rnd_hid_cfg_keytrans_t
+#define pcb_hid_cfg_keys_s rnd_hid_cfg_keys_s
+#define pcb_hid_cfg_keys_t rnd_hid_cfg_keys_t
+#define hid_cfg_key_default_trans rnd_hid_cfg_key_default_trans
+#define pcb_hid_cfg_mod_t rnd_hid_cfg_mod_t
Index: trunk/src_plugins/hid_lesstif/lesstif.h
===================================================================
--- trunk/src_plugins/hid_lesstif/lesstif.h	(revision 30989)
+++ trunk/src_plugins/hid_lesstif/lesstif.h	(revision 30990)
@@ -20,8 +20,8 @@
 extern Screen *screen_s;
 extern int screen;
 
-extern pcb_hid_cfg_mouse_t lesstif_mouse;
-extern pcb_hid_cfg_keys_t lesstif_keymap;
+extern rnd_hid_cfg_mouse_t lesstif_mouse;
+extern rnd_hid_cfg_keys_t lesstif_keymap;
 
 extern Widget mainwind, work_area, command, hscroll, vscroll;
 extern Widget m_click;
Index: trunk/src_plugins/hid_lesstif/main.c
===================================================================
--- trunk/src_plugins/hid_lesstif/main.c	(revision 30989)
+++ trunk/src_plugins/hid_lesstif/main.c	(revision 30990)
@@ -62,8 +62,8 @@
 
 rnd_hidlib_t *ltf_hidlib;
 
-pcb_hid_cfg_mouse_t lesstif_mouse;
-pcb_hid_cfg_keys_t lesstif_keymap;
+rnd_hid_cfg_mouse_t lesstif_mouse;
+rnd_hid_cfg_keys_t lesstif_keymap;
 int lesstif_active = 0;
 
 static int idle_proc_set = 0;
@@ -986,14 +986,14 @@
 	ltf_mod_key(e, set, 1);
 }
 
-static pcb_hid_cfg_mod_t lesstif_mb2cfg(int but)
+static rnd_hid_cfg_mod_t lesstif_mb2cfg(int but)
 {
 	switch(but) {
-		case 1: return PCB_MB_LEFT;
-		case 2: return PCB_MB_MIDDLE;
-		case 3: return PCB_MB_RIGHT;
-		case 4: return PCB_MB_SCROLL_UP;
-		case 5: return PCB_MB_SCROLL_DOWN;
+		case 1: return RND_MB_LEFT;
+		case 2: return RND_MB_MIDDLE;
+		case 3: return RND_MB_RIGHT;
+		case 4: return RND_MB_SCROLL_UP;
+		case 5: return RND_MB_SCROLL_DOWN;
 	}
 	return 0;
 }
@@ -1025,14 +1025,14 @@
 
 			rnd_hid_notify_crosshair_change(ltf_hidlib, pcb_false);
 			pressed_button = e->xbutton.button;
-			mods = ((e->xbutton.state & ShiftMask) ? PCB_M_Shift : 0)
-				+ ((e->xbutton.state & ControlMask) ? PCB_M_Ctrl : 0)
+			mods = ((e->xbutton.state & ShiftMask) ? RND_M_Shift : 0)
+				+ ((e->xbutton.state & ControlMask) ? RND_M_Ctrl : 0)
 #ifdef __APPLE__
-				+ ((e->xbutton.state & (1 << 13)) ? PCB_M_Alt : 0);
+				+ ((e->xbutton.state & (1 << 13)) ? RND_M_Alt : 0);
 #else
-				+ ((e->xbutton.state & Mod1Mask) ? PCB_M_Alt : 0);
+				+ ((e->xbutton.state & Mod1Mask) ? RND_M_Alt : 0);
 #endif
-			hid_cfg_mouse_action(ltf_hidlib, &lesstif_mouse, lesstif_mb2cfg(e->xbutton.button) | mods, cmd_is_active);
+			rnd_hid_cfg_mouse_action(ltf_hidlib, &lesstif_mouse, lesstif_mb2cfg(e->xbutton.button) | mods, cmd_is_active);
 
 			rnd_hid_notify_crosshair_change(ltf_hidlib, pcb_true);
 			break;
@@ -1046,15 +1046,15 @@
 			lesstif_button_event(w, e);
 			rnd_hid_notify_crosshair_change(ltf_hidlib, pcb_false);
 			pressed_button = 0;
-			mods = ((e->xbutton.state & ShiftMask) ? PCB_M_Shift : 0)
-				+ ((e->xbutton.state & ControlMask) ? PCB_M_Ctrl : 0)
+			mods = ((e->xbutton.state & ShiftMask) ? RND_M_Shift : 0)
+				+ ((e->xbutton.state & ControlMask) ? RND_M_Ctrl : 0)
 #ifdef __APPLE__
-				+ ((e->xbutton.state & (1 << 13)) ? PCB_M_Alt : 0)
+				+ ((e->xbutton.state & (1 << 13)) ? RND_M_Alt : 0)
 #else
-				+ ((e->xbutton.state & Mod1Mask) ? PCB_M_Alt : 0)
+				+ ((e->xbutton.state & Mod1Mask) ? RND_M_Alt : 0)
 #endif
-				+ PCB_M_Release;
-			hid_cfg_mouse_action(ltf_hidlib, &lesstif_mouse, lesstif_mb2cfg(e->xbutton.button) | mods, cmd_is_active);
+				+ RND_M_Release;
+			rnd_hid_cfg_mouse_action(ltf_hidlib, &lesstif_mouse, lesstif_mb2cfg(e->xbutton.button) | mods, cmd_is_active);
 			rnd_hid_notify_crosshair_change(ltf_hidlib, pcb_true);
 			break;
 		}
@@ -1407,11 +1407,11 @@
 
 	lesstif_begin();
 
-	pcb_hid_cfg_keys_init(&lesstif_keymap);
+	rnd_hid_cfg_keys_init(&lesstif_keymap);
 	lesstif_keymap.translate_key = lesstif_translate_key;
 	lesstif_keymap.key_name = lesstif_key_name;
 	lesstif_keymap.auto_chr = 1;
-	lesstif_keymap.auto_tr = hid_cfg_key_default_trans;
+	lesstif_keymap.auto_tr = rnd_hid_cfg_key_default_trans;
 
 	stdarg_n = 0;
 	stdarg(XtNwidth, &width);
@@ -1554,7 +1554,7 @@
 
 	XtAppMainLoop(app_context);
 
-	pcb_hid_cfg_keys_uninit(&lesstif_keymap);
+	rnd_hid_cfg_keys_uninit(&lesstif_keymap);
 	lesstif_end();
 }
 
Index: trunk/src_plugins/hid_lesstif/menu.c
===================================================================
--- trunk/src_plugins/hid_lesstif/menu.c	(revision 30989)
+++ trunk/src_plugins/hid_lesstif/menu.c	(revision 30990)
@@ -226,7 +226,7 @@
 	anode = pcb_hid_cfg_menu_field(node, PCB_MF_ACTION, NULL);
 	knode = pcb_hid_cfg_menu_field(node, PCB_MF_ACCELERATOR, NULL);
 	if ((anode != NULL) && (knode != NULL))
-		pcb_hid_cfg_keys_add_by_desc(&lesstif_keymap, knode, anode);
+		rnd_hid_cfg_keys_add_by_desc(&lesstif_keymap, knode, anode);
 	else
 		rnd_hid_cfg_error(node, "No action specified for key accel\n");
 }
@@ -239,11 +239,11 @@
 	int mods = 0;
 
 	if (e->state & ShiftMask)
-		mods |= PCB_M_Shift;
+		mods |= RND_M_Shift;
 	if (e->state & ControlMask)
-		mods |= PCB_M_Ctrl;
+		mods |= RND_M_Ctrl;
 	if (e->state & Mod1Mask)
-		mods |= PCB_M_Alt;
+		mods |= RND_M_Alt;
 
 	e->state &= ~(ControlMask | Mod1Mask);
 
@@ -271,7 +271,7 @@
 	}
 
 /* TODO#3: this works only on US keyboard */
-	if (mods & PCB_M_Shift) {
+	if (mods & RND_M_Shift) {
 		static const char *lower = "`1234567890-=[]\\;',./";
 		static const char *upper = "~!@#$%^&*()_+{}|:\"<>?";
 		char *l;
@@ -279,13 +279,13 @@
 			sym = tolower(sym);
 		else if ((l = strchr(lower, sym)) != NULL) {
 			sym = upper[l - lower];
-			mods &= ~PCB_M_Shift;
+			mods &= ~RND_M_Shift;
 		}
 	}
 
 /*	printf("KEY lookup: mod=%x sym=%x/%d\n", mods, sym, slen); */
 TODO("TODO#3: pass on raw and translated keys")
-	slen = pcb_hid_cfg_keys_input(&lesstif_keymap, mods, sym, sym);
+	slen = rnd_hid_cfg_keys_input(&lesstif_keymap, mods, sym, sym);
 	if (slen <= 0)
 		return 1;
 
@@ -299,7 +299,7 @@
 
 	/* Parsing actions may not return until more user interaction
 	   happens.  */
-	pcb_hid_cfg_keys_action(ltf_hidlib, &lesstif_keymap);
+	rnd_hid_cfg_keys_action(ltf_hidlib, &lesstif_keymap);
 
 	return 1;
 }
@@ -329,7 +329,7 @@
 
 	knode = pcb_hid_cfg_menu_field(node, PCB_MF_ACCELERATOR, NULL);
 	if (knode != NULL)
-		pcb_hid_cfg_keys_del_by_desc(&lesstif_keymap, knode);
+		rnd_hid_cfg_keys_del_by_desc(&lesstif_keymap, knode);
 
 
 	if (md->wflag_idx >= 0)
@@ -427,7 +427,7 @@
 
 	kacc = pcb_hid_cfg_menu_field(node, PCB_MF_ACCELERATOR, NULL);
 	if (kacc != NULL) {
-		char *acc_str = pcb_hid_cfg_keys_gen_accel(&lesstif_keymap, kacc, 1, NULL);
+		char *acc_str = rnd_hid_cfg_keys_gen_accel(&lesstif_keymap, kacc, 1, NULL);
 
 		if (acc_str != NULL) {
 			XmString as = XmStringCreatePCB(acc_str);
@@ -621,7 +621,7 @@
 	}
 
 
-	hid_cfg_mouse_init(lesstif_cfg, &lesstif_mouse);
+	rnd_hid_cfg_mouse_init(lesstif_cfg, &lesstif_mouse);
 
 	return mb;
 }
Index: trunk/src_plugins/lib_gtk_common/bu_menu.c
===================================================================
--- trunk/src_plugins/lib_gtk_common/bu_menu.c	(revision 30989)
+++ trunk/src_plugins/lib_gtk_common/bu_menu.c	(revision 30990)
@@ -116,8 +116,8 @@
 	/* Resolve accelerator and save it */
 	if (n_keydesc != NULL) {
 		if (n_action != NULL) {
-			pcb_hid_cfg_keys_add_by_desc(&ghid_keymap, n_keydesc, n_action);
-			accel = pcb_hid_cfg_keys_gen_accel(&ghid_keymap, n_keydesc, 1, NULL);
+			rnd_hid_cfg_keys_add_by_desc(&ghid_keymap, n_keydesc, n_action);
+			accel = rnd_hid_cfg_keys_gen_accel(&ghid_keymap, n_keydesc, 1, NULL);
 		}
 		else
 			rnd_hid_cfg_error(sub_res, "No action specified for key accel\n");
@@ -203,7 +203,7 @@
 			if ((tip != NULL) || (n_keydesc != NULL)) {
 				char *acc = NULL, *s;
 				if (n_keydesc != NULL)
-					acc = pcb_hid_cfg_keys_gen_accel(&ghid_keymap, n_keydesc, -1, "\nhotkey: ");
+					acc = rnd_hid_cfg_keys_gen_accel(&ghid_keymap, n_keydesc, -1, "\nhotkey: ");
 				s = pcb_concat((tip == NULL ? "" : tip), "\nhotkey: ", (acc == NULL ? "" : acc), NULL);
 				gtk_widget_set_tooltip_text(item, s);
 				free(s);
@@ -419,7 +419,7 @@
 		lht_node_t *n_keydesc = pcb_hid_cfg_menu_field(nd, PCB_MF_ACCELERATOR, NULL);
 		menu->actions = g_list_remove(menu->actions, h->action);
 		if (n_keydesc != NULL)
-			pcb_hid_cfg_keys_del_by_desc(&ghid_keymap, n_keydesc);
+			rnd_hid_cfg_keys_del_by_desc(&ghid_keymap, n_keydesc);
 		gtk_widget_destroy(h->destroy);
 		free(h);
 		nd->user_data = NULL;
@@ -495,7 +495,7 @@
 	}
 
 	mr = rnd_hid_cfg_get_menu(*cfg_out, "/mouse");
-	if (hid_cfg_mouse_init(*cfg_out, &ghid_mouse) != 0)
+	if (rnd_hid_cfg_mouse_init(*cfg_out, &ghid_mouse) != 0)
 		rnd_message(RND_MSG_ERROR, "Error: failed to load mouse actions from the hid config lihata - mouse input will not work.");
 
 	return menu_bar;
Index: trunk/src_plugins/lib_gtk_common/glue_hid.c
===================================================================
--- trunk/src_plugins/lib_gtk_common/glue_hid.c	(revision 30989)
+++ trunk/src_plugins/lib_gtk_common/glue_hid.c	(revision 30990)
@@ -25,7 +25,7 @@
 #include "glue_common.h"
 #include "../src_plugins/lib_hid_common/menu_helper.h"
 
-extern pcb_hid_cfg_keys_t ghid_keymap;
+extern rnd_hid_cfg_keys_t ghid_keymap;
 
 static gint ghid_port_window_enter_cb(GtkWidget *widget, GdkEventCrossing *ev, void *ctx_)
 {
@@ -143,11 +143,11 @@
 
 	gctx->hid_active = 1;
 
-	pcb_hid_cfg_keys_init(&ghid_keymap);
+	rnd_hid_cfg_keys_init(&ghid_keymap);
 	ghid_keymap.translate_key = ghid_translate_key;
 	ghid_keymap.key_name = ghid_key_name;
 	ghid_keymap.auto_chr = 1;
-	ghid_keymap.auto_tr = hid_cfg_key_default_trans;
+	ghid_keymap.auto_tr = rnd_hid_cfg_key_default_trans;
 
 	ghid_create_pcb_widgets(gctx, &gctx->topwin, gctx->port.top_window);
 
@@ -179,7 +179,7 @@
 	gtk_widget_grab_focus(gctx->port.drawing_area);
 
 	gtk_main();
-	pcb_hid_cfg_keys_uninit(&ghid_keymap);
+	rnd_hid_cfg_keys_uninit(&ghid_keymap);
 
 	gctx->hid_active = 0;
 	gctx->gui_is_up = 0;
Index: trunk/src_plugins/lib_gtk_common/in_keyboard.c
===================================================================
--- trunk/src_plugins/lib_gtk_common/in_keyboard.c	(revision 30989)
+++ trunk/src_plugins/lib_gtk_common/in_keyboard.c	(revision 30990)
@@ -38,7 +38,7 @@
 #include <librnd/core/compat_misc.h>
 #include "glue_common.h"
 
-pcb_hid_cfg_keys_t ghid_keymap;
+rnd_hid_cfg_keys_t ghid_keymap;
 GdkModifierType pcb_gtk_glob_mask;
 
 gboolean ghid_is_modifier_key_sym(gint ksym)
@@ -103,9 +103,9 @@
 
 		pcb_gtk_glob_mask = state;
 
-		if (state & GDK_MOD1_MASK)    mods |= PCB_M_Alt;
-		if (state & GDK_CONTROL_MASK) mods |= PCB_M_Ctrl;
-		if (state & GDK_SHIFT_MASK)   mods |= PCB_M_Shift;
+		if (state & GDK_MOD1_MASK)    mods |= RND_M_Alt;
+		if (state & GDK_CONTROL_MASK) mods |= RND_M_Ctrl;
+		if (state & GDK_SHIFT_MASK)   mods |= RND_M_Shift;
 
 		/* Retrieve the basic character (level 0) corresponding to physical key stroked. */
 		if (gdk_keymap_get_entries_for_keycode(gdk_keymap_get_default(), kev->hardware_keycode, &keys, &keyvals, &n_entries)) {
@@ -121,9 +121,9 @@
 		if (kv == PCB_GTK_KEY(KP_Divide)) key_raw = kv = '/';
 		if (kv == PCB_GTK_KEY(KP_Enter)) key_raw = kv = PCB_GTK_KEY(Return);
 
-		slen = pcb_hid_cfg_keys_input(&ghid_keymap, mods, key_raw, kv);
+		slen = rnd_hid_cfg_keys_input(&ghid_keymap, mods, key_raw, kv);
 		if (slen > 0) {
-			pcb_hid_cfg_keys_action(gctx->hidlib, &ghid_keymap);
+			rnd_hid_cfg_keys_action(gctx->hidlib, &ghid_keymap);
 			return TRUE;
 		}
 	}
Index: trunk/src_plugins/lib_gtk_common/in_keyboard.h
===================================================================
--- trunk/src_plugins/lib_gtk_common/in_keyboard.h	(revision 30989)
+++ trunk/src_plugins/lib_gtk_common/in_keyboard.h	(revision 30990)
@@ -9,13 +9,13 @@
 
 typedef enum {
 	NONE_PRESSED = 0,
-	SHIFT_PRESSED = PCB_M_Shift,
-	CONTROL_PRESSED = PCB_M_Ctrl,
-	MOD1_PRESSED = PCB_M_Mod1,
-	SHIFT_CONTROL_PRESSED = PCB_M_Shift | PCB_M_Ctrl,
-	SHIFT_MOD1_PRESSED = PCB_M_Shift | PCB_M_Mod1,
-	CONTROL_MOD1_PRESSED = PCB_M_Ctrl | PCB_M_Mod1,
-	SHIFT_CONTROL_MOD1_PRESSED = PCB_M_Shift | PCB_M_Ctrl | PCB_M_Mod1
+	SHIFT_PRESSED = RND_M_Shift,
+	CONTROL_PRESSED = RND_M_Ctrl,
+	MOD1_PRESSED = RND_M_Mod1,
+	SHIFT_CONTROL_PRESSED = RND_M_Shift | RND_M_Ctrl,
+	SHIFT_MOD1_PRESSED = RND_M_Shift | RND_M_Mod1,
+	CONTROL_MOD1_PRESSED = RND_M_Ctrl | RND_M_Mod1,
+	SHIFT_CONTROL_MOD1_PRESSED = RND_M_Shift | RND_M_Ctrl | RND_M_Mod1
 } ModifierKeysState;
 
 /* return TRUE ksym is SHIFT or CTRL modifier key. */
@@ -27,7 +27,7 @@
 /* Handle user key events of the output drawing area. */
 gboolean ghid_port_key_press_cb(GtkWidget *drawing_area, GdkEventKey *kev, gpointer data);
 
-extern pcb_hid_cfg_keys_t ghid_keymap;
+extern rnd_hid_cfg_keys_t ghid_keymap;
 
 extern GdkModifierType pcb_gtk_glob_mask;
 
Index: trunk/src_plugins/lib_gtk_common/in_mouse.c
===================================================================
--- trunk/src_plugins/lib_gtk_common/in_mouse.c	(revision 30989)
+++ trunk/src_plugins/lib_gtk_common/in_mouse.c	(revision 30990)
@@ -48,13 +48,13 @@
 #include "in_keyboard.h"
 #include "glue_common.h"
 
-pcb_hid_cfg_mouse_t ghid_mouse;
+rnd_hid_cfg_mouse_t ghid_mouse;
 int ghid_wheel_zoom = 0;
 
-pcb_hid_cfg_mod_t ghid_mouse_button(int ev_button)
+rnd_hid_cfg_mod_t ghid_mouse_button(int ev_button)
 {
 	/* GDK numbers buttons from 1..5, there seems to be no symbolic names */
-	return (PCB_MB_LEFT << (ev_button - 1));
+	return (RND_MB_LEFT << (ev_button - 1));
 }
 
 static GdkCursorType cursor_override;
@@ -235,15 +235,15 @@
 	 * special mouse scroll events, so this may conflict with a mouse
 	 * who has buttons 4 - 7 that aren't the scroll wheel? */
 	switch (ev->direction) {
-		case GDK_SCROLL_UP:    button = PCB_MB_SCROLL_UP; break;
-		case GDK_SCROLL_DOWN:  button = PCB_MB_SCROLL_DOWN; break;
-		case GDK_SCROLL_LEFT:  button = PCB_MB_SCROLL_LEFT; break;
-		case GDK_SCROLL_RIGHT: button = PCB_MB_SCROLL_RIGHT; break;
+		case GDK_SCROLL_UP:    button = RND_MB_SCROLL_UP; break;
+		case GDK_SCROLL_DOWN:  button = RND_MB_SCROLL_DOWN; break;
+		case GDK_SCROLL_LEFT:  button = RND_MB_SCROLL_LEFT; break;
+		case GDK_SCROLL_RIGHT: button = RND_MB_SCROLL_RIGHT; break;
 		default: return FALSE;
 	}
 
 	ghid_wheel_zoom = 1;
-	hid_cfg_mouse_action(ctx->hidlib, &ghid_mouse, button | mk, ctx->topwin.cmd.command_entry_status_line_active);
+	rnd_hid_cfg_mouse_action(ctx->hidlib, &ghid_mouse, button | mk, ctx->topwin.cmd.command_entry_status_line_active);
 	ghid_wheel_zoom = 0;
 
 	return TRUE;
@@ -268,7 +268,7 @@
 
 	gdkc_window_get_pointer(drawing_area, NULL, NULL, &mask);
 
-	hid_cfg_mouse_action(ctx->hidlib, &ghid_mouse, ghid_mouse_button(ev->button) | mk, ctx->topwin.cmd.command_entry_status_line_active);
+	rnd_hid_cfg_mouse_action(ctx->hidlib, &ghid_mouse, ghid_mouse_button(ev->button) | mk, ctx->topwin.cmd.command_entry_status_line_active);
 
 	rnd_gui->invalidate_all(rnd_gui);
 	if (!ctx->port.view.panning)
@@ -287,7 +287,7 @@
 	state = (GdkModifierType) (ev->state);
 	mk = ghid_modifier_keys_state(drawing_area, &state);
 
-	hid_cfg_mouse_action(ctx->hidlib, &ghid_mouse, ghid_mouse_button(ev->button) | mk | PCB_M_Release, ctx->topwin.cmd.command_entry_status_line_active);
+	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_gui->invalidate_all(rnd_gui);
Index: trunk/src_plugins/lib_gtk_common/in_mouse.h
===================================================================
--- trunk/src_plugins/lib_gtk_common/in_mouse.h	(revision 30989)
+++ trunk/src_plugins/lib_gtk_common/in_mouse.h	(revision 30990)
@@ -8,10 +8,10 @@
 #include <gdk/gdkevents.h>
 
 
-extern pcb_hid_cfg_mouse_t ghid_mouse;
+extern rnd_hid_cfg_mouse_t ghid_mouse;
 extern int ghid_wheel_zoom;
 
-pcb_hid_cfg_mod_t ghid_mouse_button(int ev_button);
+rnd_hid_cfg_mod_t ghid_mouse_button(int ev_button);
 
 gboolean ghid_get_user_xy(pcb_gtk_t *ctx, const char *msg);
 
Index: trunk/src_plugins/lib_gtk_common/wt_preview.c
===================================================================
--- trunk/src_plugins/lib_gtk_common/wt_preview.c	(revision 30989)
+++ trunk/src_plugins/lib_gtk_common/wt_preview.c	(revision 30990)
@@ -311,7 +311,7 @@
 }
 
 
-static gboolean button_press_(GtkWidget *w, pcb_hid_cfg_mod_t btn)
+static gboolean button_press_(GtkWidget *w, rnd_hid_cfg_mod_t btn)
 {
 	pcb_gtk_preview_t *preview = (pcb_gtk_preview_t *) w;
 	rnd_coord_t cx, cy;
@@ -322,7 +322,7 @@
 	draw_data = preview->expose_data.draw_data;
 
 	switch (btn) {
-	case PCB_MB_LEFT:
+	case RND_MB_LEFT:
 		if (preview->mouse_cb != NULL) {
 /*				pcb_printf("bp %mm %mm\n", cx, cy); */
 			if (preview->mouse_cb(w, draw_data, RND_HID_MOUSE_PRESS, cx, cy))
@@ -329,7 +329,7 @@
 				gtk_widget_queue_draw(w);
 		}
 		break;
-	case PCB_MB_MIDDLE:
+	case RND_MB_MIDDLE:
 		preview->view.panning = 1;
 		preview->grabx = cx;
 		preview->graby = cy;
@@ -336,10 +336,10 @@
 		preview->grabt = time(NULL);
 		preview->grabmot = 0;
 		break;
-	case PCB_MB_SCROLL_UP:
+	case RND_MB_SCROLL_UP:
 		pcb_gtk_preview_zoom_cursor_rel(preview, cx, cy, wx, wy, 0.8);
 		goto do_zoom;
-	case PCB_MB_SCROLL_DOWN:
+	case RND_MB_SCROLL_DOWN:
 		pcb_gtk_preview_zoom_cursor_rel(preview, cx, cy, wx, wy, 1.25);
 		goto do_zoom;
 	default:
@@ -354,7 +354,7 @@
 	return FALSE;
 }
 
-static gboolean button_press(GtkWidget *w, pcb_hid_cfg_mod_t btn)
+static gboolean button_press(GtkWidget *w, rnd_hid_cfg_mod_t btn)
 {
 	int save_fx, save_fy;
 	gboolean r;
@@ -381,9 +381,9 @@
 {
 	switch (ev->direction) {
 	case GDK_SCROLL_UP:
-		return button_press(w, PCB_MB_SCROLL_UP);
+		return button_press(w, RND_MB_SCROLL_UP);
 	case GDK_SCROLL_DOWN:
-		return button_press(w, PCB_MB_SCROLL_DOWN);
+		return button_press(w, RND_MB_SCROLL_DOWN);
 	default:;
 	}
 	return FALSE;
@@ -407,14 +407,14 @@
 	get_ptr(preview, &cx, &cy, &wx, &wy);
 
 	switch (ghid_mouse_button(ev->button)) {
-	case PCB_MB_MIDDLE:
+	case RND_MB_MIDDLE:
 		preview->view.panning = 0;
 		break;
-	case PCB_MB_RIGHT:
+	case RND_MB_RIGHT:
 		if ((preview->mouse_cb != NULL) && (preview->mouse_cb(w, draw_data, RND_HID_MOUSE_POPUP, cx, cy)))
 			gtk_widget_queue_draw(w);
 		break;
-	case PCB_MB_LEFT:
+	case RND_MB_LEFT:
 		if (preview->mouse_cb != NULL) {
 /*				pcb_printf("br %mm %mm\n", cx, cy); */
 			if (preview->mouse_cb(w, draw_data, RND_HID_MOUSE_RELEASE, cx, cy))
Index: trunk/src_plugins/lib_hid_pcbui/status.c
===================================================================
--- trunk/src_plugins/lib_hid_pcbui/status.c	(revision 30989)
+++ trunk/src_plugins/lib_hid_pcbui/status.c	(revision 30990)
@@ -61,17 +61,17 @@
 {
 	char kbd[128];
 	const char *flag = conf_core.editor.all_direction_lines ? "*" : (conf_core.editor.line_refraction == 0 ? "X" : (conf_core.editor.line_refraction == 1 ? "_/" : "\\_"));
-	pcb_hid_cfg_keys_t *kst = rnd_gui->key_state;
+	rnd_hid_cfg_keys_t *kst = rnd_gui->key_state;
 
 	if (kst != NULL) {
 		if (kst->seq_len_action > 0) {
 			int len;
 			memcpy(kbd, "(last: ", 7);
-			len = pcb_hid_cfg_keys_seq(kst, kbd+7, sizeof(kbd)-9);
+			len = rnd_hid_cfg_keys_seq(kst, kbd+7, sizeof(kbd)-9);
 			memcpy(kbd+len+7, ")", 2);
 		}
 		else
-			pcb_hid_cfg_keys_seq(kst, kbd, sizeof(kbd));
+			rnd_hid_cfg_keys_seq(kst, kbd, sizeof(kbd));
 	}
 	else
 		*kbd = '\0';