kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #148 in FS/freeswitch from ~DDRAGIC/freeswitch:feature/FS-7129-fs_cli-function-keys-toggle-functionality to master 

* commit '959b07c06f565f7d2d8a158c3ce2f44bdae3f350':
  FS-7129 fs_cli: add toggle mode to function keys
This commit is contained in:
Mike Jerris 2015-01-09 11:51:07 -06:00
parent eceb399c3d 959b07c06f
commit 9caea96371
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libs/esl/fs_cli.c
View File

@ -57,6 +57,8 @@ typedef struct {
char pass[128]; char pass[128];
int debug; int debug;
const char *console_fnkeys[12]; const char *console_fnkeys[12];
const char *console_fnkeys_toggle[12];
int console_fnkeys_state[12];
char loglevel[128]; char loglevel[128];
int log_uuid; int log_uuid;
int log_uuid_length; int log_uuid_length;
@ -158,8 +160,15 @@ static void screen_size(int *x, int *y)
static unsigned char console_fnkey_pressed(int i) static unsigned char console_fnkey_pressed(int i)
{ {
const char *c; const char *c;
int fnkey;
assert((i > 0) && (i <= 12)); assert((i > 0) && (i <= 12));
if (!(c = global_profile->console_fnkeys[i - 1])) { fnkey = i - 1;
if ((c = global_profile->console_fnkeys_toggle[fnkey]) && global_profile->console_fnkeys_state[fnkey]) {
global_profile->console_fnkeys_state[fnkey] = 0;
} else if ((c = global_profile->console_fnkeys[fnkey])) {
global_profile->console_fnkeys_state[fnkey] = 1;
} else {
printf("\n"); printf("\n");
esl_log(ESL_LOG_ERROR, "FUNCTION KEY F%d IS NOT BOUND, please edit your config.\n", i); esl_log(ESL_LOG_ERROR, "FUNCTION KEY F%d IS NOT BOUND, please edit your config.\n", i);
return CC_REDISPLAY; return CC_REDISPLAY;
@ -1278,6 +1287,14 @@ static void read_config(const char *dft_cfile, const char *cfile) {
profiles[pcount-1].console_fnkeys[i - 1] = strdup(val); profiles[pcount-1].console_fnkeys[i - 1] = strdup(val);
} }
} }
} else if (!strncasecmp(var, "key_toggle_F", 12)) {
char *key = var + 12;
if (key) {
int i = atoi(key);
if (i > 0 && i < 13) {
profiles[pcount-1].console_fnkeys_toggle[i - 1] = strdup(val);
}
}
} else if (!strcasecmp(var, "timeout")) { } else if (!strcasecmp(var, "timeout")) {
timeout = atoi(val); timeout = atoi(val);
} else if (!strcasecmp(var, "connect-timeout")) { } else if (!strcasecmp(var, "connect-timeout")) {