<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[Freeswitch-trunk][15956] </title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<div id="header">FreeSWITCH Subversion</div>
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://fisheye.freeswitch.org/changelog/FreeSWITCH?cs=15956">15956</a></dd>
<dt>Author</dt> <dd>anthm</dd>
<dt>Date</dt> <dd>2009-12-14 18:19:30 -0600 (Mon, 14 Dec 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>bowl over previous commit that nearly conflicted out 2 hours of coding (grrr) hook new complete api up to FSAPI and export tab completion down to fs_cli</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunklibseslfs_clic">freeswitch/trunk/libs/esl/fs_cli.c</a></li>
<li><a href="#freeswitchtrunksrcincludeswitch_consoleh">freeswitch/trunk/src/include/switch_console.h</a></li>
<li><a href="#freeswitchtrunksrcmodapplicationsmod_commandsmod_commandsc">freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunklibseslfs_clic"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/esl/fs_cli.c (15955 => 15956)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/esl/fs_cli.c 2009-12-14 22:36:39 UTC (rev 15955)
+++ freeswitch/trunk/libs/esl/fs_cli.c 2009-12-15 00:19:30 UTC (rev 15956)
</span><span class="lines">@@ -428,6 +428,57 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><ins>+#ifdef HAVE_EDITLINE
+
+static unsigned char complete(EditLine * el, int ch)
+{
+ const LineInfo *lf = el_line(el);
+ char cmd_str[2048] = "";
+ unsigned char ret = CC_REDISPLAY;
+
+ if (*lf->cursor) {
+ snprintf(cmd_str, sizeof(cmd_str), "api console_complete c=%ld;%s\n\n", lf->cursor - lf->buffer, lf->buffer);
+ } else {
+ snprintf(cmd_str, sizeof(cmd_str), "api console_complete %s\n\n", lf->buffer);
+ }
+
+ esl_send_recv(global_handle, cmd_str);
+
+
+ if (global_handle->last_sr_event && global_handle->last_sr_event->body) {
+ char *r = global_handle->last_sr_event->body;
+ char *w, *p;
+
+ if (r) {
+ if ((w = strstr(r, "\n\nwrite="))) {
+ int len = 0;
+ *w = '\0';
+ w += 8;
+
+ len = atoi(w);
+
+ if ((p = strchr(w, ':'))) {
+ w = p + 1;
+ }
+
+ printf("%s\n\n\n", r);
+
+ el_deletestr(el, len);
+ el_insertstr(el, w);
+
+ } else {
+ printf("%s\n", r);
+ }
+ }
+
+ fflush(stdout);
+ }
+
+ return ret;
+}
+#endif
+
+
</ins><span class="cx"> int main(int argc, char *argv[])
</span><span class="cx"> {
</span><span class="cx"> esl_handle_t handle = {{0}};
</span><span class="lines">@@ -673,6 +724,7 @@
</span><span class="cx"> el = el_init(__FILE__, stdout, stdout, stdout);
</span><span class="cx"> el_set(el, EL_PROMPT, &prompt);
</span><span class="cx"> el_set(el, EL_EDITOR, "emacs");
</span><ins>+
</ins><span class="cx"> myhistory = history_init();
</span><span class="cx">
</span><span class="cx"> el_set(el, EL_ADDFN, "f1-key", "F1 KEY PRESS", console_f1key);
</span><span class="lines">@@ -711,6 +763,9 @@
</span><span class="cx">
</span><span class="cx"> el_set(el, EL_BIND, "\004", "EOF-key", NULL);
</span><span class="cx">
</span><ins>+ el_set(el, EL_ADDFN, "ed-complete", "Complete argument", complete);
+ el_set(el, EL_BIND, "^I", "ed-complete", NULL);
+
</ins><span class="cx"> if (myhistory == 0) {
</span><span class="cx"> esl_log(ESL_LOG_ERROR, "history could not be initialized\n");
</span><span class="cx"> goto done;
</span></span></pre></div>
<a id="freeswitchtrunksrcincludeswitch_consoleh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/include/switch_console.h (15955 => 15956)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/include/switch_console.h 2009-12-14 22:36:39 UTC (rev 15955)
+++ freeswitch/trunk/src/include/switch_console.h 2009-12-15 00:19:30 UTC (rev 15956)
</span><span class="lines">@@ -82,9 +82,10 @@
</span><span class="cx"> SWITCH_DECLARE(switch_status_t) switch_console_add_complete_func(const char *name, switch_console_complete_callback_t cb);
</span><span class="cx"> SWITCH_DECLARE(switch_status_t) switch_console_del_complete_func(const char *name);
</span><span class="cx"> SWITCH_DECLARE(switch_status_t) switch_console_run_complete_func(const char *func, const char *line,
</span><del>- const char *cursor, switch_console_callback_match_t **matches);
</del><ins>+ const char *last_word, switch_console_callback_match_t **matches);
</ins><span class="cx"> SWITCH_DECLARE(void) switch_console_push_match(switch_console_callback_match_t **matches, const char *new_val);
</span><span class="cx"> SWITCH_DECLARE(void) switch_console_free_matches(switch_console_callback_match_t **matches);
</span><ins>+SWITCH_DECLARE(unsigned char) switch_console_complete(const char *line, const char *last_word, FILE *console_out, switch_stream_handle_t *stream);
</ins><span class="cx">
</span><span class="cx"> SWITCH_END_EXTERN_C
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="freeswitchtrunksrcmodapplicationsmod_commandsmod_commandsc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c (15955 => 15956)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c 2009-12-14 22:36:39 UTC (rev 15955)
+++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c 2009-12-15 00:19:30 UTC (rev 15956)
</span><span class="lines">@@ -767,7 +767,29 @@
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+SWITCH_STANDARD_API(console_complete_function)
+{
+ const char *p, *cursor = NULL;
+ int c;
</ins><span class="cx">
</span><ins>+ if (zstr(cmd)) {
+ cmd = " ";
+ }
+
+ if ((p = strstr(cmd, "c="))) {
+ p += 2;
+ c = atoi(p);
+ if ((p = strchr(p, ';'))) {
+ cmd = p + 1;
+ cursor = cmd + c;
+ }
+ }
+
+ switch_console_complete(cmd, cursor, NULL, stream);
+ return SWITCH_STATUS_SUCCESS;
+}
+
+
</ins><span class="cx"> SWITCH_STANDARD_API(eval_function)
</span><span class="cx"> {
</span><span class="cx"> char *expanded;
</span><span class="lines">@@ -3791,6 +3813,7 @@
</span><span class="cx"> SWITCH_ADD_API(commands_api_interface, "break", "Break", break_function, BREAK_SYNTAX);
</span><span class="cx"> SWITCH_ADD_API(commands_api_interface, "complete", "Complete", complete_function, COMPLETE_SYNTAX);
</span><span class="cx"> SWITCH_ADD_API(commands_api_interface, "cond", "Eval a conditional", cond_function, "<expr> ? <true val> : <false val>");
</span><ins>+ SWITCH_ADD_API(commands_api_interface, "console_complete", "", console_complete_function, "<line>");
</ins><span class="cx"> SWITCH_ADD_API(commands_api_interface, "create_uuid", "Create a uuid", uuid_function, UUID_SYNTAX);
</span><span class="cx"> SWITCH_ADD_API(commands_api_interface, "db_cache", "db cache management", db_cache_function, "status");
</span><span class="cx"> SWITCH_ADD_API(commands_api_interface, "domain_exists", "check if a domain exists", domain_exists_function, "<domain>");
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>