Changeset 8bb0f5d6 in mainline

Timestamp:

2014-01-16T16:43:04Z (11 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

dace86a

Parents:

296e124e

Message:

remove compositor self-test code
(not needed anymore, the code is stable; if required, should be implemented as an external test)

Location:

uspace/srv/hid/compositor

Files:

• Makefile (modified) (1 diff)
• compositor.c (modified) (3 diffs)
• gfx/nameic.tga (deleted)

uspace/srv/hid/compositor/Makefile

@@ -34 +34 @@
 
 SOURCES = \
-        compositor.c \
-        images.c
-
-IMAGES = \
-        gfx/nameic.tga
-
-PRE_DEPEND = images.c images.h
-EXTRA_CLEAN = images.c images.h
+        compositor.c
 
 include $(USPACE_PREFIX)/Makefile.common
-
-images.c images.h: $(IMAGES)
-        $(ROOT_PATH)/tools/mkarray.py images COMPOSITOR_IMAGES $^

uspace/srv/hid/compositor/compositor.c

@@ -72 +72 @@
 #include <codec/tga.h>
 
-#include "images.h"
 #include "compositor.h"
 
@@ -1746 +1745 @@
             key == KC_O || key == KC_P);
         bool kconsole_switch = (mods & KM_ALT) && (key == KC_M);
-        bool compositor_test = (mods & KM_ALT) && (key == KC_H);
 
         bool filter = (type == KEY_RELEASE) && (win_transform || win_resize ||
             win_opacity || win_close || win_switch || viewport_move ||
-            viewport_change || kconsole_switch || compositor_test);
+            viewport_change || kconsole_switch);
 
         if (filter) {
@@ -2014 +2012 @@
         } else if (kconsole_switch) {
                 __SYSCALL0(SYS_DEBUG_ACTIVATE_CONSOLE);
-        } else if (compositor_test) {
-                fibril_mutex_lock(&window_list_mtx);
-
-                window_t *red_win = window_create(0, 0);
-                red_win->surface = surface_create(250, 150, NULL, 0);
-                pixel_t red_pix = PIXEL(255, 240, 0, 0);
-                for (sysarg_t y = 0; y <  150; ++y) {
-                        for (sysarg_t x = 0; x < 250; ++x) {
-                                surface_put_pixel(red_win->surface, x, y, red_pix);
-                        }
-                }
-                list_prepend(&red_win->link, &window_list);
-
-                window_t *blue_win = window_create(0, 0);
-                blue_win->surface = surface_create(200, 100, NULL, 0);
-                pixel_t blue_pix = PIXEL(255, 0, 0, 240);
-                for (sysarg_t y = 0; y <  100; ++y) {
-                        for (sysarg_t x = 0; x < 200; ++x) {
-                                surface_put_pixel(blue_win->surface, x, y, blue_pix);
-                        }
-                }
-                list_prepend(&blue_win->link, &window_list);
-                
-                window_t *nameic_win = window_create(0, 0);
-                nameic_win->surface = decode_tga((void *) nameic_tga, nameic_tga_size, 0);
-                list_prepend(&nameic_win->link, &window_list);
-
-                fibril_mutex_unlock(&window_list_mtx);
-                comp_damage(0, 0, UINT32_MAX, UINT32_MAX);
         } else {
                 window_event_t *event = (window_event_t *) malloc(sizeof(window_event_t));