summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stone <daniels@collabora.com>2018-04-03 19:38:09 +0100
committerDerek Foreman <derekf@osg.samsung.com>2018-04-05 10:31:20 -0500
commitee96ce2fc2ac54f61316ecc357c2777f30da5f92 (patch)
tree57d5d2ddf9430145cf11520d8e89f28f6d997b11
parent10fe82fe2d45f19e4df96e77d21fb11564c3398a (diff)
downloadweston-ee96ce2fc2ac54f61316ecc357c2777f30da5f92.tar.gz
terminal: Fix unintended fallthrough to cursor restore
ef57a9b788 added support for window operations such as reporting the title in escape mode. It implemented this by which-window-op case, inside the existing which-escape-code case. Whilst it would break out of the former window-op case, it never broke out of the latter escape-code case. This would lead to window ops (such as reporting title) falling through to restoring the saved cursor position. This doesn't seem at all right, and also fixes a warning with GCC 8. Signed-off-by: Daniel Stone <daniels@collabora.com> Reviewed-by: Derek Foreman <derekf@osg.samsung.com>
-rw-r--r--clients/terminal.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/clients/terminal.c b/clients/terminal.c
index 16a44954..f792badc 100644
--- a/clients/terminal.c
+++ b/clients/terminal.c
@@ -1686,6 +1686,7 @@ handle_escape(struct terminal *terminal)
fprintf(stderr, "Unimplemented windowOp %d\n", args[0]);
break;
}
+ break;
case 'u': /* Restore cursor location */
terminal->row = terminal->saved_row;
terminal->column = terminal->saved_column;