summaryrefslogtreecommitdiff
path: root/frontends/kolibrios/fb/gui.c
diff options
context:
space:
mode:
Diffstat (limited to 'frontends/kolibrios/fb/gui.c')
-rw-r--r--frontends/kolibrios/fb/gui.c31
1 files changed, 19 insertions, 12 deletions
diff --git a/frontends/kolibrios/fb/gui.c b/frontends/kolibrios/fb/gui.c
index dd5ef71ab..ab2b9812f 100644
--- a/frontends/kolibrios/fb/gui.c
+++ b/frontends/kolibrios/fb/gui.c
@@ -44,16 +44,16 @@
#include "netsurf/cookie_db.h"
#include "content/fetch.h"
-#include "framebuffer/gui.h"
-#include "framebuffer/fbtk.h"
-#include "framebuffer/framebuffer.h"
-#include "framebuffer/schedule.h"
-#include "framebuffer/findfile.h"
-#include "framebuffer/image_data.h"
-#include "framebuffer/font.h"
-#include "framebuffer/clipboard.h"
-#include "framebuffer/fetch.h"
-#include "framebuffer/bitmap.h"
+#include "kolibrios/fb/gui.h"
+#include "kolibrios/fb/fbtk.h"
+#include "kolibrios/fb/framebuffer.h"
+#include "kolibrios/fb/schedule.h"
+#include "kolibrios/fb/findfile.h"
+#include "kolibrios/fb/image_data.h"
+#include "kolibrios/fb/font.h"
+#include "kolibrios/fb/clipboard.h"
+#include "kolibrios/fb/fetch.h"
+#include "kolibrios/fb/bitmap.h"
#define NSFB_TOOLBAR_DEFAULT_LAYOUT "blfsrutc"
@@ -465,7 +465,7 @@ process_cmdline(int argc, char** argv)
LOG("argc %d, argv %p", argc, argv);
- fename = "sdl";
+ fename = "kolibri";
febpp = 32;
fewidth = nsoption_int(window_width);
@@ -2142,7 +2142,14 @@ main(int argc, char** argv)
if (process_cmdline(argc,argv) != true)
die("unable to process command line.\n");
+ extern struct nsfb_surface_rtns_t kolibri_rtns;
+ _nsfb_register_surface(NSFB_SURFACE_KOLIBRI, &kolibri_rtns, "kolibri");
+
+ extern struct nsfb_surface_rtns_t ram_rtns;
+ _nsfb_register_surface(NSFB_SURFACE_RAM, &ram_rtns, "ram");
+
nsfb = framebuffer_initialise(fename, fewidth, feheight, febpp);
+
if (nsfb == NULL)
die("Unable to initialise framebuffer");
@@ -2170,11 +2177,11 @@ main(int argc, char** argv)
&bw);
nsurl_unref(url);
}
+
if (ret != NSERROR_OK) {
fb_warn_user(messages_get_errorcode(ret), 0);
} else {
framebuffer_run();
-
browser_window_destroy(bw);
}