diff --git a/Makefile b/Makefile index 5f7beb3..45d63e0 100644 --- a/Makefile +++ b/Makefile @@ -25,7 +25,7 @@ endif LDFLAGS := -s -Wl,--as-needed ${shell pkg-config --libs ${GTK} ${VTE}} ${LDFLAGS} -termite: termite.c config.h +termite: termite.c ${CC} ${CFLAGS} -o $@ $< ${LDFLAGS} install: termite diff --git a/config.h b/config.h deleted file mode 100644 index c0fd3ad..0000000 --- a/config.h +++ /dev/null @@ -1,11 +0,0 @@ -static const char *url_regex = "(ftp|http)s?://[-a-zA-Z0-9.?$%&/=_~#.,:;+()]*"; - -// keybindings -#define KEY_COPY c -#define KEY_PASTE v -#define KEY_PREV p -#define KEY_NEXT n -#define KEY_SEARCH f -#define KEY_RSEARCH r -#define KEY_URL j -#define KEY_RURL k diff --git a/termite.c b/termite.c index 5657aea..703558b 100644 --- a/termite.c +++ b/termite.c @@ -6,15 +6,12 @@ #include #include -#include "config.h" - -#define CONCAT(X, Y) X ## Y -#define KEY(X) CONCAT(GDK_KEY_, X) - #ifndef __GNUC__ # define __attribute__(x) #endif +static const char *url_regex = "(ftp|http)s?://[-a-zA-Z0-9.?$%&/=_~#.,:;+()]*"; + typedef enum overlay_mode { OVERLAY_HIDDEN = 0, OVERLAY_SEARCH, @@ -63,30 +60,30 @@ gboolean key_press_cb(VteTerminal *vte, GdkEventKey *event, search_panel_info *i const guint modifiers = event->state & gtk_accelerator_get_default_mod_mask(); if (modifiers == (GDK_CONTROL_MASK|GDK_SHIFT_MASK)) { switch (gdk_keyval_to_lower(event->keyval)) { - case KEY(KEY_COPY): + case GDK_KEY_c: vte_terminal_copy_clipboard(vte); return TRUE; - case KEY(KEY_PASTE): + case GDK_KEY_v: vte_terminal_paste_clipboard(vte); return TRUE; - case KEY(KEY_PREV): + case GDK_KEY_p: vte_terminal_search_find_previous(vte); vte_terminal_copy_primary(vte); return TRUE; - case KEY(KEY_NEXT): + case GDK_KEY_n: vte_terminal_search_find_next(vte); vte_terminal_copy_primary(vte); return TRUE; - case KEY(KEY_SEARCH): + case GDK_KEY_f: overlay_show(info, OVERLAY_SEARCH, true); return TRUE; - case KEY(KEY_RSEARCH): + case GDK_KEY_r: overlay_show(info, OVERLAY_RSEARCH, true); return TRUE; - case KEY(KEY_URL): + case GDK_KEY_j: search(vte, url_regex, false); return TRUE; - case KEY(KEY_RURL): + case GDK_KEY_k: search(vte, url_regex, true); return TRUE; }