summaryrefslogtreecommitdiff
path: root/userspace
diff options
context:
space:
mode:
Diffstat (limited to 'userspace')
-rw-r--r--userspace/Makefile3
-rw-r--r--userspace/files/icons.ppmbin0 -> 6220801 bytes
-rw-r--r--userspace/pain/Makefile6
-rw-r--r--userspace/pain/pain1.c200
-rw-r--r--userspace/pain1.c48
-rw-r--r--userspace/put_pixel.h2
6 files changed, 210 insertions, 49 deletions
diff --git a/userspace/Makefile b/userspace/Makefile
index 8e3518f..860478a 100644
--- a/userspace/Makefile
+++ b/userspace/Makefile
@@ -37,6 +37,7 @@ ext2.img: $(PROGS)
make -C xterm
make -C cpp
make -C ncurses
+ make -C pain
@echo "----------------------"
@echo "Creating ext2.img ...."
@dd if=/dev/zero of=ext2.img bs=1024 count=$(IMAGESIZE)
@@ -68,6 +69,7 @@ ext2.img: $(PROGS)
@cp xterm/xterm mnt/bin
@cp cpp/testcpp mnt/bin
@cp ncurses/nc mnt/bin
+ @cp pain/pain1 mnt/bin
# @cp /home/miguel/temp/foolos/usr/bin/* mnt/bin
@cp /home/miguel/temp/foolos/usr/bin/worm mnt/bin
@cp /home/miguel/temp/foolos/usr/bin/xmas mnt/bin
@@ -104,6 +106,7 @@ clean:
make -C xterm clean
make -C cpp clean
make -C ncurses clean
+ make -C pain clean
@echo "Cleaning userspace ..."; rm -f *.o $(PROGS) ext2.img *.d
umount:
diff --git a/userspace/files/icons.ppm b/userspace/files/icons.ppm
new file mode 100644
index 0000000..45ce414
--- /dev/null
+++ b/userspace/files/icons.ppm
Binary files differ
diff --git a/userspace/pain/Makefile b/userspace/pain/Makefile
new file mode 100644
index 0000000..bfa31c8
--- /dev/null
+++ b/userspace/pain/Makefile
@@ -0,0 +1,6 @@
+CC=i686-foolos-gcc
+
+pain1 : pain1.c
+ i686-foolos-gcc pain1.c -lpng -lz -o pain1
+clean:
+ -rm pain1
diff --git a/userspace/pain/pain1.c b/userspace/pain/pain1.c
new file mode 100644
index 0000000..a3fb03a
--- /dev/null
+++ b/userspace/pain/pain1.c
@@ -0,0 +1,200 @@
+// http://zarb.org/~gc/html/libpng.html
+
+#include "../put_pixel.h"
+
+#include <stdlib.h>
+#include <stdio.h>
+
+#define dimx 640
+#define dimy 480
+
+/*
+ * Copyright 2002-2010 Guillaume Cottenceau.
+ *
+ * This software may be freely redistributed under the terms
+ * of the X11 license.
+ *
+ */
+
+#include <unistd.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <stdarg.h>
+
+#define PNG_DEBUG 3
+#include <png.h>
+
+void abort_(const char * s, ...)
+{
+ va_list args;
+ va_start(args, s);
+ vfprintf(stderr, s, args);
+ fprintf(stderr, "\n");
+ va_end(args);
+ abort();
+}
+
+int x, y;
+
+int width, height;
+png_byte color_type;
+png_byte bit_depth;
+
+png_structp png_ptr;
+png_infop info_ptr;
+int number_of_passes;
+png_bytep * row_pointers;
+
+void read_png_file(char* file_name)
+{
+ char header[8]; // 8 is the maximum size that can be checked
+
+ /* open file and test for it being a png */
+ FILE *fp = fopen(file_name, "rb");
+ if (!fp)
+ abort_("[read_png_file] File %s could not be opened for reading", file_name);
+ fread(header, 1, 8, fp);
+ if (png_sig_cmp(header, 0, 8))
+ abort_("[read_png_file] File %s is not recognized as a PNG file", file_name);
+
+
+ /* initialize stuff */
+ png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
+
+ if (!png_ptr)
+ abort_("[read_png_file] png_create_read_struct failed");
+
+ info_ptr = png_create_info_struct(png_ptr);
+ if (!info_ptr)
+ abort_("[read_png_file] png_create_info_struct failed");
+
+ if (setjmp(png_jmpbuf(png_ptr)))
+ abort_("[read_png_file] Error during init_io");
+
+ png_init_io(png_ptr, fp);
+ png_set_sig_bytes(png_ptr, 8);
+
+ png_read_info(png_ptr, info_ptr);
+
+ width = png_get_image_width(png_ptr, info_ptr);
+ height = png_get_image_height(png_ptr, info_ptr);
+ color_type = png_get_color_type(png_ptr, info_ptr);
+ bit_depth = png_get_bit_depth(png_ptr, info_ptr);
+
+ number_of_passes = png_set_interlace_handling(png_ptr);
+ png_read_update_info(png_ptr, info_ptr);
+
+
+ /* read file */
+ if (setjmp(png_jmpbuf(png_ptr)))
+ abort_("[read_png_file] Error during read_image");
+
+ row_pointers = (png_bytep*) malloc(sizeof(png_bytep) * height);
+ for (y=0; y<height; y++)
+ row_pointers[y] = (png_byte*) malloc(png_get_rowbytes(png_ptr,info_ptr));
+
+ png_read_image(png_ptr, row_pointers);
+
+ fclose(fp);
+}
+
+
+void write_png_file(char* file_name)
+{
+ /* create file */
+ FILE *fp = fopen(file_name, "wb");
+ if (!fp)
+ abort_("[write_png_file] File %s could not be opened for writing", file_name);
+
+
+ /* initialize stuff */
+ png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
+
+ if (!png_ptr)
+ abort_("[write_png_file] png_create_write_struct failed");
+
+ info_ptr = png_create_info_struct(png_ptr);
+ if (!info_ptr)
+ abort_("[write_png_file] png_create_info_struct failed");
+
+ if (setjmp(png_jmpbuf(png_ptr)))
+ abort_("[write_png_file] Error during init_io");
+
+ png_init_io(png_ptr, fp);
+
+
+ /* write header */
+ if (setjmp(png_jmpbuf(png_ptr)))
+ abort_("[write_png_file] Error during writing header");
+
+ png_set_IHDR(png_ptr, info_ptr, width, height,
+ bit_depth, color_type, PNG_INTERLACE_NONE,
+ PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);
+
+ png_write_info(png_ptr, info_ptr);
+
+
+ /* write bytes */
+ if (setjmp(png_jmpbuf(png_ptr)))
+ abort_("[write_png_file] Error during writing bytes");
+
+ png_write_image(png_ptr, row_pointers);
+
+
+ /* end write */
+ if (setjmp(png_jmpbuf(png_ptr)))
+ abort_("[write_png_file] Error during end of write");
+
+ png_write_end(png_ptr, NULL);
+
+ /* cleanup heap allocation */
+ for (y=0; y<height; y++)
+ free(row_pointers[y]);
+ free(row_pointers);
+
+ fclose(fp);
+}
+
+
+void process_file(void)
+{
+ if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_RGB)
+ abort_("[process_file] input file is PNG_COLOR_TYPE_RGB but must be PNG_COLOR_TYPE_RGBA "
+ "(lacks the alpha channel)");
+
+ if (png_get_color_type(png_ptr, info_ptr) != PNG_COLOR_TYPE_RGBA)
+ abort_("[process_file] color_type of input file must be PNG_COLOR_TYPE_RGBA (%d) (is %d)",
+ PNG_COLOR_TYPE_RGBA, png_get_color_type(png_ptr, info_ptr));
+
+ for (y=0; y<height; y++) {
+ png_byte* row = row_pointers[y];
+ for (x=0; x<width; x++) {
+ png_byte* ptr = &(row[x*4]);
+ //printf("Pixel at position [ %d - %d ] has RGBA values: %d - %d - %d - %d\n",
+ // x, y, ptr[0], ptr[1], ptr[2], ptr[3]);
+
+ /* set red value to 0 and green value to the blue one */
+ //ptr[0] = 0;
+ //ptr[1] = ptr[2];
+ if(x<dimx&&y<dimy)put_pixel(x,y,ptr[2]|ptr[1]<<8|ptr[0]<<16);
+
+ }
+ }
+}
+
+
+int main(int argc, char **argv)
+{
+ if (argc != 2)
+ abort_("Usage: program_name <file_in>");
+
+ _gui_win();
+ read_png_file(argv[1]);
+ process_file();
+ _gui_rect();
+ while(1);
+// write_png_file(argv[2]);
+
+ return 0;
+}
diff --git a/userspace/pain1.c b/userspace/pain1.c
deleted file mode 100644
index ddceaa5..0000000
--- a/userspace/pain1.c
+++ /dev/null
@@ -1,48 +0,0 @@
-#include "put_pixel.h"
-
-#include <stdlib.h>
-#include <stdio.h>
-
-#define dimx 640
-#define dimy 480
-
-/*
-void doscolor(int color,int color2)
-{
- int i=0;
-
- for (int y = 0; y < dimy; y++)
- for (int x = 0; x < dimx; x++)
- {
- {
- if(x%2&&y%2)put_pixel(x,y,color);
- else put_pixel(x,y,color2);
- }
- }
-}
-*/
-
-int main(int argc,char **argv)
-{
- _gui_win();
-
- for(int i=0;i<2000;i++)
- {
- for(int i=0;i<380;i+=40)
- {
- put_rect(0,0,640,480,0x0000ff);
- put_rect(640-i,i,100,100,0xff00ff);
- _gui_rect();
- }
-
- for(int i=380;i>0;i-=80)
- {
- put_rect(0,0,640,480,0x0000ff);
- put_rect(640-i,i,100,100,0x00ffff);
- _gui_rect();
- }
- }
-
- return EXIT_SUCCESS;
-}
-
diff --git a/userspace/put_pixel.h b/userspace/put_pixel.h
index 936026f..563a7e8 100644
--- a/userspace/put_pixel.h
+++ b/userspace/put_pixel.h
@@ -1,6 +1,6 @@
#include <stdint.h>
-#define VESA_FRAMEBUFFER 0xfc000000
+#define VESA_FRAMEBUFFER 0xf5100000
#define VESA_PITCH 2560
#define VESA_BPP 4
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-08 20:48:30 +0000