You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by mj...@apache.org on 2022/03/01 00:56:11 UTC

[guacamole-server] 01/01: GUACAMOLE-1538: Merge corrections to libguac-terminal build and scope.

This is an automated email from the ASF dual-hosted git repository.

mjumper pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/guacamole-server.git

commit d8073f9b17c3cb09b79591dbe3d0de82f0ae7004
Merge: dc9dfe5 46e8133
Author: Mike Jumper <mj...@apache.org>
AuthorDate: Mon Feb 28 16:56:04 2022 -0800

    GUACAMOLE-1538: Merge corrections to libguac-terminal build and scope.

 .dockerignore                                      |   2 +-
 .gitignore                                         |   2 +-
 Makefile.am                                        |  19 +-
 configure.ac                                       |   5 +-
 doc/{ => libguac-terminal}/Doxyfile.in             |  10 +-
 doc/{ => libguac}/Doxyfile.in                      |   4 +-
 src/common/clipboard.c                             |   6 +-
 src/common/common/clipboard.h                      |  12 +-
 src/protocols/kubernetes/argv.c                    |  15 +-
 src/protocols/kubernetes/client.c                  |   5 -
 src/protocols/kubernetes/client.h                  |   5 -
 src/protocols/kubernetes/clipboard.c               |   6 +-
 src/protocols/kubernetes/input.c                   |   5 +-
 src/protocols/kubernetes/kubernetes.c              |   7 +-
 src/protocols/kubernetes/kubernetes.h              |   5 -
 src/protocols/kubernetes/user.c                    |   4 +-
 src/protocols/rdp/channels/cliprdr.c               |   8 +-
 src/protocols/rdp/client.h                         |   5 -
 src/protocols/ssh/argv.c                           |  13 +-
 src/protocols/ssh/client.c                         |   5 -
 src/protocols/ssh/client.h                         |   5 -
 src/protocols/ssh/clipboard.c                      |   5 +-
 src/protocols/ssh/input.c                          |   3 +-
 src/protocols/ssh/ssh.c                            |  36 +-
 src/protocols/ssh/ssh.h                            |   5 -
 src/protocols/ssh/user.c                           |   5 +-
 src/protocols/telnet/argv.c                        |  14 +-
 src/protocols/telnet/client.c                      |   6 +-
 src/protocols/telnet/client.h                      |   5 -
 src/protocols/telnet/clipboard.c                   |   5 +-
 src/protocols/telnet/input.c                       |  10 +-
 src/protocols/telnet/telnet.c                      |  14 +-
 src/protocols/telnet/telnet.h                      |   6 -
 src/protocols/telnet/user.c                        |   4 +-
 src/protocols/vnc/client.c                         |   2 +-
 src/protocols/vnc/client.h                         |   5 -
 src/protocols/vnc/clipboard.c                      |   4 +-
 src/terminal/Makefile.am                           |  20 +-
 src/terminal/buffer.c                              |   1 -
 src/terminal/{char_mappings.c => char-mappings.c}  |   1 -
 src/terminal/color-scheme.c                        |   1 -
 src/terminal/common.c                              |   1 -
 src/terminal/display.c                             |   3 +-
 src/terminal/named-colors.c                        |   1 -
 src/terminal/palette.c                             |   1 -
 src/terminal/scrollbar.c                           |   1 -
 src/terminal/select.c                              |   2 +-
 .../{terminal_handlers.c => terminal-handlers.c}   |   7 +-
 src/terminal/terminal-stdin-stream.c               |   2 +-
 src/terminal/terminal.c                            |  88 +-
 src/terminal/terminal/buffer.h                     |   8 +-
 .../terminal/{char_mappings.h => char-mappings.h}  |   7 +-
 src/terminal/terminal/color-scheme.h               |   9 +-
 src/terminal/terminal/common.h                     |   7 +-
 src/terminal/terminal/display.h                    |   7 +-
 src/terminal/terminal/named-colors.h               |   9 +-
 src/terminal/terminal/palette.h                    |   7 +-
 src/terminal/terminal/scrollbar.h                  |   7 +-
 src/terminal/terminal/select.h                     |   7 +-
 .../{terminal_handlers.h => terminal-handlers.h}   |   7 +
 src/terminal/terminal/terminal-priv.h              | 640 +++++++++++++++
 src/terminal/terminal/terminal.h                   | 883 +++++----------------
 src/terminal/terminal/types.h                      |   8 +-
 src/terminal/terminal/typescript.h                 |   8 +-
 src/terminal/terminal/xparsecolor.h                |   9 +-
 src/terminal/typescript.c                          |   1 -
 src/terminal/xparsecolor.c                         |   1 -
 67 files changed, 1126 insertions(+), 905 deletions(-)