merges qt4 into trunk

git-svn-id: svn://svn.code.sf.net/p/qjoypad/code/trunk@94 c05e91a0-76c8-4ec0-b377-ef19ce7cc080
This commit is contained in:
John Toman
2009-08-03 00:46:33 +00:00
committed by virtuoussin13
parent 17ed926cdf
commit c1ef3fa0b7
12 changed files with 1596 additions and 1490 deletions

View File

@ -1,30 +0,0 @@
[Breakpoint 0]
Enabled=true
File=layout.cpp
Line=263
Temporary=false
[Breakpoint 1]
Enabled=true
File=moc_layout_edit.cpp
Line=58
Temporary=false
[Breakpoint 2]
Enabled=true
File=layout_edit.cpp
Line=107
Temporary=false
[General]
DebuggerCmdStr=
DriverName=GDB
FileVersion=1
OptionsSelected=
ProgramArgs=
TTYLevel=7
WorkingDirectory=
[Memory]
ColumnWidths=80,0
NumExprs=0

View File

@ -1,74 +1,48 @@
############################################################################# #############################################################################
# Makefile for building: qjoypad # Makefile for building: qjoypad
# Generated by qmake (1.07a) (Qt 3.3.6) on: Wed Nov 1 12:59:29 2006 # Generated by qmake (2.01a) (Qt 4.5.1) on: Mon May 25 00:43:37 2009
# Project: qjoypad.pro # Project: qjoypad.pro
# Template: app # Template: app
# Command: $(QMAKE) "DEVDIR=/dev/input" "PREFIX=/usr" "DEFINES += " -o Makefile qjoypad.pro # Command: /usr/bin/qmake -unix -o Makefile qjoypad.pro
############################################################################# #############################################################################
####### Compiler, tools and options ####### Compiler, tools and options
CC = gcc CC = gcc
CXX = g++ CXX = g++
LEX = flex DEFINES = -DDEVDIR="\"/dev/input\"" -DICON24="\"/share/pixmaps/qjoypad/icon24.png\"" -DICON64="\"/share/pixmaps/qjoypad/icon64.png\"" -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED
YACC = yacc CFLAGS = -pipe -march=i686 -mtune=generic -O2 -pipe -Wall -W -D_REENTRANT $(DEFINES)
CFLAGS = -pipe -Wall -W -O2 -D_REENTRANT -DDEVDIR='"/dev/input"' -DICON24='"/usr/share/pixmaps/qjoypad/icon24.png"' -DICON64='"/usr/share/pixmaps/qjoypad/icon64.png"' -DQT_NO_DEBUG -DQT_THREAD_SUPPORT -DQT_SHARED -DQT_TABLET_SUPPORT CXXFLAGS = -g -pipe -march=i686 -mtune=generic -O2 -pipe -Wall -W -D_REENTRANT $(DEFINES)
CXXFLAGS = -pipe -Wall -W -O2 -D_REENTRANT -DDEVDIR='"/dev/input"' -DICON24='"/usr/share/pixmaps/qjoypad/icon24.png"' -DICON64='"/usr/share/pixmaps/qjoypad/icon64.png"' -DQT_NO_DEBUG -DQT_THREAD_SUPPORT -DQT_SHARED -DQT_TABLET_SUPPORT INCPATH = -I/usr/share/qt/mkspecs/linux-g++ -I. -I/usr/include/QtCore -I/usr/include/QtGui -I/usr/include -I. -Itrayicon -I. -I.
LEXFLAGS = LINK = g++
YACCFLAGS= -d LFLAGS = -Wl,-O1 -Wl,-rpath,/usr/lib
INCPATH = -I/usr/share/qt3/mkspecs/default -I. -I. -Itrayicon -I/usr/include/qt3 LIBS = $(SUBLIBS) -L/usr/lib -lXtst -lQtGui -L/usr/lib -L/usr/X11R6/lib -pthread -lpng -lfreetype -lgobject-2.0 -lSM -lICE -pthread -pthread -lXrender -lfontconfig -lXext -lX11 -lQtCore -lz -lm -pthread -lgthread-2.0 -lrt -lglib-2.0 -ldl -lpthread
LINK = g++ AR = ar cqs
LFLAGS = RANLIB =
LIBS = $(SUBLIBS) -L/usr/share/qt3/lib -L/usr/X11R6/lib -lXtst -lqt-mt -lXext -lX11 -lm -lpthread QMAKE = /usr/bin/qmake
AR = ar cqs TAR = tar -cf
RANLIB = COMPRESS = gzip -9f
MOC = /usr/share/qt3/bin/moc COPY = cp -f
UIC = /usr/share/qt3/bin/uic SED = sed
QMAKE = qmake COPY_FILE = $(COPY)
TAR = tar -cf COPY_DIR = $(COPY) -r
GZIP = gzip -9f INSTALL_FILE = install -m 644 -p
COPY = cp -f INSTALL_DIR = $(COPY_DIR)
COPY_FILE= $(COPY) INSTALL_PROGRAM = install -m 755 -p
COPY_DIR = $(COPY) -r DEL_FILE = rm -f
INSTALL_FILE= $(COPY_FILE) SYMLINK = ln -sf
INSTALL_DIR = $(COPY_DIR) DEL_DIR = rmdir
DEL_FILE = rm -f MOVE = mv -f
SYMLINK = ln -sf
DEL_DIR = rmdir
MOVE = mv -f
CHK_DIR_EXISTS= test -d CHK_DIR_EXISTS= test -d
MKDIR = mkdir -p MKDIR = mkdir -p
####### Output directory ####### Output directory
OBJECTS_DIR = ./ OBJECTS_DIR = ./
####### Files ####### Files
HEADERS = axis.h \ SOURCES = axis.cpp \
axis_edit.h \
axisw.h \
button.h \
button_edit.h \
buttonw.h \
component.h \
constant.h \
device.h \
error.h \
event.h \
flash.h \
icon.h \
joypad.h \
joypadw.h \
joyslider.h \
keycode.h \
layout.h \
layout_edit.h \
loop.h \
quickset.h \
timer.h \
trayicon/trayicon.h
SOURCES = axis.cpp \
axis_edit.cpp \ axis_edit.cpp \
axisw.cpp \ axisw.cpp \
button.cpp \ button.cpp \
@ -83,12 +57,23 @@ SOURCES = axis.cpp \
keycode.cpp \ keycode.cpp \
layout.cpp \ layout.cpp \
layout_edit.cpp \ layout_edit.cpp \
loop.cpp \
main.cpp \ main.cpp \
quickset.cpp \ quickset.cpp \
getkey.cpp \
trayicon/trayicon.cpp \ trayicon/trayicon.cpp \
trayicon/trayicon_x11.cpp trayicon/trayicon_x11.cpp moc_axis.cpp \
OBJECTS = axis.o \ moc_axis_edit.cpp \
moc_button.cpp \
moc_button_edit.cpp \
moc_flash.cpp \
moc_icon.cpp \
moc_joypad.cpp \
moc_joypadw.cpp \
moc_keycode.cpp \
moc_layout.cpp \
moc_getkey.cpp \
moc_trayicon.cpp
OBJECTS = axis.o \
axis_edit.o \ axis_edit.o \
axisw.o \ axisw.o \
button.o \ button.o \
@ -103,85 +88,126 @@ OBJECTS = axis.o \
keycode.o \ keycode.o \
layout.o \ layout.o \
layout_edit.o \ layout_edit.o \
loop.o \
main.o \ main.o \
quickset.o \ quickset.o \
getkey.o \
trayicon.o \ trayicon.o \
trayicon_x11.o trayicon_x11.o \
FORMS = moc_axis.o \
UICDECLS = moc_axis_edit.o \
UICIMPLS = moc_button.o \
SRCMOC = moc_axis_edit.cpp \
moc_button_edit.cpp \
moc_flash.cpp \
moc_icon.cpp \
moc_joypadw.cpp \
moc_keycode.cpp \
moc_layout.cpp \
trayicon/moc_trayicon.cpp
OBJMOC = moc_axis_edit.o \
moc_button_edit.o \ moc_button_edit.o \
moc_flash.o \ moc_flash.o \
moc_icon.o \ moc_icon.o \
moc_joypad.o \
moc_joypadw.o \ moc_joypadw.o \
moc_keycode.o \ moc_keycode.o \
moc_layout.o \ moc_layout.o \
moc_getkey.o \
moc_trayicon.o moc_trayicon.o
DIST = qjoypad.pro DIST = /usr/share/qt/mkspecs/common/g++.conf \
QMAKE_TARGET = qjoypad /usr/share/qt/mkspecs/common/unix.conf \
DESTDIR = /usr/share/qt/mkspecs/common/linux.conf \
TARGET = qjoypad /usr/share/qt/mkspecs/qconfig.pri \
/usr/share/qt/mkspecs/features/qt_functions.prf \
/usr/share/qt/mkspecs/features/qt_config.prf \
/usr/share/qt/mkspecs/features/exclusive_builds.prf \
/usr/share/qt/mkspecs/features/default_pre.prf \
/usr/share/qt/mkspecs/features/release.prf \
/usr/share/qt/mkspecs/features/default_post.prf \
/usr/share/qt/mkspecs/features/warn_on.prf \
/usr/share/qt/mkspecs/features/qt.prf \
/usr/share/qt/mkspecs/features/unix/thread.prf \
/usr/share/qt/mkspecs/features/moc.prf \
/usr/share/qt/mkspecs/features/resources.prf \
/usr/share/qt/mkspecs/features/uic.prf \
/usr/share/qt/mkspecs/features/yacc.prf \
/usr/share/qt/mkspecs/features/lex.prf \
/usr/share/qt/mkspecs/features/include_source_dir.prf \
qjoypad.pro
QMAKE_TARGET = qjoypad
DESTDIR =
TARGET = qjoypad
first: all first: all
####### Implicit rules ####### Implicit rules
.SUFFIXES: .c .o .cpp .cc .cxx .C .SUFFIXES: .o .c .cpp .cc .cxx .C
.cpp.o: .cpp.o:
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
.cc.o: .cc.o:
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
.cxx.o: .cxx.o:
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
.C.o: .C.o:
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
.c.o: .c.o:
$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< $(CC) -c $(CFLAGS) $(INCPATH) -o "$@" "$<"
####### Build rules ####### Build rules
all: Makefile $(TARGET) all: Makefile $(TARGET)
$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(TARGET): $(OBJECTS)
$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(OBJCOMP) $(LIBS) $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS)
mocables: $(SRCMOC) Makefile: qjoypad.pro /usr/share/qt/mkspecs/linux-g++/qmake.conf /usr/share/qt/mkspecs/common/g++.conf \
uicables: $(UICDECLS) $(UICIMPLS) /usr/share/qt/mkspecs/common/unix.conf \
/usr/share/qt/mkspecs/common/linux.conf \
$(MOC): /usr/share/qt/mkspecs/qconfig.pri \
( cd $(QTDIR)/src/moc && $(MAKE) ) /usr/share/qt/mkspecs/features/qt_functions.prf \
/usr/share/qt/mkspecs/features/qt_config.prf \
Makefile: qjoypad.pro /usr/share/qt3/mkspecs/default/qmake.conf /usr/share/qt3/lib/libqt-mt.prl /usr/share/qt/mkspecs/features/exclusive_builds.prf \
$(QMAKE) "DEVDIR=/dev/input" "PREFIX=/usr" "DEFINES += " -o Makefile qjoypad.pro /usr/share/qt/mkspecs/features/default_pre.prf \
qmake: /usr/share/qt/mkspecs/features/release.prf \
@$(QMAKE) "DEVDIR=/dev/input" "PREFIX=/usr" "DEFINES += " -o Makefile qjoypad.pro /usr/share/qt/mkspecs/features/default_post.prf \
/usr/share/qt/mkspecs/features/warn_on.prf \
/usr/share/qt/mkspecs/features/qt.prf \
/usr/share/qt/mkspecs/features/unix/thread.prf \
/usr/share/qt/mkspecs/features/moc.prf \
/usr/share/qt/mkspecs/features/resources.prf \
/usr/share/qt/mkspecs/features/uic.prf \
/usr/share/qt/mkspecs/features/yacc.prf \
/usr/share/qt/mkspecs/features/lex.prf \
/usr/share/qt/mkspecs/features/include_source_dir.prf \
/usr/lib/libQtGui.prl \
/usr/lib/libQtCore.prl
$(QMAKE) -unix -o Makefile qjoypad.pro
/usr/share/qt/mkspecs/common/g++.conf:
/usr/share/qt/mkspecs/common/unix.conf:
/usr/share/qt/mkspecs/common/linux.conf:
/usr/share/qt/mkspecs/qconfig.pri:
/usr/share/qt/mkspecs/features/qt_functions.prf:
/usr/share/qt/mkspecs/features/qt_config.prf:
/usr/share/qt/mkspecs/features/exclusive_builds.prf:
/usr/share/qt/mkspecs/features/default_pre.prf:
/usr/share/qt/mkspecs/features/release.prf:
/usr/share/qt/mkspecs/features/default_post.prf:
/usr/share/qt/mkspecs/features/warn_on.prf:
/usr/share/qt/mkspecs/features/qt.prf:
/usr/share/qt/mkspecs/features/unix/thread.prf:
/usr/share/qt/mkspecs/features/moc.prf:
/usr/share/qt/mkspecs/features/resources.prf:
/usr/share/qt/mkspecs/features/uic.prf:
/usr/share/qt/mkspecs/features/yacc.prf:
/usr/share/qt/mkspecs/features/lex.prf:
/usr/share/qt/mkspecs/features/include_source_dir.prf:
/usr/lib/libQtGui.prl:
/usr/lib/libQtCore.prl:
qmake: FORCE
@$(QMAKE) -unix -o Makefile qjoypad.pro
dist: dist:
@mkdir -p .tmp/qjoypad && $(COPY_FILE) --parents $(SOURCES) $(HEADERS) $(FORMS) $(DIST) .tmp/qjoypad/ && ( cd `dirname .tmp/qjoypad` && $(TAR) qjoypad.tar qjoypad && $(GZIP) qjoypad.tar ) && $(MOVE) `dirname .tmp/qjoypad`/qjoypad.tar.gz . && $(DEL_FILE) -r .tmp/qjoypad @$(CHK_DIR_EXISTS) .tmp/qjoypad1.0.0 || $(MKDIR) .tmp/qjoypad1.0.0
$(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/qjoypad1.0.0/ && $(COPY_FILE) --parents axis.h axis_edit.h axisw.h button.h button_edit.h buttonw.h constant.h device.h error.h event.h flash.h icon.h joypad.h joypadw.h joyslider.h keycode.h layout.h getkey.h layout_edit.h quickset.h trayicon/trayicon.h .tmp/qjoypad1.0.0/ && $(COPY_FILE) --parents axis.cpp axis_edit.cpp axisw.cpp button.cpp button_edit.cpp buttonw.cpp event.cpp flash.cpp icon.cpp joypad.cpp joypadw.cpp joyslider.cpp keycode.cpp layout.cpp layout_edit.cpp main.cpp quickset.cpp getkey.cpp trayicon/trayicon.cpp trayicon/trayicon_x11.cpp .tmp/qjoypad1.0.0/ && (cd `dirname .tmp/qjoypad1.0.0` && $(TAR) qjoypad1.0.0.tar qjoypad1.0.0 && $(COMPRESS) qjoypad1.0.0.tar) && $(MOVE) `dirname .tmp/qjoypad1.0.0`/qjoypad1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/qjoypad1.0.0
mocclean:
-$(DEL_FILE) $(OBJMOC)
-$(DEL_FILE) $(SRCMOC)
uiclean: clean:compiler_clean
yaccclean:
lexclean:
clean: mocclean
-$(DEL_FILE) $(OBJECTS) -$(DEL_FILE) $(OBJECTS)
-$(DEL_FILE) *~ core *.core -$(DEL_FILE) *~ core *.core
@ -189,220 +215,308 @@ clean: mocclean
####### Sub-libraries ####### Sub-libraries
distclean: clean distclean: clean
-$(DEL_FILE) $(TARGET) $(TARGET) -$(DEL_FILE) $(TARGET)
-$(DEL_FILE) Makefile
FORCE: mocclean: compiler_moc_header_clean compiler_moc_source_clean
####### Compile mocables: compiler_moc_header_make_all compiler_moc_source_make_all
axis.o: axis.cpp axis.h \ compiler_moc_header_make_all: moc_axis.cpp moc_axis_edit.cpp moc_button.cpp moc_button_edit.cpp moc_flash.cpp moc_icon.cpp moc_joypad.cpp moc_joypadw.cpp moc_keycode.cpp moc_layout.cpp moc_getkey.cpp moc_trayicon.cpp
component.h \ compiler_moc_header_clean:
timer.h \ -$(DEL_FILE) moc_axis.cpp moc_axis_edit.cpp moc_button.cpp moc_button_edit.cpp moc_flash.cpp moc_icon.cpp moc_joypad.cpp moc_joypadw.cpp moc_keycode.cpp moc_layout.cpp moc_getkey.cpp moc_trayicon.cpp
event.h \ moc_axis.cpp: constant.h \
constant.h axis.h
/usr/bin/moc $(DEFINES) $(INCPATH) axis.h -o moc_axis.cpp
axis_edit.o: axis_edit.cpp axis_edit.h \ moc_axis_edit.cpp: axis.h \
joyslider.h \
keycode.h \
axis.h \
constant.h \
component.h \
timer.h \
event.h
axisw.o: axisw.cpp axisw.h \
axis.h \
axis_edit.h \
flash.h \
component.h \
timer.h \
event.h \
constant.h \ constant.h \
joyslider.h \ joyslider.h \
keycode.h
button.o: button.cpp button.h \
component.h \
timer.h \
keycode.h \ keycode.h \
event.h \ axis_edit.h
constant.h /usr/bin/moc $(DEFINES) $(INCPATH) axis_edit.h -o moc_axis_edit.cpp
button_edit.o: button_edit.cpp button_edit.h \ moc_button.cpp: keycode.h \
button.h \ constant.h \
button.h
/usr/bin/moc $(DEFINES) $(INCPATH) button.h -o moc_button.cpp
moc_button_edit.cpp: button.h \
keycode.h \ keycode.h \
component.h \ constant.h \
timer.h \ button_edit.h
event.h \ /usr/bin/moc $(DEFINES) $(INCPATH) button_edit.h -o moc_button_edit.cpp
constant.h
buttonw.o: buttonw.cpp buttonw.h \ moc_flash.cpp: flash.h
button.h \ /usr/bin/moc $(DEFINES) $(INCPATH) flash.h -o moc_flash.cpp
button_edit.h \
flash.h \ moc_icon.cpp: constant.h \
component.h \ icon.h
timer.h \ /usr/bin/moc $(DEFINES) $(INCPATH) icon.h -o moc_icon.cpp
moc_joypad.cpp: button.h \
keycode.h \ keycode.h \
event.h \ constant.h \
constant.h
event.o: event.cpp event.h
flash.o: flash.cpp flash.h
icon.o: icon.cpp icon.h \
constant.h
joypad.o: joypad.cpp joypad.h \
button.h \
axis.h \ axis.h \
joypadw.h \ joypadw.h \
error.h \
component.h \
timer.h \
keycode.h \
event.h \
constant.h \
axisw.h \ axisw.h \
buttonw.h \
quickset.h \
axis_edit.h \
flash.h \ flash.h \
axis_edit.h \
joyslider.h \ joyslider.h \
button_edit.h
joypadw.o: joypadw.cpp joypadw.h \
joypad.h \ joypad.h \
axisw.h \ error.h \
buttonw.h \ buttonw.h \
button_edit.h \
quickset.h \ quickset.h \
button.h \ joypad.h
/usr/bin/moc $(DEFINES) $(INCPATH) joypad.h -o moc_joypad.cpp
moc_joypadw.cpp: axisw.h \
axis.h \ axis.h \
error.h \
component.h \
timer.h \
keycode.h \
event.h \
constant.h \ constant.h \
axis_edit.h \
flash.h \ flash.h \
axis_edit.h \
joyslider.h \ joyslider.h \
button_edit.h keycode.h \
joyslider.o: joyslider.cpp joyslider.h \
constant.h
keycode.o: keycode.cpp keycode.h \
constant.h
layout.o: layout.cpp layout.h \
joypad.h \ joypad.h \
button.h \
joypadw.h \
buttonw.h \
button_edit.h \
quickset.h \
error.h \
joypadw.h
/usr/bin/moc $(DEFINES) $(INCPATH) joypadw.h -o moc_joypadw.cpp
moc_keycode.cpp: constant.h \
keycode.h
/usr/bin/moc $(DEFINES) $(INCPATH) keycode.h -o moc_keycode.cpp
moc_layout.cpp: joypad.h \
button.h \
keycode.h \
constant.h \
axis.h \
joypadw.h \
axisw.h \
flash.h \
axis_edit.h \
joyslider.h \
buttonw.h \
button_edit.h \
quickset.h \
error.h \ error.h \
device.h \ device.h \
trayicon/trayicon.h \ trayicon/trayicon.h \
icon.h \ icon.h \
layout_edit.h \ layout_edit.h \
layout.h \
layout.h
/usr/bin/moc $(DEFINES) $(INCPATH) layout.h -o moc_layout.cpp
moc_getkey.cpp: constant.h \
getkey.h
/usr/bin/moc $(DEFINES) $(INCPATH) getkey.h -o moc_getkey.cpp
moc_trayicon.cpp: trayicon/trayicon.h
/usr/bin/moc $(DEFINES) $(INCPATH) trayicon/trayicon.h -o moc_trayicon.cpp
compiler_rcc_make_all:
compiler_rcc_clean:
compiler_image_collection_make_all: qmake_image_collection.cpp
compiler_image_collection_clean:
-$(DEL_FILE) qmake_image_collection.cpp
compiler_moc_source_make_all:
compiler_moc_source_clean:
compiler_uic_make_all:
compiler_uic_clean:
compiler_yacc_decl_make_all:
compiler_yacc_decl_clean:
compiler_yacc_impl_make_all:
compiler_yacc_impl_clean:
compiler_lex_make_all:
compiler_lex_clean:
compiler_clean: compiler_moc_header_clean
####### Compile
axis.o: axis.cpp axis.h \
constant.h \
event.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o axis.o axis.cpp
axis_edit.o: axis_edit.cpp axis_edit.h \
axis.h \
constant.h \
joyslider.h \
keycode.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o axis_edit.o axis_edit.cpp
axisw.o: axisw.cpp axisw.h \
axis.h \
constant.h \
flash.h \
axis_edit.h \
joyslider.h \
keycode.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o axisw.o axisw.cpp
button.o: button.cpp button.h \
keycode.h \
constant.h \
event.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o button.o button.cpp
button_edit.o: button_edit.cpp button_edit.h \
button.h \ button.h \
keycode.h \
constant.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o button_edit.o button_edit.cpp
buttonw.o: buttonw.cpp buttonw.h \
button.h \
keycode.h \
constant.h \
button_edit.h \
flash.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o buttonw.o buttonw.cpp
event.o: event.cpp event.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o event.o event.cpp
flash.o: flash.cpp flash.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o flash.o flash.cpp
icon.o: icon.cpp icon.h \
constant.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o icon.o icon.cpp
joypad.o: joypad.cpp joypad.h \
button.h \
keycode.h \
constant.h \
axis.h \ axis.h \
joypadw.h \ joypadw.h \
component.h \
timer.h \
keycode.h \
event.h \
constant.h \
axisw.h \ axisw.h \
buttonw.h \
quickset.h \
axis_edit.h \
flash.h \ flash.h \
axis_edit.h \
joyslider.h \ joyslider.h \
button_edit.h buttonw.h \
button_edit.h \
quickset.h \
error.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o joypad.o joypad.cpp
joypadw.o: joypadw.cpp joypadw.h \
axisw.h \
axis.h \
constant.h \
flash.h \
axis_edit.h \
joyslider.h \
keycode.h \
joypad.h \
button.h \
error.h \
buttonw.h \
button_edit.h \
quickset.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o joypadw.o joypadw.cpp
joyslider.o: joyslider.cpp joyslider.h \
constant.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o joyslider.o joyslider.cpp
keycode.o: keycode.cpp keycode.h \
constant.h \
getkey.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o keycode.o keycode.cpp
layout.o: layout.cpp layout.h \
joypad.h \
button.h \
keycode.h \
constant.h \
axis.h \
joypadw.h \
axisw.h \
flash.h \
axis_edit.h \
joyslider.h \
buttonw.h \
button_edit.h \
quickset.h \
error.h \
device.h \
trayicon/trayicon.h \
icon.h \
layout_edit.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o layout.o layout.cpp
layout_edit.o: layout_edit.cpp layout_edit.h \ layout_edit.o: layout_edit.cpp layout_edit.h \
flash.h \ flash.h \
layout.h \ layout.h \
device.h \
joypadw.h \
joypad.h \
error.h \
trayicon/trayicon.h \
icon.h \
button.h \
axis.h \
component.h \
timer.h \
keycode.h \
event.h \
constant.h \
axisw.h \
buttonw.h \
quickset.h \
axis_edit.h \
joyslider.h \
button_edit.h
loop.o: loop.cpp loop.h \
joypad.h \
device.h \
button.h \
axis.h \
joypadw.h \
error.h \
component.h \
timer.h \
keycode.h \
event.h \
constant.h \
axisw.h \
buttonw.h \
quickset.h \
axis_edit.h \
flash.h \
joyslider.h \
button_edit.h
main.o: main.cpp loop.h \
layout.h \
event.h \
device.h \
error.h \
joypad.h \ joypad.h \
button.h \ button.h \
axis.h \
joypadw.h \
component.h \
timer.h \
keycode.h \ keycode.h \
constant.h \ constant.h \
axis.h \
joypadw.h \
axisw.h \ axisw.h \
buttonw.h \
quickset.h \
axis_edit.h \ axis_edit.h \
flash.h \
joyslider.h \ joyslider.h \
buttonw.h \
button_edit.h \ button_edit.h \
quickset.h \
error.h \
device.h \
trayicon/trayicon.h \
icon.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o layout_edit.o layout_edit.cpp
main.o: main.cpp layout.h \
joypad.h \
button.h \
keycode.h \
constant.h \
axis.h \
joypadw.h \
axisw.h \
flash.h \
axis_edit.h \
joyslider.h \
buttonw.h \
button_edit.h \
quickset.h \
error.h \
device.h \
trayicon/trayicon.h \ trayicon/trayicon.h \
icon.h \ icon.h \
layout_edit.h layout_edit.h \
event.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o main.o main.cpp
quickset.o: quickset.cpp quickset.h \ quickset.o: quickset.cpp quickset.h \
keycode.h \
joypad.h \ joypad.h \
constant.h \
button.h \ button.h \
keycode.h \
constant.h \
axis.h \ axis.h \
joypadw.h \ joypadw.h \
error.h \
component.h \
timer.h \
event.h \
axisw.h \ axisw.h \
buttonw.h \
axis_edit.h \
flash.h \ flash.h \
axis_edit.h \
joyslider.h \ joyslider.h \
button_edit.h buttonw.h \
button_edit.h \
error.h \
getkey.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o quickset.o quickset.cpp
getkey.o: getkey.cpp getkey.h \
constant.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o getkey.o getkey.cpp
trayicon.o: trayicon/trayicon.cpp trayicon/trayicon.h trayicon.o: trayicon/trayicon.cpp trayicon/trayicon.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o trayicon.o trayicon/trayicon.cpp $(CXX) -c $(CXXFLAGS) $(INCPATH) -o trayicon.o trayicon/trayicon.cpp
@ -410,116 +524,67 @@ trayicon.o: trayicon/trayicon.cpp trayicon/trayicon.h
trayicon_x11.o: trayicon/trayicon_x11.cpp trayicon/trayicon.h trayicon_x11.o: trayicon/trayicon_x11.cpp trayicon/trayicon.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o trayicon_x11.o trayicon/trayicon_x11.cpp $(CXX) -c $(CXXFLAGS) $(INCPATH) -o trayicon_x11.o trayicon/trayicon_x11.cpp
moc_axis_edit.o: moc_axis_edit.cpp axis_edit.h joyslider.h \ moc_axis.o: moc_axis.cpp
keycode.h \ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_axis.o moc_axis.cpp
axis.h \
constant.h \
component.h \
timer.h \
event.h
moc_button_edit.o: moc_button_edit.cpp button_edit.h button.h \ moc_axis_edit.o: moc_axis_edit.cpp
keycode.h \ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_axis_edit.o moc_axis_edit.cpp
component.h \
timer.h \
event.h \
constant.h
moc_flash.o: moc_flash.cpp flash.h moc_button.o: moc_button.cpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_button.o moc_button.cpp
moc_icon.o: moc_icon.cpp icon.h constant.h moc_button_edit.o: moc_button_edit.cpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_button_edit.o moc_button_edit.cpp
moc_joypadw.o: moc_joypadw.cpp joypadw.h joypad.h \ moc_flash.o: moc_flash.cpp
axisw.h \ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_flash.o moc_flash.cpp
buttonw.h \
quickset.h \
button.h \
axis.h \
error.h \
component.h \
timer.h \
keycode.h \
event.h \
constant.h \
axis_edit.h \
flash.h \
joyslider.h \
button_edit.h
moc_keycode.o: moc_keycode.cpp keycode.h constant.h moc_icon.o: moc_icon.cpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_icon.o moc_icon.cpp
moc_layout.o: moc_layout.cpp layout.h joypad.h \ moc_joypad.o: moc_joypad.cpp
error.h \ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_joypad.o moc_joypad.cpp
device.h \
trayicon/trayicon.h \
icon.h \
layout_edit.h \
button.h \
axis.h \
joypadw.h \
component.h \
timer.h \
keycode.h \
event.h \
constant.h \
axisw.h \
buttonw.h \
quickset.h \
axis_edit.h \
flash.h \
joyslider.h \
button_edit.h
moc_trayicon.o: trayicon/moc_trayicon.cpp trayicon/trayicon.h moc_joypadw.o: moc_joypadw.cpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_trayicon.o trayicon/moc_trayicon.cpp $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_joypadw.o moc_joypadw.cpp
moc_axis_edit.cpp: $(MOC) axis_edit.h moc_keycode.o: moc_keycode.cpp
$(MOC) axis_edit.h -o moc_axis_edit.cpp $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_keycode.o moc_keycode.cpp
moc_button_edit.cpp: $(MOC) button_edit.h moc_layout.o: moc_layout.cpp
$(MOC) button_edit.h -o moc_button_edit.cpp $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_layout.o moc_layout.cpp
moc_flash.cpp: $(MOC) flash.h moc_getkey.o: moc_getkey.cpp
$(MOC) flash.h -o moc_flash.cpp $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_getkey.o moc_getkey.cpp
moc_icon.cpp: $(MOC) icon.h moc_trayicon.o: moc_trayicon.cpp
$(MOC) icon.h -o moc_icon.cpp $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_trayicon.o moc_trayicon.cpp
moc_joypadw.cpp: $(MOC) joypadw.h
$(MOC) joypadw.h -o moc_joypadw.cpp
moc_keycode.cpp: $(MOC) keycode.h
$(MOC) keycode.h -o moc_keycode.cpp
moc_layout.cpp: $(MOC) layout.h
$(MOC) layout.h -o moc_layout.cpp
trayicon/moc_trayicon.cpp: $(MOC) trayicon/trayicon.h
$(MOC) trayicon/trayicon.h -o trayicon/moc_trayicon.cpp
####### Install ####### Install
install_target: all install_target: first FORCE
@$(CHK_DIR_EXISTS) "$(INSTALL_ROOT)/usr/bin/" || $(MKDIR) "$(INSTALL_ROOT)/usr/bin/" @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/bin/ || $(MKDIR) $(INSTALL_ROOT)/bin/
-$(INSTALL_FILE) "$(QMAKE_TARGET)" "$(INSTALL_ROOT)/usr/bin/$(QMAKE_TARGET)" -$(INSTALL_PROGRAM) "$(QMAKE_TARGET)" "$(INSTALL_ROOT)/bin/$(QMAKE_TARGET)"
-strip "$(INSTALL_ROOT)/usr/bin/$(QMAKE_TARGET)" -strip "$(INSTALL_ROOT)/bin/$(QMAKE_TARGET)"
uninstall_target: uninstall_target: FORCE
-$(DEL_FILE) "$(INSTALL_ROOT)/usr/bin/$(QMAKE_TARGET)" -$(DEL_FILE) "$(INSTALL_ROOT)/bin/$(QMAKE_TARGET)"
-$(DEL_DIR) "$(INSTALL_ROOT)/usr/bin/" -$(DEL_DIR) $(INSTALL_ROOT)/bin/
install_icons: all install_icons: first FORCE
@$(CHK_DIR_EXISTS) "$(INSTALL_ROOT)/usr/share/pixmaps/qjoypad/" || $(MKDIR) "$(INSTALL_ROOT)/usr/share/pixmaps/qjoypad/" @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/share/pixmaps/qjoypad/ || $(MKDIR) $(INSTALL_ROOT)/share/pixmaps/qjoypad/
cp ../icons/* /usr/share/pixmaps/qjoypad; cd /usr/share/pixmaps/qjoypad; ln -sf gamepad4-24x24.png icon24.png; ln -sf gamepad3-64x64.png icon64.png; chmod -R a+r /usr/share/pixmaps/qjoypad cp ../icons/* /share/pixmaps/qjoypad; cd /share/pixmaps/qjoypad; ln -sf gamepad4-24x24.png icon24.png; ln -sf gamepad3-64x64.png icon64.png; chmod -R a+r /share/pixmaps/qjoypad
install_doc: all install_doc: first FORCE
@$(CHK_DIR_EXISTS) "$(INSTALL_ROOT)/usr/doc/qjoypad3/" || $(MKDIR) "$(INSTALL_ROOT)/usr/doc/qjoypad3/" @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/doc/qjoypad3/ || $(MKDIR) $(INSTALL_ROOT)/doc/qjoypad3/
cp ../README.txt ../LICENSE.txt /usr/doc/qjoypad3 cp ../README.txt ../LICENSE.txt /doc/qjoypad3
install: install_target install_icons install_doc install: install_target install_icons install_doc FORCE
uninstall: uninstall_target uninstall: uninstall_target FORCE
FORCE:

View File

@ -1,194 +1,213 @@
#include "axis.h" #include "axis.h"
#include "event.h"
#include "time.h"
#define sqr(a) ((a)*(a)) #define sqr(a) ((a)*(a))
Axis::Axis( int i ) { Axis::Axis( int i ) {
index = i; index = i;
isOn = false; isOn = false;
//to keep toDefault from calling tossTimer without first calling takeTimer isDown = false;
gradient = false; state = 0;
toDefault(); gradient = false;
toDefault();
tick = 0;
timer = new QTimer(this);
a = 0;
b = 0;
c = 0;
} }
Axis::~Axis() { Axis::~Axis() {
release(); release();
delete timer;
} }
bool Axis::read( QTextStream* stream ) { bool Axis::read( QTextStream* stream ) {
// At this point, toDefault has just been called. // At this point, toDefault has just been called.
//read in a line from the stream, and split it up into individual words //read in a line from the stream, and split it up into individual words
QString input = stream->readLine().lower(); QString input = stream->readLine().toLower();
QRegExp regex("[\\s,]+"); QRegExp regex("[\\s,]+");
QStringList words = QStringList::split(regex,input); QStringList words = input.split(regex);
//used to assure QString->int conversions worked //used to assure QString->int conversions worked
bool ok; bool ok;
//int to store values derived from strings //int to store values derived from strings
int val; int val;
//step through each word, check if it's a token we recognize //step through each word, check if it's a token we recognize
for ( QStringList::Iterator it = words.begin(); it != words.end(); ++it ) { for ( QStringList::Iterator it = words.begin(); it != words.end(); ++it ) {
if (*it == "maxspeed") { if (*it == "maxspeed") {
++it; //move to the next word, which should be the maximum speed. ++it; //move to the next word, which should be the maximum speed.
//if no value was given, there's an error in the file, stop reading. //if no value was given, there's an error in the file, stop reading.
if (it == words.end()) return false; if (it == words.end()) return false;
//try to convert the value. //try to convert the value.
val = (*it).toInt(&ok); val = (*it).toInt(&ok);
//if that worked and the maximum speed is in range, set it. //if that worked and the maximum speed is in range, set it.
if (ok && val >= 0 && val <= MAXMOUSESPEED) maxSpeed = val; if (ok && val >= 0 && val <= MAXMOUSESPEED) maxSpeed = val;
//otherwise, faulty input, give up. //otherwise, faulty input, give up.
else return false; else return false;
} }
//pretty much the same process for getting the dead zone //pretty much the same process for getting the dead zone
else if (*it == "dzone") { else if (*it == "dzone") {
++it; ++it;
if (it == words.end()) return false; if (it == words.end()) return false;
val = (*it).toInt(&ok); val = (*it).toInt(&ok);
if (ok && val >= 0 && val <= JOYMAX) dZone = val; if (ok && val >= 0 && val <= JOYMAX) dZone = val;
else return false; else return false;
} }
//and again for the extreme zone, //and again for the extreme zone,
else if (*it == "xzone") { else if (*it == "xzone") {
++it; ++it;
if (it == words.end()) return false; if (it == words.end()) return false;
val = (*it).toInt(&ok); val = (*it).toInt(&ok);
if (ok && val >= 0 && val <= JOYMAX) xZone = val; if (ok && val >= 0 && val <= JOYMAX) xZone = val;
else return false; else return false;
} }
//and for the positive keycode, //and for the positive keycode,
else if (*it == "+key") { else if (*it == "+key") {
++it; ++it;
if (it == words.end()) return false; if (it == words.end()) return false;
val = (*it).toInt(&ok); val = (*it).toInt(&ok);
if (ok && val >= 0 && val <= MAXKEY) pkeycode = val; if (ok && val >= 0 && val <= MAXKEY) pkeycode = val;
else return false; else return false;
} }
//and finally for the negative keycode. //and finally for the negative keycode.
else if (*it == "-key") { else if (*it == "-key") {
++it; ++it;
if (it == words.end()) return false; if (it == words.end()) return false;
val = (*it).toInt(&ok); val = (*it).toInt(&ok);
if (ok && val >= 0 && val <= MAXKEY) nkeycode = val; if (ok && val >= 0 && val <= MAXKEY) nkeycode = val;
else return false; else return false;
} }
//the rest of the options are keywords without integers //the rest of the options are keywords without integers
else if (*it == "gradient") { else if (*it == "gradient") {
if (!gradient) takeTimer( this ); gradient = true;
gradient = true; }
} else if (*it == "throttle+") {
else if (*it == "throttle+") { throttle = 1;
throttle = 1; }
} else if (*it == "throttle-") {
else if (*it == "throttle-") { throttle = -1;
throttle = -1; }
} else if (*it == "mouse+v") {
else if (*it == "mouse+v") { mode = mousepv;
mode = mousepv; }
} else if (*it == "mouse-v") {
else if (*it == "mouse-v") { mode = mousenv;
mode = mousenv; }
} else if (*it == "mouse+h") {
else if (*it == "mouse+h") { mode = mouseph;
mode = mouseph; }
} else if (*it == "mouse-h") {
else if (*it == "mouse-h") { mode = mousenh;
mode = mousenh; }
} //we ignore unrecognized words to be friendly and allow for additions to
//we ignore unrecognized words to be friendly and allow for additions to //the format in later versions. Note, this means that typos will not get
//the format in later versions. Note, this means that typos will not get //the desired effect OR produce an error message.
//the desired effect OR produce an error message.
} }
//assume that xZone, dZone, or maxSpeed has changed, for simplicity. //assume that xZone, dZone, or maxSpeed has changed, for simplicity.
//do a few floating point calculations. //do a few floating point calculations.
adjustGradient(); adjustGradient();
//if we parsed through all of the words, yay! All done. //if we parsed through all of the words, yay! All done.
return true; return true;
}
void Axis::timerCalled() {
timerTick(++tick);
} }
void Axis::write( QTextStream* stream ) { void Axis::write( QTextStream* stream ) {
*stream << "\t" << getName() << ": "; *stream << "\t" << getName() << ": ";
if (gradient) *stream << "gradient, "; if (gradient) *stream << "gradient, ";
if (throttle > 0) *stream << "throttle+, "; if (throttle > 0) *stream << "throttle+, ";
else if (throttle < 0) *stream << "throttle-, "; else if (throttle < 0) *stream << "throttle-, ";
if (dZone != DZONE) *stream << "dZone " << dZone << ", "; if (dZone != DZONE) *stream << "dZone " << dZone << ", ";
if (xZone != XZONE) *stream << "xZone " << xZone << ", "; if (xZone != XZONE) *stream << "xZone " << xZone << ", ";
if (mode == keybd) { if (mode == keybd) {
*stream << "+key " << pkeycode << ", " *stream << "+key " << pkeycode << ", "
<< "-key " << nkeycode << "\n"; << "-key " << nkeycode << "\n";
} }
else { else {
if (gradient) *stream << "maxSpeed " << maxSpeed << ", "; if (gradient) *stream << "maxSpeed " << maxSpeed << ", ";
*stream << "mouse"; *stream << "mouse";
if (mode == mousepv) if (mode == mousepv)
*stream << "+v\n"; *stream << "+v\n";
else if (mode == mousenv) else if (mode == mousenv)
*stream << "-v\n"; *stream << "-v\n";
else if (mode == mouseph) else if (mode == mouseph)
*stream << "+h\n"; *stream << "+h\n";
else if (mode == mousenh) else if (mode == mousenh)
*stream << "-h\n"; *stream << "-h\n";
} }
} }
void Axis::release() { void Axis::release() {
//if we're pressing a key, let it go. //if we're pressing a key, let it go.
if (isDown) { if (isDown) {
move(false); move(false);
isDown = false; isDown = false;
} }
} }
void Axis::jsevent( int value ) { void Axis::jsevent( int value ) {
//adjust real value to throttle value //adjust real value to throttle value
if (throttle == 0) if (throttle == 0)
state = value; state = value;
else if (throttle == -1) else if (throttle == -1)
state = (value + JOYMIN) / 2; state = (value + JOYMIN) / 2;
else else
state = (value + JOYMAX) / 2; state = (value + JOYMAX) / 2;
//set isOn, deal with state changing.
//if was on but now should be off:
if (isOn && abs(state) <= dZone) {
isOn = false;
if (gradient) {
duration = 0;
release();
timer->stop();
disconnect(timer, SIGNAL(timeout()), 0, 0);
tick = 0;
}
}
//if was off but now should be on:
else if (!isOn && abs(state) >= dZone) {
isOn = true;
if (gradient) {
duration = (abs(state) * FREQ) / JOYMAX;
connect(timer, SIGNAL(timeout()), this, SLOT(timerCalled()));
timer->start(MSEC);
}
}
//otherwise, state doesn't change! Don't touch it.
else return;
//set isOn, deal with state changing. //gradient will trigger movement on its own via timer().
//if was on but now should be off: //non-gradient needs to be told to move.
if (isOn && abs(state) <= dZone) { if (!gradient) {
isOn = false; move(isOn);
if (gradient) release(); }
}
//if was off but now should be on:
else if (!isOn && abs(state) >= dZone) {
isOn = true;
if (gradient) duration = (abs(state) * FREQ) / JOYMAX;
}
//otherwise, state doesn't change! Don't touch it.
else return;
//gradient will trigger movement on its own via timer().
//non-gradient needs to be told to move.
if (!gradient) {
move(isOn);
}
} }
void Axis::toDefault() { void Axis::toDefault() {
release(); release();
gradient = false;
if (gradient) tossTimer( this ); throttle = 0;
gradient = false; maxSpeed = 100;
throttle = 0; dZone = DZONE;
maxSpeed = 100; tick = 0;
dZone = DZONE; xZone = XZONE;
xZone = XZONE; mode = keybd;
mode = keybd; pkeycode = 0;
pkeycode = 0; nkeycode = 0;
nkeycode = 0; downkey = 0;
downkey = 0; state = 0;
state = 0; adjustGradient();
adjustGradient();
} }
bool Axis::isDefault() { bool Axis::isDefault() {
@ -203,119 +222,121 @@ bool Axis::isDefault() {
} }
bool Axis::inDeadZone( int val ) { bool Axis::inDeadZone( int val ) {
int value; int value;
if (throttle == 0) if (throttle == 0)
value = val; value = val;
else if (throttle == -1) else if (throttle == -1)
value = (val + JOYMIN) / 2; value = (val + JOYMIN) / 2;
else else
value = (val + JOYMAX) / 2; value = (val + JOYMAX) / 2;
return (abs(value) < dZone); return (abs(value) < dZone);
} }
QString Axis::status() { QString Axis::status() {
QString result = getName() + " : ["; QString result = getName() + " : [";
if (mode == keybd) { if (mode == keybd) {
if (throttle == 0) if (throttle == 0)
result += "KEYBOARD"; result += "KEYBOARD";
else result += "THROTTLE"; else result += "THROTTLE";
} }
else result += "MOUSE"; else result += "MOUSE";
return result + "]"; return result + "]";
} }
void Axis::setKey(bool positive, int value) { void Axis::setKey(bool positive, int value) {
if (positive) if (positive)
pkeycode = value; pkeycode = value;
else else
nkeycode = value; nkeycode = value;
} }
void Axis::timer( int tick ) { void Axis::timerTick( int tick ) {
if (isOn) { if (isOn) {
if (mode == keybd) { if (mode == keybd) {
if (tick % FREQ == 0) { if (tick % FREQ == 0)
if (duration == FREQ) { {
if (!isDown) move(true); if (duration == FREQ)
duration = (abs(state) * FREQ) / JOYMAX; {
return; if (!isDown) move(true);
} duration = (abs(state) * FREQ) / JOYMAX;
move(true); return;
} }
if (tick % FREQ == duration) { move(true);
move(false); }
duration = (abs(state) * FREQ) / JOYMAX; if (tick % FREQ == duration) {
} move(false);
} duration = (abs(state) * FREQ) / JOYMAX;
else { }
move(true); }
} else {
} move(true);
}
}
} }
void Axis::adjustGradient() { void Axis::adjustGradient() {
//create a nice quadratic curve fitting it to the points //create a nice quadratic curve fitting it to the points
//(dZone,0) and (xZone,MaxSpeed) //(dZone,0) and (xZone,MaxSpeed)
a = (double) (maxSpeed) / sqr(xZone - dZone); a = (double) (maxSpeed) / sqr(xZone - dZone);
b = -2 * a * dZone; b = -2 * a * dZone;
c = a * sqr(dZone); c = a * sqr(dZone);
//actual equation for curve is: y = ax^2 + b //actual equation for curve is: y = ax^2 + b
//where x is the state of the axis and y is the distance the mouse should move. //where x is the state of the axis and y is the distance the mouse should move.
} }
void Axis::move( bool press ) { void Axis::move( bool press ) {
xevent e; xevent e;
if (mode == keybd) { if (mode == keybd) {
//prevent KeyPress-KeyPress and KeyRelease-KeyRelease pairs. //prevent KeyPress-KeyPress and KeyRelease-KeyRelease pairs.
//this would only happen in odd circumstances involving the setup //this would only happen in odd circumstances involving the setup
//dialog being open and blocking events from happening. //dialog being open and blocking events from happening.
if (isDown == press) return; if (isDown == press) return;
isDown = press; isDown = press;
if (press) { if (press) {
e.type = KPRESS; e.type = KPRESS;
downkey = (state > 0)?pkeycode:nkeycode; downkey = (state > 0)?pkeycode:nkeycode;
} }
else { else {
e.type = KREL; e.type = KREL;
} }
e.value1 = downkey; e.value1 = downkey;
e.value2 = 0; e.value2 = 0;
} }
//if using the mouse //if using the mouse
else if (press){ else if (press) {
int dist; int dist;
if (gradient) { if (gradient) {
//calculate our mouse speed curve based on calculations made in //calculate our mouse speed curve based on calculations made in
//adjustGradient() //adjustGradient()
int absState = abs(state); int absState = abs(state);
if (absState >= xZone) dist = maxSpeed; if (absState >= xZone) dist = maxSpeed;
else if (absState <= dZone) dist = 0; else if (absState <= dZone) dist = 0;
else dist = (int) (a*sqr(absState) + b*absState + c); else dist = (int) (a*sqr(absState) + b*absState + c);
} }
//if not gradient, always go full speed. //if not gradient, always go full speed.
else dist = maxSpeed; else dist = maxSpeed;
//if we're on the negative side of the axis, must compensate for //if we're on the negative side of the axis, must compensate for
//squaring and make distance negative. //squaring and make distance negative.
if (state < 0) dist = -dist; if (state < 0) dist = -dist;
e.type = WARP; e.type = WARP;
if (mode == mousepv) { if (mode == mousepv) {
e.value1 = 0; e.value1 = 0;
e.value2 = dist; e.value2 = dist;
} }
else if (mode == mousenv) { else if (mode == mousenv) {
e.value1 = 0; e.value1 = 0;
e.value2 = -dist; e.value2 = -dist;
} }
else if (mode == mouseph) { else if (mode == mouseph) {
e.value1 = dist; e.value1 = dist;
e.value2 = 0; e.value2 = 0;
} }
else if (mode == mousenh) { else if (mode == mousenh) {
e.value1 = -dist; e.value1 = -dist;
e.value2 = 0; e.value2 = 0;
} }
} }
//actually create the event //actually create the event
sendevent(e); sendevent(e);
} }

View File

@ -1,175 +1,286 @@
#include "unistd.h"
#include "joypad.h" #include "joypad.h"
#include <stdio.h>
#include <fcntl.h>
#include <poll.h>
#include <QApplication>
JoyPad::JoyPad( int i, int dev ) { JoyPad::JoyPad( int i, int dev ) {
//remember the index, //remember the index,
index = i; index = i;
//load data from the joystick device, if available. //load data from the joystick device, if available.
resetToDev(dev); joydevFileHandle = NULL;
if(dev > 0) {
//there is no JoyPadWidget yet. resetToDev(dev);
jpw = NULL; joydevFileHandle = new QSocketNotifier(dev, QSocketNotifier::Read, this);
joydevFileException = new QSocketNotifier(dev, QSocketNotifier::Exception, this);
connect(joydevFileHandle, SIGNAL(activated(int)), this, SLOT(handleJoyEvents(int)));
connect(joydevFileException, SIGNAL(activated(int)), this, SLOT(errorRead(int)));
}
//there is no JoyPadWidget yet.
jpw = NULL;
} }
void JoyPad::resetToDev(int dev ) { void JoyPad::resetToDev(int dev ) {
//remember the device file descriptor //remember the device file descriptor
joydev = dev; joydev = dev;
//read in the number of axes / buttons //read in the number of axes / buttons
axes = 0; axes = 0;
ioctl (joydev, JSIOCGAXES, &axes); ioctl (joydev, JSIOCGAXES, &axes);
buttons = 0; buttons = 0;
ioctl (joydev, JSIOCGBUTTONS, &buttons); ioctl (joydev, JSIOCGBUTTONS, &buttons);
//make sure that we have the axes we need. //make sure that we have the axes we need.
//if one that we need doesn't yet exist, add it in. //if one that we need doesn't yet exist, add it in.
//Note: if the current layout has a key assigned to an axis that did not //Note: if the current layout has a key assigned to an axis that did not
//have a real joystick axis mapped to it, and this function suddenly brings //have a real joystick axis mapped to it, and this function suddenly brings
//that axis into use, the key assignment will not be lost because the axis //that axis into use, the key assignment will not be lost because the axis
//will already exist and no new axis will be created. //will already exist and no new axis will be created.
for (int i = 0; i < axes; i++) { for (int i = 0; i < axes; i++) {
if (Axes[i] == 0) Axes.insert(i, new Axis( i )); if (Axes[i] == 0) Axes.insert(i, new Axis( i ));
} }
for (int i = 0; i < buttons; i++) { for (int i = 0; i < buttons; i++) {
if (Buttons[i] == 0) Buttons.insert(i, new Button( i )); if (Buttons[i] == 0) Buttons.insert(i, new Button( i ));
} }
struct pollfd read_struct;
read_struct.fd = joydev;
read_struct.events = POLLIN;
char buf[10];
while(poll(&read_struct, 1, 2)!=0) {
printf("reading junk data\n");
read(joydev, buf, 10);
}
setupJoyDeviceListener(dev);
}
void JoyPad::setupJoyDeviceListener(int dev) {
if(joydevFileHandle != NULL) {
delete joydevFileHandle;
}
joydevFileHandle = new QSocketNotifier(dev, QSocketNotifier::Read, this);
connect(joydevFileHandle, SIGNAL(activated(int)), this, SLOT(handleJoyEvents(int)));
} }
void JoyPad::toDefault() { void JoyPad::toDefault() {
//to reset the whole, reset all the parts. //to reset the whole, reset all the parts.
for ( QIntDictIterator<Axis> it( Axes ); it.current(); ++it ) do
it.current()->toDefault(); {
for ( QIntDictIterator<Button> it( Buttons ); it.current(); ++it ) QHashIterator<int, Axis*> it( Axes );
it.current()->toDefault(); while (it.hasNext())
{
it.next();
it.value()->toDefault();
}
} while (0);
do
{
QHashIterator<int, Button*> it( Buttons );
while (it.hasNext())
{
it.next();
it.value()->toDefault();
}
} while (0);
} }
bool JoyPad::isDefault() { bool JoyPad::isDefault() {
//if any of the parts are not at default, then the whole isn't either. //if any of the parts are not at default, then the whole isn't either.
for ( QIntDictIterator<Axis> it( Axes ); it.current(); ++it ) do {
if (!it.current()->isDefault()) return false; QHashIterator<int, Axis*> it( Axes );
for ( QIntDictIterator<Button> it( Buttons ); it.current(); ++it ) while (it.hasNext())
if (!it.current()->isDefault()) return false; {
return true; it.next();
if (!it.value()->isDefault()) return false;
}
} while (0);
do {
QHashIterator<int, Button*> it( Buttons );
while (it.hasNext())
{
it.next();
if (!it.value()->isDefault()) return false;
}
} while (0);
return true;
} }
bool JoyPad::read( QTextStream* stream ) { bool JoyPad::readConfig( QTextStream* stream ) {
toDefault(); toDefault();
QString word; QString word;
QChar dump; QChar dump;
int num; int num;
*stream >> word; *stream >> word;
while (word != NULL && word != "}") { while (word != NULL && word != "}") {
word = word.lower(); word = word.toLower();
if (word == "button") { if (word == "button") {
*stream >> num; *stream >> num;
if (num > 0) { if (num > 0) {
*stream >> dump; *stream >> dump;
if (dump != ':') { if (dump != ':') {
error("Layout file error", "Expected ':', found '" + QString(dump) + "'."); error("Layout file error", "Expected ':', found '" + QString(dump) + "'.");
return false; return false;
} }
if (Buttons[num-1] == 0) { if (Buttons[num-1] == 0) {
Buttons.insert(num-1,new Button(num-1)); Buttons.insert(num-1,new Button(num-1));
} }
if (!Buttons[num-1]->read( stream )) { if (!Buttons[num-1]->read( stream )) {
error("Layout file error", "Error reading Button " + QString::number(num)); error("Layout file error", "Error reading Button " + QString::number(num));
return false; return false;
} }
} }
else { else {
stream->readLine(); stream->readLine();
} }
} }
else if (word == "axis") { else if (word == "axis") {
*stream >> num; *stream >> num;
if (num > 0) { if (num > 0) {
*stream >> dump; *stream >> dump;
if (dump != ':') { if (dump != ':') {
error("Layout file error", "Expected ':', found '" + QString(dump) + "'."); error("Layout file error", "Expected ':', found '" + QString(dump) + "'.");
return false; return false;
} }
if (Axes[num-1] == 0) { if (Axes[num-1] == 0) {
Axes.insert(num-1,new Axis(num-1)); Axes.insert(num-1,new Axis(num-1));
} }
if (!Axes[num-1]->read(stream)) { if (!Axes[num-1]->read(stream)) {
error("Layout file error", "Error reading Axis " + QString::number(num)); error("Layout file error", "Error reading Axis " + QString::number(num));
return false; return false;
} }
} }
} }
else { else {
error( "Layout file error", "Error while reading layout. Unrecognized word: " + word ); error( "Layout file error", "Error while reading layout. Unrecognized word: " + word );
return false; return false;
} }
*stream >> word; *stream >> word;
} }
return true; return true;
} }
//only actually writes something if this JoyPad is NON DEFAULT. //only actually writes something if this JoyPad is NON DEFAULT.
void JoyPad::write( QTextStream* stream ) { void JoyPad::write( QTextStream* stream ) {
int i = 0; //use to test if this is default or not. int i = 0; //use to test if this is default or not.
QString result; QString result;
QTextStream* s = new QTextStream(&result, IO_WriteOnly); QTextStream* s = new QTextStream(&result, QIODevice::WriteOnly);
*s << getName() << " {\n"; *s << getName() << " {\n";
for ( QIntDictIterator<Axis> it( Axes ); it.current(); ++it ) { do {
//only write an axis if it is not at the default settings :) QHashIterator<int, Axis*> it( Axes );
if (!it.current()->isDefault()) { while (it.hasNext()) {
it.current()->write( s ); it.next();
++i; if (!it.value()->isDefault()) {
} it.value()->write( s );
} ++i;
for ( QIntDictIterator<Button> it( Buttons ); it.current(); ++it ) { }
if (!it.current()->isDefault()) { }
it.current()->write( s ); } while (0);
++i; QHashIterator<int, Button*> it( Buttons );
} while (it.hasNext()) {
} it.next();
if (!it.value()->isDefault()) {
it.value()->write( s );
++i;
}
}
if (i > 0) { if (i > 0) {
*stream << result << "}\n\n"; *stream << result << "}\n\n";
} }
} }
void JoyPad::release() { void JoyPad::release() {
for ( QIntDictIterator<Axis> it( Axes ); it.current(); ++it ) { do {
it.current()->release(); QHashIterator<int, Axis*> it( Axes );
} while (it.hasNext()) {
for ( QIntDictIterator<Button> it( Buttons ); it.current(); ++it ) { it.next();
it.current()->release(); it.value()->release();
} }
} while (0);
do {
QHashIterator<int, Button*> it( Buttons );
while (it.hasNext()) {
it.next();
it.value()->release();
}
} while (0);
} }
void JoyPad::jsevent( js_event msg ) { void JoyPad::jsevent( js_event msg ) {
//if there is a JoyPadWidget around, ie, if the joypad is being edited //if there is a JoyPadWidget around, ie, if the joypad is being edited
if (jpw != NULL) { if (jpw != NULL) {
//tell the dialog there was an event. It will use this to flash //tell the dialog there was an event. It will use this to flash
//the appropriate button, if necesary. //the appropriate button, if necesary.
jpw->jsevent(msg); jpw->jsevent(msg);
} return;
//if the dialog is open, stop here. We don't want to signal ourselves with }
//the input we generate. //if the dialog is open, stop here. We don't want to signal ourselves with
if (qApp->activeWindow() != 0 && qApp->activeModalWidget() != 0) return; //the input we generate.
if (qApp->activeWindow() != 0 && qApp->activeModalWidget() != 0) return;
//otherwise, lets create us a fake event! Pass on the event to whichever //otherwise, lets create us a fake event! Pass on the event to whichever
//Button or Axis was pressed and let them decide what to do with it. //Button or Axis was pressed and let them decide what to do with it.
if (msg.type & JS_EVENT_AXIS) { if (msg.type & JS_EVENT_AXIS) {
Axes[msg.number]->jsevent(msg.value); printf("DEBUG: passing on an axis event\n");
} printf("DEBUG: %d %d\n", msg.number, msg.value);
else { Axes[msg.number]->jsevent(msg.value);
Buttons[msg.number]->jsevent(msg.value); }
} else {
printf("DEBUG: passing on a button event\n");
printf("DEBUG: %d %d\n", msg.number, msg.value);
Buttons[msg.number]->jsevent(msg.value);
}
} }
JoyPadWidget* JoyPad::widget( QWidget* parent, int i) { JoyPadWidget* JoyPad::widget( QWidget* parent, int i) {
//create the widget and remember it. //create the widget and remember it.
jpw = new JoyPadWidget(this, i, parent); jpw = new JoyPadWidget(this, i, parent);
return jpw; return jpw;
}
void JoyPad::handleJoyEvents(int fd) {
js_event msg;
int len;
len = read( joydev, &msg, sizeof(js_event));
//if there was a real event waiting,
if (len == (int) sizeof(js_event)) {
//pass that event on to the joypad!
jsevent(msg);
}
//sleep for a moment. This is just to keep us from throwing all the
//available processer power into madly checking for new events.
//usleep(10000);
} }
void JoyPad::releaseWidget() { void JoyPad::releaseWidget() {
//this is how we know that there is no longer a JoyPadWidget around. //this is how we know that there is no longer a JoyPadWidget around.
jpw = NULL; jpw = NULL;
}
void JoyPad::unsetDev() {
close(joydev);
joydev = -1;
if(joydevFileHandle != NULL) {
delete joydevFileHandle;
}
}
void JoyPad::errorRead(int fd) {
joydevFileHandle->blockSignals(true);
joydevFileHandle->setEnabled(false);
close(joydev);
if(disconnect(joydevFileHandle , 0, 0, 0)) {
joydevFileHandle->deleteLater();
joydevFileHandle = NULL;
}
if(disconnect(joydevFileException, 0, 0, 0)) {
joydevFileException->setEnabled(false);
joydevFileException->deleteLater();
joydevFileException = NULL;
}
joydev = -1;
} }

View File

@ -1,19 +1,6 @@
#ifndef JOYPAD_H #ifndef JOYPAD_H
#define JOYPAD_H #define JOYPAD_H
//to have dictionaries of buttons and axes
#include <qintdict.h>
//the parent of JoyPadWidget
#include <qobject.h>
//for access to qApp so I can check if the application has active windows :)
#include <qapplication.h>
//for actually interacting with the joystick devices
#include <linux/joystick.h>
#include <fcntl.h>
#include <unistd.h>
//parts of the joypad //parts of the joypad
#include "button.h" #include "button.h"
#include "axis.h" #include "axis.h"
@ -24,16 +11,27 @@
//for raising errors //for raising errors
#include "error.h" #include "error.h"
//for actually interacting with the joystick devices
#include <linux/joystick.h>
#include <fcntl.h>
#include <unistd.h>
#include <QTextStream>
#include <QHash>
#include <QSocketNotifier>
class JoyPadWidget; class JoyPadWidget;
//represents an actual joystick device //represents an actual joystick device
class JoyPad : public QObject{ class JoyPad : public QObject{
friend class JoyPadWidget; Q_OBJECT
friend class JoyPadWidget;
friend class QuickSet; friend class QuickSet;
public: public:
JoyPad( int i, int dev ); void setupJoyDeviceListener(int dev);
//read from a stream JoyPad( int i, int dev );
bool read( QTextStream* stream ); //read from a stream
bool readConfig( QTextStream* stream );
//write to a stream //write to a stream
void write( QTextStream* stream ); void write( QTextStream* stream );
//release any pushed buttons and return to a neutral state //release any pushed buttons and return to a neutral state
@ -45,7 +43,7 @@ class JoyPad : public QObject{
//true iff this is currently at default settings //true iff this is currently at default settings
bool isDefault(); bool isDefault();
//release the connection to the real joystick //release the connection to the real joystick
void unsetDev() {close(joydev); joydev = -1;}; void unsetDev();
//read the dimensions on the real joystick and use them //read the dimensions on the real joystick and use them
void resetToDev( int dev ); void resetToDev( int dev );
//generates a name ("Joystick 1") //generates a name ("Joystick 1")
@ -66,14 +64,19 @@ class JoyPad : public QObject{
//layouts with different numbers of axes/buttons than the current //layouts with different numbers of axes/buttons than the current
//devices. Note that with the current layout settings, the defined //devices. Note that with the current layout settings, the defined
//buttons that don't actually exist on the device may not be contiguous. //buttons that don't actually exist on the device may not be contiguous.
QIntDict<Axis> Axes; QHash<int, Axis*> Axes;
QIntDict<Button> Buttons; QHash<int, Button*> Buttons;
//the index of this device (devicenum) //the index of this device (devicenum)
int index; int index;
//the widget that edits this. Mainly I keep track of this to know if //the widget that edits this. Mainly I keep track of this to know if
//the joypad is currently being edited. //the joypad is currently being edited.
JoyPadWidget* jpw; JoyPadWidget* jpw;
QSocketNotifier *joydevFileHandle;
QSocketNotifier *joydevFileException;
public slots:
void handleJoyEvents(int fd);
void errorRead(int fd);
}; };
#endif #endif

View File

@ -1,301 +1,378 @@
#include "layout.h" #include "layout.h"
#include <errno.h>
//initialize things and set up an icon :) //initialize things and set up an icon :)
LayoutManager::LayoutManager( bool useTrayIcon ) { LayoutManager::LayoutManager( bool useTrayIcon ) {
//no LayoutEdit yet. //no LayoutEdit yet.
le = NULL; le = NULL;
//prepare the popup first. //prepare the popup first.
Popup = new QPopupMenu(); Popup = new QMenu();
fillPopup(); fillPopup();
connect(Popup,SIGNAL(activated(int)),this, SLOT(trayMenu(int))); connect(Popup,SIGNAL(triggered(QAction*)),this, SLOT(trayMenu(QAction*)));
//make a tray icon //make a tray icon
if (useTrayIcon) { if (useTrayIcon) {
TrayIcon* Tray = new TrayIcon(QPixmap(ICON24),NAME,Popup,0,"tray"); TrayIcon* Tray = new TrayIcon(QPixmap(ICON24),NAME,Popup,0,"tray");
connect(Tray, SIGNAL( clicked(const QPoint&, int)), this, SLOT( trayClick())); connect(Tray, SIGNAL( clicked(const QPoint&, int)), this, SLOT( trayClick()));
Tray->show(); Tray->show();
} }
//or make a floating icon //or make a floating icon
else { else {
FloatingIcon* Icon = new FloatingIcon(QPixmap(ICON64),Popup,0,"tray"); FloatingIcon* Icon = new FloatingIcon(QPixmap(ICON64),Popup,0,"tray");
connect(Icon, SIGNAL( clicked()), this, SLOT( trayClick())); connect(Icon, SIGNAL( clicked()), this, SLOT( trayClick()));
connect(Icon, SIGNAL( closed()), qApp, SLOT( quit())); connect(Icon, SIGNAL( closed()), qApp, SLOT( quit()));
Icon->show(); Icon->show();
} }
//no layout loaded at start. //no layout loaded at start.
setLayoutName(NL); setLayoutName(NL);
} }
QString LayoutManager::getFileName( QString layoutname ) { QString LayoutManager::getFileName( QString layoutname ) {
return settingsDir + layoutname + ".lyt"; return settingsDir + layoutname + ".lyt";
} }
bool LayoutManager::load(const QString& name) { bool LayoutManager::load(const QString& name) {
//it's VERY easy to load NL :) //it's VERY easy to load NL :)
if (name == NL) { if (name == NL) {
clear(); clear();
return true; return true;
} }
QFile file(getFileName(name)); QFile file(getFileName(name));
//if the file isn't available, //if the file isn't available,
if (!file.exists()) { if (!file.exists()) {
error("Load error","Failed to find a layout named " + name); error("Load error","Failed to find a layout named " + name);
return false; return false;
} }
//if the file isn't readable, //if the file isn't readable,
if (!file.open(IO_ReadOnly)) { if (!file.open(QIODevice::ReadOnly)) {
error("Load error","Error reading from file " + file.name()); error("Load error","Error reading from file " + file.fileName());
return false; return false;
} }
//reset all the joypads. //reset all the joypads.
//note that we don't use available here, but joypads instead. This is so //note that we don't use available here, but joypads instead. This is so
//if one layout has more joypads than this one does, this won't have the //if one layout has more joypads than this one does, this won't have the
//extra settings left over after things are supposed to be "cleared" //extra settings left over after things are supposed to be "cleared"
QIntDictIterator<JoyPad> it( joypads ); QHashIterator<int, JoyPad*> it( joypads );
for ( ; it.current(); ++it ) { while (it.hasNext())
it.current()->toDefault(); {
} it.next();
it.value()->toDefault();
}
//start reading joypads! //start reading joypads!
QTextStream stream( &file ); QTextStream stream( &file );
QString input = stream.readLine().lower(); QString input = stream.readLine().toLower();
QRegExp quoted("\"(.*)\""); QRegExp quoted("\"(.*)\"");
bool okay; bool okay;
int num; int num;
while (input != QString::null) { while (input != QString::null) {
QStringList words = QStringList::split(" ",input); QStringList words = input.split(" ");
//if this line is specifying a joystick //if this line is specifying a joystick
if (words[0] == "joystick") { if (words[0] == "joystick") {
num = words[1].toInt(&okay); num = words[1].toInt(&okay);
//make sure the number of the joystick is valid //make sure the number of the joystick is valid
if (!okay || okay < 1) { if (!okay || okay < 1) {
error( "Load error", "Error reading joystick definition. Expected: Joysyick 1 {"); error( "Load error", "Error reading joystick definition. Expected: Joysyick 1 {");
if (name != CurrentLayout) reload(); if (name != CurrentLayout) reload();
else clear(); else clear();
return false; return false;
} }
//if there was no joypad defined for this index before, make it now! //if there was no joypad defined for this index before, make it now!
if (joypads[num-1] == 0) { if (joypads[num-1] == 0) {
joypads.insert(num-1, new JoyPad(num-1, 0)); joypads.insert(num-1, new JoyPad(num-1, 0));
} }
//try to read the joypad, report error on fail. //try to read the joypad, report error on fail.
if (!joypads[num-1]->read(&stream)) { if (!joypads[num-1]->readConfig(&stream)) {
error( "Load error", "Error reading definition for joystick " + QString::number(num-1)); error( "Load error", "Error reading definition for joystick " + QString::number(num-1));
//if this was attempting to change to a new layout and it failed, //if this was attempting to change to a new layout and it failed,
//revert back to the old layout. //revert back to the old layout.
if (name != CurrentLayout) reload(); if (name != CurrentLayout) reload();
//to keep from going into an infinite loop, if there is no good //to keep from going into an infinite loop, if there is no good
//layout to fall back on, go to NL. //layout to fall back on, go to NL.
else clear(); else clear();
return false; return false;
} }
} }
//read a new line. //read a new line.
input = stream.readLine().lower(); input = stream.readLine().toLower();
} }
//if loading succeeded, this is our new layout. //if loading succeeded, this is our new layout.
setLayoutName(name); setLayoutName(name);
return true; return true;
} }
bool LayoutManager::load() { bool LayoutManager::load() {
//try to load the file named "layout" to retrieve the last used layout name //try to load the file named "layout" to retrieve the last used layout name
QFile file( settingsDir + "layout"); QFile file( settingsDir + "layout");
QString name; QString name;
if (file.open(IO_ReadOnly)) { if (file.open(QIODevice::ReadOnly)) {
QTextStream stream(&file); QTextStream stream(&file);
name = stream.readLine(); name = stream.readLine();
file.close(); file.close();
//if there was no name, don't load. //if there was no name, don't load.
if (name == "") { if (name == "") {
return false; return false;
} }
//if there was a name, try to load it! Note, this will still return //if there was a name, try to load it! Note, this will still return
//false if the name is invalid ( see load() ) //false if the name is invalid ( see load() )
return load(name); return load(name);
} }
//if the file isn't available to open, don't load. //if the file isn't available to open, don't load.
return false; return false;
} }
bool LayoutManager::reload() { bool LayoutManager::reload() {
return load(CurrentLayout); return load(CurrentLayout);
} }
void LayoutManager::clear() { void LayoutManager::clear() {
//reset all the joypads... //reset all the joypads...
for (QIntDictIterator<JoyPad> it(joypads); it.current(); ++it) { QHashIterator<int, JoyPad*> it (joypads);
it.current()->toDefault(); while (it.hasNext())
} {
//and call our layout NL it.next();
setLayoutName(NL); it.value()->toDefault();
}
//and call our layout NL
setLayoutName(NL);
} }
void LayoutManager::save() { void LayoutManager::save() {
if (CurrentLayout == NL) { if (CurrentLayout == NL) {
saveAs(); saveAs();
return; return;
} }
//get a filename //get a filename
QString filename = getFileName( CurrentLayout ); QString filename = getFileName( CurrentLayout );
QFile file(filename); QFile file(filename);
//if it's good, start writing the file //if it's good, start writing the file
if (file.open(IO_WriteOnly)) { if (file.open(QIODevice::WriteOnly)) {
QTextStream stream( &file ); QTextStream stream( &file );
stream << "# "NAME" Layout File\n\n"; stream << "# "NAME" Layout File\n\n";
for (QIntDictIterator<JoyPad> it(joypads); it.current(); ++it) { QHashIterator<int, JoyPad*> it (joypads);
it.current()->write( &stream ); while (it.hasNext())
} {
file.close(); it.next();
} it.value()->write( &stream );
//if it's not, error. }
else file.close();
error("Save error", "Could not open file " + filename + ", layout not saved."); }
//if it's not, error.
else
error("Save error", "Could not open file " + filename + ", layout not saved.");
} }
void LayoutManager::saveAs() { void LayoutManager::saveAs() {
bool ok; bool ok;
//request a new name! //request a new name!
QString name = QInputDialog::getText(NAME" - Name new layout","Enter a name for the new layout:", QLineEdit::Normal, QString::null, &ok ); QString name = QInputDialog::getText(0, NAME" - Name new layout","Enter a name for the new layout:", QLineEdit::Normal, QString::null, &ok );
if (!ok) return; if (!ok) {
QFile file(settingsDir + name + ".lyt"); return;
//don't overwrite an existing layout. }
if (file.exists()) { QFile file(settingsDir + name + ".lyt");
error("Save error", "That name's already taken!"); //don't overwrite an existing layout.
return; if (file.exists()) {
} error("Save error", "That name's already taken!");
return;
}
//now that the new layout has a name, that is the name we should use. //now that the new layout has a name, that is the name we should use.
setLayoutName(name); setLayoutName(name);
//since we have a new name for this layout now, we can save it normally :) //since we have a new name for this layout now, we can save it normally :)
save(); save();
//add the new name to our lists //add the new name to our lists
fillPopup(); fillPopup();
if (le != NULL) { if (le != NULL) {
le->updateLayoutList(); le->updateLayoutList();
} }
} }
void LayoutManager::saveDefault() { void LayoutManager::saveDefault() {
QFile file( settingsDir + "layout"); QFile file( settingsDir + "layout");
if (file.open(IO_WriteOnly)) { if (file.open(QIODevice::WriteOnly)) {
QTextStream stream(&file); QTextStream stream(&file);
stream << CurrentLayout; stream << CurrentLayout;
file.close(); file.close();
} }
} }
void LayoutManager::remove() { void LayoutManager::remove() {
if (CurrentLayout == NL) return; if (CurrentLayout == NL) return;
if (QMessageBox::warning( 0, NAME" - Delete layout?","Remove layout permanently from your hard drive?", "Yes", "No", 0, 0, 1 ) == 1) return; if (QMessageBox::warning( 0, NAME" - Delete layout?","Remove layout permanently from your hard drive?", "Yes", "No", 0, 0, 1 ) == 1) return;
QString filename = getFileName( CurrentLayout ); QString filename = getFileName( CurrentLayout );
if (!QFile(filename).remove()) { if (!QFile(filename).remove()) {
error("Remove error", "Could not remove file " + filename); error("Remove error", "Could not remove file " + filename);
} }
fillPopup(); fillPopup();
if (le != NULL) { if (le != NULL) {
le->updateLayoutList(); le->updateLayoutList();
} }
clear(); clear();
} }
QStringList LayoutManager::getLayoutNames() { QStringList LayoutManager::getLayoutNames() {
//goes through the list of .lyt files and removes the file extensions ;) //goes through the list of .lyt files and removes the file extensions ;)
QStringList result = QDir(settingsDir).entryList("*.lyt"); QStringList result = QDir(settingsDir).entryList(QStringList("*.lyt"));
for ( QStringList::Iterator it = result.begin(); it != result.end(); ++it ) { for ( QStringList::Iterator it = result.begin(); it != result.end(); ++it ) {
*it = (*it).left((*it).length() - 4); *it = (*it).left((*it).length() - 4);
} }
//and, of course, there's always NL. //and, of course, there's always NL.
result.prepend(NL); result.prepend(NL);
return result; return result;
} }
void LayoutManager::setLayoutName(QString name) { void LayoutManager::setLayoutName(QString name) {
CurrentLayout = name; CurrentLayout = name;
fillPopup(); fillPopup();
if (le != NULL) { if (le != NULL) {
le->setLayout(name); le->setLayout(name);
} }
} }
void LayoutManager::trayClick() { void LayoutManager::trayClick() {
//don't show the dialog if there aren't any joystick devices plugged in //don't show the dialog if there aren't any joystick devices plugged in
if (available.count() == 0) { if (available.count() == 0) {
error("No joystick devices available","No joystick devices are currently available to configure.\nPlease plug in a gaming device and select\n\"Update Joystick Devices\" from the popup menu."); error("No joystick devices available","No joystick devices are currently available to configure.\nPlease plug in a gaming device and select\n\"Update Joystick Devices\" from the popup menu.");
return; return;
} }
//otherwise, make a new LayoutEdit dialog and show it. //otherwise, make a new LayoutEdit dialog and show it.
le = new LayoutEdit(this); le = new LayoutEdit(this);
le->setLayout(CurrentLayout); le->setLayout(CurrentLayout);
//note, this will cause the menu to hang. You cannot use the menu while the //note, this will cause the menu to hang. You cannot use the menu while the
//dialog is active. I'd rather it not work out that way, but this makes my //dialog is active. I'd rather it not work out that way, but this makes my
//code MUCH simpler for a small inconvenience that shouldn't matter. For //code MUCH simpler for a small inconvenience that shouldn't matter. For
//instance, I don't have to worry about the current joysticks changing //instance, I don't have to worry about the current joysticks changing
//while there's a dialog and therefore adjusting the dialog to match. //while there's a dialog and therefore adjusting the dialog to match.
le->exec(); le->exec();
delete le; delete le;
le = NULL; le = NULL;
} }
void LayoutManager::trayMenu(int id) { void LayoutManager::trayMenu(QAction *menuItemAction) {
//if they clicked on a Layout name, load it! //if they clicked on a Layout name, load it!
//note that the other options are handled with their own special functions //note that the other options are handled with their own special functions
if (Popup->indexOf(id) > 4 && Popup->text(id) != "Quit") { printf("%s\n", qPrintable(menuItemAction->text()));
load(Popup->text(id)); if (Popup->actions().indexOf(menuItemAction) > 1 && menuItemAction->text() != "Quit" &&
} menuItemAction->text() != "Update lyaout list" &&
menuItemAction->text() != "Update joystick devices") {
load(menuItemAction->text());
}
} }
void LayoutManager::fillPopup() { void LayoutManager::fillPopup() {
//start with an empty slate //start with an empty slate
Popup->clear(); Popup->clear();
//make a list of joystick devices //make a list of joystick devices
QString devs = "Joysticks: "; QString devs = "Joysticks: ";
QIntDictIterator<JoyPad> it( available ); QHashIterator<int, JoyPad*> it( available );
for ( ; it.current(); ++it ) { while (it.hasNext())
devs += QString::number(it.currentKey() + 1) + " "; {
} it.next();
Popup->insertItem(devs); devs += QString::number(it.key() + 1) + " ";
Popup->insertSeparator(); }
QAction *temp = Popup->addAction(devs);
Popup->addSeparator(/*temp*/);
//add in the Update options //add in the Update options
Popup->insertItem("Update layout list", this, SLOT(fillPopup())); QAction *tempAdd = new QAction("Update layout list", this);
Popup->insertItem("Update joystick devices", this, SLOT(updateJoyDevs())); connect(tempAdd, SIGNAL(triggered(bool)), this, SLOT(fillPopup()));
Popup->insertSeparator(); Popup->addAction(tempAdd);
tempAdd = new QAction("Update joystick devices", this);
connect(tempAdd, SIGNAL(triggered(bool)), this, SLOT(updateJoyDevs()));
Popup->addAction(tempAdd);
Popup->addSeparator(/*temp*/);
//then add all the layout names //then add all the layout names
QStringList names = getLayoutNames(); QStringList names = getLayoutNames();
for ( QStringList::Iterator it = names.begin(); it != names.end(); ++it ) { for ( QStringList::Iterator it = names.begin(); it != names.end(); ++it ) {
int id = Popup->insertItem(*it); temp = Popup->addAction(*it);
//put a check by the current one ;) temp->setCheckable(true);
if (CurrentLayout == (*it)) Popup->setItemChecked(id,true); //put a check by the current one ;)
} if (CurrentLayout == (*it)) {
Popup->insertSeparator(); temp->setChecked(true);
}
}
Popup->addSeparator();
//and, at the end, quit! //and, at the end, quit!
Popup->insertItem("Quit",qApp,SLOT(quit())); Popup->addAction("Quit",qApp,SLOT(quit()));
} }
void LayoutManager::updateJoyDevs() { void LayoutManager::updateJoyDevs() {
//the actual update process is handled by main.cpp, we just need to signal QString devdir = DEVDIR;
//ourselves to do it. //reset all joydevs to sentinal value (-1)
raise(SIGUSR1); do {
QHashIterator<int, JoyPad*> it( joypads );
while (it.hasNext() ) {
it.next();
it.value()->unsetDev();
}
} while (0);
//clear out the list of previously available joysticks
available.clear();
//set all joydevs anew (create new JoyPad's if necesary)
QDir DeviceDir(devdir);
QStringList devices = DeviceDir.entryList(QStringList("js*"), QDir::System );
QRegExp devicename(".*\\js(\\d+)");
int joydev;
int index;
//for every joystick device in the directory listing...
//(note, with devfs, only available devices are listed)
for (QStringList::Iterator it = devices.begin(); it != devices.end(); ++it) {
//try opening the device.
joydev = open( qPrintable(devdir + "/" + (*it)), O_RDONLY | O_NONBLOCK);
//if it worked, then we have a live joystick! Make sure it's properly
//setup.
if (joydev > 0) {
devicename.indexIn(*it);
index = QString(devicename.cap(1)).toInt();
JoyPad* joypad;
//if we've never seen this device before, make a new one!
if (joypads[index] == 0) {
struct pollfd read_struct;
read_struct.fd = joydev;
read_struct.events = POLLIN;
char buf[10];
while(poll(&read_struct, 1, 5)!=0) {
printf("reading junk data\n");
read(joydev, buf, 10);
}
joypad = new JoyPad( index, joydev );
joypads.insert(index,joypad);
}
else {
joypad = joypads[index];
joypad->resetToDev(joydev);
}
//make this joystick device available.
available.insert(index,joypad);
}
else {
int errsv = errno;
printf("%s\n", strerror(errsv));
}
}
//when it's all done, rebuild the popup menu so it displays the correct
//information.
fillPopup();
//the actual update process is handled by main.cpp, we just need to signal
//ourselves to do it.
//raise(SIGUSR1);
} }

View File

@ -1,110 +1,126 @@
#include "layout_edit.h" #include "layout_edit.h"
//build the dialog //build the dialog
LayoutEdit::LayoutEdit( LayoutManager* l ) { LayoutEdit::LayoutEdit( LayoutManager* l ) {
lm = l; lm = l;
setCaption( NAME ); setWindowTitle( NAME );
setIcon(QPixmap(ICON24)); setWindowIcon(QPixmap(ICON24));
LMain = new QVBoxLayout( this,5,5 ); LMain = new QVBoxLayout( this);
LMain->setSpacing(5);
LMain->setMargin(5);
QFrame* frame = new QFrame(this); QFrame* frame = new QFrame(this);
frame->setFrameStyle(QFrame::Box | QFrame::Sunken ); frame->setFrameStyle(QFrame::Box | QFrame::Sunken );
QGridLayout* g = new QGridLayout(frame,2,1,5,5); QGridLayout* g = new QGridLayout(frame);
CLayouts = new QComboBox(frame); g->setMargin(5);
connect( CLayouts, SIGNAL(activated( const QString& )), lm, SLOT(load(const QString&))); g->setSpacing(5);
g->addMultiCellWidget(CLayouts,0,0,0,3); CLayouts = new QComboBox(frame);
connect( CLayouts, SIGNAL(activated( const QString& )), lm, SLOT(load(const QString&)));
g->addWidget(CLayouts,0,0,1,4);
//most of these buttons can link directly into slots in the LayoutManager //most of these buttons can link directly into slots in the LayoutManager
BAdd = new QPushButton("Add", frame); BAdd = new QPushButton("Add", frame);
connect(BAdd, SIGNAL(clicked()), lm, SLOT(saveAs())); connect(BAdd, SIGNAL(clicked()), lm, SLOT(saveAs()));
g->addWidget(BAdd,1,0); g->addWidget(BAdd,1,0);
BRem = new QPushButton("Remove", frame); BRem = new QPushButton("Remove", frame);
connect(BRem, SIGNAL(clicked()), lm, SLOT(remove())); connect(BRem, SIGNAL(clicked()), lm, SLOT(remove()));
g->addWidget(BRem,1,1); g->addWidget(BRem,1,1);
BUpd = new QPushButton("Update", frame); BUpd = new QPushButton("Update", frame);
connect(BUpd, SIGNAL(clicked()), lm, SLOT(save())); connect(BUpd, SIGNAL(clicked()), lm, SLOT(save()));
g->addWidget(BUpd,1,2); g->addWidget(BUpd,1,2);
BRev = new QPushButton("Revert", frame); BRev = new QPushButton("Revert", frame);
connect(BRev, SIGNAL(clicked()), lm, SLOT(reload())); connect(BRev, SIGNAL(clicked()), lm, SLOT(reload()));
g->addWidget(BRev,1,3); g->addWidget(BRev,1,3);
LMain->addWidget( frame ); LMain->addWidget( frame );
//we have a WidgetStack to represent the multiple joypads //produce a list of names for the FlashRadioArray
PadStack = new QWidgetStack( this ); //this is only necesary since joystick devices need not always be
PadStack->setFrameStyle(QFrame::Box | QFrame::Sunken ); //contiguous
LMain->addWidget(PadStack); int padcount = available.count();
QString names[padcount];
int i = 0;
do
{
QHashIterator<int, JoyPad*> it( available );
while (it.hasNext())
{
it.next();
names[i] = it.value()->getName();
++i;
}
} while (0);
//produce a list of names for the FlashRadioArray //flash radio array
//this is only necesary since joystick devices need not always be JoyButtons = new FlashRadioArray(padcount, names, true, this );
//contiguous LMain->addWidget( JoyButtons );
int padcount = available.count();
QString names[padcount];
int i = 0;
QIntDictIterator<JoyPad> it( available );
for ( ; it.current(); ++it ) {
names[i] = it.current()->getName();
++i;
}
//flash radio array //we have a WidgetStack to represent the multiple joypads
JoyButtons = new FlashRadioArray(padcount, names, true, this ); PadStack = new QStackedWidget( this );
LMain->insertWidget( 1, JoyButtons ); PadStack->setFrameStyle(QFrame::Box | QFrame::Sunken );
LMain->addWidget(PadStack);
//go through each of the available joysticks //go through each of the available joysticks
i = 0; // i is the current index into PadStack i = 0; // i is the current index into PadStack
for (it.toFirst() ; it.current(); ++it ) { do
//add a new JoyPadWidget to the stack {
PadStack->addWidget( it.current()->widget(PadStack,i),i ); QHashIterator<int, JoyPad*> it(available);
//every time it "flashes", flash the associated tab. while (it.hasNext())
connect( PadStack->widget(i), SIGNAL( flashed( int ) ), JoyButtons, SLOT( flash( int ))); {
++i; it.next();
} //add a new JoyPadWidget to the stack
//whenever a new tab is selected, raise the appropriate JoyPadWidget PadStack->insertWidget( i,it.value()->widget(PadStack,i) );
connect( JoyButtons, SIGNAL( changed( int ) ), PadStack, SLOT( raiseWidget( int ))); //every time it "flashes", flash the associated tab.
connect( PadStack->widget(i), SIGNAL( flashed( int ) ), JoyButtons, SLOT( flash( int )));
++i;
}
} while (0);
//whenever a new tab is selected, raise the appropriate JoyPadWidget
connect( JoyButtons, SIGNAL( changed( int ) ), PadStack, SLOT( setCurrentIndex( int )));
updateLayoutList(); updateLayoutList();
//add the buttons at the bottom. //add the buttons at the bottom.
QHBoxLayout* h = new QHBoxLayout(0,0,5); QHBoxLayout* h = new QHBoxLayout(0);
QPushButton* close = new QPushButton( "-- Close Dialog --", this ); h->setMargin(0);
connect(close, SIGNAL(clicked()), this, SLOT(close())); h->setSpacing(5);
h->addWidget(close); QPushButton* close = new QPushButton( "-- Close Dialog --", this );
QPushButton* quit = new QPushButton( "-- Quit --", this ); connect(close, SIGNAL(clicked()), this, SLOT(close()));
connect( quit, SIGNAL( clicked() ), qApp, SLOT(quit())); h->addWidget(close);
h->addWidget(quit); QPushButton* quit = new QPushButton( "-- Quit --", this );
LMain->addLayout(h); connect( quit, SIGNAL( clicked() ), qApp, SLOT(quit()));
h->addWidget(quit);
LMain->addLayout(h);
} }
void LayoutEdit::setLayout(QString layout) { void LayoutEdit::setLayout(QString layout) {
//change the text, //change the text,
CLayouts->setCurrentText(layout); CLayouts->setItemText(CLayouts->currentIndex(), layout);
//update all the JoyPadWidgets. //update all the JoyPadWidgets.
for (uint i = 0; i < available.count(); i++) { for (uint i = 0; i < available.count(); i++) {
((JoyPadWidget*)PadStack->widget(i))->update(); ((JoyPadWidget*)PadStack->widget(i))->update();
} }
} }
void LayoutEdit::updateLayoutList() { void LayoutEdit::updateLayoutList() {
//blank the list, then load in new names from the LayoutManager. //blank the list, then load in new names from the LayoutManager.
CLayouts->clear(); CLayouts->clear();
QStringList layouts = lm->getLayoutNames(); QStringList layouts = lm->getLayoutNames();
//For some reason, insertStringList doesn't want to work for me! CLayouts->insertItems(-1, layouts);
for ( QStringList::Iterator it = layouts.begin(); it != layouts.end(); ++it ) { CLayouts->setCurrentIndex(layouts.indexOf(lm->CurrentLayout));
CLayouts->insertItem(*it);
}
CLayouts->setCurrentText(lm->CurrentLayout);
} }
void LayoutEdit::windowActivationChange( bool oldActive ) { void LayoutEdit::windowActivationChange( bool oldActive ) {
if (oldActive) return; if (oldActive) return;
//whenever the window becomes active, release all pressed buttons! This way
//whenever the window becomes active, release all pressed buttons! This way //you don't get any presses without releases to confuse things.
//you don't get any presses without releases to confuse things. QHashIterator<int, JoyPad*> it( available );
QIntDictIterator<JoyPad> it( available ); while (it.hasNext())
for ( ; it.current(); ++it ) { {
it.current()->release(); printf("iterating and releasing\n");
} it.next();
it.value()->release();
}
printf("done releasing!\n");
} }

View File

@ -1,11 +1,7 @@
#ifndef LAYOUT_EDIT_H #ifndef LAYOUT_EDIT_H
#define LAYOUT_EDIT_H #define LAYOUT_EDIT_H
//needed to build the dialog #include <QStackedWidget>
#include <qdialog.h>
#include <qlayout.h>
#include <qcombobox.h>
#include <qwidgetstack.h>
//for the tab list of joypads //for the tab list of joypads
#include "flash.h" #include "flash.h"
@ -32,15 +28,12 @@ class LayoutEdit : public QDialog {
//find out when the window is activated. //find out when the window is activated.
virtual void windowActivationChange( bool oldActive ); virtual void windowActivationChange( bool oldActive );
//parts of the dialog: //parts of the dialog:
QVBoxLayout *LMain; QVBoxLayout *LMain;
QWidgetStack *PadStack; QStackedWidget *PadStack;
FlashRadioArray *JoyButtons; FlashRadioArray *JoyButtons;
QComboBox* CLayouts; QComboBox* CLayouts;
QPushButton *BAdd, *BRem, *BUpd, *BRev; QPushButton *BAdd, *BRem, *BUpd, *BRev;
}; };
#endif #endif

View File

@ -1,22 +1,13 @@
#define MAIN #define MAIN
//to create a qapplication //to create a qapplication
#include <qapplication.h> #include <QFile>
//for basic file i/o and argument parsing
#include <qstring.h>
#include <qdir.h>
#include <qfile.h>
#include <qstringlist.h>
#include <qregexp.h>
//for ouput when there is no GUI going //for ouput when there is no GUI going
#include <stdio.h> #include <stdio.h>
//to create and handle signals for various events //to create and handle signals for various events
#include <signal.h> #include <signal.h>
//for our custom-made event loop
#include "loop.h"
//to load layouts //to load layouts
#include "layout.h" #include "layout.h"
//to give event.h the current X11 display //to give event.h the current X11 display
@ -25,95 +16,38 @@
#include "device.h" #include "device.h"
//to produce errors! //to produce errors!
#include "error.h" #include "error.h"
#include <QX11Info>
#include <poll.h>
#include <cstdlib>
//for making universally available variables //for making universally available variables
extern Display* display; //from event.h extern Display* display; //from event.h
QIntDict<JoyPad> available; //to device.h QHash<int, JoyPad*> available; //to device.h
QIntDict<JoyPad> joypads; //to device.h QHash<int, JoyPad*> joypads; //to device.h
QPtrList<Component> timerList; //to timer.h
//to be made available in timer.h
//they simply pass on the message to JoyLoop
void takeTimer( Component* c ) {
((JoyLoop*) qApp->eventLoop())->takeTimer( c );
}
void tossTimer( Component* c ) {
((JoyLoop*) qApp->eventLoop())->tossTimer( c );
}
//variables needed in various functions in this file //variables needed in various functions in this file
LayoutManager* lm; LayoutManager* lm;
QString devdir = DEVDIR; QString devdir = DEVDIR;
//update the joystick devices!
void buildJoyDevices() {
//reset all joydevs to sentinal value (-1)
QIntDictIterator<JoyPad> it( joypads );
for ( ; it.current(); ++it ) {
it.current()->unsetDev();
}
//clear out the list of previously available joysticks
available.clear();
//set all joydevs anew (create new JoyPad's if necesary)
QDir DeviceDir(devdir);
QStringList devices = DeviceDir.entryList("js*", QDir::System );
QRegExp devicename(".*\\js(\\d+)");
int joydev;
int index;
//for every joystick device in the directory listing...
//(note, with devfs, only available devices are listed)
for (QStringList::Iterator it = devices.begin(); it != devices.end(); ++it) {
//try opening the device.
joydev = open( devdir + "/" + (*it), O_RDONLY | O_NONBLOCK);
//if it worked, then we have a live joystick! Make sure it's properly
//setup.
if (joydev > 0) {
devicename.match(*it);
index = QString(devicename.cap(1)).toInt();
JoyPad* joypad;
//if we've never seen this device before, make a new one!
if (joypads[index] == 0) {
joypad = new JoyPad( index, joydev );
joypads.insert(index,joypad);
}
else {
joypad = joypads[index];
joypad->resetToDev(joydev);
}
//make this joystick device available.
available.insert(index,joypad);
}
}
//when it's all done, rebuild the popup menu so it displays the correct
//information.
lm->fillPopup();
}
//signal handler for SIGIO //signal handler for SIGIO
//SIGIO means that a new layout should be loaded. It is saved in //SIGIO means that a new layout should be loaded. It is saved in
// ~/.qjoypad/layout, where the last used layout is put. // ~/.qjoypad/layout, where the last used layout is put.
void catchSIGIO( int sig ) void catchSIGIO( int sig )
{ {
lm->load(); lm->load();
//remember to catch this signal again next time. //remember to catch this signal again next time.
signal( sig, catchSIGIO ); signal( sig, catchSIGIO );
} }
//signal handler for SIGUSR1 //signal handler for SIGUSR1
//SIGUSR1 means that we should update the available joystick device list. //SIGUSR1 means that we should update the available joystick device list.
void catchSIGUSR1( int sig ){ void catchSIGUSR1( int sig ) {
buildJoyDevices(); //buildJoyDevices();
//remember to catch this signal again next time. lm->updateJoyDevs();
signal( sig, catchSIGUSR1 ); //remember to catch this signal again next time.
signal( sig, catchSIGUSR1 );
} }
@ -128,151 +62,151 @@ void catchSIGUSR2( int sig ) {
int main( int argc, char **argv ) int main( int argc, char **argv )
{ {
//create a new event loop. This will be captured by the QApplication //create a new event loop. This will be captured by the QApplication
//when it gets created //when it gets created
JoyLoop loop;
QApplication a( argc, argv ); QApplication a( argc, argv );
//where to look for settings. If it does not exist, it will be created //where to look for settings. If it does not exist, it will be created
QDir dir(settingsDir); QDir dir(settingsDir);
//if there is no new directory and we can't make it, complain //if there is no new directory and we can't make it, complain
if (!dir.exists() && !dir.mkdir(settingsDir)) { if (!dir.exists() && !dir.mkdir(settingsDir)) {
printf("Couldn't create the QJoyPad save directory (" + settingsDir + ")!"); printf("Couldn't create the QJoyPad save directory (%s)!", settingsDir.toStdString().c_str());
return 1; return 1;
} }
//start out with no special layout. //start out with no special layout.
QString layout = ""; QString layout = "";
//by default, we use a tray icon //by default, we use a tray icon
bool useTrayIcon = true; bool useTrayIcon = true;
//this execution wasn't made to update the joystick device list. //this execution wasn't made to update the joystick device list.
bool update = false; bool update = false;
//parse command-line options //parse command-line options
for (int i = 1; i < a.argc(); i++) { for (int i = 1; i < a.argc(); i++) {
//if a device directory was specified, //if a device directory was specified,
if (QRegExp("-{1,2}device").exactMatch(a.argv()[i])) { if (QRegExp("-{1,2}device").exactMatch(a.argv()[i])) {
++i; ++i;
if (i < a.argc()) { if (i < a.argc()) {
if (QFile::exists(a.argv()[i])) { if (QFile::exists(a.argv()[i])) {
devdir = a.argv()[i]; devdir = a.argv()[i];
} }
else { else {
error("Command Line Argument Problems", "No such directory: " + QString(a.argv()[i])); error("Command Line Argument Problems", "No such directory: " + QString(a.argv()[i]));
continue; continue;
} }
} }
} }
//if no-tray mode was requested, //if no-tray mode was requested,
else if (QRegExp("-{1,2}notray").exactMatch(a.argv()[i])) { else if (QRegExp("-{1,2}notray").exactMatch(a.argv()[i])) {
useTrayIcon = false; useTrayIcon = false;
} }
//if this execution is just meant to update the joystick devices, //if this execution is just meant to update the joystick devices,
else if (QRegExp("-{1,2}update").exactMatch(a.argv()[i])) { else if (QRegExp("-{1,2}update").exactMatch(a.argv()[i])) {
update = true; update = true;
} }
//if help was requested, //if help was requested,
else if (QRegExp("-{1,2}h(elp)?").exactMatch(a.argv()[i])) { else if (QRegExp("-{1,2}h(elp)?").exactMatch(a.argv()[i])) {
printf(NAME"\nUsage: qjoypad [--device \"/device/path\"] [--notray] [\"layout name\"]\n\nOptions:\n --device path Look for joystick devices in \"path\". This should\n be something like \"/dev/input\" if your game\n devices are in /dev/input/js0, /dev/input/js1, etc.\n --notray Do not use a system tray icon. This is useful for\n window managers that don't support this feature.\n --update Force a running instance of QJoyPad to update its\n list of devices and layouts.\n \"layout name\" Load the given layout in an already running\n instance of QJoyPad, or start QJoyPad using the\n given layout.\n"); printf(NAME"\nUsage: qjoypad [--device \"/device/path\"] [--notray] [\"layout name\"]\n\nOptions:\n --device path Look for joystick devices in \"path\". This should\n be something like \"/dev/input\" if your game\n devices are in /dev/input/js0, /dev/input/js1, etc.\n --notray Do not use a system tray icon. This is useful for\n window managers that don't support this feature.\n --update Force a running instance of QJoyPad to update its\n list of devices and layouts.\n \"layout name\" Load the given layout in an already running\n instance of QJoyPad, or start QJoyPad using the\n given layout.\n");
return 1; return 1;
} }
//in all other cases, an argument is assumed to be a layout name. //in all other cases, an argument is assumed to be a layout name.
//note: only the last layout name given will be used. //note: only the last layout name given will be used.
else layout = a.argv()[i]; else layout = a.argv()[i];
} }
//if the user specified a layout to use, //if the user specified a layout to use,
if (layout != "") if (layout != "")
{ {
//then we try to store that layout in the last-used layout spot, to be //then we try to store that layout in the last-used layout spot, to be
//loaded by default. //loaded by default.
QFile file( settingsDir + "layout"); QFile file( settingsDir + "layout");
if (file.open(IO_WriteOnly)) if (file.open(QIODevice::WriteOnly))
{ {
QTextStream stream( &file ); QTextStream stream( &file );
stream << layout; stream << layout;
file.close(); file.close();
} }
} }
//create a pid lock file. //create a pid lock file.
QFile pidFile( "/tmp/qjoypad.pid" ); QFile pidFile( "/tmp/qjoypad.pid" );
//if that file already exists, then qjoypad is already running! //if that file already exists, then qjoypad is already running!
if (pidFile.exists()) if (pidFile.exists())
{ {
int pid; int pid;
if (pidFile.open( IO_ReadOnly )); if (pidFile.open( QIODevice::ReadOnly ));
{ {
//try to get that pid... //try to get that pid...
QTextStream( &pidFile ) >> pid; QTextStream( &pidFile ) >> pid;
pidFile.close(); pidFile.close();
//if we can signal the pid (ie, if the process is active) //if we can signal the pid (ie, if the process is active)
if (kill(pid,0) == 0) if (kill(pid,0) == 0)
{ {
//then prevent two instances from running at once. //then prevent two instances from running at once.
//however, if we are setting the layout or updating the device //however, if we are setting the layout or updating the device
//list, this is not an error and we shouldn't make one! //list, this is not an error and we shouldn't make one!
if (layout == "" && update == false) error("Instance Error","There is already a running instance of QJoyPad; please close\nthe old instance before starting a new one."); if (layout == "" && update == false) error("Instance Error","There is already a running instance of QJoyPad; please close\nthe old instance before starting a new one.");
else { else {
//if one of these is the case, send the approrpriate signal! //if one of these is the case, send the approrpriate signal!
if (update == true) if (update == true)
kill(pid,SIGUSR1); kill(pid,SIGUSR1);
if (layout != "") if (layout != "")
kill(pid,SIGIO); kill(pid,SIGIO);
} }
//and quit. We don't need two instances. //and quit. We don't need two instances.
return 0; return 0;
} }
} }
} }
//now we can try to create and write our pid to the lock file. //now we can try to create and write our pid to the lock file.
if (pidFile.open( IO_WriteOnly )) if (pidFile.open( QIODevice::WriteOnly ))
{ {
QTextStream( &pidFile ) << getpid(); QTextStream( &pidFile ) << getpid();
pidFile.close(); pidFile.close();
} }
//prepare the signal handlers //prepare the signal handlers
signal( SIGIO, catchSIGIO ); signal( SIGIO, catchSIGIO );
signal( SIGUSR1, catchSIGUSR1 ); signal( SIGUSR1, catchSIGUSR1 );
// signal( SIGUSR2, catchSIGUSR2 ); // signal( SIGUSR2, catchSIGUSR2 );
//capture the current display for event.h //capture the current display for event.h
display = QPaintDevice::x11AppDisplay(); display = QX11Info::display();
//create a new LayoutManager with a tray icon / floating icon, depending //create a new LayoutManager with a tray icon / floating icon, depending
//on the user's request //on the user's request
lm = new LayoutManager(useTrayIcon); lm = new LayoutManager(useTrayIcon);
//build the joystick device list for the first time, //build the joystick device list for the first time,
buildJoyDevices(); //buildJoyDevices();
lm->updateJoyDevs();
//load the last used layout (Or the one given as a command-line argument) //load the last used layout (Or the one given as a command-line argument)
lm->load(); lm->load();
//and run the program! //and run the program!
int result = a.exec(); int result = a.exec();
//when everything is done, save the current layout for next time... //when everything is done, save the current layout for next time...
lm->saveDefault(); lm->saveDefault();
//remove the lock file... //remove the lock file...
pidFile.remove(); pidFile.remove();
//and terminate! //and terminate!
return result; return result;
} }

Binary file not shown.

View File

@ -1,89 +0,0 @@
########################################
# #
# QMake project file for QJoyPad #
# #
########################################
##### Setup Targets #####
target.path = $$PREFIX/bin
icons.path = $$PREFIX/share/pixmaps/qjoypad
icons.extra = cp ../icons/* $${icons.path}; cd $${icons.path}; ln -sf gamepad4-24x24.png icon24.png; ln -sf gamepad3-64x64.png icon64.png; chmod -R a+r $${icons.path}
doc.path = $$PREFIX/doc/qjoypad3
doc.extra = cp ../README.txt ../LICENSE.txt $${doc.path}
##### Setup Compile #####
DEFINES += DEVDIR='"$$DEVDIR"'
DEFINES += ICON24='"$${icons.path}/icon24.png"'
DEFINES += ICON64='"$${icons.path}/icon64.png"'
TEMPLATE = app
DEPENDPATH += trayicon
INCLUDEPATH += . trayicon
QMAKE_LIBS += -lXtst
# Input
HEADERS += axis.h \
axis_edit.h \
axisw.h \
button.h \
button_edit.h \
buttonw.h \
component.h \
constant.h \
device.h \
error.h \
event.h \
flash.h \
icon.h \
joypad.h \
joypadw.h \
joyslider.h \
keycode.h \
layout.h \
layout_edit.h \
loop.h \
quickset.h \
timer.h \
trayicon/trayicon.h
SOURCES += axis.cpp \
axis_edit.cpp \
axisw.cpp \
button.cpp \
button_edit.cpp \
buttonw.cpp \
event.cpp \
flash.cpp \
icon.cpp \
joypad.cpp \
joypadw.cpp \
joyslider.cpp \
keycode.cpp \
layout.cpp \
layout_edit.cpp \
loop.cpp \
main.cpp \
quickset.cpp \
trayicon/trayicon.cpp \
trayicon/trayicon_x11.cpp
##### Install #####
INSTALLS += target icons doc

View File

@ -1,54 +1,59 @@
#include "quickset.h" #include "quickset.h"
#include "getkey.h"
//build the dialog //build the dialog
QuickSet::QuickSet( JoyPad* jp) QuickSet::QuickSet( JoyPad* jp)
: QDialog(){ : QDialog() {
setting = false; setting = false;
joypad = jp; joypad = jp;
setCaption("Quick set " + joypad->getName()); setWindowTitle("Set " + jp->getName());
QVBoxLayout* LMain = new QVBoxLayout(this,5,5); QVBoxLayout* LMain = new QVBoxLayout(this);
LMain->setAutoAdd(true); LMain->setMargin(5);
LMain->setSpacing(5);
//LMain->setAutoAdd(true);
new QLabel("Press any button or axis and\nyou will be prompted for a key.",this); QLabel *temp = new QLabel("Press any button or axis and\nyou will be prompted for a key.",this);
QPushButton* button = new QPushButton("Done",this); LMain->addWidget(temp);
connect( button, SIGNAL(clicked()), this, SLOT(accept())); QPushButton* button = new QPushButton("Done",this);
LMain->addWidget(button);
connect( button, SIGNAL(clicked()), this, SLOT(accept()));
} }
void QuickSet::jsevent( js_event msg ) { void QuickSet::jsevent( js_event msg ) {
//ignore any joystick events if we're waiting for a keypress //ignore any joystick events if we're waiting for a keypress
if (setting) return; if (setting) return;
//if a button was pressed on the joystick //if a button was pressed on the joystick
if (msg.type == JS_EVENT_BUTTON) { if (msg.type == JS_EVENT_BUTTON) {
//capture that button. //capture that button.
Button* button = joypad->Buttons[msg.number]; Button* button = joypad->Buttons[msg.number];
//go into setting mode and request a key/mousebutton //go into setting mode and request a key/mousebutton
setting = true; setting = true;
int code = GetKey(button->getName(), true).exec(); int code = GetKey(button->getName(), true).exec();
setting = false; setting = false;
//if a mouse button was used, //if a mouse button was used,
if (code > MOUSE_OFFSET) if (code > MOUSE_OFFSET)
//then tell it to the Button a mouse button //then tell it to the Button a mouse button
button->setKey(true, code - MOUSE_OFFSET); button->setKey(true, code - MOUSE_OFFSET);
else else
//otherwise, tell it to use a keycode. //otherwise, tell it to use a keycode.
button->setKey(false, code); button->setKey(false, code);
} }
else { else {
//require a signal strength of at least 5000 to consider an axis moved. //require a signal strength of at least 5000 to consider an axis moved.
if (abs(msg.value) < 5000) return; if (abs(msg.value) < 5000) return;
//capture the axis that moved //capture the axis that moved
Axis* axis = joypad->Axes[msg.number]; Axis* axis = joypad->Axes[msg.number];
//grab a keycode for that axis and that direction //grab a keycode for that axis and that direction
setting = true; setting = true;
int code = GetKey(axis->getName() + ", " + QString((msg.value > 0)?"positive":"negative"), false).exec(); int code = GetKey(axis->getName() + ", " + QString((msg.value > 0)?"positive":"negative"), false).exec();
setting = false; setting = false;
//assign the key to the axis. //assign the key to the axis.
axis->setKey((msg.value > 0),code); axis->setKey((msg.value > 0),code);
} }
} }