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

Minor stuff

Browse Source
This commit is contained in:
Kevin Lange 2012-04-17 15:34:34 -05:00
parent 40130c6782
commit 4cb3f0020b
4 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
userspace/compositor.c
View File

@ -323,9 +323,7 @@ void draw_bounding_box(window_t * window, int32_t left, int32_t top) {
for (uint16_t y = _lo_y; y < _hi_y; ++y) {
for (uint16_t x = _lo_x; x < _hi_x; ++x) {
/* XXX MAKE THIS FASTER */
//if (TO_DERPED_OFFSET(x,y) >= window->width * window->height) continue;
GFX(ctx,x,y) = alpha_blend(GFX(ctx,x,y), ((uint32_t *)window->buffer)[TO_DERPED_OFFSET(x,y)], rgb(127,0,0));
GFX(ctx,x,y) = alpha_blend(GFX(ctx,x,y), ((uint32_t *)window->buffer)[TO_DERPED_OFFSET(x,y)], rgb(127,0,0));
}
}

21
userspace/draw.c
View File

@ -4,6 +4,7 @@
#include "lib/graphics.h"
#include "lib/list.h"
#include "lib/shmemfonts.h"
#include "lib/decorations.h"
/* XXX TOOLKIT FUNCTIONS */
@ -136,6 +137,10 @@ static void quit_app(void * button, w_mouse_t * event) {
exit(0);
}
void decors(window_t * win) {
render_decorations(win, win->buffer, "Draw!");
}
int main (int argc, char ** argv) {
int left = 30;
int top = 30;
@ -149,27 +154,29 @@ int main (int argc, char ** argv) {
window_t * wina = window_create(left, top, width, height);
ctx = init_graphics_window(wina);
draw_fill(ctx, rgb(255,255,255));
init_decorations();
decors(wina);
win_use_threaded_handler();
setup_ttk(wina);
ttk_button * button_blue = ttk_new_button("Blue", set_color);
ttk_position((ttk_object *)button_blue, 3, 3, 100, 20);
ttk_position((ttk_object *)button_blue, decor_left_width + 3, decor_top_height + 3, 100, 20);
button_blue->fill_color = rgb(0,0,255);
button_blue->fore_color = rgb(255,255,255);
ttk_button * button_green = ttk_new_button("Green", set_color);
ttk_position((ttk_object *)button_green, 106, 3, 100, 20);
ttk_position((ttk_object *)button_green, decor_left_width + 106, decor_top_height + 3, 100, 20);
button_green->fill_color = rgb(0,255,0);
button_green->fore_color = rgb(0,0,0);
ttk_button * button_red = ttk_new_button("Red", set_color);
ttk_position((ttk_object *)button_red, 209, 3, 100, 20);
ttk_position((ttk_object *)button_red, decor_left_width + 209, decor_top_height + 3, 100, 20);
button_red->fill_color = rgb(255,0,0);
button_red->fore_color = rgb(255,255,255);
ttk_button * button_quit = ttk_new_button("X", quit_app);
ttk_position((ttk_object *)button_quit, width - 23, 3, 20, 20);
ttk_position((ttk_object *)button_quit, decor_left_width + width - 25, decor_top_height + 3, 20, 20);
button_quit->fill_color = rgb(255,0,0);
button_quit->fore_color = rgb(255,255,255);
@ -188,10 +195,8 @@ int main (int argc, char ** argv) {
w_mouse_t * mouse = poll_mouse();
if (mouse != NULL) {
if (mouse->command == WE_MOUSEMOVE && mouse->buttons & MOUSE_BUTTON_LEFT) {
//if (mouse->old_x >= 0 && mouse->new_x >= 0 && mouse->old_y >= 0 && mouse->new_y >= 0 &&
// mouse->old_x < width && mouse->new_x < width && mouse->old_y < width && mouse->new_y < width) {
draw_line(ctx, mouse->old_x, mouse->new_x, mouse->old_y, mouse->new_y, drawing_color);
//}
draw_line(ctx, mouse->old_x, mouse->new_x, mouse->old_y, mouse->new_y, drawing_color);
decors(wina);
}
free(mouse);
}

8
userspace/lib/graphics.c
View File

@ -67,10 +67,10 @@ uint32_t rgb(uint8_t r, uint8_t g, uint8_t b) {
}
uint32_t alpha_blend(uint32_t bottom, uint32_t top, uint32_t mask) {
float a = _RED(mask) / 256.0;
uint8_t red = _RED(bottom) * (1.0 - a) + _RED(top) * a;
uint8_t gre = _GRE(bottom) * (1.0 - a) + _GRE(top) * a;
uint8_t blu = _BLU(bottom) * (1.0 - a) + _BLU(top) * a;
uint8_t a = _RED(mask);
uint8_t red = (_RED(bottom) * (255 - a) + _RED(top) * a) / 256;
uint8_t gre = (_GRE(bottom) * (255 - a) + _GRE(top) * a) / 256;
uint8_t blu = (_BLU(bottom) * (255 - a) + _BLU(top) * a) / 256;
return rgb(red,gre,blu);
}

2
userspace/wallpaper.c
View File

@ -52,7 +52,7 @@ int main (int argc, char ** argv) {
assert(wina);
window_reorder (wina, 0);
ctx = init_graphics_window_double_buffer(wina);
draw_fill(ctx, rgb(0,0,0));
draw_fill(ctx, rgb(127,127,127));
flip(ctx);
#if 1