Add multiline braille support.

chrome/browser/extensions/api/braille_display_private/brlapi_connection.cc

 // Copyright 2013 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 "chrome/browser/extensions/api/braille_display_private/brlapi_connection.h"
 
 #include <errno.h>
 
 #include "base/files/file_descriptor_watcher_posix.h"
 #include "base/macros.h"
@@ skipping 23 matching lines @@
   explicit BrlapiConnectionImpl(LibBrlapiLoader* loader) :
       libbrlapi_loader_(loader) {}
 
   ~BrlapiConnectionImpl() override { Disconnect(); }
 
   ConnectResult Connect(const OnDataReadyCallback& on_data_ready) override;
   void Disconnect() override;
   bool Connected() override { return handle_ != nullptr; }
   brlapi_error_t* BrlapiError() override;
   std::string BrlapiStrError() override;
-  bool GetDisplaySize(size_t* size) override;
-  bool WriteDots(const unsigned char* cells) override;
+  bool GetDisplaySize(unsigned int* rows, unsigned int* columns) override;
+  bool WriteDots(const std::vector<unsigned char> cells) override;
   int ReadKey(brlapi_keyCode_t* keyCode) override;
 
  private:
   bool CheckConnected();
   ConnectResult ConnectResultForError();
 
   LibBrlapiLoader* libbrlapi_loader_;
   std::unique_ptr<brlapi_handle_t, base::FreeDeleter> handle_;
   std::unique_ptr<base::FileDescriptorWatcher::Controller> fd_controller_;
 
@@ skipping 30 matching lines @@
     path[pathElements++] = kDefaultTtyChromeOS;
 #endif
   if (pathElements == 0 && getenv("WINDOWPATH") == NULL)
     path[pathElements++] = kDefaultTtyLinux;
   if (libbrlapi_loader_->brlapi__enterTtyModeWithPath(
           handle_.get(), path, pathElements, NULL) < 0) {
     LOG(ERROR) << "brlapi: couldn't enter tty mode: " << BrlapiStrError();
     Disconnect();
     return CONNECT_ERROR_RETRY;
   }
+  unsigned int rows = 0;
+  unsigned int columns = 0;
 
-  size_t size;
-  if (!GetDisplaySize(&size)) {
+  if (!GetDisplaySize(&rows, &columns)) {
     // Error already logged.
     Disconnect();
     return CONNECT_ERROR_RETRY;
   }
 
   // A display size of 0 means no display connected.  We can't reliably
   // detect when a display gets connected, so fail and let the caller
   // retry connecting.
-  if (size == 0) {
+  if (rows * columns == 0) {
     VLOG(1) << "No braille display connected";
     Disconnect();
     return CONNECT_ERROR_RETRY;
   }
 
   const brlapi_keyCode_t extraKeys[] = {
       BRLAPI_KEY_TYPE_CMD | BRLAPI_KEY_CMD_OFFLINE,
       // brltty 5.1 converts dot input to Unicode characters unless we
       // explicitly accept this command.
       BRLAPI_KEY_TYPE_CMD | BRLAPI_KEY_CMD_PASSDOTS,
@@ skipping 23 matching lines @@
 }
 
 brlapi_error_t* BrlapiConnectionImpl::BrlapiError() {
   return libbrlapi_loader_->brlapi_error_location();
 }
 
 std::string BrlapiConnectionImpl::BrlapiStrError() {
   return libbrlapi_loader_->brlapi_strerror(BrlapiError());
 }
 
-bool BrlapiConnectionImpl::GetDisplaySize(size_t* size) {
+bool BrlapiConnectionImpl::GetDisplaySize(unsigned int* columns,
+                                          unsigned int* rows) {
   if (!CheckConnected()) {
     return false;
   }
-  unsigned int columns, rows;
-  if (libbrlapi_loader_->brlapi__getDisplaySize(
-          handle_.get(), &columns, &rows) < 0) {
+  if (libbrlapi_loader_->brlapi__getDisplaySize(handle_.get(), columns, rows) <
+      0) {
     LOG(ERROR) << "Couldn't get braille display size " << BrlapiStrError();
     return false;
   }
-  *size = columns * rows;
   return true;
 }
 
-bool BrlapiConnectionImpl::WriteDots(const unsigned char* cells) {
+bool BrlapiConnectionImpl::WriteDots(const std::vector<unsigned char> cells) {
+  // Cells is a 2D vector, compressed into 1D.
   if (!CheckConnected())
     return false;
-  if (libbrlapi_loader_->brlapi__writeDots(handle_.get(), cells) < 0) {
+  if (libbrlapi_loader_->brlapi__writeDots(handle_.get(), &cells[0]) < 0) {

[Devlin, 2016/10/25 22:36:54]

Do we need to check if cells is empty?

Also, prefer cells.data() to access the pointer to the beginning of the array,
rather than &cells[0].

[ultimatedbz, 2016/10/27 03:16:58]

Cool! I did not know vectors had a data() function! And I can't say for sure
what would happen if cells was empty, but I think nothing would be drawn on the
braille display, or brlapi__writeDots(...) would return a negative number.

[Devlin, 2016/10/27 14:59:28]

Reason I asked about checking emptiness before was because it would otherwise
crash on cells[0].  Using data() should be safe as long as writeDots doesn't try
to write anything with the passed data.

     VLOG(1) << "Couldn't write to brlapi: " << BrlapiStrError();
     return false;
   }
   return true;
 }
 
 int BrlapiConnectionImpl::ReadKey(brlapi_keyCode_t* key_code) {
   if (!CheckConnected())
     return -1;
   return libbrlapi_loader_->brlapi__readKey(
@@ skipping 17 matching lines @@
   if (error->brlerrno == BRLAPI_ERROR_LIBCERR
       && error->libcerrno == ENOENT) {
     return CONNECT_ERROR_NO_RETRY;
   }
   return CONNECT_ERROR_RETRY;
 }
 
 }  // namespace braille_display_private
 }  // namespace api
 }  // namespace extensions