Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature: allow adjusting VTE line height from configuration #60

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Feature: allow adjusting VTE line height from configuration #60

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions src/sakura.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,6 +265,7 @@ static struct {
GtkWidget *menu;
GtkWidget *fade_window; /* Window used for fading effect */
PangoFontDescription *font;
gdouble line_height; /* Font line height */
GdkRGBA forecolors[NUM_COLORSETS];
GdkRGBA backcolors[NUM_COLORSETS];
GdkRGBA curscolors[NUM_COLORSETS];
Expand Down Expand Up @@ -366,6 +367,7 @@ struct sakura_tab {
#define DEFAULT_MIN_WIDTH_CHARS 20
#define DEFAULT_MIN_HEIGHT_CHARS 1
#define DEFAULT_FONT "Ubuntu Mono,monospace 13"
#define DEFAULT_LINE_HEIGHT 1.0
#define FONT_MINIMAL_SIZE (PANGO_SCALE*6)
#define DEFAULT_WORD_CHARS "-,./?%&#_~:"
#define TAB_MAX_SIZE 40
Expand Down Expand Up @@ -434,6 +436,11 @@ static GQuark term_data_id = 0;
sakura.config_modified=TRUE;\
} while(0);

#define sakura_set_config_double(key, value) do {\
g_key_file_set_double(sakura.cfg, cfg_group, key, value);\
sakura.config_modified=TRUE;\
} while(0);


/* Spawn callback */
void sakura_spawm_callback (VteTerminal *, GPid, GError, gpointer);
Expand Down Expand Up @@ -1989,6 +1996,11 @@ sakura_init()
}
sakura.scroll_lines = g_key_file_get_integer(sakura.cfg, cfg_group, "scroll_lines", NULL);

if (!g_key_file_has_key(sakura.cfg, cfg_group, "line_height", NULL)) {
sakura_set_config_double("line_height", DEFAULT_LINE_HEIGHT);
}
sakura.line_height = g_key_file_get_double(sakura.cfg, cfg_group, "line_height", NULL);

if (!g_key_file_has_key(sakura.cfg, cfg_group, "font", NULL)) {
sakura_set_config_string("font", DEFAULT_FONT);
}
Expand Down Expand Up @@ -2799,6 +2811,7 @@ sakura_set_size (void)
//SAY("padding x %d y %d", pad_x, pad_y);
char_width = vte_terminal_get_char_width(VTE_TERMINAL(sk_tab->vte));
char_height = vte_terminal_get_char_height(VTE_TERMINAL(sk_tab->vte));
char_height = (int) (sakura.line_height * char_height);

sakura.width = pad_x + (char_width * sakura.columns);
sakura.height = pad_y + (char_height * sakura.rows);
Expand Down Expand Up @@ -2854,6 +2867,7 @@ sakura_set_font()
for (i = (n_pages - 1); i >= 0; i--) {
sk_tab = sakura_get_sktab(sakura, i);
vte_terminal_set_font(VTE_TERMINAL(sk_tab->vte), sakura.font);
vte_terminal_set_cell_height_scale(VTE_TERMINAL(sk_tab->vte), sakura.line_height);
}
}

Expand Down