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

cleaner fix for gdk3 support (compat header)

This commit is contained in:
Daniel Micay 2012-05-22 15:07:33 -04:00
parent 956d1fb1d9
commit 5ac9eb13cc
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
termite.c
View File

@ -7,10 +7,9 @@
#include "config.h" #include "config.h"
#if GTK_CHECK_VERSION (2, 90, 7) #if GTK_CHECK_VERSION (2, 90, 7)
#define GDK_KEY(symbol) GDK_KEY_##symbol #include <gdk/gdkkeysyms-compat.h>
#else #else
#include <gdk/gdkkeysyms.h> #include <gdk/gdkkeysyms.h>
#define GDK_KEY(symbol) GDK_##symbol
#endif #endif
#ifndef __GNUC__ #ifndef __GNUC__
@ -80,18 +79,18 @@ static gboolean key_press_cb(GtkWidget *vte, GdkEventKey *event, search_dialog_i
if (modifiers == (GDK_CONTROL_MASK|GDK_SHIFT_MASK)) { if (modifiers == (GDK_CONTROL_MASK|GDK_SHIFT_MASK)) {
switch (gdk_keyval_to_lower(event->keyval)) { switch (gdk_keyval_to_lower(event->keyval)) {
case GDK_KEY(p): case GDK_p:
vte_terminal_search_find_previous(VTE_TERMINAL(vte)); vte_terminal_search_find_previous(VTE_TERMINAL(vte));
return TRUE; return TRUE;
case GDK_KEY(n): case GDK_n:
vte_terminal_search_find_next(VTE_TERMINAL(vte)); vte_terminal_search_find_next(VTE_TERMINAL(vte));
return TRUE; return TRUE;
case GDK_KEY(question): case GDK_question:
open_search_dialog(vte, search_backward, info); open_search_dialog(vte, search_backward, info);
return TRUE; return TRUE;
} }
} }
if (modifiers == GDK_CONTROL_MASK && event->keyval == GDK_KEY(slash)) { if (modifiers == GDK_CONTROL_MASK && event->keyval == GDK_slash) {
open_search_dialog(vte, search_forward, info); open_search_dialog(vte, search_forward, info);
return TRUE; return TRUE;
} }