Skip to content

Commit 1db2a98

Browse files
konect-Vkonect-V
committed
Update store-ui
1 parent 874a541 commit 1db2a98

File tree

10 files changed

+195
-119
lines changed

10 files changed

+195
-119
lines changed

‎sources/core/apps/desktop/icons/lock.tga

-768 KB
Binary file not shown.

‎sources/core/apps/desktop/icons/weather-ui.tga

-768 KB
Binary file not shown.

‎sources/core/apps/desktop/source/core/core.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -176,9 +176,6 @@ int load_json(){
176176

177177
json_root = cJSON_Parse(json_buffer);
178178

179-
int r = 0;
180-
181-
182179
if(json_root != NULL){
183180
wallpaper_path_json = cJSON_GetObjectItem(json_root, "wallpaper_path");
184181
if(cJSON_IsString(wallpaper_path_json) && (wallpaper_path_json->valuestring != NULL)){

‎sources/core/apps/explorer/source/core/core.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -211,10 +211,7 @@ int load_json(){
211211
json_buffer = malloc(json_size);
212212
fread(json_buffer, 1, json_size, json_file);
213213

214-
json_root = cJSON_Parse(json_buffer);
215-
216-
int r = 0;
217-
214+
json_root = cJSON_Parse(json_buffer);
218215

219216
if(json_root != NULL){
220217
wallpaper_path_json = cJSON_GetObjectItem(json_root, "wallpaper_path");

‎sources/core/apps/lock/source/core/core.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -225,8 +225,6 @@ int main(int argc, char* argv[]){
225225

226226
json_root = cJSON_Parse(json_buffer);
227227

228-
int r = 0;
229-
230228
char* wallpaper_path = NULL;
231229
char* font_path = NULL;
232230
char* pin_expected = NULL;

‎sources/core/apps/store-ui/res/default_font.ttf

1.76 MB
Binary file not shown.

‎sources/core/apps/store-ui/res/store-ui.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"font_path": "/usr/bin/res/store-ui/default_font.ttf"
3+
}

‎sources/core/apps/store-ui/source/core/core.c

Lines changed: 185 additions & 106 deletions
Original file line numberDiff line numberDiff line change
@@ -1,128 +1,207 @@
1+
#include <math.h>
2+
#include <fcntl.h>
13
#include <stdio.h>
2-
#include <stdlib.h>
4+
#include <stddef.h>
5+
#include <stdint.h>
36
#include <string.h>
7+
#include <unistd.h>
8+
#include <assert.h>
9+
#include <stdlib.h>
10+
#include <dirent.h>
411
#include <stdbool.h>
12+
13+
#include <linux/fb.h>
14+
#include <sys/time.h>
15+
#include <sys/wait.h>
16+
#include <sys/ioctl.h>
17+
#include <sys/types.h>
18+
519
#include <curl/curl.h>
620

21+
#include <cjson/cJSON.h>
22+
23+
#include <kot-graphics/font.h>
24+
#include <kot-graphics/utils.h>
25+
#include <kot-graphics/image.h>
26+
727
#include "../apps/apps.h"
828
#include "../launch/launch.h"
929
#include "../update/update.h"
1030
#include "../install/install.h"
1131
#include "../remove/remove.h"
1232

13-
int main(int argc, char *argv[]){
14-
curl_global_init(CURL_GLOBAL_DEFAULT);
15-
CURL *curl = curl_easy_init();
33+
int fb_fd = -1;
34+
kframebuffer_t fb;
35+
CURL* curl = NULL;
36+
kfont_t font = NULL;
37+
char* font_path = NULL;
38+
struct fb_fix_screeninfo fix_screeninfo;
39+
struct fb_var_screeninfo var_screeninfo;
1640

17-
if(curl == NULL){
18-
printf("Can't load curl");
19-
return -1;
41+
size_t json_size = 0;
42+
void* json_buffer = NULL;
43+
FILE* json_file = NULL;
44+
cJSON* json_root = NULL;
45+
cJSON* font_path_json = NULL;
46+
47+
uint32_t header_part_width = 0;
48+
char* header_text[] = {"Install <F1>", "Update <F2>", "Uninstall <F3>"};
49+
50+
int load_fb(){
51+
fb_fd = open("/dev/fb0", O_RDWR);
52+
53+
assert(fb_fd >= 0);
54+
55+
56+
assert(ioctl(fb_fd, FBIOGET_FSCREENINFO, &fix_screeninfo) == 0);
57+
assert(ioctl(fb_fd, FBIOGET_VSCREENINFO, &var_screeninfo) == 0);
58+
59+
if(
60+
fix_screeninfo.visual == FB_VISUAL_TRUECOLOR &&
61+
var_screeninfo.bits_per_pixel == 32 &&
62+
var_screeninfo.red.length == 8 && var_screeninfo.red.msb_right == 0 &&
63+
var_screeninfo.green.length == 8 && var_screeninfo.green.msb_right == 0 &&
64+
var_screeninfo.blue.length == 8 && var_screeninfo.blue.msb_right == 0
65+
){
66+
fb.bpp = var_screeninfo.bits_per_pixel;
67+
fb.btpp = fb.bpp / 8;
68+
fb.size = var_screeninfo.xres_virtual * var_screeninfo.yres_virtual * fb.btpp;
69+
fb.width = var_screeninfo.xres_virtual;
70+
fb.pitch = fb.width * fb.btpp;
71+
fb.height = var_screeninfo.yres_virtual;
72+
fb.buffer = malloc(fb.size);
73+
memset(fb.buffer, 0, fb.size);
2074
}else{
21-
if(!strcmp(argv[1], "--install") && argc == 2){
22-
char search_mode[3];
23-
printf("Search with > T(tag)/N(name)\n");
24-
fgets(search_mode, sizeof(search_mode), stdin);
25-
search_mode[strcspn(search_mode, "\n")] = 0;
26-
if(!strcmp("T", search_mode)){
27-
char tag[512];
28-
printf("What is the tag of the application you want to install?\n");
29-
fgets(tag, sizeof(tag), stdin);
30-
tag[strcspn(tag, "\n")] = 0;
31-
32-
app_url_by_tag_t** apps_available = find_apps_url_by_tag(curl, tag);
33-
34-
if(apps_available != NULL){
35-
int i = 0;
36-
while(apps_available[i] != NULL){
37-
printf("%d) %s\n", i, apps_available[i]->name);
38-
i++;
39-
}
40-
41-
char link_index[10];
42-
printf("Select the index you want to install :\n");
43-
fgets(link_index, sizeof(link_index), stdin);
44-
link_index[strcspn(link_index, "\n")] = 0;
45-
46-
int index_to_install = atoi(link_index);
47-
48-
if(index_to_install >= 0 && index_to_install < i){
49-
char allow_install[3];
50-
printf("%s > Would you like to install it? (Y/N)\n", apps_available[index_to_install]->name);
51-
fgets(allow_install, sizeof(allow_install), stdin);
52-
allow_install[strcspn(allow_install, "\n")] = 0;
53-
if(!strcmp("Y", allow_install)){
54-
install_app(curl, apps_available[index_to_install]->url, apps_available[index_to_install]->name, false);
55-
}else{
56-
printf("Cancel the installation\n");
57-
}
58-
}else{
59-
printf("Unknow index !\n");
60-
}
61-
62-
free_app_url_by_tag(apps_available);
63-
}else{
64-
printf("No application found with tag: %s. Please check the spelling or try a different tag.\n", tag);
65-
}
66-
}else if(!strcmp("N", search_mode)){
67-
char name[512];
68-
printf("What is the name of the application you want to install?\n");
69-
fgets(name, sizeof(name), stdin);
70-
name[strcspn(name, "\n")] = 0;
71-
72-
char* url = find_apps_url_by_name(curl, name);
73-
74-
if(url != NULL){
75-
char allow_install[3];
76-
printf("%s found in the store. Would you like to install it? (Y/N)\n", name);
77-
fgets(allow_install, sizeof(allow_install), stdin);
78-
allow_install[strcspn(allow_install, "\n")] = 0;
79-
if(!strcmp("Y", allow_install)){
80-
install_app(curl, url, name, false);
81-
}else{
82-
printf("Cancel the installation\n");
83-
}
84-
free(url);
85-
}else{
86-
printf("Can't find %s in the store. Did you spell it correctly?\n", name);
87-
}
88-
}else{
89-
printf("Unknow search method !\n");
90-
}
91-
}else if(!strcmp(argv[1], "--install") && argc == 3){
92-
char* name = argv[2];
93-
94-
char* url = find_apps_url_by_name(curl, name);
75+
perror("'/dev/fb0' : format not supported");
76+
return EXIT_FAILURE;
77+
}
78+
79+
return EXIT_SUCCESS;
80+
}
81+
82+
void unload_fb(){
83+
free(fb.buffer);
84+
close(fb_fd);
85+
}
86+
87+
int load_json(){
88+
json_file = fopen("/usr/bin/res/store-ui/store-ui.json", "r");
89+
90+
if(json_file == NULL){
91+
perror("Error: Unable to open the file : /usr/bin/res/store-ui/store-ui.json\n");
92+
return EXIT_FAILURE;
93+
}
94+
95+
fseek(json_file, 0, SEEK_END);
96+
json_size = ftell(json_file);
97+
fseek(json_file, 0, SEEK_SET);
98+
99+
json_buffer = malloc(json_size);
100+
fread(json_buffer, 1, json_size, json_file);
101+
102+
json_root = cJSON_Parse(json_buffer);
103+
104+
if(json_root != NULL){
105+
font_path_json = cJSON_GetObjectItem(json_root, "font_path");
106+
if(cJSON_IsString(font_path_json) && (font_path_json->valuestring != NULL)){
107+
font_path = strdup(font_path_json->valuestring);
108+
}else{
109+
free(json_buffer);
110+
111+
fclose(json_file);
95112

96-
if(url != NULL){
97-
char allow_install[3];
98-
printf("%s found in the store. Would you like to install it? (Y/N)\n", name);
99-
fgets(allow_install, sizeof(allow_install), stdin);
100-
allow_install[strcspn(allow_install, "\n")] = 0;
101-
if(!strcmp("Y", allow_install)){
102-
install_app(curl, url, name, false);
103-
}else{
104-
printf("Cancel the installation\n");
105-
}
106-
free(url);
107-
}else{
108-
printf("Can't find %s in the store. Did you spell it correctly?\n", name);
109-
}
110-
}else if(!strcmp(argv[1], "--update") && argc == 3){
111-
char* name = argv[2];
112-
update_app(curl, name);
113-
}else if(!strcmp(argv[1], "--remove") && argc == 3){
114-
char* name = argv[2];
115-
remove_app(name, true);
116-
}else if(!strcmp(argv[1], "--launch") && argc >= 3){
117-
char* name = argv[2];
118-
// Keep the app name
119-
launch_app(name, argc - 2, &argv[2]);
113+
printf("Error: Unable to parse the file : /usr/bin/res/store-ui/store-ui.json\n");
114+
return EXIT_FAILURE;
120115
}
116+
}else{
117+
free(json_buffer);
118+
119+
fclose(json_file);
120+
121+
printf("Error: Unable to parse the file : /usr/bin/res/image-reader/image-reader.json\n");
122+
return EXIT_FAILURE;
123+
}
124+
125+
return EXIT_SUCCESS;
126+
}
127+
128+
void unload_json(){
129+
free(font_path);
130+
}
131+
132+
int load_font_data(){
133+
FILE* font_file = fopen(font_path, "rb");
134+
if(font_file == NULL){
135+
perror("Failed to open font file");
136+
return EXIT_FAILURE;
137+
}
138+
139+
fseek(font_file, 0, SEEK_END);
140+
size_t font_file_size = ftell(font_file);
141+
fseek(font_file, 0, SEEK_SET);
142+
143+
void* font_data = malloc(font_file_size);
144+
fread(font_data, font_file_size, 1, font_file);
145+
fclose(font_file);
146+
147+
font = load_font(font_data, font_file_size);
148+
free(font_data);
149+
150+
return EXIT_SUCCESS;
151+
}
152+
153+
void unload_font_data(){
154+
free_font(font);
155+
}
156+
157+
int load_curl(){
158+
curl_global_init(CURL_GLOBAL_DEFAULT);
159+
curl = curl_easy_init();
160+
161+
if(curl == NULL){
162+
perror("Can't load curl");
163+
return EXIT_FAILURE;
121164
}
122165

166+
return EXIT_SUCCESS;
167+
}
168+
169+
void unload_curl(){
123170
curl_easy_cleanup(curl);
124171

125172
curl_global_cleanup();
173+
}
174+
175+
int main(int argc, char *argv[]){
176+
if(load_fb() != EXIT_SUCCESS){
177+
return EXIT_FAILURE;
178+
}
179+
180+
if(load_json() != EXIT_SUCCESS){
181+
unload_fb();
182+
return EXIT_FAILURE;
183+
}
184+
185+
if(load_font_data(font_path) != EXIT_SUCCESS){
186+
unload_json();
187+
unload_fb();
188+
return EXIT_FAILURE;
189+
}
190+
191+
if(load_curl() != EXIT_SUCCESS){
192+
unload_fb();
193+
unload_font_data();
194+
return EXIT_FAILURE;
195+
}
196+
197+
while(true){
198+
199+
}
200+
201+
unload_fb();
202+
unload_curl();
203+
unload_json();
204+
unload_font_data();
126205

127-
return 0;
206+
return EXIT_SUCCESS;
128207
}

‎sources/core/apps/store-ui/target/amd64/makefile

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,10 @@ $(LIB)/%_c.o: $(SOURCE)/%.c
3434

3535
link:
3636
@ mkdir -m 777 -p $(BIN)
37-
@ $(CC) $(LDFLAGS) -o $(BIN)/store-ui $(OBJS) $(LIBRARIES)/libcurl.a $(LIBRARIES)/libtls.a $(LIBRARIES)/libssl.a $(LIBRARIES)/libcjson.a $(LIBRARIES)/libz.a
37+
@ $(CC) $(LDFLAGS) -o $(BIN)/store-ui $(OBJS) $(LIBRARIES)/libcurl.a $(LIBRARIES)/libtls.a $(LIBRARIES)/libssl.a $(LIBRARIES)/libcjson.a $(LIBRARIES)/libz.a $(LIBRARIES)/libkot-graphics.a $(LIBRARIES)/libfreetype.a
3838

39-
build: $(OBJS) link
39+
copy_res:
40+
@ mkdir -m 777 -p $(BIN)/res/store-ui
41+
@ cp -r $(HOME)/res/. $(BIN)/res/store-ui
42+
43+
build: $(OBJS) link copy_res

‎sources/core/apps/text-reader/source/core/core.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -259,8 +259,6 @@ int load_json(){
259259

260260
json_root = cJSON_Parse(json_buffer);
261261

262-
int r = 0;
263-
264262
if(json_root != NULL){
265263
font_path_json = cJSON_GetObjectItem(json_root, "font_path");
266264
if(cJSON_IsString(font_path_json) && (font_path_json->valuestring != NULL)){

0 commit comments

Comments
 (0)