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

use -Wc++-compat and fix the warnings 

this makes termite compilable as C++, and as a bonus turns on stricter
type checking
This commit is contained in:
Daniel Micay 2012-06-02 06:13:59 -04:00
parent ebb446a82c
commit 85eafbf950
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -12,6 +12,8 @@ CFLAGS += -std=c99 -O3 \
-Wcast-align \ -Wcast-align \
-Wcast-qual \ -Wcast-qual \
-Wconversion \ -Wconversion \
-Wc++-compat \
-Wbad-function-cast \
$(shell pkg-config --cflags ${GTK} ${VTE}) $(shell pkg-config --cflags ${GTK} ${VTE})
LDFLAGS += -s -Wl,--as-needed $(shell pkg-config --libs ${GTK} ${VTE}) LDFLAGS += -s -Wl,--as-needed $(shell pkg-config --libs ${GTK} ${VTE})

12
termite.c
View File

@ -23,7 +23,7 @@ typedef struct search_panel_info {
static void search(VteTerminal *vte, const char *pattern, bool reverse) { static void search(VteTerminal *vte, const char *pattern, bool reverse) {
GRegex *regex = vte_terminal_search_get_gregex(vte); GRegex *regex = vte_terminal_search_get_gregex(vte);
if (regex) g_regex_unref(regex); if (regex) g_regex_unref(regex);
regex = g_regex_new(pattern, 0, 0, NULL); regex = g_regex_new(pattern, (GRegexCompileFlags)0, (GRegexMatchFlags)0, NULL);
vte_terminal_search_set_gregex(vte, regex); vte_terminal_search_set_gregex(vte, regex);
if (!reverse) { if (!reverse) {
@ -52,7 +52,7 @@ static gboolean search_key_press_cb(GtkEntry *entry, GdkEventKey *event, search_
} }
static gboolean key_press_cb(GtkWidget *vte, GdkEventKey *event, search_panel_info *info) { static gboolean key_press_cb(GtkWidget *vte, GdkEventKey *event, search_panel_info *info) {
const GdkModifierType modifiers = event->state & gtk_accelerator_get_default_mod_mask(); const guint modifiers = event->state & gtk_accelerator_get_default_mod_mask();
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 KEY(KEY_COPY): case KEY(KEY_COPY):
@ -117,7 +117,7 @@ static gboolean button_press_cb(VteTerminal *vte, GdkEventButton *event) {
char *match = check_match(vte, (int)event->x, (int)event->y); char *match = check_match(vte, (int)event->x, (int)event->y);
if (event->button == 1 && event->type == GDK_BUTTON_PRESS && match != NULL) { if (event->button == 1 && event->type == GDK_BUTTON_PRESS && match != NULL) {
char *argv[] = URL_COMMAND(match); char *argv[] = URL_COMMAND(match);
g_spawn_async(NULL, argv, NULL, 0, NULL, NULL, NULL, NULL); g_spawn_async(NULL, argv, NULL, (GSpawnFlags)0, NULL, NULL, NULL, NULL);
g_free(match); g_free(match);
return TRUE; return TRUE;
} }
@ -205,7 +205,7 @@ int main(int argc, char **argv) {
command_argv = default_argv; command_argv = default_argv;
} }
VtePty *pty = vte_terminal_pty_new(VTE_TERMINAL(vte), 0, &error); VtePty *pty = vte_terminal_pty_new(VTE_TERMINAL(vte), (VtePtyFlags)0, &error);
if (!pty) { if (!pty) {
g_printerr("Failed to create pty: %s\n", error->message); g_printerr("Failed to create pty: %s\n", error->message);
@ -218,7 +218,7 @@ int main(int argc, char **argv) {
GPid ppid; GPid ppid;
if (g_spawn_async(NULL, command_argv, NULL, if (g_spawn_async(NULL, command_argv, NULL,
G_SPAWN_DO_NOT_REAP_CHILD | G_SPAWN_SEARCH_PATH, (GSpawnFlags)(G_SPAWN_DO_NOT_REAP_CHILD | G_SPAWN_SEARCH_PATH),
(GSpawnChildSetupFunc)vte_pty_child_setup, pty, (GSpawnChildSetupFunc)vte_pty_child_setup, pty,
&ppid, &error)) { &ppid, &error)) {
vte_terminal_watch_child(VTE_TERMINAL(vte), ppid); vte_terminal_watch_child(VTE_TERMINAL(vte), ppid);
@ -286,7 +286,7 @@ int main(int argc, char **argv) {
G_REGEX_CASELESS, G_REGEX_CASELESS,
G_REGEX_MATCH_NOTEMPTY, G_REGEX_MATCH_NOTEMPTY,
NULL), NULL),
0); (GRegexMatchFlags)0);
vte_terminal_match_set_cursor_type(VTE_TERMINAL(vte), tmp, GDK_HAND2); vte_terminal_match_set_cursor_type(VTE_TERMINAL(vte), tmp, GDK_HAND2);
g_signal_connect(vte, "button-press-event", G_CALLBACK(button_press_cb), NULL); g_signal_connect(vte, "button-press-event", G_CALLBACK(button_press_cb), NULL);
#endif #endif