takino
/
termite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into scrollback-completion 

Conflicts:
	README.rst
This commit is contained in:
Daniel Micay 2012-06-06 11:42:51 -04:00
parent 50f23b3ade e31fe139fb
commit a678d559ec
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.rst
View File

@ -38,6 +38,8 @@ TODO
* tab and shift-tab bindings for completion * tab and shift-tab bindings for completion
* better integration of scrollback completion * better integration of scrollback completion
* better url matching regex
* hint mode overlay for urls (like elinks/vimperator/pentadactyl)
* scrollback search needs to be improved upstream [1]_ * scrollback search needs to be improved upstream [1]_
* expose more options in ``config.h`` * expose more options in ``config.h``

1
config.h
View File

@ -20,6 +20,7 @@ static const bool cursor_blink = false;
static const char *foreground_color = "#dcdccc"; static const char *foreground_color = "#dcdccc";
static const char *background_color = "#3f3f3f"; static const char *background_color = "#3f3f3f";
static const char *cursor_color = "#dcdccc";
static const char *colors[16] = { static const char *colors[16] = {
"#3f3f3f", // black "#3f3f3f", // black

4
termite.c
View File

@ -359,15 +359,17 @@ int main(int argc, char **argv) {
#endif #endif
// set colors // set colors
GdkColor foreground, background, palette[16]; GdkColor foreground, background, cursor, palette[16];
gdk_color_parse(foreground_color, &foreground); gdk_color_parse(foreground_color, &foreground);
gdk_color_parse(background_color, &background); gdk_color_parse(background_color, &background);
gdk_color_parse(cursor_color, &cursor);
for (unsigned i = 0; i < 16; i++) { for (unsigned i = 0; i < 16; i++) {
gdk_color_parse(colors[i], &palette[i]); gdk_color_parse(colors[i], &palette[i]);
} }
vte_terminal_set_colors(VTE_TERMINAL(vte), &foreground, &background, palette, 16); vte_terminal_set_colors(VTE_TERMINAL(vte), &foreground, &background, palette, 16);
vte_terminal_set_color_cursor(VTE_TERMINAL(vte), &cursor);
#ifdef CLICKABLE_URL #ifdef CLICKABLE_URL
int tmp = vte_terminal_match_add_gregex(VTE_TERMINAL(vte), int tmp = vte_terminal_match_add_gregex(VTE_TERMINAL(vte),