Skip to content

Commit

Permalink
Improved mouse data type parsing and began readability improvements
Browse files Browse the repository at this point in the history
  • Loading branch information
@keelimeguy
keelimeguy committed Jul 7, 2017
1 parent a101a6d commit 3c87233
Show file tree
Hide file tree
Showing 4 changed files with 457 additions and 127 deletions.
112 changes: 73 additions & 39 deletions main.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,133 +8,167 @@ int main(int argc, char* argv[]) {
if (argc!=3) {
printf("usage: %s <html_file> <master_css>\n", argv[0]);
} else {

/* Open the mouse files for reading mouse clicks and movement */
int mmf, mcf;
if ((mmf = open(MOUSE_MOVE_FILE, O_RDONLY))==-1) {
printf("ERROR opening %s\n", MOUSE_MOVE_FILE);
/* If one fails they both fail */
mmf = 0;
mcf = 0;
} else if ((mcf = open(MOUSE_CLICK_FILE, O_RDONLY))==-1) {
printf("ERROR opening %s\n", MOUSE_CLICK_FILE);
/* If one fails they both fail */
mmf = 0;
mcf = 0;
}

/* Read the given file and print its contents to the screen */
// printf("Reading file %s as HTML:\n\n", argv[1]);

/* Extract the directory for the HTML file path for later use */
std::string prefix = argv[1];
if (std::count(prefix.begin(), prefix.end(), '/') > 0)
prefix = prefix.substr(0, prefix.find_last_of('/'));
else prefix = "";

/* Read the given HTML file */
// printf("Reading file %s as HTML:\n\n", argv[1]);
std::ifstream t(argv[1]);
std::stringstream buffer;
buffer << t.rdbuf();
// printf("%s\n", buffer.str().c_str());
std::stringstream html_buffer;
html_buffer << t.rdbuf();
// printf("%s\n", html_buffer.str().c_str());

/* Load the master.css file */
/* Read the given CSS file */
// printf("Loading file %s as Master CSS\n\n", argv[2]);

std::ifstream t2(argv[2]);
std::stringstream buffer2;
buffer2 << t2.rdbuf();
std::stringstream css_buffer;
css_buffer << t2.rdbuf();

/* Get references to the framebuffer to work with */
/* Get references to the framebuffer in order to draw to the screen */
struct fb_fix_screeninfo finfo;
struct fb_var_screeninfo vinfo;
litehtml::uint_ptr hdc = get_drawable(&finfo, &vinfo);
if (!hdc) {
printf("ERROR opening %s\n", FRAMEBUFFER_FILE);
/* If this fails, no use continuing */
return 0;
}

/* Separate draw layer for mouse */
/* Create a separate draw layer for the mouse */
litehtml::uint_ptr hdcMouse = mmap(0, vinfo.yres_virtual * finfo.line_length, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, off_t(0));

/* Setup litehtml variables
See: https://github.com/litehtml/litehtml/wiki/How-to-use-litehtml */
uxmux_container* painter = new uxmux_container(prefix, "", &finfo, &vinfo);
litehtml::context context;

/* Start litehtml rendering
See: https://github.com/litehtml/litehtml/wiki/How-to-use-litehtml */
// printf("load_master_stylesheet\n");
context.load_master_stylesheet(buffer2.str().c_str());
context.load_master_stylesheet(css_buffer.str().c_str());
// printf("createFromString\n");
litehtml::document::ptr doc;
doc = litehtml::document::createFromString(buffer.str().c_str(), painter, &context);
doc = litehtml::document::createFromString(html_buffer.str().c_str(), painter, &context);

/* Setup useful flags and variables */
bool done = false, redraw = true, is_clicked = false;
int x=-1, y=-1;
unsigned char click_ie = 0;

/* Dirty fix for carryover click bug */
if (mcf&&mmf) {
/* Dirty fix for carryover click bug
(Without this the program may immediately read a right click and end the program) */
if (mcf && mmf) { // If mouse loading was successful
printf("Right click screen to start. (Then again to exit.)\n");

unsigned char val = handle_mouse(mcf, mmf, &x, &y, 0);
while (!(val&0x7))val=handle_mouse(mcf, mmf, &x, &y, 0);
while (val&0x2||val==0)val=handle_mouse(mcf, mmf, &x, &y, 0);
} else {
/* Read mouse until any click value is found */
while (!(val & MOUSE_ANY_CLICK))
val = handle_mouse(mcf, mmf, &x, &y, 0);

/* Read mouse until right click or empty value is found */
while ((val & MOUSE_RIGHT_CLICK) || !val)
val = handle_mouse(mcf, mmf, &x, &y, 0);

} else { // Else use enter key to control program
printf("Press enter to start. (Then again to exit.)\n");
int c;
/* Wait until user presses the enter key */
while (1) {
c = getchar();
if (isspace(c) || c == EOF)
break;
}
click_ie = 0x10;
/* Set flag to show the mouse files weren't loaded */
click_ie = MOUSE_INVALID;
}

///////////////////////////////////////////////////////////
#if !UXMUX_SAFE_MODE
/* Turn on graphics tty mode */
int tty_fd = open(TTY_FILE, O_RDWR);
ioctl(tty_fd, KDSETMODE, KD_GRAPHICS);
#endif

/* Main program loop */
while (!done) {
/* Draw to the screen */
render(hdc, doc, painter, &vinfo, &finfo, hdcMouse, x, y, click_ie, redraw);

/* Read mouse info */
click_ie = handle_mouse(mcf, mmf, &x, &y, click_ie);
if(painter->check_new_page()) {

/* Check if new page was loaded */
if (painter->check_new_page()) {

/* Get the file for the new HTML page and load it */
std::string page = painter->get_directory()+painter->get_new_page();
// printf("new_page: %s\n", page.c_str());

std::ifstream t3(page.c_str());
if (t3) {
std::stringstream buffer3;
buffer3 << t3.rdbuf();
// printf("%s\n", buffer3.str().c_str());

// printf("createFromString: %s\n", page.c_str());
if (t3) { // If page exists
/* Read the HTML file */
std::stringstream new_html_page_buffer;
new_html_page_buffer << t3.rdbuf();
// printf("%s\n", new_html_page_buffer.str().c_str());

/* Keep track of the new file location prefix */
if (std::count(page.begin(), page.end(), '/') > 0)
page = page.substr(0, page.find_last_of('/'));
else page = "";

/* Load the page into litehtml */
painter = new uxmux_container(page, painter->get_font_directory(), &finfo, &vinfo);
doc = litehtml::document::createFromString(buffer3.str().c_str(), painter, &context);
// printf("createFromString: %s\n", page.c_str());
doc = litehtml::document::createFromString(new_html_page_buffer.str().c_str(), painter, &context);
continue;
} else if (painter->check_new_page_alt()) {

} else if (painter->check_new_page_alt()) { // Else try alternate page file
/* Get the file for the new HTML page and load it */
page = painter->get_directory()+painter->get_new_page_alt();
// printf("alt_page: %s\n", page.c_str());

std::ifstream t4(page.c_str());
if (t4) {
std::stringstream buffer4;
buffer4 << t4.rdbuf();
// printf("%s\n", buffer4.str().c_str());

// printf("createFromString: %s\n", page.c_str());
if (t4) { // If page exists
/* Read the HTML file */
std::stringstream new_html_page_alt_buffer;
new_html_page_alt_buffer << t4.rdbuf();
// printf("%s\n", new_html_page_alt_buffer.str().c_str());

/* Keep track of the new file location prefix */
if (std::count(page.begin(), page.end(), '/') > 0)
page = page.substr(0, page.find_last_of('/'));
else page = "";

/* Load the page into litehtml */
painter = new uxmux_container(page, painter->get_font_directory(), &finfo, &vinfo);
doc = litehtml::document::createFromString(buffer4.str().c_str(), painter, &context);
// printf("createFromString: %s\n", page.c_str());
doc = litehtml::document::createFromString(new_html_page_alt_buffer.str().c_str(), painter, &context);
continue;
}
}
}

/* Update screen contents and check if program exit is triggered */
done = update(doc, painter, click_ie, x, y, &redraw, &is_clicked);
}

#if !UXMUX_SAFE_MODE
/* Turn on text tty mode before exiting */
ioctl(tty_fd, KDSETMODE, KD_TEXT);
#endif
///////////////////////////////////////////////////////////
Expand Down
6 changes: 4 additions & 2 deletions sample/other/links.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,10 +71,12 @@ <h1>Sample "Hello, World" Application</h1>

<br><h2>Always Run Functions:</h2>
<p>To use an always running external function, use the html tag:<br><code>&lt;link type="binary/elf" href="FILE_NAME.elf"></code><br>then provide the text tag:<br><code>&lt;text href="FILE_NAME.elf" type="function/always_run" target="FUNCTION_NAME_FROM_ELF"></code>
<br><br>An always running function is started on page loading to run continuously and may be configured to return a string which is to be displayed in the html text tag; to enable this provide a <code>rel="string"</code> argument in the text tag and write your function of the form:
<br><br>An always running function is started on page loading to run continuously and may be configured to return a string which is to be displayed in the html text tag; to enable this provide a <code>rel="string"</code> and an <code>id="YOUR_UNIQUE_ID"</code> argument in the text tag and write your function of the form:
<br><code>void FUNCTION_NAME_FROM_ELF(char *buf, int size)</code></p>
<p><br>Example:</p>
<text id="test" href="../../extra.elf" rel="string" type="function/always_run" target="func_always">func_always</text>
&lt;text id="test" href="../../extra.elf" rel="string" type="function/always_run" target="func_always">0&lt;/text>
<br> gives <br>
<text id="test" href="../../extra.elf" rel="string" type="function/always_run" target="func_always">0</text>
</p>

</body>
Expand Down
Loading

0 comments on commit 3c87233

Please sign in to comment.