commit d64cb2c45ffcecbe2bb2a7d5ce3c00fe9c296c81
author Carl Norum <cjn@google.com> Tue Feb 12 09:39:31 2019 -0800
committer Carl Norum <cjn@google.com> Thu Mar 28 09:01:16 2019 -0700
tree 512a98398e9864e37f22659e6d50339fdbc58523
parent 1a886d8f7140fe1c4e61fe049a1f69c475868b6d

[term] Topaz fixes for new PTY ioctl.

Change-Id: I1a16898ac326402824e1f1bc5f0ea28648b1d894

app/term/BUILD.gn

diff --git a/app/term/BUILD.gn b/app/term/BUILD.gn
index 36fe440..90975dc 100644
--- a/app/term/BUILD.gn
+++ b/app/term/BUILD.gn
@@ -39,6 +39,7 @@
     "//third_party/skia",
     "//topaz/examples/ui/lib:skia_fonts",
     "//topaz/examples/ui/lib:skia_view",
+    "//zircon/public/fidl/fuchsia-hardware-pty:fuchsia-hardware-pty_c",
     "//zircon/public/lib/async-cpp",
     "//zircon/public/lib/async-loop-cpp",
     "//zircon/public/lib/fdio",

app/term/pty_server.cc

diff --git a/app/term/pty_server.cc b/app/term/pty_server.cc
index 9683494..b39a8b9 100644
--- a/app/term/pty_server.cc
+++ b/app/term/pty_server.cc
@@ -5,13 +5,13 @@
 #include "topaz/app/term/pty_server.h"
 
 #include <fcntl.h>
+#include <fuchsia/hardware/pty/c/fidl.h>
 #include <lib/fdio/io.h>
 #include <lib/fdio/private.h>
 #include <lib/fdio/spawn.h>
 #include <lib/async/default.h>
 #include <poll.h>
 #include <unistd.h>
-#include <zircon/device/pty.h>
 #include <zircon/status.h>
 
 #include "lib/fxl/logging.h"
@@ -39,12 +39,15 @@
 PTYServer::~PTYServer() = default;
 
 void PTYServer::SetWindowSize(uint32_t width, uint32_t height) {
-  pty_window_size_t window = {
-      .width = width,
-      .height = height,
+  fuchsia_hardware_pty_WindowSize window = {
+    .width = width,
+    .height = height,
   };
 
-  ioctl_pty_set_window_size(pty_.get(), &window);
+  fdio_t* io = fdio_unsafe_fd_to_io(pty_.get());
+  zx_status_t status;
+  fuchsia_hardware_pty_DeviceSetWindowSize(fdio_unsafe_borrow_channel(io), &window, &status);
+  fdio_unsafe_release(io);
 }
 
 zx_status_t PTYServer::Run(std::vector<std::string> command,