JMR-dev/redshift-rebooted
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add first pass of Geoclue location provider.

Browse Source
This commit is contained in:
Mathieu Trudel-Lapierre
2011-02-09 23:31:17 -05:00
parent 82c4aa5d67
commit 3bf1f85267
4 changed files with 265 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.ac
+10
View File
@@ -24,6 +24,7 @@ PKG_CHECK_MODULES([XCB_RANDR], [xcb-randr],
PKG_CHECK_MODULES([GLIB], [glib-2.0 gobject-2.0], [have_glib=yes], [have_glib=no])
PKG_CHECK_MODULES([GCONF], [gconf-2.0], [have_gconf=yes], [have_gconf=no])
PKG_CHECK_MODULES([GEOCLUE], [geoclue], [have_geoclue=yes], [have_geoclue=no])
AC_CHECK_HEADER([windows.h], [have_windows_h=yes], [have_windows_h=no])
@@ -131,6 +132,15 @@ AS_IF([test "x$enable_gnome_clock" != xno], [
])
AM_CONDITIONAL([ENABLE_GNOME_CLOCK], [test "x$enable_gnome_clock" = xyes])
# conditionally enable geoclue provider
AC_ARG_ENABLE([geoclue], [AC_HELP_STRING([--enable-geoclue],
[enable Geoclue location provider])],
[enable_geoclue=yes
AC_DEFINE([ENABLE_GEOCLUE], 1,
[Define to 1 to enable Geoclue location provider])
],[enable_geoclue=no])
AM_CONDITIONAL([ENABLE_GEOCLUE], [test "x$enable_geoclue" = xyes])
# Check for GUI status icon
AC_MSG_CHECKING([whether to enable GUI status icon])
AC_ARG_ENABLE([gui], [AC_HELP_STRING([--enable-gui],
src/location-geoclue.c
+190
View File
@@ -0,0 +1,190 @@
/* location-geoclue.c -- Geoclue location provider source
This file is part of Redshift.
Redshift is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
Redshift is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with Redshift. If not, see <http://www.gnu.org/licenses/>.
Copyright (c) 2010 Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com>
*/
#include <stdio.h>
#include <string.h>
#include <math.h>
#include <gconf/gconf-client.h>
#include <geoclue/geoclue-master.h>
#include <geoclue/geoclue-position.h>
#include "location-geoclue.h"
#ifdef ENABLE_NLS
# include <libintl.h>
# define _(s) gettext(s)
#else
# define _(s) s
#endif
#define DEFAULT_PROVIDER "org.freedesktop.Geoclue.Providers.UbuntuGeoIP"
#define DEFAULT_PROVIDER_PATH "/org/freedesktop/Geoclue/Providers/UbuntuGeoIP"
int
location_geoclue_init(location_geoclue_state_t *state)
{
g_type_init ();
state->position = NULL;
state->provider = NULL;
state->provider_path = NULL;
return 0;
}
int
location_geoclue_start(location_geoclue_state_t *state)
{
GeoclueMaster *master = NULL;
GeoclueMasterClient *client = NULL;
GError *error = NULL;
gchar *name = NULL;
gchar *desc = NULL;
if (!(state->provider && state->provider_path)) {
master = geoclue_master_get_default ();
client = geoclue_master_create_client (master, NULL, NULL);
if (!geoclue_master_client_set_requirements (client,
GEOCLUE_ACCURACY_LEVEL_REGION,
0, FALSE,
GEOCLUE_RESOURCE_NETWORK,
&error)) {
g_printerr (_("Can't set requirements for master: %s"),
error->message);
g_error_free (error);
g_object_unref (client);
return 1;
}
state->position = geoclue_master_client_create_position (client, NULL);
}
else {
state->position = geoclue_position_new (state->provider,
state->provider_path);
}
if (geoclue_provider_get_provider_info (GEOCLUE_PROVIDER (state->position),
&name, &desc, NULL)) {
fprintf (stdout, _("Started provider '%s':\n"), name);
fprintf (stdout, "%s\n", desc);
g_free (name);
g_free (desc);
}
else {
fputs(_("Could not find a usable Geoclue provider.\n"), stderr);
fputs(_("Try setting name and path to specify which to use.\n"), stderr);
return 1;
}
return 0;
}
void
location_geoclue_free(location_geoclue_state_t *state)
{
if (state->position != NULL)
g_object_unref (state->position);
}
void
location_geoclue_print_help(FILE *f)
{
fputs(_("Use the location as discovered by a Geoclue provider.\n"), f);
fputs("\n", f);
}
int
location_geoclue_set_option(location_geoclue_state_t *state,
const char *key, const char *value)
{
const char *provider = NULL, *path = NULL;
int i = 0;
/* Parse string value */
if (key != NULL && strcasecmp(key, "name") == 0) {
if (value != NULL && strcasecmp(value, "default") == 0)
provider = DEFAULT_PROVIDER;
else if (value != NULL)
provider = value;
else {
fputs(_("Must specify a provider 'name' (or use 'default').\n"), stderr);
return -1;
}
state->provider = provider;
}
else if (key != NULL && strcasecmp(key, "path") == 0) {
if (value != NULL && strcasecmp(value, "default") == 0)
path = DEFAULT_PROVIDER_PATH;
else if (value != NULL)
path = value;
else {
fputs(_("Must specify a provider 'path' (or use 'default').\n"), stderr);
return -1;
}
state->provider_path = path;
}
else if (key == NULL) {
return -1;
}
else {
fprintf(stderr, _("Unknown method parameter: `%s'.\n"), key);
return -1;
}
return 0;
}
int
location_geoclue_get_location(location_geoclue_state_t *state,
float *lat, float *lon)
{
GeocluePositionFields fields;
GError *error = NULL;
double latitude = 0, longitude = 0;
fields = geoclue_position_get_position (state->position, NULL,
&latitude, &longitude, NULL,
NULL, &error);
if (error) {
g_printerr (_("Could not get location: %s.\n"), error->message);
g_error_free (error);
return 1;
}
if (fields & GEOCLUE_POSITION_FIELDS_LATITUDE &&
fields & GEOCLUE_POSITION_FIELDS_LONGITUDE) {
fprintf (stdout, _("According to the geoclue provider we're at:\n"));
fprintf (stdout, _("Latitude: %.3f %s\n"),
fabs(latitude),
latitude <= 0 ? _("S") : _("N"));
fprintf (stdout, _("Longitude: %.3f %s\n"),
fabs(longitude),
longitude <= 0 ? _("W") : _("E"));
} else {
g_warning (_("Provider does not have a valid location available."));
return 1;
}
lat = &latitude;
lon = &longitude;
return 0;
}
src/location-geoclue.h
+44
View File
@@ -0,0 +1,44 @@
/* location-geoclue.h -- Geoclue location provider header
This file is part of Redshift.
Redshift is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
Redshift is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with Redshift. If not, see <http://www.gnu.org/licenses/>.
Copyright (c) 2010 Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com>
*/
#ifndef _REDSHIFT_LOCATION_GEOCLUE_H
#define _REDSHIFT_LOCATION_GEOCLUE_H
#include <stdio.h>
#include <geoclue/geoclue-position.h>
typedef struct {
GeocluePosition *position; /* main geoclue object */
const char *provider; /* name of a geoclue provider */
const char *provider_path; /* path of the geoclue provider */
} location_geoclue_state_t;
int location_geoclue_init(location_geoclue_state_t *state);
int location_geoclue_start(location_geoclue_state_t *state);
void location_geoclue_free(location_geoclue_state_t *state);
void location_geoclue_print_help(FILE *f);
int location_geoclue_set_option(location_geoclue_state_t *state,
const char *key, const char *value);
int location_geoclue_get_location(location_geoclue_state_t *state,
float *lat, float *lon);
#endif /* ! _REDSHIFT_LOCATION_GEOCLUE_H */
src/redshift.c
+21
View File
@@ -76,6 +76,10 @@
# include "location-gnome-clock.h"
#endif
#ifdef ENABLE_GEOCLUE
# include "location-geoclue.h"
#endif
/* Union of state data for gamma adjustment methods */
typedef union {
@@ -139,11 +143,28 @@ typedef union {
#ifdef ENABLE_GNOME_CLOCK
location_gnome_clock_state_t gnome_clock;
#endif
#ifdef ENABLE_GEOCLUE
location_geoclue_state_t geoclue;
#endif
} location_state_t;
/* Location provider method structs */
static const location_provider_t location_providers[] = {
#ifdef ENABLE_GEOCLUE
{
"geoclue",
(location_provider_init_func *)location_geoclue_init,
(location_provider_start_func *)location_geoclue_start,
(location_provider_free_func *)location_geoclue_free,
(location_provider_print_help_func *)
location_geoclue_print_help,
(location_provider_set_option_func *)
location_geoclue_set_option,
(location_provider_get_location_func *)
location_geoclue_get_location
},
#endif
#ifdef ENABLE_GNOME_CLOCK
{
"gnome-clock",