diff options
| author | John Mark Bell <jmb@netsurf-browser.org> | 2010-07-07 18:08:17 +0000 |
|---|---|---|
| committer | John Mark Bell <jmb@netsurf-browser.org> | 2010-07-07 18:08:17 +0000 |
| commit | 5bebf2f2fc27a31c8b2efa7a837baef63c1b0a97 (patch) | |
| tree | 65d353a907c3496eb638bbff780ff4d0f1437313 /framebuffer/options.h | |
| parent | f6faa20a37f38643d505ba41baa8a88e3dfa545a (diff) | |
| download | netsurf-5bebf2f2fc27a31c8b2efa7a837baef63c1b0a97.tar.gz netsurf-5bebf2f2fc27a31c8b2efa7a837baef63c1b0a97.tar.bz2 | |
Merge branches/vince/netsurf-fbtk-rework to trunk.
svn path=/trunk/netsurf/; revision=10605
Diffstat (limited to 'framebuffer/options.h')
| -rw-r--r-- | framebuffer/options.h | 54 |
1 files changed, 35 insertions, 19 deletions
diff --git a/framebuffer/options.h b/framebuffer/options.h index f2f52ae49..fff5fd192 100644 --- a/framebuffer/options.h +++ b/framebuffer/options.h @@ -1,5 +1,5 @@ /* - * Copyright 2008 Daniel Silverstone <dsilvers@netsurf-browser.org> + * Copyright 2008, 2010 Daniel Silverstone <dsilvers@netsurf-browser.org> * * This file is part of NetSurf, http://www.netsurf-browser.org/ * @@ -23,10 +23,14 @@ extern int option_fb_depth; extern int option_fb_refresh; -extern bool option_fb_font_monochrome; /* render font monochrome */ extern char *option_fb_device; extern char *option_fb_input_devpath; extern char *option_fb_input_glob; +extern int option_fb_furniture_size; /* toolkit furniture size */ +extern int option_fb_toolbar_size; /* toolbar furniture size */ +extern bool option_fb_osk; /* enable on screen keyboard */ + +extern bool option_fb_font_monochrome; /* render font monochrome */ extern char *option_fb_face_sans_serif; /* default sans face */ extern char *option_fb_face_sans_serif_bold; /* bold sans face */ extern char *option_fb_face_sans_serif_italic; /* bold sans face */ @@ -35,27 +39,33 @@ extern char *option_fb_face_monospace; /* monospace face */ extern char *option_fb_face_serif; /* serif face */ extern char *option_fb_face_serif_bold; /* bold serif face */ -#define EXTRA_OPTION_DEFINE \ - int option_fb_depth = 32; \ - int option_fb_refresh = 70; \ - bool option_fb_font_monochrome = false; \ - char *option_fb_device = 0; \ - char *option_fb_input_devpath = 0; \ - char *option_fb_input_glob = 0; \ - char *option_fb_face_sans_serif; \ - char *option_fb_face_sans_serif_bold; \ - char *option_fb_face_sans_serif_italic; \ - char *option_fb_face_sans_serif_italic_bold; \ - char *option_fb_face_monospace; \ - char *option_fb_face_serif; \ - char *option_fb_face_serif_bold; +#define EXTRA_OPTION_DEFINE \ + int option_fb_depth = 32; \ + int option_fb_refresh = 70; \ + char *option_fb_device = 0; \ + char *option_fb_input_devpath = 0; \ + char *option_fb_input_glob = 0; \ + int option_fb_furniture_size = 18; \ + int option_fb_toolbar_size = 30; \ + bool option_fb_osk = false; \ + bool option_fb_font_monochrome = false; \ + char *option_fb_face_sans_serif; \ + char *option_fb_face_sans_serif_bold; \ + char *option_fb_face_sans_serif_italic; \ + char *option_fb_face_sans_serif_italic_bold; \ + char *option_fb_face_monospace; \ + char *option_fb_face_serif; \ + char *option_fb_face_serif_bold; #define EXTRA_OPTION_TABLE \ - { "fb_depth", OPTION_INTEGER, &option_fb_depth }, \ - { "fb_refresh", OPTION_INTEGER, &option_fb_refresh }, \ + { "fb_depth", OPTION_INTEGER, &option_fb_depth }, \ + { "fb_refresh", OPTION_INTEGER, &option_fb_refresh }, \ { "fb_device", OPTION_STRING, &option_fb_device }, \ { "fb_input_devpath", OPTION_STRING, &option_fb_input_devpath }, \ { "fb_input_glob", OPTION_STRING, &option_fb_input_glob }, \ + { "fb_furniture_size", OPTION_INTEGER, &option_fb_furniture_size }, \ + { "fb_toolbar_size", OPTION_INTEGER, &option_fb_toolbar_size }, \ + { "fb_font_osk", OPTION_BOOL, &option_fb_osk }, \ { "fb_font_monochrome", OPTION_BOOL, &option_fb_font_monochrome }, \ { "fb_face_sans_serif", OPTION_STRING, &option_fb_face_sans_serif }, \ { "fb_face_sans_serif_bold", OPTION_STRING, &option_fb_face_sans_serif_bold }, \ @@ -63,6 +73,12 @@ extern char *option_fb_face_serif_bold; /* bold serif face */ { "fb_face_sans_serif_italic_bold", OPTION_STRING, &option_fb_face_sans_serif_italic_bold }, \ { "fb_face_monospace", OPTION_STRING, &option_fb_face_monospace }, \ { "fb_face_serif", OPTION_STRING, &option_fb_face_serif }, \ - { "fb_serif_bold", OPTION_STRING, &option_fb_face_serif_bold } + { "fb_serif_bold", OPTION_STRING, &option_fb_face_serif_bold } #endif + +/* + * Local Variables: + * c-basic-offset:8 + * End: + */ |