mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

terminal: Make terminal font configurable from command line and weston.ini

Browse Source
This commit is contained in:
Kristian Høgsberg
2012-06-20 15:29:07 -04:00
parent bd0cd762bc
commit 82cd36bfff
1 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
clients/terminal.c
+21 -2
View File
@@ -35,9 +35,11 @@
#include <wayland-client.h> #include <wayland-client.h>
#include "../shared/config-parser.h"
#include "window.h" #include "window.h"
static int option_fullscreen; static int option_fullscreen;
static char *option_font = "mono";
#define MOD_SHIFT 0x01 #define MOD_SHIFT 0x01
#define MOD_ALT 0x02 #define MOD_ALT 0x02
@@ -2310,13 +2312,13 @@ terminal_create(struct display *display, int fullscreen)
surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 0, 0); surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 0, 0);
cr = cairo_create(surface); cr = cairo_create(surface);
cairo_set_font_size(cr, 14); cairo_set_font_size(cr, 14);
cairo_select_font_face (cr, "mono", cairo_select_font_face (cr, option_font,
CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_SLANT_NORMAL,
CAIRO_FONT_WEIGHT_BOLD); CAIRO_FONT_WEIGHT_BOLD);
terminal->font_bold = cairo_get_scaled_font (cr); terminal->font_bold = cairo_get_scaled_font (cr);
cairo_scaled_font_reference(terminal->font_bold); cairo_scaled_font_reference(terminal->font_bold);
cairo_select_font_face (cr, "mono", cairo_select_font_face (cr, option_font,
CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_SLANT_NORMAL,
CAIRO_FONT_WEIGHT_NORMAL); CAIRO_FONT_WEIGHT_NORMAL);
terminal->font_normal = cairo_get_scaled_font (cr); terminal->font_normal = cairo_get_scaled_font (cr);
@@ -2381,8 +2383,18 @@ terminal_run(struct terminal *terminal, const char *path)
return 0; return 0;
} }
static const struct config_key terminal_config_keys[] = {
{ "font", CONFIG_KEY_STRING, &option_font },
};
static const struct config_section config_sections[] = {
{ "terminal",
terminal_config_keys, ARRAY_LENGTH(terminal_config_keys) },
};
static const struct weston_option terminal_options[] = { static const struct weston_option terminal_options[] = {
{ WESTON_OPTION_BOOLEAN, "fullscreen", 'f', &option_fullscreen }, { WESTON_OPTION_BOOLEAN, "fullscreen", 'f', &option_fullscreen },
{ WESTON_OPTION_STRING, "font", 0, &option_font },
}; };
int main(int argc, char *argv[]) int main(int argc, char *argv[])
@@ -2390,6 +2402,13 @@ int main(int argc, char *argv[])
struct display *d; struct display *d;
struct terminal *terminal; struct terminal *terminal;
const char *shell; const char *shell;
char *config_file;
config_file = config_file_path("weston.ini");
parse_config_file(config_file,
config_sections, ARRAY_LENGTH(config_sections),
NULL);
free(config_file);
argc = parse_options(terminal_options, argc = parse_options(terminal_options,
ARRAY_LENGTH(terminal_options), argc, argv); ARRAY_LENGTH(terminal_options), argc, argv);