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

Merge pull request #323 from jelly/resolve-deprecation-vte-0.44.0 

Replace deprecated vte_terminal_match_check
This commit is contained in:
Daniel Micay 2016-03-22 16:03:44 -04:00
parent 119bf665a0 00035a6db4
commit 2a87f8dd63
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
termite.cc
View File

@ -155,7 +155,7 @@ static GtkTreeModel *create_completion_model(VteTerminal *vte);
static void search(VteTerminal *vte, const char *pattern, bool reverse); static void search(VteTerminal *vte, const char *pattern, bool reverse);
static void overlay_show(search_panel_info *info, overlay_mode mode, VteTerminal *vte); static void overlay_show(search_panel_info *info, overlay_mode mode, VteTerminal *vte);
static void get_vte_padding(VteTerminal *vte, int *left, int *top, int *right, int *bottom); static void get_vte_padding(VteTerminal *vte, int *left, int *top, int *right, int *bottom);
static char *check_match(VteTerminal *vte, int event_x, int event_y); static char *check_match(VteTerminal *vte, GdkEventButton *event);
static void load_config(GtkWindow *window, VteTerminal *vte, config_info *info, static void load_config(GtkWindow *window, VteTerminal *vte, config_info *info,
char **geometry); char **geometry);
static void set_config(GtkWindow *window, VteTerminal *vte, config_info *info, static void set_config(GtkWindow *window, VteTerminal *vte, config_info *info,
@ -1096,7 +1096,7 @@ gboolean position_overlay_cb(GtkBin *overlay, GtkWidget *widget, GdkRectangle *a
gboolean button_press_cb(VteTerminal *vte, GdkEventButton *event, const config_info *info) { gboolean button_press_cb(VteTerminal *vte, GdkEventButton *event, const config_info *info) {
if (info->clickable_url && event->type == GDK_BUTTON_PRESS) { if (info->clickable_url && event->type == GDK_BUTTON_PRESS) {
auto match = make_unique(check_match(vte, (int)event->x, (int)event->y), g_free); auto match = make_unique(check_match(vte, event), g_free);
if (!match) if (!match)
return FALSE; return FALSE;
@ -1204,16 +1204,10 @@ void get_vte_padding(VteTerminal *vte, int *left, int *top, int *right, int *bot
*bottom = border.bottom; *bottom = border.bottom;
} }
char *check_match(VteTerminal *vte, int event_x, int event_y) { char *check_match(VteTerminal *vte, GdkEventButton *event) {
int tag, padding_left, padding_top, padding_right, padding_bottom; int tag;
const long char_width = vte_terminal_get_char_width(vte);
const long char_height = vte_terminal_get_char_height(vte);
get_vte_padding(vte, &padding_left, &padding_top, &padding_right, &padding_bottom); return vte_terminal_match_check_event(vte, (GdkEvent*) event, &tag);
return vte_terminal_match_check(vte,
(event_x - padding_left) / char_width,
(event_y - padding_top) / char_height,
&tag);
} }
/* {{{ CONFIG LOADING */ /* {{{ CONFIG LOADING */