DeforaOS/Camera
DeforaOS/Camera
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Separated window handling from the Camera widget itself

Browse Source
This commit is contained in:
Pierre Pronchery 2013-05-23 21:25:17 +02:00
parent d2889edfa1
commit cd5d55597d
8 changed files with 580 additions and 330 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@ -37,6 +37,7 @@ dist:
$(PACKAGE)-$(VERSION)/po/project.conf \ $(PACKAGE)-$(VERSION)/po/project.conf \
$(PACKAGE)-$(VERSION)/src/camera.c \ $(PACKAGE)-$(VERSION)/src/camera.c \
$(PACKAGE)-$(VERSION)/src/overlay.c \ $(PACKAGE)-$(VERSION)/src/overlay.c \
$(PACKAGE)-$(VERSION)/src/window.c \
$(PACKAGE)-$(VERSION)/src/main.c \ $(PACKAGE)-$(VERSION)/src/main.c \
$(PACKAGE)-$(VERSION)/src/Makefile \ $(PACKAGE)-$(VERSION)/src/Makefile \
$(PACKAGE)-$(VERSION)/src/camera.h \ $(PACKAGE)-$(VERSION)/src/camera.h \

7
src/Makefile
View File

@ -17,7 +17,7 @@ INSTALL = install
all: $(TARGETS) all: $(TARGETS)
camera_OBJS = camera.o overlay.o main.o camera_OBJS = camera.o overlay.o window.o main.o
camera_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS) camera_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS)
camera_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) camera_LDFLAGS = $(LDFLAGSF) $(LDFLAGS)
@ -30,7 +30,10 @@ camera.o: camera.c overlay.h camera.h ../config.h
overlay.o: overlay.c overlay.h overlay.o: overlay.c overlay.h
$(CC) $(camera_CFLAGS) -c overlay.c $(CC) $(camera_CFLAGS) -c overlay.c
main.o: main.c camera.h window.o: window.c camera.h window.h
$(CC) $(camera_CFLAGS) -c window.c
main.o: main.c window.h
$(CC) $(camera_CFLAGS) -c main.c $(CC) $(camera_CFLAGS) -c main.c
clean: clean:

490
src/camera.c
View File

@ -82,9 +82,10 @@ struct _Camera
size_t overlays_cnt; size_t overlays_cnt;
/* widgets */ /* widgets */
GtkWidget * widget;
GtkWidget * window;
PangoFontDescription * bold; PangoFontDescription * bold;
GdkGC * gc; GdkGC * gc;
GtkWidget * window;
#if GTK_CHECK_VERSION(2, 18, 0) #if GTK_CHECK_VERSION(2, 18, 0)
GtkWidget * infobar; GtkWidget * infobar;
GtkWidget * infobar_label; GtkWidget * infobar_label;
@ -104,92 +105,19 @@ static int _camera_ioctl(Camera * camera, unsigned long request,
/* callbacks */ /* callbacks */
static gboolean _camera_on_can_read(GIOChannel * channel, static gboolean _camera_on_can_read(GIOChannel * channel,
GIOCondition condition, gpointer data); GIOCondition condition, gpointer data);
static void _camera_on_close(gpointer data);
static void _camera_on_contents(gpointer data);
static gboolean _camera_on_closex(gpointer data);
static gboolean _camera_on_drawing_area_configure(GtkWidget * widget, static gboolean _camera_on_drawing_area_configure(GtkWidget * widget,
GdkEventConfigure * event, gpointer data); GdkEventConfigure * event, gpointer data);
static gboolean _camera_on_drawing_area_expose(GtkWidget * widget, static gboolean _camera_on_drawing_area_expose(GtkWidget * widget,
GdkEventExpose * event, gpointer data); GdkEventExpose * event, gpointer data);
static void _camera_on_gallery(gpointer data); static void _camera_on_gallery(gpointer data);
static gboolean _camera_on_open(gpointer data); static gboolean _camera_on_open(gpointer data);
#ifdef EMBEDDED
static void _camera_on_preferences(gpointer data); static void _camera_on_preferences(gpointer data);
static void _camera_on_properties(gpointer data); static void _camera_on_properties(gpointer data);
#endif
static gboolean _camera_on_refresh(gpointer data); static gboolean _camera_on_refresh(gpointer data);
static void _camera_on_snapshot(gpointer data); static void _camera_on_snapshot(gpointer data);
#ifndef EMBEDDED
/* menus */
static void _camera_on_file_close(gpointer data);
static void _camera_on_file_gallery(gpointer data);
static void _camera_on_file_properties(gpointer data);
static void _camera_on_file_snapshot(gpointer data);
static void _camera_on_edit_preferences(gpointer data);
static void _camera_on_help_about(gpointer data);
static void _camera_on_help_contents(gpointer data);
#endif
/* constants */
#ifndef EMBEDDED
static char const * _authors[] =
{
"Pierre Pronchery <khorben@defora.org>",
NULL
};
#endif
#ifdef EMBEDDED
static const DesktopAccel _camera_accel[] =
{
{ G_CALLBACK(_camera_on_close), GDK_CONTROL_MASK, GDK_KEY_W },
{ G_CALLBACK(_camera_on_contents), 0, GDK_KEY_F1 },
{ NULL, 0, 0 }
};
#endif
#ifndef EMBEDDED
/* menus */
static const DesktopMenu _camera_menu_file[] =
{
{ "Take _snapshot", G_CALLBACK(_camera_on_file_snapshot),
"camera-photo", 0, 0 },
{ "", NULL, NULL, 0, 0 },
{ "Gallery", G_CALLBACK(_camera_on_file_gallery), "image-x-generic", 0,
0 },
{ "", NULL, NULL, 0, 0 },
{ "_Properties", G_CALLBACK(_camera_on_file_properties),
GTK_STOCK_PROPERTIES, GDK_MOD1_MASK, GDK_KEY_Return },
{ "", NULL, NULL, 0, 0 },
{ "_Close", G_CALLBACK(_camera_on_file_close), GTK_STOCK_CLOSE,
GDK_CONTROL_MASK, GDK_KEY_W },
{ NULL, NULL, NULL, 0, 0 }
};
static const DesktopMenu _camera_menu_edit[] =
{
{ "_Preferences", G_CALLBACK(_camera_on_edit_preferences),
GTK_STOCK_PREFERENCES, GDK_CONTROL_MASK, GDK_KEY_P },
{ NULL, NULL, NULL, 0, 0 }
};
static const DesktopMenu _camera_menu_help[] =
{
{ "_Contents", G_CALLBACK(_camera_on_help_contents), "help-contents", 0,
GDK_KEY_F1 },
{ "_About", G_CALLBACK(_camera_on_help_about), GTK_STOCK_ABOUT, 0, 0 },
{ NULL, NULL, NULL, 0, 0 }
};
static const DesktopMenubar _camera_menubar[] =
{
{ "_File", _camera_menu_file },
{ "_Edit", _camera_menu_edit },
{ "_Help", _camera_menu_help },
{ NULL, NULL }
};
#endif
/* variables */ /* variables */
static DesktopToolbar _camera_toolbar[] = static DesktopToolbar _camera_toolbar[] =
@ -214,10 +142,10 @@ static DesktopToolbar _camera_toolbar[] =
/* public */ /* public */
/* functions */ /* functions */
/* camera_new */ /* camera_new */
Camera * camera_new(char const * device) Camera * camera_new(GtkWidget * window, GtkAccelGroup * group,
char const * device)
{ {
Camera * camera; Camera * camera;
GtkAccelGroup * group;
GtkWidget * vbox; GtkWidget * vbox;
GtkWidget * widget; GtkWidget * widget;
@ -237,9 +165,10 @@ Camera * camera_new(char const * device)
camera->yuv_amp = 255; camera->yuv_amp = 255;
camera->overlays = NULL; camera->overlays = NULL;
camera->overlays_cnt = 0; camera->overlays_cnt = 0;
camera->widget = NULL;
camera->window = NULL;
camera->bold = NULL; camera->bold = NULL;
camera->gc = NULL; camera->gc = NULL;
camera->window = NULL;
/* check for errors */ /* check for errors */
if(camera->device == NULL) if(camera->device == NULL)
{ {
@ -249,30 +178,13 @@ Camera * camera_new(char const * device)
/* create the window */ /* create the window */
camera->bold = pango_font_description_new(); camera->bold = pango_font_description_new();
pango_font_description_set_weight(camera->bold, PANGO_WEIGHT_BOLD); pango_font_description_set_weight(camera->bold, PANGO_WEIGHT_BOLD);
group = gtk_accel_group_new(); camera->gc = gdk_gc_new(window->window); /* XXX */
camera->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_widget_realize(camera->window);
camera->gc = gdk_gc_new(camera->window->window); /* XXX */
gtk_window_add_accel_group(GTK_WINDOW(camera->window), group);
#if GTK_CHECK_VERSION(2, 6, 0)
gtk_window_set_icon_name(GTK_WINDOW(camera->window), "camera-photo");
#endif
gtk_window_set_title(GTK_WINDOW(camera->window), "Camera");
g_signal_connect_swapped(camera->window, "delete-event", G_CALLBACK(
_camera_on_closex), camera);
#if GTK_CHECK_VERSION(3, 0, 0) #if GTK_CHECK_VERSION(3, 0, 0)
vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0); camera->widget = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
#else #else
vbox = gtk_vbox_new(FALSE, 0); camera->widget = gtk_vbox_new(FALSE, 0);
#endif
#ifdef EMBEDDED
desktop_accel_create(_camera_accel, camera, group);
#endif
#ifndef EMBEDDED
/* menubar */
widget = desktop_menubar_create(_camera_menubar, camera, group);
gtk_box_pack_start(GTK_BOX(vbox), widget, FALSE, TRUE, 0);
#endif #endif
vbox = camera->widget;
/* toolbar */ /* toolbar */
widget = desktop_toolbar_create(_camera_toolbar, camera, group); widget = desktop_toolbar_create(_camera_toolbar, camera, group);
gtk_widget_set_sensitive(GTK_WIDGET(_camera_toolbar[0].widget), FALSE); gtk_widget_set_sensitive(GTK_WIDGET(_camera_toolbar[0].widget), FALSE);
@ -305,9 +217,8 @@ Camera * camera_new(char const * device)
g_signal_connect(camera->area, "expose-event", G_CALLBACK( g_signal_connect(camera->area, "expose-event", G_CALLBACK(
_camera_on_drawing_area_expose), camera); _camera_on_drawing_area_expose), camera);
gtk_box_pack_start(GTK_BOX(vbox), camera->area, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(vbox), camera->area, TRUE, TRUE, 0);
gtk_container_add(GTK_CONTAINER(camera->window), vbox); gtk_widget_show_all(vbox);
gtk_widget_show_all(camera->window); camera_start(camera);
camera->source = g_idle_add(_camera_on_open, camera);
return camera; return camera;
} }
@ -317,8 +228,7 @@ void camera_delete(Camera * camera)
{ {
size_t i; size_t i;
if(camera->source != 0) camera_stop(camera);
g_source_remove(camera->source);
for(i = 0; i < camera->overlays_cnt; i++) for(i = 0; i < camera->overlays_cnt; i++)
cameraoverlay_delete(camera->overlays[i]); cameraoverlay_delete(camera->overlays[i]);
free(camera->overlays); free(camera->overlays);
@ -335,8 +245,6 @@ void camera_delete(Camera * camera)
g_object_unref(camera->pixmap); g_object_unref(camera->pixmap);
if(camera->gc != NULL) if(camera->gc != NULL)
g_object_unref(camera->gc); g_object_unref(camera->gc);
if(camera->window != NULL)
gtk_widget_destroy(camera->window);
if(camera->bold != NULL) if(camera->bold != NULL)
pango_font_description_free(camera->bold); pango_font_description_free(camera->bold);
if(camera->fd >= 0) if(camera->fd >= 0)
@ -349,6 +257,13 @@ void camera_delete(Camera * camera)
} }
/* accessors */
GtkWidget * camera_get_widget(Camera * camera)
{
return camera->widget;
}
/* useful */ /* useful */
/* camera_add_overlay */ /* camera_add_overlay */
CameraOverlay * camera_add_overlay(Camera * camera, char const * filename, CameraOverlay * camera_add_overlay(Camera * camera, char const * filename,
@ -367,6 +282,129 @@ CameraOverlay * camera_add_overlay(Camera * camera, char const * filename,
} }
/* camera_open_gallery */
void camera_open_gallery(Camera * camera)
{
char * argv[] = { BINDIR "/gallery", "gallery", NULL };
const GSpawnFlags flags = G_SPAWN_FILE_AND_ARGV_ZERO;
GError * error = NULL;
if(g_spawn_async(NULL, argv, NULL, flags, NULL, NULL, NULL, &error)
!= TRUE && error != NULL)
{
_camera_error(camera, error->message, 1);
g_error_free(error);
}
}
/* camera_preferences */
void camera_preferences(Camera * camera)
{
/* FIXME implement */
}
/* camera_properties */
static GtkWidget * _properties_label(Camera * camera, GtkSizeGroup * group,
char const * label, char const * value);
void camera_properties(Camera * camera)
{
GtkWidget * dialog;
GtkSizeGroup * group;
GtkWidget * vbox;
GtkWidget * hbox;
char buf[64];
const struct
{
unsigned int capability;
char const * name;
} capabilities[] =
{
{ V4L2_CAP_VIDEO_CAPTURE, "capture" },
{ V4L2_CAP_VIDEO_OUTPUT, "output" },
{ V4L2_CAP_VIDEO_OVERLAY, "overlay" },
{ V4L2_CAP_TUNER, "tuner" },
{ V4L2_CAP_AUDIO, "audio" },
{ V4L2_CAP_STREAMING, "streaming" },
{ 0, NULL }
};
unsigned int i;
char const * sep = "";
if(camera->rgb_buffer == NULL)
/* ignore the action */
return;
dialog = gtk_dialog_new_with_buttons(_("Properties"),
GTK_WINDOW(camera->window),
GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, NULL);
gtk_window_set_default_size(GTK_WINDOW(dialog), 300, 200);
group = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
#if GTK_CHECK_VERSION(2, 14, 0)
vbox = gtk_dialog_get_content_area(GTK_DIALOG(dialog));
#else
vbox = dialog->vbox;
#endif
/* driver */
snprintf(buf, sizeof(buf), "%16s", (char *)camera->cap.driver);
hbox = _properties_label(camera, group, _("Driver: "), buf);
gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0);
/* card */
snprintf(buf, sizeof(buf), "%32s", (char *)camera->cap.card);
hbox = _properties_label(camera, group, _("Card: "), buf);
gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0);
/* bus info */
snprintf(buf, sizeof(buf), "%32s", (char *)camera->cap.bus_info);
hbox = _properties_label(camera, group, _("Bus info: "), buf);
gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0);
/* version */
snprintf(buf, sizeof(buf), "0x%x", camera->cap.version);
hbox = _properties_label(camera, group, _("Version: "), buf);
gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0);
/* capabilities */
buf[0] = '\0';
for(i = 0; capabilities[i].name != NULL; i++)
if(camera->cap.capabilities & capabilities[i].capability)
{
strncat(buf, sep, sizeof(buf) - strlen(buf));
strncat(buf, capabilities[i].name, sizeof(buf)
- strlen(buf));
sep = ", ";
}
buf[sizeof(buf) - 1] = '\0';
hbox = _properties_label(camera, group, _("Capabilities: "), buf);
gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0);
gtk_widget_show_all(vbox);
gtk_dialog_run(GTK_DIALOG(dialog));
gtk_widget_destroy(dialog);
}
static GtkWidget * _properties_label(Camera * camera, GtkSizeGroup * group,
char const * label, char const * value)
{
GtkWidget * hbox;
GtkWidget * widget;
#if GTK_CHECK_VERSION(3, 0, 0)
hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
#else
hbox = gtk_hbox_new(FALSE, 4);
#endif
widget = gtk_label_new(label);
gtk_widget_modify_font(widget, camera->bold);
gtk_misc_set_alignment(GTK_MISC(widget), 0.0, 0.5);
gtk_size_group_add_widget(group, widget);
gtk_box_pack_start(GTK_BOX(hbox), widget, FALSE, TRUE, 0);
widget = gtk_label_new((value != NULL) ? value : "");
gtk_label_set_ellipsize(GTK_LABEL(widget), PANGO_ELLIPSIZE_END);
gtk_misc_set_alignment(GTK_MISC(widget), 0.0, 0.5);
gtk_box_pack_start(GTK_BOX(hbox), widget, TRUE, TRUE, 0);
return hbox;
}
/* camera_snapshot */ /* camera_snapshot */
static int _snapshot_dcim(Camera * camera, char const * homedir, static int _snapshot_dcim(Camera * camera, char const * homedir,
char const * dcim); char const * dcim);
@ -482,6 +520,24 @@ static int _snapshot_save(Camera * camera, char const * path)
} }
/* camera_start */
void camera_start(Camera * camera)
{
if(camera->source != 0)
return;
camera->source = g_idle_add(_camera_on_open, camera);
}
/* camera_stop */
void camera_stop(Camera * camera)
{
if(camera->source != 0)
g_source_remove(camera->source);
camera->source = 0;
}
/* private */ /* private */
/* functions */ /* functions */
/* camera_error */ /* camera_error */
@ -575,36 +631,6 @@ static gboolean _camera_on_can_read(GIOChannel * channel,
} }
/* camera_on_close */
static void _camera_on_close(gpointer data)
{
Camera * camera = data;
gtk_widget_hide(camera->window);
if(camera->source != 0)
g_source_remove(camera->source);
camera->source = 0;
gtk_main_quit();
}
/* camera_on_closex */
static gboolean _camera_on_closex(gpointer data)
{
Camera * camera = data;
_camera_on_close(camera);
return TRUE;
}
/* camera_on_contents */
static void _camera_on_contents(gpointer data)
{
desktop_help_contents(PACKAGE, "camera");
}
/* camera_on_drawing_area_configure */ /* camera_on_drawing_area_configure */
static gboolean _camera_on_drawing_area_configure(GtkWidget * widget, static gboolean _camera_on_drawing_area_configure(GtkWidget * widget,
GdkEventConfigure * event, gpointer data) GdkEventConfigure * event, gpointer data)
@ -645,100 +671,12 @@ static gboolean _camera_on_drawing_area_expose(GtkWidget * widget,
} }
#ifndef EMBEDDED /* camera_on_gallery */
/* menus */
/* camera_on_file_close */
static void _camera_on_file_close(gpointer data)
{
Camera * camera = data;
_camera_on_close(camera);
}
/* camera_on_file_gallery */
static void _camera_on_file_gallery(gpointer data)
{
Camera * camera = data;
_camera_on_gallery(camera);
}
/* camera_on_file_properties */
static void _camera_on_file_properties(gpointer data)
{
Camera * camera = data;
_camera_on_properties(camera);
}
/* camera_on_file_snapshot */
static void _camera_on_file_snapshot(gpointer data)
{
Camera * camera = data;
_camera_on_snapshot(camera);
}
/* camera_on_edit_preferences */
static void _camera_on_edit_preferences(gpointer data)
{
Camera * camera = data;
_camera_on_preferences(camera);
}
/* camera_on_help_about */
static void _camera_on_help_about(gpointer data)
{
Camera * camera = data;
GtkWidget * widget;
char const comments[] = N_("Simple camera application for the DeforaOS"
" desktop");
widget = desktop_about_dialog_new();
gtk_window_set_transient_for(GTK_WINDOW(widget), GTK_WINDOW(
camera->window));
desktop_about_dialog_set_authors(widget, _authors);
desktop_about_dialog_set_comments(widget, _(comments));
desktop_about_dialog_set_copyright(widget, _copyright);
desktop_about_dialog_set_license(widget, _license);
desktop_about_dialog_set_logo_icon_name(widget, "camera-photo");
desktop_about_dialog_set_name(widget, PACKAGE);
desktop_about_dialog_set_version(widget, VERSION);
desktop_about_dialog_set_website(widget, "http://www.defora.org/");
gtk_dialog_run(GTK_DIALOG(widget));
gtk_widget_destroy(widget);
}
/* camera_on_help_contents */
static void _camera_on_help_contents(gpointer data)
{
Camera * camera = data;
_camera_on_contents(camera);
}
#endif
static void _camera_on_gallery(gpointer data) static void _camera_on_gallery(gpointer data)
{ {
Camera * camera = data; Camera * camera = data;
char * argv[] = { BINDIR "/gallery", "gallery", NULL };
const GSpawnFlags flags = G_SPAWN_FILE_AND_ARGV_ZERO;
GError * error = NULL;
if(g_spawn_async(NULL, argv, NULL, flags, NULL, NULL, NULL, &error) camera_open_gallery(camera);
!= TRUE && error != NULL)
{
_camera_error(camera, error->message, 1);
g_error_free(error);
}
} }
@ -853,112 +791,24 @@ static int _open_setup(Camera * camera)
} }
#ifdef EMBEDDED
/* camera_on_preferences */ /* camera_on_preferences */
static void _camera_on_preferences(gpointer data) static void _camera_on_preferences(gpointer data)
{ {
/* FIXME implement */ Camera * camera = data;
camera_preferences(camera);
} }
/* camera_on_properties */ /* camera_on_properties */
static GtkWidget * _properties_label(Camera * camera, GtkSizeGroup * group,
char const * label, char const * value);
static void _camera_on_properties(gpointer data) static void _camera_on_properties(gpointer data)
{ {
Camera * camera = data; Camera * camera = data;
GtkWidget * dialog;
GtkSizeGroup * group;
GtkWidget * vbox;
GtkWidget * hbox;
char buf[64];
const struct
{
unsigned int capability;
char const * name;
} capabilities[] =
{
{ V4L2_CAP_VIDEO_CAPTURE, "capture" },
{ V4L2_CAP_VIDEO_OUTPUT, "output" },
{ V4L2_CAP_VIDEO_OVERLAY, "overlay" },
{ V4L2_CAP_TUNER, "tuner" },
{ V4L2_CAP_AUDIO, "audio" },
{ V4L2_CAP_STREAMING, "streaming" },
{ 0, NULL }
};
unsigned int i;
char const * sep = "";
if(camera->rgb_buffer == NULL) camera_properties(camera);
/* ignore the action */
return;
dialog = gtk_dialog_new_with_buttons(_("Properties"),
GTK_WINDOW(camera->window),
GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, NULL);
gtk_window_set_default_size(GTK_WINDOW(dialog), 300, 200);
group = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
#if GTK_CHECK_VERSION(2, 14, 0)
vbox = gtk_dialog_get_content_area(GTK_DIALOG(dialog));
#else
vbox = dialog->vbox;
#endif
/* driver */
snprintf(buf, sizeof(buf), "%16s", (char *)camera->cap.driver);
hbox = _properties_label(camera, group, _("Driver: "), buf);
gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0);
/* card */
snprintf(buf, sizeof(buf), "%32s", (char *)camera->cap.card);
hbox = _properties_label(camera, group, _("Card: "), buf);
gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0);
/* bus info */
snprintf(buf, sizeof(buf), "%32s", (char *)camera->cap.bus_info);
hbox = _properties_label(camera, group, _("Bus info: "), buf);
gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0);
/* version */
snprintf(buf, sizeof(buf), "0x%x", camera->cap.version);
hbox = _properties_label(camera, group, _("Version: "), buf);
gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0);
/* capabilities */
buf[0] = '\0';
for(i = 0; capabilities[i].name != NULL; i++)
if(camera->cap.capabilities & capabilities[i].capability)
{
strncat(buf, sep, sizeof(buf) - strlen(buf));
strncat(buf, capabilities[i].name, sizeof(buf)
- strlen(buf));
sep = ", ";
}
buf[sizeof(buf) - 1] = '\0';
hbox = _properties_label(camera, group, _("Capabilities: "), buf);
gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0);
gtk_widget_show_all(vbox);
gtk_dialog_run(GTK_DIALOG(dialog));
gtk_widget_destroy(dialog);
} }
static GtkWidget * _properties_label(Camera * camera, GtkSizeGroup * group,
char const * label, char const * value)
{
GtkWidget * hbox;
GtkWidget * widget;
#if GTK_CHECK_VERSION(3, 0, 0)
hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
#else
hbox = gtk_hbox_new(FALSE, 4);
#endif #endif
widget = gtk_label_new(label);
gtk_widget_modify_font(widget, camera->bold);
gtk_misc_set_alignment(GTK_MISC(widget), 0.0, 0.5);
gtk_size_group_add_widget(group, widget);
gtk_box_pack_start(GTK_BOX(hbox), widget, FALSE, TRUE, 0);
widget = gtk_label_new((value != NULL) ? value : "");
gtk_label_set_ellipsize(GTK_LABEL(widget), PANGO_ELLIPSIZE_END);
gtk_misc_set_alignment(GTK_MISC(widget), 0.0, 0.5);
gtk_box_pack_start(GTK_BOX(hbox), widget, TRUE, TRUE, 0);
return hbox;
}
/* camera_on_refresh */ /* camera_on_refresh */

13
src/camera.h
View File

@ -27,12 +27,23 @@ typedef struct _Camera Camera;
/* functions */ /* functions */
Camera * camera_new(char const * device); Camera * camera_new(GtkWidget * window, GtkAccelGroup * group,
char const * device);
void camera_delete(Camera * camera); void camera_delete(Camera * camera);
/* accessors */
GtkWidget * camera_get_widget(Camera * camera);
/* useful */ /* useful */
void camera_open_gallery(Camera * camera);
void camera_preferences(Camera * camera);
void camera_properties(Camera * camera);
int camera_snapshot(Camera * camera); int camera_snapshot(Camera * camera);
void camera_start(Camera * camera);
void camera_stop(Camera * camera);
CameraOverlay * camera_add_overlay(Camera * camera, char const * filename, CameraOverlay * camera_add_overlay(Camera * camera, char const * filename,
int opacity); int opacity);

10
src/main.c
View File

@ -21,7 +21,7 @@
#include <libintl.h> #include <libintl.h>
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include <System.h> #include <System.h>
#include "camera.h" #include "window.h"
#include "../config.h" #include "../config.h"
#define _(string) gettext(string) #define _(string) gettext(string)
@ -49,14 +49,14 @@ static int _usage(void);
/* camera */ /* camera */
static int _camera(char const * device, char const * overlay) static int _camera(char const * device, char const * overlay)
{ {
Camera * camera; CameraWindow * camera;
if((camera = camera_new(device)) == NULL) if((camera = camerawindow_new(device)) == NULL)
return error_print(PACKAGE); return error_print(PACKAGE);
if(overlay != NULL) if(overlay != NULL)
camera_add_overlay(camera, overlay, 50); camerawindow_add_overlay(camera, overlay, 50);
gtk_main(); gtk_main();
camera_delete(camera); camerawindow_delete(camera);
return 0; return 0;
} }

7
src/project.conf
View File

@ -6,7 +6,7 @@ dist=Makefile,camera.h,overlay.h
[camera] [camera]
type=binary type=binary
sources=camera.c,overlay.c,main.c sources=camera.c,overlay.c,window.c,main.c
install=$(BINDIR) install=$(BINDIR)
[camera.c] [camera.c]
@ -15,5 +15,8 @@ depends=overlay.h,camera.h,../config.h
[overlay.c] [overlay.c]
depends=overlay.h depends=overlay.h
[window.c]
depends=camera.h,window.h
[main.c] [main.c]
depends=camera.h depends=window.h

345
src/window.c Normal file
View File

@ -0,0 +1,345 @@
/* $Id$ */
static char const _copyright[] =
"Copyright (c) 2012-2013 Pierre Pronchery <khorben@defora.org>";
/* This file is part of DeforaOS Desktop Camera */
static char const _license[] =
"This program is free software: you can redistribute it and/or modify\n"
"it under the terms of the GNU General Public License as published by\n"
"the Free Software Foundation, version 3 of the License.\n"
"\n"
"This program is distributed in the hope that it will be useful,\n"
"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
"GNU General Public License for more details.\n"
"\n"
"You should have received a copy of the GNU General Public License\n"
"along with this program. If not, see <http://www.gnu.org/licenses/>.";
#include <stdlib.h>
#include <libintl.h>
#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>
#include <System.h>
#include <Desktop.h>
#include "camera.h"
#include "window.h"
#include "../config.h"
#define _(string) gettext(string)
#define N_(string) (string)
/* CameraWindow */
/* private */
/* types */
struct _CameraWindow
{
Camera * camera;
/* widgets */
GtkWidget * window;
};
/* prototypes */
/* callbacks */
static void _camerawindow_on_close(gpointer data);
static gboolean _camerawindow_on_closex(gpointer data);
static void _camerawindow_on_contents(gpointer data);
static void _camerawindow_on_gallery(gpointer data);
static void _camerawindow_on_preferences(gpointer data);
static void _camerawindow_on_properties(gpointer data);
static void _camerawindow_on_snapshot(gpointer data);
#ifndef EMBEDDED
/* menus */
static void _camerawindow_on_file_close(gpointer data);
static void _camerawindow_on_file_gallery(gpointer data);
static void _camerawindow_on_file_properties(gpointer data);
static void _camerawindow_on_file_snapshot(gpointer data);
static void _camerawindow_on_edit_preferences(gpointer data);
static void _camerawindow_on_help_about(gpointer data);
static void _camerawindow_on_help_contents(gpointer data);
#endif
/* constants */
#ifndef EMBEDDED
static char const * _authors[] =
{
"Pierre Pronchery <khorben@defora.org>",
NULL
};
#endif
#ifdef EMBEDDED
static const DesktopAccel _camerawindow_accel[] =
{
{ G_CALLBACK(_camerawindow_on_close), GDK_CONTROL_MASK, GDK_KEY_W },
{ G_CALLBACK(_camerawindow_on_contents), 0, GDK_KEY_F1 },
{ NULL, 0, 0 }
};
#endif
#ifndef EMBEDDED
/* menus */
static const DesktopMenu _camerawindow_menu_file[] =
{
{ "Take _snapshot", G_CALLBACK(_camerawindow_on_file_snapshot),
"camera-photo", 0, 0 },
{ "", NULL, NULL, 0, 0 },
{ "_Gallery", G_CALLBACK(_camerawindow_on_file_gallery),
"image-x-generic", 0, 0 },
{ "", NULL, NULL, 0, 0 },
{ "_Properties", G_CALLBACK(_camerawindow_on_file_properties),
GTK_STOCK_PROPERTIES, GDK_MOD1_MASK, GDK_KEY_Return },
{ "", NULL, NULL, 0, 0 },
{ "_Close", G_CALLBACK(_camerawindow_on_file_close), GTK_STOCK_CLOSE,
GDK_CONTROL_MASK, GDK_KEY_W },
{ NULL, NULL, NULL, 0, 0 }
};
static const DesktopMenu _camerawindow_menu_edit[] =
{
{ "_Preferences", G_CALLBACK(_camerawindow_on_edit_preferences),
GTK_STOCK_PREFERENCES, GDK_CONTROL_MASK, GDK_KEY_P },
{ NULL, NULL, NULL, 0, 0 }
};
static const DesktopMenu _camerawindow_menu_help[] =
{
{ "_Contents", G_CALLBACK(_camerawindow_on_help_contents), "help-contents", 0,
GDK_KEY_F1 },
{ "_About", G_CALLBACK(_camerawindow_on_help_about), GTK_STOCK_ABOUT, 0, 0 },
{ NULL, NULL, NULL, 0, 0 }
};
static const DesktopMenubar _camerawindow_menubar[] =
{
{ "_File", _camerawindow_menu_file },
{ "_Edit", _camerawindow_menu_edit },
{ "_Help", _camerawindow_menu_help },
{ NULL, NULL }
};
#endif
/* public */
/* functions */
/* camerawindow_new */
CameraWindow * camerawindow_new(char const * device)
{
CameraWindow * camera;
GtkAccelGroup * group;
GtkWidget * vbox;
GtkWidget * widget;
if((camera = object_new(sizeof(*camera))) == NULL)
return NULL;
group = gtk_accel_group_new();
camera->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
camera->camera = NULL;
if(camera->window != NULL)
{
gtk_widget_realize(camera->window);
camera->camera = camera_new(camera->window, group, device);
}
if(camera->camera == NULL)
{
camerawindow_delete(camera);
return NULL;
}
gtk_window_add_accel_group(GTK_WINDOW(camera->window), group);
g_object_unref(group);
#if GTK_CHECK_VERSION(2, 6, 0)
gtk_window_set_icon_name(GTK_WINDOW(camera->window), "camera-photo");
#endif
gtk_window_set_title(GTK_WINDOW(camera->window), "Camera");
g_signal_connect_swapped(camera->window, "delete-event", G_CALLBACK(
_camerawindow_on_closex), camera);
#if GTK_CHECK_VERSION(3, 0, 0)
vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
#else
vbox = gtk_vbox_new(FALSE, 0);
#endif
#ifdef EMBEDDED
desktop_accel_create(_camerawindow_accel, camera, group);
#endif
#ifndef EMBEDDED
/* menubar */
widget = desktop_menubar_create(_camerawindow_menubar, camera, group);
gtk_box_pack_start(GTK_BOX(vbox), widget, FALSE, TRUE, 0);
#endif
widget = camera_get_widget(camera->camera);
gtk_box_pack_start(GTK_BOX(vbox), widget, TRUE, TRUE, 0);
gtk_container_add(GTK_CONTAINER(camera->window), vbox);
gtk_widget_show_all(camera->window);
return camera;
}
/* camera_delete */
void camerawindow_delete(CameraWindow * camera)
{
if(camera->camera != NULL)
camera_delete(camera->camera);
if(camera->window != NULL)
gtk_widget_destroy(camera->window);
object_delete(camera);
}
/* useful */
/* camerawindow_add_overlay */
CameraOverlay * camerawindow_add_overlay(CameraWindow * camera,
char const * filename, int opacity)
{
return camera_add_overlay(camera->camera, filename, opacity);
}
/* callbacks */
/* camerawindow_on_close */
static void _camerawindow_on_close(gpointer data)
{
CameraWindow * camera = data;
gtk_widget_hide(camera->window);
camera_stop(camera->camera);
gtk_main_quit();
}
/* camerawindow_on_closex */
static gboolean _camerawindow_on_closex(gpointer data)
{
CameraWindow * camera = data;
_camerawindow_on_close(camera);
return TRUE;
}
/* camerawindow_on_contents */
static void _camerawindow_on_contents(gpointer data)
{
desktop_help_contents(PACKAGE, "camera");
}
#ifndef EMBEDDED
/* menus */
/* camerawindow_on_file_close */
static void _camerawindow_on_file_close(gpointer data)
{
CameraWindow * camera = data;
_camerawindow_on_close(camera);
}
/* camerawindow_on_file_gallery */
static void _camerawindow_on_file_gallery(gpointer data)
{
CameraWindow * camera = data;
_camerawindow_on_gallery(camera);
}
/* camerawindow_on_file_properties */
static void _camerawindow_on_file_properties(gpointer data)
{
CameraWindow * camera = data;
_camerawindow_on_properties(camera);
}
/* camerawindow_on_file_snapshot */
static void _camerawindow_on_file_snapshot(gpointer data)
{
CameraWindow * camera = data;
_camerawindow_on_snapshot(camera);
}
/* camerawindow_on_edit_preferences */
static void _camerawindow_on_edit_preferences(gpointer data)
{
CameraWindow * camera = data;
_camerawindow_on_preferences(camera);
}
/* camerawindow_on_help_about */
static void _camerawindow_on_help_about(gpointer data)
{
CameraWindow * camera = data;
GtkWidget * widget;
char const comments[] = N_("Simple camera application for the DeforaOS"
" desktop");
widget = desktop_about_dialog_new();
gtk_window_set_transient_for(GTK_WINDOW(widget), GTK_WINDOW(
camera->window));
desktop_about_dialog_set_authors(widget, _authors);
desktop_about_dialog_set_comments(widget, _(comments));
desktop_about_dialog_set_copyright(widget, _copyright);
desktop_about_dialog_set_license(widget, _license);
desktop_about_dialog_set_logo_icon_name(widget, "camera-photo");
desktop_about_dialog_set_name(widget, PACKAGE);
desktop_about_dialog_set_version(widget, VERSION);
desktop_about_dialog_set_website(widget, "http://www.defora.org/");
gtk_dialog_run(GTK_DIALOG(widget));
gtk_widget_destroy(widget);
}
/* camerawindow_on_help_contents */
static void _camerawindow_on_help_contents(gpointer data)
{
CameraWindow * camera = data;
_camerawindow_on_contents(camera);
}
#endif
/* camerawindow_on_gallery */
static void _camerawindow_on_gallery(gpointer data)
{
CameraWindow * camera = data;
camera_open_gallery(camera->camera);
}
/* camerawindow_on_preferences */
static void _camerawindow_on_preferences(gpointer data)
{
CameraWindow * camera = data;
camera_preferences(camera->camera);
}
/* camerawindow_on_properties */
static void _camerawindow_on_properties(gpointer data)
{
CameraWindow * camera = data;
camera_properties(camera->camera);
}
/* camerawindow_on_snapshot */
static void _camerawindow_on_snapshot(gpointer data)
{
CameraWindow * camera = data;
camera_snapshot(camera->camera);
}

37
src/window.h Normal file
View File

@ -0,0 +1,37 @@
/* $Id$ */
/* Copyright (c) 2013 Pierre Pronchery <khorben@defora.org> */
/* This file is part of DeforaOS desktop camera */
/* This program 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, version 3 of the License.
*
* This program 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 this program. If not, see <http://www.gnu.org/licenses/>. */
#ifndef CAMERA_WINDOW_H
# define CAMERA_WINDOW_H
# include "overlay.h"
/* public */
/* types */
typedef struct _CameraWindow CameraWindow;
/* functions */
CameraWindow * camerawindow_new(char const * device);
void camerawindow_delete(CameraWindow * camera);
/* useful */
CameraOverlay * camerawindow_add_overlay(CameraWindow * camera,
char const * filename, int opacity);
#endif /* !CAMERA_WINDOW_H */