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

Hopefully getting closer to a first functional version

Browse Source
This commit is contained in:
Pierre Pronchery 2012-12-20 13:40:39 +01:00
parent d090fe914f
commit e5191299c2
1 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/camera.c
View File

@ -48,12 +48,14 @@ struct _Camera
Buffer * buffer; Buffer * buffer;
/* widgets */ /* widgets */
GdkGC * gc;
GtkWidget * window; 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;
#endif #endif
GtkWidget * area; GtkWidget * area;
GtkAllocation area_allocation;
GdkPixmap * pixmap; GdkPixmap * pixmap;
}; };
@ -123,6 +125,7 @@ Camera * camera_new(char const * device)
camera->fd = -1; camera->fd = -1;
camera->buffer = NULL; camera->buffer = NULL;
camera->source = 0; camera->source = 0;
camera->gc = NULL;
camera->window = NULL; camera->window = NULL;
/* check for errors */ /* check for errors */
if(camera->device == NULL) if(camera->device == NULL)
@ -133,6 +136,8 @@ Camera * camera_new(char const * device)
/* create the window */ /* create the window */
group = gtk_accel_group_new(); group = gtk_accel_group_new();
camera->window = gtk_window_new(GTK_WINDOW_TOPLEVEL); 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); gtk_window_add_accel_group(GTK_WINDOW(camera->window), group);
#if GTK_CHECK_VERSION(2, 6, 0) #if GTK_CHECK_VERSION(2, 6, 0)
gtk_window_set_icon_name(GTK_WINDOW(camera->window), "camera-video"); gtk_window_set_icon_name(GTK_WINDOW(camera->window), "camera-video");
@ -182,6 +187,8 @@ void camera_delete(Camera * camera)
{ {
if(camera->pixmap != NULL) if(camera->pixmap != NULL)
g_object_unref(camera->pixmap); g_object_unref(camera->pixmap);
if(camera->gc != NULL)
g_object_unref(camera->gc);
if(camera->window != NULL) if(camera->window != NULL)
gtk_widget_destroy(camera->window); gtk_widget_destroy(camera->window);
if(camera->source != 0) if(camera->source != 0)
@ -294,25 +301,17 @@ static gboolean _camera_on_drawing_area_configure(GtkWidget * widget,
{ {
/* XXX this code is inspired from GQcam */ /* XXX this code is inspired from GQcam */
Camera * camera = data; Camera * camera = data;
GtkAllocation allocation; GtkAllocation * allocation = &camera->area_allocation;
GdkGC * gc;
GdkColor black = { 0, 0, 0, 0 };
GdkColor white = { 0xffffffff, 0xffff, 0xffff, 0xffff };
if(camera->pixmap != NULL) if(camera->pixmap != NULL)
g_object_unref(camera->pixmap); g_object_unref(camera->pixmap);
/* FIXME requires Gtk+ 2.18 */ /* FIXME requires Gtk+ 2.18 */
gtk_widget_get_allocation(widget, &allocation); gtk_widget_get_allocation(widget, allocation);
camera->pixmap = gdk_pixmap_new(widget->window, allocation.width, camera->pixmap = gdk_pixmap_new(widget->window, allocation->width,
allocation.height, -1); allocation->height, -1);
/* FIXME this code is untested */
gc = gdk_gc_new(widget->window);
gdk_gc_set_background(gc, &white);
gdk_gc_set_foreground(gc, &black);
/* FIXME is it not better to scale the previous pixmap for now? */ /* FIXME is it not better to scale the previous pixmap for now? */
gdk_draw_rectangle(camera->pixmap, gc, TRUE, 0, 0, allocation.width, gdk_draw_rectangle(camera->pixmap, camera->gc, TRUE, 0, 0,
allocation.height); allocation->width, allocation->height);
g_object_unref(gc);
return TRUE; return TRUE;
} }
@ -323,18 +322,12 @@ static gboolean _camera_on_drawing_area_expose(GtkWidget * widget,
{ {
/* XXX this code is inspired from GQcam */ /* XXX this code is inspired from GQcam */
Camera * camera = data; Camera * camera = data;
GtkAllocation allocation;
GdkGC * gc;
/* FIXME requires Gtk+ 2.18 */
gtk_widget_get_allocation(widget, &allocation);
/* FIXME this code is untested */ /* FIXME this code is untested */
gc = gdk_gc_new(widget->window); gdk_draw_pixmap(widget->window, camera->gc, camera->pixmap,
gdk_draw_pixmap(widget->window, gc, camera->pixmap,
event->area.x, event->area.y, event->area.x, event->area.y,
event->area.x, event->area.y, event->area.x, event->area.y,
event->area.width, event->area.height); event->area.width, event->area.height);
g_object_unref(gc);
return FALSE; return FALSE;
} }
@ -429,12 +422,17 @@ static gboolean _camera_on_open(gpointer data)
static gboolean _camera_on_refresh(gpointer data) static gboolean _camera_on_refresh(gpointer data)
{ {
Camera * camera = data; Camera * camera = data;
GtkAllocation * allocation = &camera->area_allocation;
#ifdef DEBUG #ifdef DEBUG
fprintf(stderr, "DEBUG: %s()\n", __func__); fprintf(stderr, "DEBUG: %s()\n", __func__);
#endif #endif
camera->source = 0; camera->source = 0;
/* FIXME really implement */ /* FIXME really implement */
gdk_draw_rgb_image(camera->pixmap, camera->gc, 0, 0, allocation->width,
allocation->height, GDK_RGB_DITHER_NORMAL,
(unsigned char *)buffer_get_data(camera->buffer),
allocation->width * 3);
camera->source = g_timeout_add(1000, _camera_on_can_read, camera); camera->source = g_timeout_add(1000, _camera_on_can_read, camera);
return FALSE; return FALSE;
} }