Skip to content

Folio #342

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Eeems merged 6 commits into from
Jan 16, 2024
Merged

Folio #342

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5bd8a39
Split device settings and xochitlsettings into their own files
Eeems Jan 15, 2024
1ecc539
Move shared settings to it's own file
Eeems Jan 15, 2024
1683bd6
Fix #340
Eeems Jan 16, 2024
3cc1c95
Fix #339
Eeems Jan 16, 2024
825980b
Remove broken nix build
Eeems Jan 16, 2024
35d329b
Fix build errors
Eeems Jan 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 0 additions & 48 deletions .github/workflows/nix.yml
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,3 @@ You can find other (likely outdated) [videos here](https://github.com/Eeems/oxid
1. Install [toltecmk](https://pypi.org/project/toltecmk/)
2. Run `make package`
3. The ipk files can be found in the `dist/` folder

### Nix
Works on x86_64-linux or macOS via [nix-docker](https://github.com/LnL7/nix-docker).

```ShellSession
$ nix-build --argstr system 'x86_64-linux'
```
160 changes: 80 additions & 80 deletions applications/inject_evdev/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,9 @@ bool process_EV_ABS(const QStringList& args){
abs(ABS_TILT_Y);
abs(ABS_TOOL_WIDTH);
abs(ABS_VOLUME);
//abs(ABS_PROFILE);
// abs(ABS_PROFILE);
abs(ABS_MISC);
//abs(ABS_RESERVED);
abs(ABS_RESERVED);
abs(ABS_MT_SLOT);
abs(ABS_MT_TOUCH_MAJOR);
abs(ABS_MT_TOUCH_MINOR);
Expand Down Expand Up @@ -128,9 +128,9 @@ bool process_EV_REL(const QStringList& args){
rel(REL_DIAL);
rel(REL_WHEEL);
rel(REL_MISC);
//rel(REL_RESERVED);
//rel(REL_WHEEL_HI_RES);
//rel(REL_HWHEEL_HI_RES);
rel(REL_RESERVED);
rel(REL_WHEEL_HI_RES);
rel(REL_HWHEEL_HI_RES);
rel(REL_MAX);
rel(REL_CNT);
qDebug() << "Unknown EV_REL event code:" << code.c_str();
Expand Down Expand Up @@ -350,7 +350,7 @@ bool process_EV_KEY(const QStringList& args){
key(KEY_PAUSECD);
key(KEY_PROG3);
key(KEY_PROG4);
//key(KEY_ALL_APPLICATIONS);
// key(KEY_ALL_APPLICATIONS);
key(KEY_DASHBOARD);
key(KEY_SUSPEND);
key(KEY_CLOSE);
Expand Down Expand Up @@ -418,11 +418,11 @@ bool process_EV_KEY(const QStringList& args){
key(KEY_TITLE);
key(KEY_SUBTITLE);
key(KEY_ANGLE);
//key(KEY_FULL_SCREEN);
key(KEY_FULL_SCREEN);
key(KEY_ZOOM);
key(KEY_MODE);
key(KEY_KEYBOARD);
//key(KEY_ASPECT_RATIO);
key(KEY_ASPECT_RATIO);
key(KEY_SCREEN);
key(KEY_PC);
key(KEY_TV);
Expand Down Expand Up @@ -492,9 +492,9 @@ bool process_EV_KEY(const QStringList& args){
key(KEY_10CHANNELSUP);
key(KEY_10CHANNELSDOWN);
key(KEY_IMAGES);
//key(KEY_NOTIFICATION_CENTER);
//key(KEY_PICKUP_PHONE);
//key(KEY_HANGUP_PHONE);
// key(KEY_NOTIFICATION_CENTER);
// key(KEY_PICKUP_PHONE);
// key(KEY_HANGUP_PHONE);
key(KEY_DEL_EOL);
key(KEY_DEL_EOS);
key(KEY_INS_LINE);
Expand All @@ -520,7 +520,7 @@ bool process_EV_KEY(const QStringList& args){
key(KEY_FN_F);
key(KEY_FN_S);
key(KEY_FN_B);
//key(KEY_FN_RIGHT_SHIFT);
// key(KEY_FN_RIGHT_SHIFT);
key(KEY_BRL_DOT1);
key(KEY_BRL_DOT2);
key(KEY_BRL_DOT3);
Expand Down Expand Up @@ -563,21 +563,21 @@ bool process_EV_KEY(const QStringList& args){
key(KEY_ATTENDANT_TOGGLE);
key(KEY_LIGHTS_TOGGLE);
key(KEY_ALS_TOGGLE);
//key(KEY_ROTATE_LOCK_TOGGLE);
key(KEY_ROTATE_LOCK_TOGGLE);
key(KEY_BUTTONCONFIG);
key(KEY_TASKMANAGER);
key(KEY_JOURNAL);
key(KEY_CONTROLPANEL);
key(KEY_APPSELECT);
key(KEY_SCREENSAVER);
key(KEY_VOICECOMMAND);
//key(KEY_ASSISTANT);
//key(KEY_KBD_LAYOUT_NEXT);
//key(KEY_EMOJI_PICKER);
//key(KEY_DICTATE);
//key(KEY_CAMERA_ACCESS_ENABLE);
//key(KEY_CAMERA_ACCESS_DISABLE);
//key(KEY_CAMERA_ACCESS_TOGGLE);
key(KEY_ASSISTANT);
key(KEY_KBD_LAYOUT_NEXT);
// key(KEY_EMOJI_PICKER);
// key(KEY_DICTATE);
// key(KEY_CAMERA_ACCESS_ENABLE);
// key(KEY_CAMERA_ACCESS_DISABLE);
// key(KEY_CAMERA_ACCESS_TOGGLE);
key(KEY_BRIGHTNESS_MIN);
key(KEY_BRIGHTNESS_MAX);
key(KEY_KBDINPUTASSIST_PREV);
Expand All @@ -604,65 +604,65 @@ bool process_EV_KEY(const QStringList& args){
key(KEY_FASTREVERSE);
key(KEY_SLOWREVERSE);
key(KEY_DATA);
//key(KEY_ONSCREEN_KEYBOARD);
//key(KEY_PRIVACY_SCREEN_TOGGLE);
//key(KEY_SELECTIVE_SCREENSHOT);
//key(KEY_NEXT_ELEMENT);
//key(KEY_PREVIOUS_ELEMENT);
//key(KEY_AUTOPILOT_ENGAGE_TOGGLE);
//key(KEY_MARK_WAYPOINT);
//key(KEY_SOS);
//key(KEY_NAV_CHART);
//key(KEY_FISHING_CHART);
//key(KEY_SINGLE_RANGE_RADAR);
//key(KEY_DUAL_RANGE_RADAR);
//key(KEY_RADAR_OVERLAY);
//key(KEY_TRADITIONAL_SONAR);
//key(KEY_CLEARVU_SONAR);
//key(KEY_SIDEVU_SONAR);
//key(KEY_NAV_INFO);
//key(KEY_BRIGHTNESS_MENU);
//key(KEY_MACRO1);
//key(KEY_MACRO2);
//key(KEY_MACRO3);
//key(KEY_MACRO4);
//key(KEY_MACRO5);
//key(KEY_MACRO6);
//key(KEY_MACRO7);
//key(KEY_MACRO8);
//key(KEY_MACRO9);
//key(KEY_MACRO10);
//key(KEY_MACRO11);
//key(KEY_MACRO12);
//key(KEY_MACRO13);
//key(KEY_MACRO14);
//key(KEY_MACRO15);
//key(KEY_MACRO16);
//key(KEY_MACRO17);
//key(KEY_MACRO18);
//key(KEY_MACRO19);
//key(KEY_MACRO20);
//key(KEY_MACRO21);
//key(KEY_MACRO22);
//key(KEY_MACRO23);
//key(KEY_MACRO24);
//key(KEY_MACRO25);
//key(KEY_MACRO26);
//key(KEY_MACRO27);
//key(KEY_MACRO28);
//key(KEY_MACRO29);
//key(KEY_MACRO30);
//key(KEY_MACRO_RECORD_START);
//key(KEY_MACRO_RECORD_STOP);
//key(KEY_MACRO_PRESET_CYCLE);
//key(KEY_MACRO_PRESET1);
//key(KEY_MACRO_PRESET2);
//key(KEY_MACRO_PRESET3);
//key(KEY_KBD_LCD_MENU1);
//key(KEY_KBD_LCD_MENU2);
//key(KEY_KBD_LCD_MENU3);
//key(KEY_KBD_LCD_MENU4);
//key(KEY_KBD_LCD_MENU5);
key(KEY_ONSCREEN_KEYBOARD);
// key(KEY_PRIVACY_SCREEN_TOGGLE);
// key(KEY_SELECTIVE_SCREENSHOT);
// key(KEY_NEXT_ELEMENT);
// key(KEY_PREVIOUS_ELEMENT);
// key(KEY_AUTOPILOT_ENGAGE_TOGGLE);
// key(KEY_MARK_WAYPOINT);
// key(KEY_SOS);
// key(KEY_NAV_CHART);
// key(KEY_FISHING_CHART);
// key(KEY_SINGLE_RANGE_RADAR);
// key(KEY_DUAL_RANGE_RADAR);
// key(KEY_RADAR_OVERLAY);
// key(KEY_TRADITIONAL_SONAR);
// key(KEY_CLEARVU_SONAR);
// key(KEY_SIDEVU_SONAR);
// key(KEY_NAV_INFO);
// key(KEY_BRIGHTNESS_MENU);
// key(KEY_MACRO1);
// key(KEY_MACRO2);
// key(KEY_MACRO3);
// key(KEY_MACRO4);
// key(KEY_MACRO5);
// key(KEY_MACRO6);
// key(KEY_MACRO7);
// key(KEY_MACRO8);
// key(KEY_MACRO9);
// key(KEY_MACRO10);
// key(KEY_MACRO11);
// key(KEY_MACRO12);
// key(KEY_MACRO13);
// key(KEY_MACRO14);
// key(KEY_MACRO15);
// key(KEY_MACRO16);
// key(KEY_MACRO17);
// key(KEY_MACRO18);
// key(KEY_MACRO19);
// key(KEY_MACRO20);
// key(KEY_MACRO21);
// key(KEY_MACRO22);
// key(KEY_MACRO23);
// key(KEY_MACRO24);
// key(KEY_MACRO25);
// key(KEY_MACRO26);
// key(KEY_MACRO27);
// key(KEY_MACRO28);
// key(KEY_MACRO29);
// key(KEY_MACRO30);
// key(KEY_MACRO_RECORD_START);
// key(KEY_MACRO_RECORD_STOP);
// key(KEY_MACRO_PRESET_CYCLE);
// key(KEY_MACRO_PRESET1);
// key(KEY_MACRO_PRESET2);
// key(KEY_MACRO_PRESET3);
// key(KEY_KBD_LCD_MENU1);
// key(KEY_KBD_LCD_MENU2);
// key(KEY_KBD_LCD_MENU3);
// key(KEY_KBD_LCD_MENU4);
// key(KEY_KBD_LCD_MENU5);
key(KEY_MIN_INTERESTING);
key(KEY_MAX);
key(KEY_CNT);
Expand Down Expand Up @@ -731,7 +731,7 @@ bool process_EV_KEY(const QStringList& args){
key(BTN_TOOL_MOUSE);
key(BTN_TOOL_LENS);
key(BTN_TOOL_QUINTTAP);
//key(BTN_STYLUS3);
key(BTN_STYLUS3);
key(BTN_TOUCH);
key(BTN_STYLUS);
key(BTN_STYLUS2);
Expand Down
6 changes: 3 additions & 3 deletions applications/system-service/application.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ void Application::uninterruptApplication(){
case Background:
case Backgroundable:
if(stateNoSecurityCheck() == Paused){
touchHandler->clear_buffer();
systemAPI->clearDeviceBuffers();
kill(-m_process->processId(), SIGCONT);
}
qDebug() << "Waiting for SIGUSR1 ack";
Expand All @@ -303,7 +303,7 @@ void Application::uninterruptApplication(){
break;
case Foreground:
default:
touchHandler->clear_buffer();
systemAPI->clearDeviceBuffers();
kill(-m_process->processId(), SIGCONT);
startSpan("foreground", "Application is in the foreground");
}
Expand Down Expand Up @@ -339,7 +339,7 @@ void Application::stopNoSecurityCheck(){
Application* pausedApplication = nullptr;
if(state == Paused){
Oxide::Sentry::sentry_span(t, "resume", "Resume paused application", [this, &pausedApplication](){
touchHandler->clear_buffer();
systemAPI->clearDeviceBuffers();
auto currentApplication = appsAPI->currentApplicationNoSecurityCheck();
if(currentApplication.path() != path()){
pausedApplication = appsAPI->getApplication(currentApplication);
Expand Down
4 changes: 3 additions & 1 deletion applications/system-service/buttonhandler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,11 @@ void ButtonHandler::clear_buffer(){
#ifdef DEBUG
qDebug() << "Clearing event buffer on" << buttons.device.c_str();
#endif
::write(buttons.fd, flood, 512 * 8 * 4 * sizeof(input_event));
::write(buttons.fd, flood, EVENT_FLOOD_SIZE);
}

input_event* ButtonHandler::event_flood(){ return flood; }

void ButtonHandler::run(){
char name[256];
memset(name, 0, sizeof(name));
Expand Down
2 changes: 2 additions & 0 deletions applications/system-service/buttonhandler.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ using namespace std;
using namespace Oxide;

#define buttonHandler ButtonHandler::init()
#define EVENT_FLOOD_SIZE 512 * 8 * 4 * sizeof(input_event)

struct PressRecord {
bool pressed = false;
Expand All @@ -51,6 +52,7 @@ class ButtonHandler : public QThread {
ButtonHandler();
void setEnabled(bool enabled);
void clear_buffer();
input_event* event_flood();

public slots:
void pressKey(Qt::Key);
Expand Down
Loading