summaryrefslogtreecommitdiffstats
path: root/gui
diff options
context:
space:
mode:
authorDees Troy <dees_troy@teamw.in>2017-11-28 15:04:30 +0100
committerGerrit Code Review <gerrit2@gerrit.omnirom.org>2017-11-28 15:04:30 +0100
commitdc864ec8acde6d384a7a402ee071895f12ef1910 (patch)
treeea7a6b02bf02cf8e6e4e31ff14d773814001706f /gui
parentFix issues building with LineageOS cryptfs_hw (diff)
parentSupport v2 fstab format (diff)
downloadandroid_bootable_recovery-dc864ec8acde6d384a7a402ee071895f12ef1910.tar
android_bootable_recovery-dc864ec8acde6d384a7a402ee071895f12ef1910.tar.gz
android_bootable_recovery-dc864ec8acde6d384a7a402ee071895f12ef1910.tar.bz2
android_bootable_recovery-dc864ec8acde6d384a7a402ee071895f12ef1910.tar.lz
android_bootable_recovery-dc864ec8acde6d384a7a402ee071895f12ef1910.tar.xz
android_bootable_recovery-dc864ec8acde6d384a7a402ee071895f12ef1910.tar.zst
android_bootable_recovery-dc864ec8acde6d384a7a402ee071895f12ef1910.zip
Diffstat (limited to 'gui')
-rw-r--r--gui/action.cpp2
-rw-r--r--gui/gui.cpp46
-rw-r--r--gui/gui.hpp2
-rw-r--r--gui/terminal.cpp3
-rw-r--r--gui/theme/common/languages/en.xml1
5 files changed, 37 insertions, 17 deletions
diff --git a/gui/action.cpp b/gui/action.cpp
index 039c4ef43..3d497ca5c 100644
--- a/gui/action.cpp
+++ b/gui/action.cpp
@@ -1,4 +1,4 @@
-/*update
+/*
Copyright 2013 bigbiff/Dees_Troy TeamWin
This file is part of TWRP/TeamWin Recovery Project.
diff --git a/gui/gui.cpp b/gui/gui.cpp
index a70dadfd2..a270e365f 100644
--- a/gui/gui.cpp
+++ b/gui/gui.cpp
@@ -33,7 +33,6 @@
#include <sys/mount.h>
#include <time.h>
#include <unistd.h>
-#include <stdlib.h>
extern "C"
{
@@ -79,6 +78,8 @@ int gGuiRunning = 0;
int g_pty_fd = -1; // set by terminal on init
void terminal_pty_read();
+int select_fd = 0;
+
static int gRecorder = -1;
extern "C" void gr_write_frame_to_file(int fd);
@@ -395,9 +396,18 @@ void InputHandler::handleDrag()
}
}
+void set_select_fd() {
+ select_fd = ors_read_fd + 1;
+ if (g_pty_fd >= select_fd)
+ select_fd = g_pty_fd + 1;
+ if (PartitionManager.uevent_pfd.fd >= select_fd)
+ select_fd = PartitionManager.uevent_pfd.fd + 1;
+}
+
static void setup_ors_command()
{
ors_read_fd = -1;
+ set_select_fd();
unlink(ORS_INPUT_FILE);
if (mkfifo(ORS_INPUT_FILE, 06660) != 0) {
@@ -417,6 +427,7 @@ static void setup_ors_command()
unlink(ORS_INPUT_FILE);
unlink(ORS_OUTPUT_FILE);
}
+ set_select_fd();
}
// callback called after a CLI command was executed
@@ -448,6 +459,7 @@ static void ors_command_read()
if (!orsout) {
close(ors_read_fd);
ors_read_fd = -1;
+ set_select_fd();
LOGINFO("Unable to fopen %s\n", ORS_OUTPUT_FILE);
unlink(ORS_INPUT_FILE);
unlink(ORS_OUTPUT_FILE);
@@ -554,29 +566,30 @@ static int runPages(const char *page_name, const int stop_on_page_done)
for (;;)
{
loopTimer(input_timeout_ms);
+ FD_ZERO(&fdset);
+ timeout.tv_sec = 0;
+ timeout.tv_usec = 1;
if (g_pty_fd > 0) {
- // TODO: this is not nice, we should have one central select for input, pty, and ors
- FD_ZERO(&fdset);
FD_SET(g_pty_fd, &fdset);
- timeout.tv_sec = 0;
- timeout.tv_usec = 1;
- has_data = select(g_pty_fd+1, &fdset, NULL, NULL, &timeout);
- if (has_data > 0) {
- terminal_pty_read();
- }
+ }
+ if (PartitionManager.uevent_pfd.fd > 0) {
+ FD_SET(PartitionManager.uevent_pfd.fd, &fdset);
}
#ifndef TW_OEM_BUILD
if (ors_read_fd > 0 && !orsout) { // orsout is non-NULL if a command is still running
- FD_ZERO(&fdset);
FD_SET(ors_read_fd, &fdset);
- timeout.tv_sec = 0;
- timeout.tv_usec = 1;
- has_data = select(ors_read_fd+1, &fdset, NULL, NULL, &timeout);
- if (has_data > 0) {
- ors_command_read();
- }
}
#endif
+ // TODO: combine this select with the poll done by input handling
+ has_data = select(select_fd, &fdset, NULL, NULL, &timeout);
+ if (has_data > 0) {
+ if (g_pty_fd > 0 && FD_ISSET(g_pty_fd, &fdset))
+ terminal_pty_read();
+ if (PartitionManager.uevent_pfd.fd > 0 && FD_ISSET(PartitionManager.uevent_pfd.fd, &fdset))
+ PartitionManager.read_uevent();
+ if (ors_read_fd > 0 && !orsout && FD_ISSET(ors_read_fd, &fdset))
+ ors_command_read();
+ }
if (!gForceRender.get_value())
{
@@ -636,6 +649,7 @@ static int runPages(const char *page_name, const int stop_on_page_done)
if (ors_read_fd > 0)
close(ors_read_fd);
ors_read_fd = -1;
+ set_select_fd();
gGuiRunning = 0;
return 0;
}
diff --git a/gui/gui.hpp b/gui/gui.hpp
index afcd9b0a9..d5b9553d6 100644
--- a/gui/gui.hpp
+++ b/gui/gui.hpp
@@ -21,6 +21,8 @@
#include "twmsg.h"
+void set_select_fd();
+
void gui_msg(const char* text);
void gui_warn(const char* text);
void gui_err(const char* text);
diff --git a/gui/terminal.cpp b/gui/terminal.cpp
index 1744788da..65ad2c026 100644
--- a/gui/terminal.cpp
+++ b/gui/terminal.cpp
@@ -34,6 +34,7 @@ extern "C" {
#include "../twcommon.h"
}
#include "../minuitwrp/minui.h"
+#include "gui.hpp"
#include "rapidxml.hpp"
#include "objects.hpp"
@@ -83,6 +84,7 @@ public:
// and write it to the terminal
// this currently works through gui.cpp calling terminal_pty_read below
g_pty_fd = fdMaster;
+ set_select_fd();
return true;
}
else {
@@ -174,6 +176,7 @@ public:
}
close(fdMaster);
g_pty_fd = fdMaster = -1;
+ set_select_fd();
int status;
waitpid(pid, &status, WNOHANG); // avoid zombies but don't hang if the child is still alive and we got here due to some error
pid = 0;
diff --git a/gui/theme/common/languages/en.xml b/gui/theme/common/languages/en.xml
index 8a1be1875..23beb4091 100644
--- a/gui/theme/common/languages/en.xml
+++ b/gui/theme/common/languages/en.xml
@@ -30,6 +30,7 @@
<string name="sdext">SD-EXT</string>
<string name="adopted_data">Adopted Data</string>
<string name="adopted_storage">Adopted Storage</string>
+ <string name="autostorage">Storage</string>
<!-- GUI XML strings -->
<string name="twrp_header">Team Win Recovery Project</string>