Enlightenment CVS committal
Author : monkeyiq
Project : misc
Module : feh
Dir : misc/feh/src
Modified Files:
Makefile.am feh.h imlib.c main.c winwidget.c
Added Files:
sixdof.c sixdof.h
Log Message:
Initial optional support for 6 degrees of freedom controllers
using libsixdof. Currently only slideshow speed can be effected.
===================================================================
RCS file: /cvs/e/misc/feh/src/Makefile.am,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -3 -r1.42 -r1.43
--- Makefile.am 23 Feb 2003 16:26:23 -0000 1.42
+++ Makefile.am 22 Apr 2008 13:21:36 -0000 1.43
@@ -6,7 +6,9 @@
-I$(prefix)/include -I$(includedir) \
-I. -I$(top_srcdir)/src \
-DPREFIX=\""$(prefix)"\" \
- @IMLIB_CFLAGS@ @GIBLIB_CFLAGS@
+ @IMLIB_CFLAGS@ @GIBLIB_CFLAGS@ \
+ @SIXDOF_CFLAGS@
+
LIBOBJS = @LIBOBJS@
bin_PROGRAMS = feh
@@ -15,8 +17,8 @@
filelist.c filelist.h multiwindow.c imlib.c index.c slideshow.c \
utils.c utils.h keyevents.c timers.c timers.h list.c collage.c debug.h \
events.c events.h support.c support.h \
-thumbnail.c thumbnail.h ipc.c ipc.h
-feh_LDADD = -lX11 @IMLIB_LIBS@ @GIBLIB_LIBS@
+thumbnail.c thumbnail.h ipc.c ipc.h sixdof.c sixdof.h
+feh_LDADD = -lX11 @IMLIB_LIBS@ @GIBLIB_LIBS@ @SIXDOF_LIBS@
images_DATA = about.png menubg_default.png menubg_sky.png \
menubg_chrome.png menubg_brushed.png \
===================================================================
RCS file: /cvs/e/misc/feh/src/feh.h,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -3 -r1.128 -r1.129
--- feh.h 24 Jul 2004 13:53:57 -0000 1.128
+++ feh.h 22 Apr 2008 13:21:36 -0000 1.129
@@ -148,6 +148,11 @@
gib_list * feh_wrap_string(char *text, int wrap_width, int max_height,
Imlib_Font fn, gib_style * style);
char *build_caption_filename(feh_file *file);
+#ifdef HAVE_SIXDOF
+#include <libSixDOFc.h>
+extern sixdof_t sdof;
+#endif
+
/* Imlib stuff */
extern Display *disp;
===================================================================
RCS file: /cvs/e/misc/feh/src/imlib.c,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -3 -r1.151 -r1.152
--- imlib.c 24 Jul 2004 13:53:57 -0000 1.151
+++ imlib.c 22 Apr 2008 13:21:36 -0000 1.152
@@ -34,6 +34,10 @@
#include <arpa/inet.h>
#include <netdb.h>
+#ifdef HAVE_SIXDOF
+#include "sixdof.h"
+#endif
+
Display *disp = NULL;
Visual *vis = NULL;
Screen *scr = NULL;
@@ -98,6 +102,10 @@
imlib_add_path_to_font_path(PREFIX "/share/feh/fonts");
imlib_add_path_to_font_path("./ttfonts");
+#ifdef HAVE_SIXDOF
+ sixdof_init( disp );
+#endif
+
D_RETURN_(4);
}
===================================================================
RCS file: /cvs/e/misc/feh/src/main.c,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -3 -r1.81 -r1.82
--- main.c 24 Jul 2004 13:53:57 -0000 1.81
+++ main.c 22 Apr 2008 13:21:36 -0000 1.82
@@ -119,7 +119,14 @@
XNextEvent(disp, &ev);
if (ev_handler[ev.type])
(*(ev_handler[ev.type])) (&ev);
-
+
+#ifdef HAVE_SIXDOF
+ {
+ XAnyEvent* pAny = (XAnyEvent*)&ev;
+ libsixdof_processEvent( sdof, pAny );
+ }
+#endif
+
if (window_num == 0)
D_RETURN(5,0);
}
===================================================================
RCS file: /cvs/e/misc/feh/src/winwidget.c,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -3 -r1.119 -r1.120
--- winwidget.c 3 Jul 2006 19:46:03 -0000 1.119
+++ winwidget.c 22 Apr 2008 13:21:36 -0000 1.120
@@ -862,6 +862,11 @@
windows[window_num - 1] = win;
XSaveContext(disp, win->win, xid_context, (XPointer) win);
+
+#ifdef HAVE_SIXDOF
+ libsixdof_manageWindow( sdof, win->win );
+#endif
+
D_RETURN_(4);
}
-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference
Don't miss this year's exciting event. There's still time to save $100.
Use priority code J8TL2D2.
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
