Revert "Make libminuitwrp compile"
This reverts commit a27d02fab9d6feb793cdcd6146f2655658f36f2b.
Change-Id: I62d143044749f101cd70fef048057f896e46c208
diff --git a/minuitwrp/Android.mk b/minuitwrp/Android.mk
index 9723d9d..bc4e054 100644
--- a/minuitwrp/Android.mk
+++ b/minuitwrp/Android.mk
@@ -2,7 +2,7 @@
include $(CLEAR_VARS)
-LOCAL_SRC_FILES := events.c resourcesnew.c graphics_overlay.c graphics_utils.c
+LOCAL_SRC_FILES := events.c resources.c graphics_overlay.c graphics_utils.c
ifneq ($(TW_BOARD_CUSTOM_GRAPHICS),)
LOCAL_SRC_FILES += $(TW_BOARD_CUSTOM_GRAPHICS)
diff --git a/minuitwrp/graphics.c b/minuitwrp/graphics.c
index 0cdd772..9926904 100644
--- a/minuitwrp/graphics.c
+++ b/minuitwrp/graphics.c
@@ -77,13 +77,6 @@
static int gr_fb_fd = -1;
static int gr_vt_fd = -1;
-static unsigned char gr_current_r = 255;
-static unsigned char gr_current_g = 255;
-static unsigned char gr_current_b = 255;
-static unsigned char gr_current_a = 255;
-
-static GRSurface* gr_draw = NULL;
-
struct fb_var_screeninfo vi;
static struct fb_fix_screeninfo fi;
@@ -582,8 +575,7 @@
}
void gr_blit(gr_surface source, int sx, int sy, int w, int h, int dx, int dy) {
- // This is the old code, not sure if we still need it or not
- /*if (gr_context == NULL) {
+ if (gr_context == NULL) {
return;
}
@@ -602,29 +594,7 @@
gl->recti(gl, dx, dy, dx + w, dy + h);
if(surface->format == GGL_PIXEL_FORMAT_RGBX_8888)
- gl->enable(gl, GGL_BLEND);*/
- if (source == NULL) return;
-
- // This code doesn't compile yet, but may very well be needed later
- /*if (gr_draw->pixel_bytes != source->pixel_bytes) {
- printf("gr_blit: source has wrong format\n");
- return;
- }
-
- dx += overscan_offset_x;
- dy += overscan_offset_y;
-
- if (outside(dx, dy) || outside(dx+w-1, dy+h-1)) return;*/
-
- unsigned char* src_p = source->data + sy*source->row_bytes + sx*source->pixel_bytes;
- unsigned char* dst_p = gr_draw->data + dy*gr_draw->row_bytes + dx*gr_draw->pixel_bytes;
-
- int i;
- for (i = 0; i < h; ++i) {
- memcpy(dst_p, src_p, w * source->pixel_bytes);
- src_p += source->row_bytes;
- dst_p += gr_draw->row_bytes;
- }
+ gl->enable(gl, GGL_BLEND);
}
unsigned int gr_get_width(gr_surface surface) {
diff --git a/minuitwrp/minui.h b/minuitwrp/minui.h
index 699b08c..cb9f8a3 100644
--- a/minuitwrp/minui.h
+++ b/minuitwrp/minui.h
@@ -17,16 +17,7 @@
#ifndef _MINUI_H_
#define _MINUI_H_
-typedef struct {
- int width;
- int height;
- int row_bytes;
- int pixel_bytes;
- unsigned char* data;
-} GRSurface;
-
-typedef GRSurface* gr_surface;
-
+typedef void* gr_surface;
typedef unsigned short gr_pixel;
#define FONT_TYPE_TWRP 0
diff --git a/minuitwrp/resourcesnew.c b/minuitwrp/resourcesnew.c
deleted file mode 100644
index a13c0fd..0000000
--- a/minuitwrp/resourcesnew.c
+++ /dev/null
@@ -1,353 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <stdlib.h>
-#include <unistd.h>
-
-#include <fcntl.h>
-#include <stdio.h>
-
-#include <sys/ioctl.h>
-#include <sys/mman.h>
-#include <sys/types.h>
-
-#include <linux/fb.h>
-#include <linux/kd.h>
-
-#include <pixelflinger/pixelflinger.h>
-
-#include <png.h>
-#include "jpeglib.h"
-
-#include "minui.h"
-
-// libpng gives "undefined reference to 'pow'" errors, and I have no
-// idea how to convince the build system to link with -lm. We don't
-// need this functionality (it's used for gamma adjustment) so provide
-// a dummy implementation to satisfy the linker.
-double pow(double x, double y) {
- return x;
-}
-
-#define SURFACE_DATA_ALIGNMENT 8
-
-static gr_surface malloc_surface(size_t data_size) {
- unsigned char* temp = malloc(sizeof(GRSurface) + data_size + SURFACE_DATA_ALIGNMENT);
- if (temp == NULL) return NULL;
- gr_surface surface = (gr_surface) temp;
- surface->data = temp + sizeof(GRSurface) +
- (SURFACE_DATA_ALIGNMENT - (sizeof(GRSurface) % SURFACE_DATA_ALIGNMENT));
- return surface;
-}
-
-static int open_png(const char* name, png_structp* png_ptr, png_infop* info_ptr,
- png_uint_32* width, png_uint_32* height, png_byte* channels) {
- char resPath[256];
- unsigned char header[8];
- int result = 0;
-
- snprintf(resPath, sizeof(resPath)-1, "/res/images/%s.png", name);
- resPath[sizeof(resPath)-1] = '\0';
- FILE* fp = fopen(resPath, "rb");
- if (fp == NULL) {
- result = -1;
- goto exit;
- }
-
- size_t bytesRead = fread(header, 1, sizeof(header), fp);
- if (bytesRead != sizeof(header)) {
- result = -2;
- goto exit;
- }
-
- if (png_sig_cmp(header, 0, sizeof(header))) {
- result = -3;
- goto exit;
- }
-
- *png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
- if (!*png_ptr) {
- result = -4;
- goto exit;
- }
-
- *info_ptr = png_create_info_struct(*png_ptr);
- if (!*info_ptr) {
- result = -5;
- goto exit;
- }
-
- if (setjmp(png_jmpbuf(*png_ptr))) {
- result = -6;
- goto exit;
- }
-
- png_init_io(*png_ptr, fp);
- png_set_sig_bytes(*png_ptr, sizeof(header));
- png_read_info(*png_ptr, *info_ptr);
-
- int color_type, bit_depth;
- png_get_IHDR(*png_ptr, *info_ptr, width, height, &bit_depth,
- &color_type, NULL, NULL, NULL);
-
- *channels = png_get_channels(*png_ptr, *info_ptr);
-
- if (bit_depth == 8 && *channels == 3 && color_type == PNG_COLOR_TYPE_RGB) {
- // 8-bit RGB images: great, nothing to do.
- } else if (bit_depth <= 8 && *channels == 1 && color_type == PNG_COLOR_TYPE_GRAY) {
- // 1-, 2-, 4-, or 8-bit gray images: expand to 8-bit gray.
- png_set_expand_gray_1_2_4_to_8(*png_ptr);
- } else if (bit_depth <= 8 && *channels == 1 && color_type == PNG_COLOR_TYPE_PALETTE) {
- // paletted images: expand to 8-bit RGB. Note that we DON'T
- // currently expand the tRNS chunk (if any) to an alpha
- // channel, because minui doesn't support alpha channels in
- // general.
- png_set_palette_to_rgb(*png_ptr);
- *channels = 3;
- } else {
- fprintf(stderr, "minui doesn't support PNG depth %d channels %d color_type %d\n",
- bit_depth, *channels, color_type);
- result = -7;
- goto exit;
- }
-
- return result;
-
- exit:
- if (result < 0) {
- png_destroy_read_struct(png_ptr, info_ptr, NULL);
- }
- if (fp != NULL) {
- fclose(fp);
- }
-
- return result;
-}
-
-// "display" surfaces are transformed into the framebuffer's required
-// pixel format (currently only RGBX is supported) at load time, so
-// gr_blit() can be nothing more than a memcpy() for each row. The
-// next two functions are the only ones that know anything about the
-// framebuffer pixel format; they need to be modified if the
-// framebuffer format changes (but nothing else should).
-
-// Allocate and return a gr_surface sufficient for storing an image of
-// the indicated size in the framebuffer pixel format.
-static gr_surface init_display_surface(png_uint_32 width, png_uint_32 height) {
- gr_surface surface;
-
- surface = malloc_surface(width * height * 4);
- if (surface == NULL) return NULL;
-
- surface->width = width;
- surface->height = height;
- surface->row_bytes = width * 4;
- surface->pixel_bytes = 4;
-
- return surface;
-}
-
-// Copy 'input_row' to 'output_row', transforming it to the
-// framebuffer pixel format. The input format depends on the value of
-// 'channels':
-//
-// 1 - input is 8-bit grayscale
-// 3 - input is 24-bit RGB
-// 4 - input is 32-bit RGBA/RGBX
-//
-// 'width' is the number of pixels in the row.
-static void transform_rgb_to_draw(unsigned char* input_row,
- unsigned char* output_row,
- int channels, int width) {
- int x;
- unsigned char* ip = input_row;
- unsigned char* op = output_row;
-
- switch (channels) {
- case 1:
- // expand gray level to RGBX
- for (x = 0; x < width; ++x) {
- *op++ = *ip;
- *op++ = *ip;
- *op++ = *ip;
- *op++ = 0xff;
- ip++;
- }
- break;
-
- case 3:
- // expand RGBA to RGBX
- for (x = 0; x < width; ++x) {
- *op++ = *ip++;
- *op++ = *ip++;
- *op++ = *ip++;
- *op++ = 0xff;
- }
- break;
-
- case 4:
- // copy RGBA to RGBX
- memcpy(output_row, input_row, width*4);
- break;
- }
-}
-
-int res_create_surface_png(const char* name, gr_surface* pSurface) {
- gr_surface surface = NULL;
- int result = 0;
- png_structp png_ptr = NULL;
- png_infop info_ptr = NULL;
- png_uint_32 width, height;
- png_byte channels;
-
- *pSurface = NULL;
-printf("png trying to open '%s'\n", name);
- result = open_png(name, &png_ptr, &info_ptr, &width, &height, &channels);
- if (result < 0) return result;
-
- surface = init_display_surface(width, height);
- if (surface == NULL) {
- result = -8;
- goto exit;
- }
-
- unsigned char* p_row = malloc(width * 4);
- unsigned int y;
- for (y = 0; y < height; ++y) {
- png_read_row(png_ptr, p_row, NULL);
- transform_rgb_to_draw(p_row, surface->data + y * surface->row_bytes, channels, width);
- }
- free(p_row);
-
- *pSurface = surface->data;
-
- exit:
- png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
- if (result < 0 && surface != NULL) free(surface);
- printf("res_create_surface_png returning: %i\n", result);
- return result;
-}
-
-int res_create_surface_jpg(const char* name, gr_surface* pSurface) {
- GGLSurface* surface = NULL;
- int result = 0;
- struct jpeg_decompress_struct cinfo;
- struct jpeg_error_mgr jerr;
-
- FILE* fp = fopen(name, "rb");
- if (fp == NULL) {
- char resPath[256];
-
- snprintf(resPath, sizeof(resPath)-1, "/res/images/%s", name);
- resPath[sizeof(resPath)-1] = '\0';
- fp = fopen(resPath, "rb");
- if (fp == NULL) {
- result = -1;
- goto exit;
- }
- }
-
- cinfo.err = jpeg_std_error(&jerr);
- jpeg_create_decompress(&cinfo);
-
- /* Specify data source for decompression */
- jpeg_stdio_src(&cinfo, fp);
-
- /* Read file header, set default decompression parameters */
- if (jpeg_read_header(&cinfo, TRUE) != JPEG_HEADER_OK)
- goto exit;
-
- /* Start decompressor */
- (void) jpeg_start_decompress(&cinfo);
-
- size_t width = cinfo.image_width;
- size_t height = cinfo.image_height;
- size_t stride = 4 * width;
- size_t pixelSize = stride * height;
-
- surface = malloc(sizeof(GGLSurface) + pixelSize);
- if (surface == NULL) {
- result = -8;
- goto exit;
- }
-
- unsigned char* pData = (unsigned char*) (surface + 1);
- surface->version = sizeof(GGLSurface);
- surface->width = width;
- surface->height = height;
- surface->stride = width; /* Yes, pixels, not bytes */
- surface->data = pData;
- surface->format = GGL_PIXEL_FORMAT_RGBX_8888;
-
- int y;
- for (y = 0; y < (int) height; ++y) {
- unsigned char* pRow = pData + y * stride;
- jpeg_read_scanlines(&cinfo, &pRow, 1);
-
- int x;
- for(x = width - 1; x >= 0; x--) {
- int sx = x * 3;
- int dx = x * 4;
- unsigned char r = pRow[sx];
- unsigned char g = pRow[sx + 1];
- unsigned char b = pRow[sx + 2];
- unsigned char a = 0xff;
- pRow[dx ] = r; // r
- pRow[dx + 1] = g; // g
- pRow[dx + 2] = b; // b
- pRow[dx + 3] = a;
- }
- }
- *pSurface = (gr_surface) surface;
-
-exit:
- if (fp != NULL)
- {
- if (surface)
- {
- (void) jpeg_finish_decompress(&cinfo);
- if (result < 0)
- {
- free(surface);
- }
- }
- jpeg_destroy_decompress(&cinfo);
- fclose(fp);
- }
- return result;
-}
-
-int res_create_surface(const char* name, gr_surface* pSurface) {
- int ret;
-
- if (!name) return -1;
-
- if (strlen(name) > 4 && strcmp(name + strlen(name) - 4, ".jpg") == 0)
- return res_create_surface_jpg(name,pSurface);
-
- ret = res_create_surface_png(name,pSurface);
- if (ret < 0)
- ret = res_create_surface_jpg(name,pSurface);
-
- return ret;
-}
-
-void res_free_surface(gr_surface surface) {
- GGLSurface* pSurface = (GGLSurface*) surface;
- if (pSurface) {
- free(pSurface);
- }
-}