[NaCl SDK] ppapi_simple: Allow initial terminal size to to be set on startup.

native_client_sdk/src/libraries/ppapi_simple/ps_instance.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <errno.h>
 #include <fcntl.h>
 #include <pthread.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/ioctl.h>
@@ skipping 220 matching lines @@
 
   tty_prefix_ = getenv("PS_TTY_PREFIX");
   if (tty_prefix_) {
     tty_fd_ = open("/dev/tty", O_WRONLY);
     if (tty_fd_ >= 0) {
       RegisterMessageHandler(tty_prefix_, MessageHandlerInputStatic, this);
       const char* tty_resize = getenv("PS_TTY_RESIZE");
       if (tty_resize)
         RegisterMessageHandler(tty_resize, MessageHandlerResizeStatic, this);
 
+      const char* tty_rows = getenv("PS_TTY_ROWS");
+      const char* tty_cols = getenv("PS_TTY_COLS");
+      if (tty_rows && tty_cols)
+         HandleResize(atoi(tty_cols), atoi(tty_rows));

[binji, 2013/11/09 00:55:08]

better error messaging here? What if only one is set? Or if the values are
non-integers?

[Sam Clegg, 2013/11/09 01:12:58]

Done.

+
       tioc_nacl_output handler;
       handler.handler = TtyOutputHandlerStatic;
       handler.user_data = this;
       ioctl(tty_fd_, TIOCNACLOUTPUT, reinterpret_cast<char*>(&handler));
     } else {
       Error("Failed to open /dev/tty.\n");
     }
   }
 
   const char* exit_message = getenv("PS_EXIT_MESSAGE");
@@ skipping 114 matching lines @@
   struct tioc_nacl_input_string ioctl_message;
   ioctl_message.length = buffer.size();
   ioctl_message.buffer = buffer.c_str();
   int ret =
     ioctl(tty_fd_, TIOCNACLINPUT, reinterpret_cast<char*>(&ioctl_message));
   if (ret != 0 && errno != ENOTTY) {
     Error("ioctl returned unexpected error: %d.\n", ret);
   }
 }
 
+void PSInstance::HandleResize(int width, int height){
+  struct winsize size;
+  memset(&size, 0, sizeof(size));
+  size.ws_col = width;
+  size.ws_row = height;
+  ioctl(tty_fd_, TIOCSWINSZ, reinterpret_cast<char*>(&size));
+}
+
 void PSInstance::MessageHandlerResize(const pp::Var& message) {
   assert(message.is_array());
   pp::VarArray array(message);
   assert(array.GetLength() == 2);
 
-  struct winsize size;
-  memset(&size, 0, sizeof(size));
-  size.ws_col = array.Get(0).AsInt();
-  size.ws_row = array.Get(1).AsInt();
-  ioctl(tty_fd_, TIOCSWINSZ, reinterpret_cast<char*>(&size));
+  int width = array.Get(0).AsInt();
+  int height = array.Get(1).AsInt();
+  HandleResize(width, height);
 }
 
 ssize_t PSInstance::TtyOutputHandlerStatic(const char* buf,
                                            size_t count,
                                            void* user_data) {
   PSInstance* instance = reinterpret_cast<PSInstance*>(user_data);
   return instance->TtyOutputHandler(buf, count);
 }
 
 void PSInstance::MessageHandlerInputStatic(const pp::Var& key,
@@ skipping 135 matching lines @@
 
 void PSInstance::Graphics3DContextLost() {
   Log("Graphics3DContextLost\n");
   PostEvent(PSE_GRAPHICS3D_GRAPHICS3DCONTEXTLOST);
 }
 
 void PSInstance::MouseLockLost() {
   Log("MouseLockLost\n");
   PostEvent(PSE_MOUSELOCK_MOUSELOCKLOST);
 }