This is an automated email from the ASF dual-hosted git repository. jmuehlner pushed a commit to branch next in repository https://gitbox.apache.org/repos/asf/guacamole-server.git
commit e5967fb2b9db4be81d844f84b312a3cb96629381 Merge: b94dd5ad 04e90157 Author: James Muehlner <[email protected]> AuthorDate: Sun Sep 29 19:15:06 2024 +0000 Merge main branch changes to next. .gitignore | 4 + configure.ac | 5 + src/common-ssh/key.c | 13 +- src/common/Makefile.am | 2 - src/common/common/display.h | 293 ----------- src/common/display.c | 422 ---------------- src/libguac/Makefile.am | 109 ++-- src/libguac/client.c | 180 ++----- src/libguac/display-builtin-cursors.c | 149 ++++++ src/libguac/display-builtin-cursors.h | 93 ++++ src/libguac/display-cursor.c | 104 ++++ src/libguac/display-flush.c | 391 ++++++++++++++ src/libguac/display-layer-list.c | 396 +++++++++++++++ src/libguac/display-layer.c | 324 ++++++++++++ src/libguac/display-plan-combine.c | 334 ++++++++++++ src/libguac/display-plan-rect.c | 240 +++++++++ src/libguac/display-plan-search.c | 436 ++++++++++++++++ src/libguac/display-plan.c | 441 ++++++++++++++++ src/libguac/display-plan.h | 399 +++++++++++++++ src/libguac/display-priv.h | 813 ++++++++++++++++++++++++++++++ src/libguac/display-render-thread.c | 173 +++++++ src/libguac/display-worker.c | 522 +++++++++++++++++++ src/libguac/display.c | 351 +++++++++++++ src/libguac/encode-webp.c | 2 +- src/libguac/fifo.c | 210 ++++++++ src/libguac/flag.c | 167 ++++++ src/libguac/guacamole/assert.h | 47 ++ src/libguac/guacamole/client-constants.h | 2 +- src/libguac/guacamole/client.h | 17 +- src/libguac/guacamole/display-constants.h | 56 ++ src/libguac/guacamole/display-types.h | 106 ++++ src/libguac/guacamole/display.h | 780 ++++++++++++++++++++++++++++ src/libguac/guacamole/fifo-constants.h | 57 +++ src/libguac/guacamole/fifo-types.h | 53 ++ src/libguac/guacamole/fifo.h | 314 ++++++++++++ src/libguac/guacamole/flag-types.h | 36 ++ src/libguac/guacamole/flag.h | 244 +++++++++ src/libguac/guacamole/pool.h | 59 ++- src/libguac/guacamole/rect-types.h | 33 ++ src/libguac/guacamole/rect.h | 271 ++++++++++ src/libguac/guacamole/user-constants.h | 2 +- src/libguac/mem.c | 13 +- src/libguac/pool.c | 112 +++- src/libguac/rect.c | 178 +++++++ src/libguac/tests/Makefile.am | 7 + src/libguac/tests/fifo/fifo.c | 298 +++++++++++ src/libguac/tests/flag/flag.c | 168 ++++++ src/libguac/tests/rect/align.c | 70 +++ src/libguac/tests/rect/constrain.c | 42 ++ src/libguac/tests/rect/extend.c | 41 ++ src/libguac/tests/rect/init.c | 38 ++ src/libguac/tests/rect/intersects.c | 85 ++++ src/libguac/user.c | 30 +- src/protocols/kubernetes/user.c | 1 - src/protocols/rdp/Makefile.am | 4 - src/protocols/rdp/bitmap.c | 168 ------ src/protocols/rdp/bitmap.h | 133 ----- src/protocols/rdp/channels/disp.c | 26 +- src/protocols/rdp/channels/disp.h | 16 + src/protocols/rdp/channels/rdpei.c | 4 +- src/protocols/rdp/client.c | 2 +- src/protocols/rdp/client.h | 25 +- src/protocols/rdp/fs.c | 2 +- src/protocols/rdp/gdi.c | 453 +++-------------- src/protocols/rdp/gdi.h | 135 +---- src/protocols/rdp/glyph.c | 170 ------- src/protocols/rdp/glyph.h | 224 -------- src/protocols/rdp/input.c | 6 +- src/protocols/rdp/pointer.c | 106 ++-- src/protocols/rdp/pointer.h | 5 +- src/protocols/rdp/rdp.c | 167 +++--- src/protocols/rdp/rdp.h | 27 +- src/protocols/rdp/settings.c | 7 +- src/protocols/rdp/user.c | 5 +- src/protocols/ssh/input.c | 2 - src/protocols/ssh/user.c | 1 - src/protocols/vnc/client.c | 5 +- src/protocols/vnc/client.h | 25 +- src/protocols/vnc/cursor.c | 96 ++-- src/protocols/vnc/cursor.h | 4 +- src/protocols/vnc/display.c | 182 ++++--- src/protocols/vnc/display.h | 7 +- src/protocols/vnc/input.c | 7 +- src/protocols/vnc/log.c | 1 - src/protocols/vnc/log.h | 1 - src/protocols/vnc/user.c | 10 +- src/protocols/vnc/vnc.c | 145 +++--- src/protocols/vnc/vnc.h | 23 +- src/terminal/buffer.c | 460 +++++++++++++++-- src/terminal/common.c | 7 + src/terminal/display.c | 120 +++-- src/terminal/select.c | 100 ++-- src/terminal/terminal-handlers.c | 196 ++++++- src/terminal/terminal.c | 420 ++++----------- src/terminal/terminal/buffer.h | 193 ++++--- src/terminal/terminal/terminal-priv.h | 96 ++-- src/terminal/terminal/types.h | 16 +- 97 files changed, 10229 insertions(+), 3306 deletions(-)
