Aren/toaruos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Strip unused features from background; no terminal at startup

Browse Source
This commit is contained in:
K. Lange 2018-04-24 09:27:36 +09:00 committed by Kevin Lange
parent 7b7f2f416c
commit f7f6c6ffe8
1 changed files with 0 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
apps/background.c
View File

@ -6,13 +6,9 @@
#include <toaru/graphics.h>
#include <toaru/drawstring.h>
#define PANEL_HEIGHT 24
static yutani_t * yctx;
static yutani_window_t * wallpaper_window;
static gfx_context_t * wallpaper_ctx;
static yutani_window_t * panel_window;
static gfx_context_t * panel_ctx;
static sprite_t * wallpaper;
static void draw_background(int width, int height) {
@ -33,15 +29,6 @@ static void draw_background(int width, int height) {
}
}
static void draw_panel(int width) {
char label[100];
struct utsname u;
uname(&u);
sprintf(label, "ToaruOS-NIH %s", u.release);
draw_fill(panel_ctx, rgba(0,0,0,170));
draw_string(panel_ctx, 1, 2, rgb(255,255,255), label);
}
static void resize_finish_wallpaper(int width, int height) {
yutani_window_resize_accept(yctx, wallpaper_window, width, height);
reinit_graphics_yutani(wallpaper_ctx, wallpaper_window);
@ -50,32 +37,6 @@ static void resize_finish_wallpaper(int width, int height) {
yutani_flip(yctx, wallpaper_window);
}
static void resize_finish_panel(int width, int height) {
yutani_window_resize_accept(yctx, panel_window, width, height);
reinit_graphics_yutani(panel_ctx, panel_window);
draw_panel(width);
yutani_window_resize_done(yctx, panel_window);
yutani_flip(yctx, panel_window);
}
static void launch_application(char * app) {
if (!fork()) {
printf("Starting %s\n", app);
char * args[] = {"/bin/sh", "-c", app, NULL};
execvp(args[0], args);
exit(1);
}
}
static void handle_key_event(struct yutani_msg_key_event * ke) {
if ((ke->event.modifiers & KEY_MOD_LEFT_CTRL) &&
(ke->event.modifiers & KEY_MOD_LEFT_ALT) &&
(ke->event.keycode == 't') &&
(ke->event.action == KEY_ACTION_DOWN)) {
launch_application("terminal");
}
}
int main (int argc, char ** argv) {
wallpaper = malloc(sizeof(sprite_t));
@ -93,27 +54,8 @@ int main (int argc, char ** argv) {
draw_background(yctx->display_width, yctx->display_height);
yutani_flip(yctx, wallpaper_window);
#if 0
/* panel */
panel_window = yutani_window_create(yctx, yctx->display_width, PANEL_HEIGHT);
yutani_window_move(yctx, panel_window, 0, 0);
yutani_set_stack(yctx, panel_window, YUTANI_ZORDER_TOP);
panel_ctx = init_graphics_yutani(panel_window);
draw_panel(yctx->display_width);
yutani_flip(yctx, panel_window);
#endif
int should_exit = 0;
yutani_key_bind(yctx, 't', KEY_MOD_LEFT_CTRL | KEY_MOD_LEFT_ALT, YUTANI_BIND_STEAL);
int _terminal_pid = fork();
if (!_terminal_pid) {
char * args[] = {"/bin/terminal", NULL};
execvp(args[0], args);
}
while (!should_exit) {
yutani_msg_t * m = yutani_poll(yctx);
if (m) {
@ -121,22 +63,12 @@ int main (int argc, char ** argv) {
case YUTANI_MSG_WELCOME:
fprintf(stderr, "Request to resize desktop received, resizing to %d x %d\n", yctx->display_width, yctx->display_height);
yutani_window_resize_offer(yctx, wallpaper_window, yctx->display_width, yctx->display_height);
#if 0
yutani_window_resize_offer(yctx, panel_window, yctx->display_width, PANEL_HEIGHT);
#endif
break;
case YUTANI_MSG_KEY_EVENT:
handle_key_event((struct yutani_msg_key_event *)m->data);
break;
case YUTANI_MSG_RESIZE_OFFER:
{
struct yutani_msg_window_resize * wr = (void*)m->data;
if (wr->wid == wallpaper_window->wid) {
resize_finish_wallpaper(wr->width, wr->height);
#if 0
} else if (wr->wid == panel_window->wid) {
resize_finish_panel(wr->width, wr->height);
#endif
}
}
break;