summaryrefslogtreecommitdiff
path: root/navit
diff options
context:
space:
mode:
Diffstat (limited to 'navit')
-rw-r--r--navit/android/build.gradle4
-rw-r--r--navit/browserplugin.c3
-rw-r--r--navit/command.c5
-rw-r--r--navit/graphics/gd/graphics_gd.c21
-rw-r--r--navit/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c42
-rw-r--r--navit/graphics/null/graphics_null.c24
-rw-r--r--navit/graphics/opengl/graphics_opengl_x11.c6
-rw-r--r--navit/gui/gtk/datawindow.c2
-rw-r--r--navit/gui/gtk/gui_gtk_window.c20
-rw-r--r--navit/speech/espeak/speak.c2
10 files changed, 75 insertions, 54 deletions
diff --git a/navit/android/build.gradle b/navit/android/build.gradle
index 11af35b83..dc19f4f5d 100644
--- a/navit/android/build.gradle
+++ b/navit/android/build.gradle
@@ -34,7 +34,9 @@ android {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
- signingConfig signingConfigs.release
+ if(file(System.getenv("KEYSTORE") ?: "/store").exists()){
+ signingConfig signingConfigs.release
+ }
}
}
lintOptions {
diff --git a/navit/browserplugin.c b/navit/browserplugin.c
index 84f0002ed..ec8acb60c 100644
--- a/navit/browserplugin.c
+++ b/navit/browserplugin.c
@@ -132,7 +132,8 @@ NP_Shutdown() {
return NPERR_NO_ERROR;
}
-NPError NPP_New(NPMIMEType pluginType, NPP instance, uint16_t mode, int16_t argc, char *argn[], char *argv[], NPSavedData * saved) {
+NPError NPP_New(NPMIMEType pluginType, NPP instance, uint16_t mode, int16_t argc, char *argn[], char *argv[],
+ NPSavedData * saved) {
char *args[]= {"/usr/bin/navit",NULL};
// Make sure we can render this plugin
NPBool browserSupportsWindowless = false;
diff --git a/navit/command.c b/navit/command.c
index 032e0f887..cc498b1a7 100644
--- a/navit/command.c
+++ b/navit/command.c
@@ -1223,7 +1223,7 @@ static void command_evaluate_to(struct attr *attr, const char *expr, struct cont
}
enum attr_type command_evaluate_to_attr(struct attr *attr, char *expr, int *error, struct attr *ret) {
- struct result res={{0,},};
+ struct result res= {{0,},};
struct context ctx;
command_evaluate_to(attr, expr, &ctx, &res);
if (ctx.error)
@@ -1501,7 +1501,8 @@ void command_interpreter(struct attr *attr) {
}
#endif
-static void command_table_call(struct command_table *table, int count, void *data, char *command, struct attr **in, struct attr ***out, int *valid) {
+static void command_table_call(struct command_table *table, int count, void *data, char *command, struct attr **in,
+ struct attr ***out, int *valid) {
int i;
for (i = 0 ; i < count ; i++) {
if (!strcmp(command,table->command)) {
diff --git a/navit/graphics/gd/graphics_gd.c b/navit/graphics/gd/graphics_gd.c
index 7c8a45693..4d25439fd 100644
--- a/navit/graphics/gd/graphics_gd.c
+++ b/navit/graphics/gd/graphics_gd.c
@@ -279,7 +279,8 @@ static struct graphics_gc_priv *gc_new(struct graphics_priv *gr, struct graphics
}
-static struct graphics_image_priv *image_new(struct graphics_priv *gr, struct graphics_image_methods *meth, char *name, int *w, int *h, struct point *hot, int rotation) {
+static struct graphics_image_priv *image_new(struct graphics_priv *gr, struct graphics_image_methods *meth, char *name,
+ int *w, int *h, struct point *hot, int rotation) {
FILE *file;
struct graphics_image_priv *ret=NULL;
gdImagePtr im=NULL;
@@ -376,7 +377,8 @@ static void draw_circle(struct graphics_priv *gr, struct graphics_gc_priv *gc, s
}
-static void draw_text(struct graphics_priv *gr, struct graphics_gc_priv *fg, struct graphics_gc_priv *bg, struct graphics_font_priv *font, char *text, struct point *p, int dx, int dy) {
+static void draw_text(struct graphics_priv *gr, struct graphics_gc_priv *fg, struct graphics_gc_priv *bg,
+ struct graphics_font_priv *font, char *text, struct point *p, int dx, int dy) {
struct font_freetype_text *t;
struct font_freetype_glyph *g, **gp;
gdImagePtr im;
@@ -428,7 +430,8 @@ static void draw_text(struct graphics_priv *gr, struct graphics_gc_priv *fg, str
gr->freetype_methods.text_destroy(t);
}
-static void draw_image(struct graphics_priv *gr, struct graphics_gc_priv *fg, struct point *p, struct graphics_image_priv *img) {
+static void draw_image(struct graphics_priv *gr, struct graphics_gc_priv *fg, struct point *p,
+ struct graphics_image_priv *img) {
gdImageCopy(gr->im, img->im, p->x, p->y, 0, 0, img->im->sx, img->im->sy);
}
@@ -507,7 +510,8 @@ static void draw_mode(struct graphics_priv *gr, enum draw_mode_num mode) {
}
}
-static struct graphics_priv * overlay_new(struct graphics_priv *gr, struct graphics_methods *meth, struct point *p, int w, int h, int wraparound);
+static struct graphics_priv * overlay_new(struct graphics_priv *gr, struct graphics_methods *meth, struct point *p,
+ int w, int h, int wraparound);
static void add_overlays(struct graphics_priv *overlay, gdImagePtr im) {
while (overlay) {
@@ -756,7 +760,8 @@ static struct graphics_methods graphics_methods = {
NULL, /* hide_native_keyboard */
};
-static struct graphics_priv *overlay_new(struct graphics_priv *gr, struct graphics_methods *meth, struct point *p, int w, int h, int wraparound) {
+static struct graphics_priv *overlay_new(struct graphics_priv *gr, struct graphics_methods *meth, struct point *p,
+ int w, int h, int wraparound) {
struct font_priv * (*font_freetype_new)(void *meth);
struct graphics_priv *ret;
@@ -784,7 +789,8 @@ static void emit_callback(struct graphics_priv *priv) {
}
-static struct graphics_priv *graphics_gd_new(struct navit *nav, struct graphics_methods *meth, struct attr **attrs, struct callback_list *cbl) {
+static struct graphics_priv *graphics_gd_new(struct navit *nav, struct graphics_methods *meth, struct attr **attrs,
+ struct callback_list *cbl) {
struct font_priv * (*font_freetype_new)(void *meth);
struct graphics_priv *ret;
event_request_system("glib","graphics_gd_new");
@@ -794,7 +800,8 @@ static struct graphics_priv *graphics_gd_new(struct navit *nav, struct graphics_
*meth=graphics_methods;
ret=g_new0(struct graphics_priv, 1);
font_freetype_new(&ret->freetype_methods);
- meth->font_new=(struct graphics_font_priv *(*)(struct graphics_priv *, struct graphics_font_methods *, char *, int, int))ret->freetype_methods.font_new;
+ meth->font_new=(struct graphics_font_priv *(*)(struct graphics_priv *, struct graphics_font_methods *, char *, int,
+ int))ret->freetype_methods.font_new;
meth->get_text_bbox=ret->freetype_methods.get_text_bbox;
ret->cb=callback_new_attr_1(callback_cast(emit_callback), attr_navit, ret);
navit_add_callback(nav, ret->cb);
diff --git a/navit/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c b/navit/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c
index 3c1173325..0f57263ee 100644
--- a/navit/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c
+++ b/navit/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c
@@ -27,7 +27,7 @@
#include <gdk/gdkkeysyms.h>
#include <cairo.h>
#include <locale.h> /* For WIN32 */
-#if !defined(GDK_Book) || !defined(GDK_Calendar)
+#if !defined(GDK_KEY_Book) || !defined(GDK_Book) || !defined(GDK_Calendar)
#include <X11/XF86keysym.h>
#endif
#ifdef HAVE_IMLIB2
@@ -51,11 +51,11 @@
#include "navit.h"
#include <errno.h>
-#ifndef GDK_Book
-#define GDK_Book XF86XK_Book
+#ifndef GDK_KEY_Book
+#define GDK_KEY_Book XF86XK_Book
#endif
-#ifndef GDK_Calendar
-#define GDK_Calendar XF86XK_Calendar
+#ifndef GDK_KEY_Calendar
+#define GDK_KEY_Calendar XF86XK_Calendar
#endif
@@ -779,62 +779,62 @@ static gint keypress(GtkWidget *widget, GdkEventKey *event, gpointer user_data)
key[len]='\0';
switch (event->keyval) {
- case GDK_Up:
+ case GDK_KEY_Up:
key[0]=NAVIT_KEY_UP;
key[1]='\0';
break;
- case GDK_Down:
+ case GDK_KEY_Down:
key[0]=NAVIT_KEY_DOWN;
key[1]='\0';
break;
- case GDK_Left:
+ case GDK_KEY_Left:
key[0]=NAVIT_KEY_LEFT;
key[1]='\0';
break;
- case GDK_Right:
+ case GDK_KEY_Right:
key[0]=NAVIT_KEY_RIGHT;
key[1]='\0';
break;
- case GDK_BackSpace:
+ case GDK_KEY_BackSpace:
key[0]=NAVIT_KEY_BACKSPACE;
key[1]='\0';
break;
- case GDK_Tab:
+ case GDK_KEY_Tab:
key[0]='\t';
key[1]='\0';
break;
- case GDK_Delete:
+ case GDK_KEY_Delete:
key[0]=NAVIT_KEY_DELETE;
key[1]='\0';
break;
- case GDK_Escape:
+ case GDK_KEY_Escape:
key[0]=NAVIT_KEY_BACK;
key[1]='\0';
break;
- case GDK_Return:
- case GDK_KP_Enter:
+ case GDK_KEY_Return:
+ case GDK_KEY_KP_Enter:
key[0]=NAVIT_KEY_RETURN;
key[1]='\0';
break;
- case GDK_Book:
+ case GDK_KEY_Book:
#ifdef USE_HILDON
- case GDK_F7:
+ case GDK_KEY_F7:
#endif
key[0]=NAVIT_KEY_ZOOM_IN;
key[1]='\0';
break;
- case GDK_Calendar:
+ case GDK_KEY_Calendar:
#ifdef USE_HILDON
- case GDK_F8:
+ case GDK_KEY_F8:
#endif
key[0]=NAVIT_KEY_ZOOM_OUT;
key[1]='\0';
break;
- case GDK_Page_Up:
+ case GDK_KEY_Page_Up:
key[0]=NAVIT_KEY_PAGE_UP;
key[1]='\0';
break;
- case GDK_Page_Down:
+ case GDK_KEY_Page_Down:
key[0]=NAVIT_KEY_PAGE_DOWN;
key[1]='\0';
break;
diff --git a/navit/graphics/null/graphics_null.c b/navit/graphics/null/graphics_null.c
index c3a21185b..552999d45 100644
--- a/navit/graphics/null/graphics_null.c
+++ b/navit/graphics/null/graphics_null.c
@@ -65,7 +65,8 @@ static struct graphics_font_methods font_methods = {
font_destroy
};
-static struct graphics_font_priv *font_new(struct graphics_priv *gr, struct graphics_font_methods *meth, char *font, int size, int flags) {
+static struct graphics_font_priv *font_new(struct graphics_priv *gr, struct graphics_font_methods *meth, char *font,
+ int size, int flags) {
*meth=font_methods;
return &graphics_font_priv;
}
@@ -98,7 +99,8 @@ static struct graphics_gc_priv *gc_new(struct graphics_priv *gr, struct graphics
return &graphics_gc_priv;
}
-static struct graphics_image_priv *image_new(struct graphics_priv *gr, struct graphics_image_methods *meth, char *path, int *w, int *h, struct point *hot, int rotation) {
+static struct graphics_image_priv *image_new(struct graphics_priv *gr, struct graphics_image_methods *meth, char *path,
+ int *w, int *h, struct point *hot, int rotation) {
return &graphics_image_priv;
}
@@ -115,10 +117,12 @@ static void draw_circle(struct graphics_priv *gr, struct graphics_gc_priv *gc, s
}
-static void draw_text(struct graphics_priv *gr, struct graphics_gc_priv *fg, struct graphics_gc_priv *bg, struct graphics_font_priv *font, char *text, struct point *p, int dx, int dy) {
+static void draw_text(struct graphics_priv *gr, struct graphics_gc_priv *fg, struct graphics_gc_priv *bg,
+ struct graphics_font_priv *font, char *text, struct point *p, int dx, int dy) {
}
-static void draw_image(struct graphics_priv *gr, struct graphics_gc_priv *fg, struct point *p, struct graphics_image_priv *img) {
+static void draw_image(struct graphics_priv *gr, struct graphics_gc_priv *fg, struct point *p,
+ struct graphics_image_priv *img) {
}
static void draw_drag(struct graphics_priv *gr, struct point *p) {
@@ -130,7 +134,8 @@ static void background_gc(struct graphics_priv *gr, struct graphics_gc_priv *gc)
static void draw_mode(struct graphics_priv *gr, enum draw_mode_num mode) {
}
-static struct graphics_priv * overlay_new(struct graphics_priv *gr, struct graphics_methods *meth, struct point *p, int w, int h, int wraparound);
+static struct graphics_priv * overlay_new(struct graphics_priv *gr, struct graphics_methods *meth, struct point *p,
+ int w, int h, int wraparound);
static void resize_callback(int w, int h) {
callback_list_call_attr_2(callbacks, attr_resize, GINT_TO_POINTER(1), GINT_TO_POINTER(1));
@@ -159,7 +164,8 @@ static void *get_data(struct graphics_priv *this, char const *type) {
static void image_free(struct graphics_priv *gr, struct graphics_image_priv *priv) {
}
-static void get_text_bbox(struct graphics_priv *gr, struct graphics_font_priv *font, char *text, int dx, int dy, struct point *ret, int estimate) {
+static void get_text_bbox(struct graphics_priv *gr, struct graphics_font_priv *font, char *text, int dx, int dy,
+ struct point *ret, int estimate) {
}
static void overlay_disable(struct graphics_priv *gr, int disable) {
@@ -193,13 +199,15 @@ static struct graphics_methods graphics_methods = {
NULL, /* hide_native_keyboard */
};
-static struct graphics_priv *overlay_new(struct graphics_priv *gr, struct graphics_methods *meth, struct point *p, int w, int h, int wraparound) {
+static struct graphics_priv *overlay_new(struct graphics_priv *gr, struct graphics_methods *meth, struct point *p,
+ int w, int h, int wraparound) {
*meth=graphics_methods;
return &graphics_priv;
}
-static struct graphics_priv *graphics_null_new(struct navit *nav, struct graphics_methods *meth, struct attr **attrs, struct callback_list *cbl) {
+static struct graphics_priv *graphics_null_new(struct navit *nav, struct graphics_methods *meth, struct attr **attrs,
+ struct callback_list *cbl) {
struct attr *event_loop_system = NULL;
*meth=graphics_methods;
diff --git a/navit/graphics/opengl/graphics_opengl_x11.c b/navit/graphics/opengl/graphics_opengl_x11.c
index f56b2b9d5..e8af93028 100644
--- a/navit/graphics/opengl/graphics_opengl_x11.c
+++ b/navit/graphics/opengl/graphics_opengl_x11.c
@@ -46,7 +46,8 @@ static void *graphics_opengl_get_window(struct graphics_opengl_window_system *x1
return (void *)x11->window;
}
-static void graphics_opengl_set_callbacks(struct graphics_opengl_window_system *x11, void *data, void *resize, void *button, void *motion, void *keypress) {
+static void graphics_opengl_set_callbacks(struct graphics_opengl_window_system *x11, void *data, void *resize,
+ void *button, void *motion, void *keypress) {
x11->data=data;
x11->resize=resize;
x11->button=button;
@@ -104,7 +105,8 @@ static void graphics_opengl_x11_watch(struct graphics_opengl_window_system *x11)
}
struct graphics_opengl_window_system *
-graphics_opengl_x11_new(void *displayname, int w, int h, int depth, struct graphics_opengl_window_system_methods **methods) {
+graphics_opengl_x11_new(void *displayname, int w, int h, int depth,
+ struct graphics_opengl_window_system_methods **methods) {
struct graphics_opengl_window_system *ret=g_new0(struct graphics_opengl_window_system, 1);
XSetWindowAttributes attributes;
unsigned long valuemask;
diff --git a/navit/gui/gtk/datawindow.c b/navit/gui/gtk/datawindow.c
index afe977dbc..4d8d6e9bf 100644
--- a/navit/gui/gtk/datawindow.c
+++ b/navit/gui/gtk/datawindow.c
@@ -153,7 +153,7 @@ void gui_gtk_datawindow_set_button(struct datawindow_priv *this_, GtkWidget *btn
static gboolean keypress(GtkWidget *widget, GdkEventKey *event, struct datawindow_priv *win) {
if (event->type != GDK_KEY_PRESS)
return FALSE;
- if (event->keyval == GDK_Cancel) {
+ if (event->keyval == GDK_KEY_Cancel) {
gui_gtk_datawindow_delete(widget, (GdkEvent *)event, win);
gtk_widget_destroy(win->window);
}
diff --git a/navit/gui/gtk/gui_gtk_window.c b/navit/gui/gtk/gui_gtk_window.c
index 008659c44..aa510b374 100644
--- a/navit/gui/gtk/gui_gtk_window.c
+++ b/navit/gui/gtk/gui_gtk_window.c
@@ -23,7 +23,7 @@
#include <math.h>
#include <locale.h>
#include <gdk/gdkkeysyms.h>
-#if !defined(GDK_Book) || !defined(GDK_Calendar)
+#if !defined(GDK_KEY_Book) || !defined(GDK_Book) || !defined(GDK_Calendar)
#include <X11/XF86keysym.h>
#endif
#include <gtk/gtk.h>
@@ -60,17 +60,17 @@
#define KEY_RIGHT HILDON_HARDKEY_RIGHT
#else
#ifndef GDK_Book
-#define GDK_Book XF86XK_Book
+#define GDK_KEY_Book XF86XK_Book
#endif
#ifndef GDK_Calendar
-#define GDK_Calendar XF86XK_Calendar
+#define GDK_KEY_Calendar XF86XK_Calendar
#endif
-#define KEY_ZOOM_IN GDK_Book
-#define KEY_ZOOM_OUT GDK_Calendar
-#define KEY_UP GDK_Up
-#define KEY_DOWN GDK_Down
-#define KEY_LEFT GDK_Left
-#define KEY_RIGHT GDK_Right
+#define KEY_ZOOM_IN GDK_KEY_Book
+#define KEY_ZOOM_OUT GDK_KEY_Calendar
+#define KEY_UP GDK_KEY_Up
+#define KEY_DOWN GDK_KEY_Down
+#define KEY_LEFT GDK_KEY_Left
+#define KEY_RIGHT GDK_KEY_Right
#endif
GdkPixbuf *geticon(const char *name);
@@ -88,7 +88,7 @@ static gboolean keypress(GtkWidget *widget, GdkEventKey *event, struct gui_priv
dbg(lvl_debug,"keypress 0x%x", event->keyval);
transform_get_size(navit_get_trans(this->nav), &w, &h);
switch (event->keyval) {
- case GDK_KP_Enter:
+ case GDK_KEY_KP_Enter:
gtk_menu_shell_select_first(GTK_MENU_SHELL(this->menubar), TRUE);
break;
case KEY_UP:
diff --git a/navit/speech/espeak/speak.c b/navit/speech/espeak/speak.c
index 1aebcf318..593e1677b 100644
--- a/navit/speech/espeak/speak.c
+++ b/navit/speech/espeak/speak.c
@@ -68,7 +68,7 @@ int GetFileLength(const char *filename) {
return(statbuf.st_size);
}
-void MarkerEvent(int type, unsigned int char_position, int value, int value2, unsigned char *out_ptr){
+void MarkerEvent(int type, unsigned int char_position, int value, int value2, unsigned char *out_ptr) {
}
char *Alloc(int size) {
View Lorry Controller Status