Use libvideo-driver for gfx(1)

Author: GrieferAtWork

kos/src/apps/.sources

@@ -41,7 +41,7 @@ DEFINE_SIMPLE_C_APPLICATION("keymap", USELIB("libkeymap"))
 DEFINE_SIMPLE_C_APPLICATION("getconf")
 DEFINE_SIMPLE_C_APPLICATION("snake")
 DEFINE_SIMPLE_C_APPLICATION("vconf")
-DEFINE_SIMPLE_CXX_APPLICATION("gfx", USELIB("libvideo-gfx"))
+DEFINE_SIMPLE_CXX_APPLICATION("gfx", USELIB("libvideo-driver") USELIB("libvideo-gfx"))
 DEFINE_SIMPLE_C_APPLICATION("showpic",
 		USELIB("libvideo-driver")
 		USELIB("libvideo-gfx")

kos/src/apps/gfx/main.c

@@ -22,6 +22,7 @@
 #define _GNU_SOURCE 1
 #define _KOS_SOURCE 1
 #define LIBVIDEO_GFX_WANT_PROTOTYPES
+#define LIBVIDEO_DRIVER_WANT_PROTOTYPES
 
 #include <hybrid/compiler.h>
 
@@ -42,14 +43,19 @@
 #include <unistd.h>
 
 #include <libvideo/color.h>
+#include <libvideo/driver/adapter.h>
+#include <libvideo/driver/monitor.h>
 #include <libvideo/gfx/buffer.h>
 #include <libvideo/gfx/font.h>
 #include <libvideo/gfx/gfx.h>
 #include <libvideo/gfx/screen.h>
 #include <libvideo/gfx/surface.h>
+#include <libvideo/rect.h>
 
 DECL_BEGIN
 
+static struct video_rect const RECT_FULL = VIDEO_RECT_INIT_FULL;
+
 #if 1
 #define rand_color() \
 	VIDEO_COLOR_RGBA(rand() % 256, rand() % 256, rand() % 256, rand() % 256)
@@ -82,7 +88,9 @@ PRIVATE void enable_rawtty_mode(void) {
 
 int main(int argc, char *argv[]) {
 	bool is_blocking = false;
-	REF struct screen_buffer *screen;
+	REF struct video_adapter *adapter;
+	REF struct video_monitor *monitor;
+	REF struct video_buffer *screen;
 	REF struct video_font *font;
 	struct video_fontprinter_data fontprinter_data;
 	struct video_gfx gfx;
@@ -92,10 +100,17 @@ int main(int argc, char *argv[]) {
 
 	enable_rawtty_mode();
 
-	/* Bind the screen buffer. */
-	screen = screen_buffer_create(NULL);
+	/* Load default video adapter and monitor */
+	adapter = video_adapter_open(NULL);
+	if (!adapter)
+		err(EXIT_FAILURE, "Failed to open video adapter");
+	monitor = video_adapter_getmonitor(adapter, 0);
+	if (!monitor)
+		err(EXIT_FAILURE, "Failed to access monitor with id=0");
+	screen = video_monitor_getbuffer(monitor);
 	if (!screen)
-		err(EXIT_FAILURE, "Failed to load screen buffer");
+		err(EXIT_FAILURE, "Failed to get screen buffer");
+
 	video_buffer_getgfx(screen, &gfx, GFX_BLENDMODE_ALPHA);
 
 	/* Load the video-mode font. */
@@ -164,7 +179,7 @@ int main(int argc, char *argv[]) {
 
 	for (;;) {
 		char buf[1];
-		screen->updaterect();
+		video_monitor_updaterect(monitor, &RECT_FULL);
 		if (read(STDIN_FILENO, buf, 1) < 1)
 			break;
 		if (buf[0] == '+') {
@@ -199,7 +214,7 @@ int main(int argc, char *argv[]) {
 		ssize_t error;
 		char buf[1];
 		video_color_t color;
-		screen->updaterect();
+		video_monitor_updaterect(monitor, &RECT_FULL);
 		error = read(STDIN_FILENO, buf, 1);
 		if (error == 1) {
 			switch (buf[0]) {

kos/src/apps/showpic/main.c

@@ -553,7 +553,7 @@ int main(int argc, char *argv[]) {
 		return 1;
 	}
 
-	/* Bind the screen buffer. */
+	/* Load default video adapter and monitor */
 	adapter = video_adapter_open(NULL);
 	if (!adapter)
 		err(EXIT_FAILURE, "Failed to open video adapter");