diff --git a/.gitignore b/.gitignore index 6e854898..0d7d7f30 100644 --- a/.gitignore +++ b/.gitignore @@ -34,7 +34,6 @@ src/Makefile.in src/key_converter.c src/tilda stamp-h1 -tilda-config.h tilda-config.h.in tilda-config.h.in~ tilda.desktop diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 00000000..bc217d8a --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,42 @@ +project(tilda C) +cmake_minimum_required(VERSION 2.8) + +#=========================================================== +IF(NOT(CMAKE_C_FLAGS)) + SET(CMAKE_C_FLAGS "-Wall -Wformat -Wformat-security -Wextra -Wshadow -Wmissing-prototypes -Wmissing-declarations -pedantic") +ENDIF(NOT(CMAKE_C_FLAGS)) +#=========================================================== +SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cMake") + +FIND_PACKAGE(glib2 REQUIRED) +FIND_PACKAGE(GTK3 REQUIRED) + +SET(_VTE_VERSION_NUM 2.90) +FIND_PACKAGE(VTE REQUIRED) + +FIND_PACKAGE(confuse REQUIRED) + +#=========================================================== +INCLUDE_DIRECTORIES(${GLIB2_INCLUDE_DIRS} ${GTK3_INCLUDE_DIRS} ${VTE_INCLUDE_DIRS} ${CONFUSE_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/src) +LINK_DIRECTORIES(${GTK3_LIBRARY_DIRS}) +#=========================================================== +SET(BINDIR ${CMAKE_INSTALL_PREFIX}/bin) +SET(DATADIR ${CMAKE_INSTALL_PREFIX}/share/tilda) +SET(PIXMAPSDIR ${CMAKE_INSTALL_PREFIX}/share/tilda/pixmaps) + +CONFIGURE_FILE(tilda.desktop.in ${CMAKE_BINARY_DIR}/tilda.desktop) +INSTALL(FILES "${CMAKE_BINARY_DIR}/tilda.desktop" DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications) +INSTALL(FILES "${CMAKE_SOURCE_DIR}/tilda.png" DESTINATION ${PIXMAPSDIR}/) +INSTALL(FILES "${CMAKE_SOURCE_DIR}/tilda.glade" DESTINATION ${DATADIR}/) +#=========================================================== +INCLUDE(po) +COMPILE_PO_FILES(${CMAKE_SOURCE_DIR}/po MO_FILES) +#=========================================================== +ADD_DEFINITIONS(${GTK3_DEFINITIONS}) +ADD_DEFINITIONS(-DPACKAGE_NAME="Tilda") +ADD_DEFINITIONS(-DPACKAGE_VERSION="1.5.1") +ADD_DEFINITIONS(-DDATADIR="${DATADIR}") + +#=========================================================== +ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/src) +#=========================================================== diff --git a/Makefile.am b/Makefile.am deleted file mode 100644 index aab7f06b..00000000 --- a/Makefile.am +++ /dev/null @@ -1,34 +0,0 @@ -## Process this file with automake to produce to Makefile.in -# vim: set ts=8 sts=8 sw=8: - -AUTOMAKE_OPTIONS = gnu - -SUBDIRS = po m4 src - -DISTCLEANFILES = tilda.desktop - -MAINTAINER_CLEAN_FILES = Makefile \ - src/Makefile \ - config.log \ - config.status \ - stamp-h1 \ - tilda-config.h - -maintainer-clean-generic: - -rm $(MAINTAINER_CLEAN_FILES) - -Applicationsdir = ${datadir}/applications -Applications_DATA = tilda.desktop - -Pixmapsdir = ${datadir}/pixmaps -Pixmaps_DATA = tilda.png - -data_DATA = tilda.glade - -EXTRA_DIST = tilda.desktop.in tilda.png tilda.glade - -tilda.desktop: tilda.desktop.in - sed -e 's|\@BINDIR\@|$(bindir)|' \ - -e 's|\@PIXMAPSDIR\@|$(datadir)/applications|' $< > $@ - -ACLOCAL_AMFLAGS = -I m4 diff --git a/autogen.sh b/autogen.sh deleted file mode 100755 index a4597925..00000000 --- a/autogen.sh +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/sh - -# This was borrowed from Gaim (see gaim.sf.net) and modified -# for our purposes. Thanks guys! - -echo "This will do all the autotools stuff so that you can build" -echo "tilda successfully. It will also call the ./configure script" -echo "and pass on any options which you passed to this script" -echo "See ./configure --help to know which options are available" -echo -echo "When it is finished, take the usual steps to install:" -echo "make" -echo "make install" -echo - -(automake --version) < /dev/null > /dev/null 2>&1 || { - echo; - echo "You must have automake installed to compile tilda"; - echo; - exit; -} - -(autoconf --version) < /dev/null > /dev/null 2>&1 || { - echo; - echo "You must have autoconf installed to compile tilda"; - echo; - exit; -} - -echo "Generating configuration files for tilda, please wait..." -echo; - -# Autoconf will call run autopoint, aclocal, autoconf, autoheader and automake -# to setup and configure the build environment -autoreconf --verbose --install --symlink --force || { - echo; - echo "autoreconf has encountered an error." - echo; - exit $? -} -# Afterwards we invoke the configure skript, "$@" will contain the arguments that -# were passed to this skript. - -echo -echo "Running configure now" -echo -./configure "$@" diff --git a/cMake/FindGTK3.cmake b/cMake/FindGTK3.cmake new file mode 100644 index 00000000..595a253a --- /dev/null +++ b/cMake/FindGTK3.cmake @@ -0,0 +1,50 @@ +# Downloaded from https://github.com/ambientsound/bylarm/blob/master/FindGTK3.cmake +# - Try to find GTK3 +# +# $Id$ +# +# Once done this will define +# +# GTK3_FOUND - System has GTK3 +# GTK3_INCLUDE_DIRS - The GTK3 include directory +# GTK3_LIBRARIES - The libraries needed to use GTK3 +# GTK3_DEFINITIONS - Compiler switches required for using GTK3 +#============================================================================= +# Copyright 2011 Duncan Mac-Vicar P. +# +# Distributed under the OSI-approved BSD License (the "License"); +# see accompanying file Copyright.txt for details. +# +# This software is distributed WITHOUT ANY WARRANTY; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# See the License for more information. +#============================================================================= +# (To distribute this file outside of CMake, substitute the full +# License text for the above reference.) + +# use pkg-config to get the directories and then use these values +# in the FIND_PATH() and FIND_LIBRARY() calls +FIND_PACKAGE(PkgConfig) +PKG_CHECK_MODULES(PC_GTK3 gtk+-3.0 QUIET) +SET(GTK3_DEFINITIONS ${PC_GTK3_CFLAGS_OTHER}) + +FIND_PATH(GTK3_INCLUDE_DIR NAMES "gtk/gtk.h" + HINTS + ${PC_GTK3_INCLUDEDIR} + ${PC_GTK3_INCLUDE_DIRS} + PATH_SUFFIXES "gtk-3.0" + ) +SET(GTK3_INCLUDE_DIRS ${PC_GTK3_INCLUDE_DIRS}) + +FIND_LIBRARY(GTK3_LIBRARIES NAMES gtk-3 gtk3 + HINTS + ${PC_GTK3_LIBDIR} + ${PC_GTK3_LIBRARY_DIRS} + ) + +# handle the QUIETLY and REQUIRED arguments and set GTK3_FOUND to TRUE if +# all listed variables are TRUE +INCLUDE(FindPackageHandleStandardArgs) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(GTK3 DEFAULT_MSG GTK3_LIBRARIES GTK3_INCLUDE_DIRS) + +MARK_AS_ADVANCED(GTK3_INCLUDE_DIRS GTK3_LIBRARIES) diff --git a/cMake/FindVTE.cmake b/cMake/FindVTE.cmake new file mode 100644 index 00000000..e1326bb1 --- /dev/null +++ b/cMake/FindVTE.cmake @@ -0,0 +1,47 @@ +# Downloaded from https://github.com/FreeRDP/Remmina/blob/master/cmake/FindVTE.cmake +# +# Remmina - The GTK+ Remote Desktop Client +# +# Copyright (C) 2011 Marc-Andre Moreau +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, +# Boston, MA 02111-1307, USA. + +if(NOT _VTE_VERSION_NUM) + set(_VTE_LIB_NAME vte) + set(_VTE_VERSION vte) +else() + set(_VTE_LIB_NAME vte${_VTE_VERSION_NUM}) + set(_VTE_VERSION vte-${_VTE_VERSION_NUM}) +endif() + +string(REPLACE . _ _VTE_LIB_NAME ${_VTE_LIB_NAME}) + +pkg_check_modules(PC_VTE ${_VTE_VERSION}) + +find_path(VTE_INCLUDE_DIR NAMES vte/vte.h + HINTS ${PC_VTE_INCLUDEDIR} ${PC_VTE_INCLUDE_DIRS} + PATH_SUFFIXES ${_VTE_VERSION}) + +find_library(VTE_LIBRARY NAMES ${_VTE_LIB_NAME}) + +include(FindPackageHandleStandardArgs) + +find_package_handle_standard_args(VTE DEFAULT_MSG VTE_LIBRARY VTE_INCLUDE_DIR) + +set(VTE_LIBRARIES ${VTE_LIBRARY}) +set(VTE_INCLUDE_DIRS ${VTE_INCLUDE_DIR}) + +mark_as_advanced(VTE_INCLUDE_DIR VTE_LIBRARY) diff --git a/cMake/Findconfuse.cmake b/cMake/Findconfuse.cmake new file mode 100644 index 00000000..291ac173 --- /dev/null +++ b/cMake/Findconfuse.cmake @@ -0,0 +1,24 @@ +# Downloaded https://code.google.com/p/cloudscribe/source/browse/trunk/cmake/FindConfuse.cmake?spec=svn2&r=2 +# +# - Find CONFUSEapi +# This module defines +# CONFUSE_INCLUDE_DIR, where to find LibEvent headers +# CONFUSE_LIBS, CONFUSE libraries +# CONFUSE_FOUND, If false, do not try to use ant + +find_path(CONFUSE_INCLUDE_DIR confuse.h PATHS + /usr/local/include +) + +set(CONFUSE_LIB_PATHS /usr/local/lib /opt/CONFUSE-dev/lib) +find_library(CONFUSE_LIB NAMES confuse PATHS ${CONFUSE_LIB_PATHS}) + +if (CONFUSE_LIB AND CONFUSE_INCLUDE_DIR) + set(CONFUSE_FOUND TRUE) + set(CONFUSE_LIBS ${CONFUSE_LIB}) +else () + set(CONFUSE_FOUND FALSE) +endif () + + +FIND_PACKAGE_HANDLE_STANDARD_ARGS(confuse DEFAULT_MSG CONFUSE_LIB CONFUSE_INCLUDE_DIR) diff --git a/cMake/Findglib2.cmake b/cMake/Findglib2.cmake new file mode 100644 index 00000000..52b33820 --- /dev/null +++ b/cMake/Findglib2.cmake @@ -0,0 +1,218 @@ +# Downloaded from http://opensource.bolloretelecom.eu/projects/boc-wimax/browser/cmake/modules/FindGLIB2.cmake?rev=8f5b254534bd304923d4cc7bc7e9d6552c119ea2 +# - Try to find GLib2 +# Once done this will define +# +# GLIB2_FOUND - system has GLib2 +# GLIB2_INCLUDE_DIRS - the GLib2 include directory +# GLIB2_LIBRARIES - Link these to use GLib2 +# +# HAVE_GLIB_GREGEX_H glib has gregex.h header and +# supports g_regex_match_simple +# +# Copyright (c) 2006 Andreas Schneider +# Copyright (c) 2006 Philippe Bernery +# Copyright (c) 2007 Daniel Gollub +# Copyright (c) 2007 Alban Browaeys +# Copyright (c) 2008 Michael Bell +# Copyright (c) 2008 Bjoern Ricks +# +# Redistribution and use is allowed according to the terms of the New +# BSD license. +# For details see the accompanying COPYING-CMAKE-SCRIPTS file. +# + + +IF (GLIB2_LIBRARIES AND GLIB2_INCLUDE_DIRS ) + # in cache already + SET(GLIB2_FOUND TRUE) +ELSE (GLIB2_LIBRARIES AND GLIB2_INCLUDE_DIRS ) + + INCLUDE(FindPkgConfig) + + ## Glib + IF ( GLIB2_FIND_REQUIRED ) + SET( _pkgconfig_REQUIRED "REQUIRED" ) + ELSE ( GLIB2_FIND_REQUIRED ) + SET( _pkgconfig_REQUIRED "" ) + ENDIF ( GLIB2_FIND_REQUIRED ) + + IF ( GLIB2_MIN_VERSION ) + PKG_SEARCH_MODULE( GLIB2 ${_pkgconfig_REQUIRED} glib-2.0>=${GLIB2_MIN_VERSION} ) + ELSE ( GLIB2_MIN_VERSION ) + PKG_SEARCH_MODULE( GLIB2 ${_pkgconfig_REQUIRED} glib-2.0 ) + ENDIF ( GLIB2_MIN_VERSION ) + IF ( PKG_CONFIG_FOUND ) + IF ( GLIB2_FOUND ) + SET ( GLIB2_CORE_FOUND TRUE ) + ELSE ( GLIB2_FOUND ) + SET ( GLIB2_CORE_FOUND FALSE ) + ENDIF ( GLIB2_FOUND ) + ENDIF ( PKG_CONFIG_FOUND ) + + # Look for glib2 include dir and libraries w/o pkgconfig + IF ( NOT GLIB2_FOUND AND NOT PKG_CONFIG_FOUND ) + FIND_PATH( + _glibconfig_include_DIR + NAMES + glibconfig.h + PATHS + /opt/gnome/lib64 + /opt/gnome/lib + /opt/lib/ + /opt/local/lib + /sw/lib/ + /usr/lib64 + /usr/lib + /usr/local/include + ${CMAKE_LIBRARY_PATH} + PATH_SUFFIXES + glib-2.0/include + ) + + FIND_PATH( + _glib2_include_DIR + NAMES + glib.h + PATHS + /opt/gnome/include + /opt/local/include + /sw/include + /usr/include + /usr/local/include + PATH_SUFFIXES + glib-2.0 + ) + + #MESSAGE(STATUS "Glib headers: ${_glib2_include_DIR}") + + FIND_LIBRARY( + _glib2_link_DIR + NAMES + glib-2.0 + glib + PATHS + /opt/gnome/lib + /opt/local/lib + /sw/lib + /usr/lib + /usr/local/lib + ) + IF ( _glib2_include_DIR AND _glib2_link_DIR ) + SET ( _glib2_FOUND TRUE ) + ENDIF ( _glib2_include_DIR AND _glib2_link_DIR ) + + + IF ( _glib2_FOUND ) + SET ( GLIB2_INCLUDE_DIRS ${_glib2_include_DIR} ${_glibconfig_include_DIR} ) + SET ( GLIB2_LIBRARIES ${_glib2_link_DIR} ) + SET ( GLIB2_CORE_FOUND TRUE ) + ELSE ( _glib2_FOUND ) + SET ( GLIB2_CORE_FOUND FALSE ) + ENDIF ( _glib2_FOUND ) + + # Handle dependencies + # libintl + IF ( NOT LIBINTL_FOUND ) + FIND_PATH(LIBINTL_INCLUDE_DIR + NAMES + libintl.h + PATHS + /opt/gnome/include + /opt/local/include + /sw/include + /usr/include + /usr/local/include + ) + + FIND_LIBRARY(LIBINTL_LIBRARY + NAMES + intl + PATHS + /opt/gnome/lib + /opt/local/lib + /sw/lib + /usr/local/lib + /usr/lib + ) + + IF (LIBINTL_LIBRARY AND LIBINTL_INCLUDE_DIR) + SET (LIBINTL_FOUND TRUE) + ENDIF (LIBINTL_LIBRARY AND LIBINTL_INCLUDE_DIR) + ENDIF ( NOT LIBINTL_FOUND ) + + # libiconv + IF ( NOT LIBICONV_FOUND ) + FIND_PATH(LIBICONV_INCLUDE_DIR + NAMES + iconv.h + PATHS + /opt/gnome/include + /opt/local/include + /opt/local/include + /sw/include + /sw/include + /usr/local/include + /usr/include + PATH_SUFFIXES + glib-2.0 + ) + + FIND_LIBRARY(LIBICONV_LIBRARY + NAMES + iconv + PATHS + /opt/gnome/lib + /opt/local/lib + /sw/lib + /usr/lib + /usr/local/lib + ) + + IF (LIBICONV_LIBRARY AND LIBICONV_INCLUDE_DIR) + SET (LIBICONV_FOUND TRUE) + ENDIF (LIBICONV_LIBRARY AND LIBICONV_INCLUDE_DIR) + ENDIF ( NOT LIBICONV_FOUND ) + + IF (LIBINTL_FOUND) + SET (GLIB2_LIBRARIES ${GLIB2_LIBRARIES} ${LIBINTL_LIBRARY}) + SET (GLIB2_INCLUDE_DIRS ${GLIB2_INCLUDE_DIRS} ${LIBINTL_INCLUDE_DIR}) + ENDIF (LIBINTL_FOUND) + + IF (LIBICONV_FOUND) + SET (GLIB2_LIBRARIES ${GLIB2_LIBRARIES} ${LIBICONV_LIBRARY}) + SET (GLIB2_INCLUDE_DIRS ${GLIB2_INCLUDE_DIRS} ${LIBICONV_INCLUDE_DIR}) + ENDIF (LIBICONV_FOUND) + + ENDIF ( NOT GLIB2_FOUND AND NOT PKG_CONFIG_FOUND ) + ## + + IF (GLIB2_CORE_FOUND AND GLIB2_INCLUDE_DIRS AND GLIB2_LIBRARIES) + SET (GLIB2_FOUND TRUE) + ENDIF (GLIB2_CORE_FOUND AND GLIB2_INCLUDE_DIRS AND GLIB2_LIBRARIES) + + IF (GLIB2_FOUND) + IF (NOT GLIB2_FIND_QUIETLY) + MESSAGE (STATUS "Found GLib2: ${GLIB2_LIBRARIES} ${GLIB2_INCLUDE_DIRS}") + ENDIF (NOT GLIB2_FIND_QUIETLY) + ELSE (GLIB2_FOUND) + IF (GLIB2_FIND_REQUIRED) + MESSAGE (SEND_ERROR "Could not find GLib2") + ENDIF (GLIB2_FIND_REQUIRED) + ENDIF (GLIB2_FOUND) + + # show the GLIB2_INCLUDE_DIRS and GLIB2_LIBRARIES variables only in the advanced view + MARK_AS_ADVANCED(GLIB2_INCLUDE_DIRS GLIB2_LIBRARIES) + MARK_AS_ADVANCED(LIBICONV_INCLUDE_DIR LIBICONV_LIBRARY) + MARK_AS_ADVANCED(LIBINTL_INCLUDE_DIR LIBINTL_LIBRARY) + +ENDIF (GLIB2_LIBRARIES AND GLIB2_INCLUDE_DIRS) + +IF ( GLIB2_FOUND ) + # Check if system has a newer version of glib + # which supports g_regex_match_simple + INCLUDE( CheckIncludeFiles ) + SET( CMAKE_REQUIRED_INCLUDES ${GLIB2_INCLUDE_DIRS} ) + CHECK_INCLUDE_FILES ( glib/gregex.h HAVE_GLIB_GREGEX_H ) + # Reset CMAKE_REQUIRED_INCLUDES + SET( CMAKE_REQUIRED_INCLUDES "" ) +ENDIF( GLIB2_FOUND ) diff --git a/cMake/po.cmake b/cMake/po.cmake new file mode 100644 index 00000000..cf482071 --- /dev/null +++ b/cMake/po.cmake @@ -0,0 +1,43 @@ +# Downloaded https://github.com/neuschaefer/gtkpod/blob/master/cmake/Po.cmake +# +# a small macro to create mo files out of po's +# Taken from sim-im.org + +MACRO(FIND_MSGFMT) + IF(NOT MSGFMT_EXECUTABLE) + IF(NOT MSGFMT_NOT_FOUND) + SET(MSGFMT_NAME "msgfmt") + FIND_PROGRAM(MSGFMT_EXECUTABLE ${MSGFMT_NAME}) + + IF (NOT MSGFMT_EXECUTABLE) + MESSAGE(STATUS "WARNING: ${MSGFMT_NAME} not found - po files can't be processed") + SET(MSGFMT_NOT_FOUND "1") # to avoid double checking in one cmake run + ENDIF (NOT MSGFMT_EXECUTABLE) + + MARK_AS_ADVANCED(MSGFMT_EXECUTABLE) + ENDIF(NOT MSGFMT_NOT_FOUND) + ENDIF(NOT MSGFMT_EXECUTABLE) +ENDMACRO(FIND_MSGFMT) + +MACRO(COMPILE_PO_FILES po_subdir _sources) + FIND_MSGFMT() + + IF(MSGFMT_EXECUTABLE) + FILE(GLOB po_files ${po_subdir}/*.po) + + FOREACH(po_input ${po_files}) + GET_FILENAME_COMPONENT(_in ${po_input} ABSOLUTE) + GET_FILENAME_COMPONENT(_basename ${po_input} NAME_WE) + + FILE(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/locale/${_basename}") + GET_FILENAME_COMPONENT(_out "${CMAKE_CURRENT_BINARY_DIR}/locale/${_basename}/${CMAKE_PROJECT_NAME}.mo" ABSOLUTE) + + EXECUTE_PROCESS(COMMAND ${MSGFMT_EXECUTABLE} ${_in} -o ${_out}) + SET(mo_files ${mo_files} ${_out}) + + INSTALL(FILES ${_out} DESTINATION "${CMAKE_INSTALL_PREFIX}/share/locale/${_basename}/LC_MESSAGES") + ENDFOREACH(po_input ${po_files}) + + SET(${_sources} ${${_sources}} ${mo_files}) + ENDIF(MSGFMT_EXECUTABLE) +ENDMACRO(COMPILE_PO_FILES) diff --git a/configure.ac b/configure.ac deleted file mode 100644 index d2340a21..00000000 --- a/configure.ac +++ /dev/null @@ -1,92 +0,0 @@ -# Autoconf file for tilda -# -*- Autoconf -*- -# Process this file with autoconf to produce a configure script. - -AC_PREREQ([2.68]) -AC_INIT([Tilda],[1.1.5],[https://github.com/lanoxx/tilda/issues],[tilda],[https://github.com/lanoxx/tilda]) -AM_INIT_AUTOMAKE - -# We are going to use silent builds which have a much -# nicer output. More information can be foudn here: -# https://live.gnome.org/GnomeGoals/NicerBuilds -m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) - -AC_CONFIG_SRCDIR([src/tilda.c]) -AC_CONFIG_HEADERS([tilda-config.h:tilda-config.h.in]) - -# This will initialize the internationalization -# capabilities of glib (glib/gi18n.h) and gettext -AM_GNU_GETTEXT_VERSION([0.18.1]) -AM_GNU_GETTEXT([external]) - -# See http://www.gnu.org/savannah-checkouts/gnu/automake/manual/html_node/maintainer_002dmode.html -# for an explanation of using this macro. The short explanation is: -# AM_MAINTAINER_MODE is bad but -# AM_MAINTAINER_MODE([enable]) is good -AM_MAINTAINER_MODE([enable]) - -# This registeres the option '--enable-maintainer-flags' to the ./configure script -# If this option is set then it activates both the '--enable-debug' and '--enable-debug-functions' -# options that are defined below. It also activates several flags to the compile such that it -# will show more warnings and errors to indicate problems in the source code. -AC_ARG_ENABLE([maintainer-flags], - [AS_HELP_STRING([--enable-maintainer-flags],[enable extra debugging (don't use as user)])]) - -#' This comment fixes syntax highlighting - -if test "x$enable_maintainer_flags" = "xyes"; then - enable_debug="yes" - enable_debug_functions="yes" - CFLAGS="$CFLAGS -Wall -Wextra -pedantic -fno-common -Wstrict-aliasing=2" - CFLAGS="$CFLAGS -Wshadow -Wmissing-prototypes -Wmissing-declarations" -fi - -# This registers the option '--enable-debug' in the ./configure script -# If this option is set, then the the options -g and -ggdb will be -# passed to the compiler. -AC_ARG_ENABLE([debug], [AS_HELP_STRING([--enable-debug],[enable extra debugging output])]) - -if test "x$enable_debug" = "xyes"; then - AC_DEFINE([DEBUG], [1], [Enable extra debugging output]) - CFLAGS="$CFLAGS -g -ggdb" -fi - -# This registers the option '--debug-functions' in the ./configure script -# If this option is set, then the name of each entered function will be -# printed on the shell. -AC_ARG_ENABLE([debug-functions], [AS_HELP_STRING([--enable-debug-functions],[enable function call tracing])]) - -if test "x$enable_debug_functions" = "xyes"; then - AC_DEFINE([DEBUG_FUNCTIONS], [1], [Enable function call tracing]) -fi - -# Checks for programs. -AC_PROG_CC -AM_PROG_CC_C_O - -# Checks for libraries. -PKG_PROG_PKG_CONFIG -PKG_CHECK_MODULES([GTK], [gtk+-3.0 >= 3.0.0]) -PKG_CHECK_MODULES([VTE], [vte-2.90]) -PKG_CHECK_MODULES([LIBCONFUSE], [libconfuse]) - -# Checks for header files. -AC_PATH_X -AC_HEADER_STDC -AC_CHECK_HEADERS([fcntl.h malloc.h stdlib.h string.h strings.h sys/ioctl.h unistd.h confuse.h]) - -# Checks for typedefs, structures, and compiler characteristics. -AC_C_CONST -AC_TYPE_PID_T -AC_TYPE_SIZE_T - -# Checks for library functions. -AC_FUNC_MALLOC -AC_FUNC_STRTOD -AC_CHECK_FUNCS([mkdir strcasecmp strchr strncasecmp strstr strtol]) - -AC_CONFIG_FILES([Makefile - src/Makefile - m4/Makefile - po/Makefile.in]) -AC_OUTPUT diff --git a/debian/README.Debian b/debian/README.Debian new file mode 100644 index 00000000..59d4ed83 --- /dev/null +++ b/debian/README.Debian @@ -0,0 +1,12 @@ +tilda for Debian +---------------- + +KEYBINDING: + To specify the keybinding use the Configuration Wizard, a useful "key-catcher" + will help you to set the proper keys. + +WEB-URL-LAUNCHER: + You can open urls in your favorite browser a click on the URL. + + + -- Sebastian Geiger Sat, 23 Feb 2013 12:06:09 +0100 diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 00000000..f43d70cd --- /dev/null +++ b/debian/changelog @@ -0,0 +1,107 @@ +tilda (1.1.4-1) unstable; urgency=low + + * New upstream release (Closes: #695574, #692904) + * Added a watch file (Closes: #501739) + * Use x-www-browser as default (Closes: #552505) + * Use word characters setting, thanks to Liu Yubao + (Closes: #506855) + * Remove deprecated dpatch and upgrade to packaging format "3.0 quilt" + and update to Standards-Version to 3.9.3 and debhelper to 9, + thanks to Jari Aalto (Closes: #664358) + * New maintainer (Sebastian Geiger), thanks to Davide Truffa for his + previous work (Closes: #583248) + * Update tilda.desktop file to be compatible with freedesktop.org, + thanks to Jekyll Wu (Closes: #678129) + + -- Sebastian Geiger Sat, 23 Feb 2013 12:06:09 +0100 +tilda (0.09.6-2) unstable; urgency=low + + * Fix "segfaults on startup" with 03_gtk_window_realize.dpatch + (Closes: #550123) + + -- Filippo Giunchedi Sat, 17 Oct 2009 19:26:52 +0100 + +tilda (0.09.6-1) unstable; urgency=low + + [ Davide Truffa ] + * New upstream release (Closes: #461123, #483722) + - updated italian translation + * debian/control + - updated Standard-Version to 3.8.0 + - updated debhelper to >= 6 + - removed build-depend on automake and cvs + - added Homepage field + * debian/compat + - updated debhelper compat level to 6 + + [ Filippo Giunchedi ] + * Fix "segfaults on startup" + (Closes: #550123) + + -- Filippo Giunchedi Sat, 17 Oct 2009 19:26:42 +0100 + +tilda (0.09.4+cvs20071012-1) unstable; urgency=high + + * New upstream release from CVS snapshot 20071012 (Closes: #446745, #432111) + - removed old patch + - added 01_general-fixes.patch to debianize this CVS snapshot + - new build depends on: automake, cvs, flex, libglade2-dev + - updated copyright file + - updated README.Debian + * Added Italian translation (02_italian-translation.dpatch) + * Updated menu structure + + -- Davide Truffa Sun, 11 Nov 2007 21:28:51 +0100 + +tilda (0.09.4-4) unstable; urgency=low + + * Fixed error when pulldown animation is inactivated (Closes: #430194) + - (new 01_segfault-fix.dpatch) + * Improved web-link launcher + - (now use ctrl+click to open urls) + * Added "/usr/share/doc/tilda/README.Debian" (Closes: #422235) + - (explain how to configure special keys) + + -- Davide Truffa Thu, 29 Jun 2007 19:32:43 +0200 + +tilda (0.09.4-3) unstable; urgency=low + + * Added web-link launcher + (patch by Davide Truffa) + + -- Davide Truffa Mon, 11 Jun 2007 21:19:59 +0200 + +tilda (0.09.4-2) unstable; urgency=low + + * Fixed segfaults when wrong keybinding (Closes: #336013). + (patch from Launchpad) + * New man page. + + -- Davide Truffa Tue, 24 Apr 2007 18:37:14 +0200 + +tilda (0.09.4-1) unstable; urgency=low + + * New upstream release (Closes: #391405). + + -- Davide Truffa Sat, 14 Apr 2007 14:24:56 +0200 + +tilda (0.09.2-1) unstable; urgency=low + + * New upstream release. + * Fixed black-on-black font/background bug (Closes: #347628). + + -- David Moreno Garza Fri, 21 Apr 2006 11:57:24 -0500 + +tilda (0.09.1-2) unstable; urgency=low + + * Correcting wrong information on manpage. + - Closes: #345343. + + -- David Moreno Garza Fri, 30 Dec 2005 13:04:32 -0600 + +tilda (0.09.1-1) unstable; urgency=low + + * Initial release. + + -- David Moreno Garza Sat, 8 Oct 2005 15:39:29 -0500 + diff --git a/debian/compat b/debian/compat new file mode 100644 index 00000000..ec635144 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +9 diff --git a/debian/control b/debian/control new file mode 100644 index 00000000..51f59162 --- /dev/null +++ b/debian/control @@ -0,0 +1,28 @@ +Source: tilda +Section: x11 +Priority: extra +Maintainer: Sebastian Geiger +Build-Depends: + cmake, + debhelper (>= 9), + libconfuse-dev, + libglib2.0-dev, + libgtk-3-dev, + libvte-2.90-dev +Standards-Version: 3.9.4 +Homepage: http://github.com/lanoxx/tilda +Vcs-Git: git://github.com/lanoxx/tilda.git +Vcs-Browser: https://github.com/lanoxx/tilda/tree/tilda-debian-1-1 + +Package: tilda +Architecture: any +Depends: + ${misc:Depends}, + ${shlibs:Depends} +Description: Gtk based drop down terminal for Linux and Unix + Tilda is a terminal emulator similar to normal terminals like + gnome-terminal (GNOME) or Konsole (KDE), with the difference + that it drops down from the edge of a screen when a certain + hotkey is pressed. This is similar to the build in consoles in + games such as Quake or Half-live. Tilda is highly configureable + through a graphical wizard. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 00000000..3f157a89 --- /dev/null +++ b/debian/copyright @@ -0,0 +1,37 @@ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: tilda +Upstream-Contact: Sebastian Geiger +Source: https://github.com/lanoxx/tilda + +Files: * +Copyright: 2004-2012, Tristan Sloughter , Ira Snyder + 2007-2008, Ken Dryer + 2012-2013, Sebastian Geiger +License: GPL-2+ + +Files: debian/* +Copyright: 2004-2013, Davide Truffa + 2013, Sebastian Geiger +License: GPL-2+ + +License: GPL-2+ + This program is free software; you can redistribute it + and/or modify it under the terms of the GNU General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later + version. + . + This program is distributed in the hope that it will be + useful, but WITHOUT ANY WARRANTY; without even the implied + warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + PURPOSE. See the GNU General Public License for more + details. + . + You should have received a copy of the GNU General Public + License along with this package; if not, write to the Free + Software Foundation, Inc., 51 Franklin St, Fifth Floor, + Boston, MA 02110-1301 USA + . + On Debian systems, the full text of the GNU General Public + License version 2 can be found in the file + `/usr/share/common-licenses/GPL-2'. diff --git a/debian/docs b/debian/docs new file mode 100644 index 00000000..5502ed8f --- /dev/null +++ b/debian/docs @@ -0,0 +1,3 @@ +NEWS +README +TODO diff --git a/debian/rules b/debian/rules new file mode 100755 index 00000000..ce2eb52b --- /dev/null +++ b/debian/rules @@ -0,0 +1,4 @@ +#!/usr/bin/make -f + +%: + dh $@ --parallel diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 00000000..163aaf8d --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian/tilda.1 b/debian/tilda.1 new file mode 100644 index 00000000..784217ec --- /dev/null +++ b/debian/tilda.1 @@ -0,0 +1,95 @@ +.TH "TILDA" "1" "June 2008" "tilda 0.09.6" "User Commands" +.SH "NAME" +tilda \- first person shooter console likeness terminal +.SH "DESCRIPTION" +\fBTilda\fR is a terminal emulator taking after the likeness of many classic +terminals from first person shooter games, Quake, Doom and Half\-Life +(to name a few), where the terminal has no border and is hidden from +the desktop until a key is pressed. +.SS "Usage:" +.IP +tilda [OPTION...] +.SS "Help Options:" +.TP +\fB\-?\fR, \fB\-\-help\fR +Show help options +.TP +\fB\-\-help\-all\fR +Show all help options +.TP +\fB\-\-help\-gtk\fR +Show GTK+ Options +.SS "Application Options:" +.TP +\fB\-a\fR, \fB\-\-antialias\fR +Use Antialiased Fonts +.TP +\fB\-b\fR, \fB\-\-background\-color\fR +Set the background color +.TP +\fB\-c\fR, \fB\-\-command\fR +Run a command at startup +.TP +\fB\-h\fR, \fB\-\-hidden\fR +Start Tilda hidden +.TP +\fB\-f\fR, \fB\-\-font\fR +Set the font to the following string +.TP +\fB\-l\fR, \fB\-\-lines\fR +Scrollback Lines +.TP +\fB\-s\fR, \fB\-\-scrollbar\fR +Use Scrollbar +.TP +\fB\-t\fR, \fB\-\-transparency\fR +Opaqueness: 0\-100% +.TP +\fB\-v\fR, \fB\-\-version\fR +Print the version, then exit +.TP +\fB\-w\fR, \fB\-\-working\-dir\fR +Set Initial Working Directory +.TP +\fB\-x\fR, \fB\-\-x\-pos\fR +X Position +.TP +\fB\-y\fR, \fB\-\-y\-pos\fR +Y Position +.TP +\fB\-B\fR, \fB\-\-image\fR +Set Background Image +.TP +\fB\-C\fR, \fB\-\-config\fR +Show Configuration Wizard +.TP +\fB\-\-display\fR=\fIDISPLAY\fR +X display to use +.SH "COPYRIGHT" +Copyright \(co 2005,2008 Tristan Sloughter (sloutri@iit.edu) +.br +Copyright \(co 2005,2008 Ira W. Snyder (tilda@irasnyder.com) +.br +Copyright \(co 2007,2008 Ken Dreyer (kdreyer@chicagolug.org) +.PP +This program comes with ABSOLUTELY NO WARRANTY. +This is free software, and you are welcome to redistribute it +under certain conditions. See the file COPYING for details. +.SH "SEE ALSO" +The full documentation for +.B tilda +is maintained as a Texinfo manual. If the +.B info +and +.B tilda +programs are properly installed at your site, the command +.IP +.B info tilda +.PP +should give you access to the complete manual. +.SH "BUGS" +Please report it using +.B "reportbug tilda" +.SH "AUTHOR" +Davide Truffa wrote this manpage for +inclusion on the Debian Project but it could be used for others. diff --git a/debian/tilda.manpages b/debian/tilda.manpages new file mode 100644 index 00000000..394169cc --- /dev/null +++ b/debian/tilda.manpages @@ -0,0 +1 @@ +debian/tilda.1 diff --git a/debian/watch b/debian/watch new file mode 100644 index 00000000..59ed7e1e --- /dev/null +++ b/debian/watch @@ -0,0 +1,3 @@ +version=3 +https://github.com/lanoxx/tilda/tags .*/tilda-(.+)\.(?:tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz))) + diff --git a/m4/Makefile.am b/m4/Makefile.am deleted file mode 100644 index e69de29b..00000000 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt new file mode 100644 index 00000000..72b19f42 --- /dev/null +++ b/src/CMakeLists.txt @@ -0,0 +1,3 @@ +ADD_EXECUTABLE(tilda callback_func.c configsys.c eggaccelerators.c key_grabber.c tilda.c tilda_terminal.c tilda_window.c tomboykeybinder.c wizard.c xerror.c) +TARGET_LINK_LIBRARIES(tilda ${GLIB2_LIBRARIES} ${GTK3_LIBRARIES} ${VTE_LIBRARIES} ${CONFUSE_LIB}) +INSTALL(TARGETS tilda DESTINATION ${CMAKE_INSTALL_PREFIX}/bin) diff --git a/src/Makefile.am b/src/Makefile.am deleted file mode 100644 index d9facd6e..00000000 --- a/src/Makefile.am +++ /dev/null @@ -1,48 +0,0 @@ -## Process this file with automake to produce Makefile.in -# vim: set ts=8 sts=8 sw=8: - -AUTOMAKE_OPTIONS = gnu - -# Define a C macro LOCALEDIR indicating where catalogs -# will be installed. -#localedir = $(datadir)/locale -DEFS = -DLOCALEDIR=\"$(localedir)\" -DDATADIR=\"$(datadir)\" @DEFS@ - -bin_PROGRAMS = tilda - -# Keep the headers here so that make dist-bzip2 works -tilda_SOURCES = callback_func.h callback_func.c \ - configsys.h configsys.c \ - debug.h \ - eggaccelerators.h eggaccelerators.c \ - key_grabber.h key_grabber.c \ - tilda.h tilda.c \ - tilda_terminal.h tilda_terminal.c \ - tilda_window.h tilda_window.c \ - tomboykeybinder.h tomboykeybinder.c \ - wizard.h wizard.c \ - xerror.h xerror.c - -tilda_CFLAGS = $(AM_CFLAGS) \ - $(GTK_CFLAGS) \ - $(LIBGLADE_CFLAGS) \ - $(VTE_CFLAGS) \ - $(LIBCONFUSE_CFLAGS) - -tilda_LDFLAGS = $(AM_LDFLAGS) \ - $(GTK_LDFLAGS) \ - $(LIBGLADE_LDFLAGS) \ - $(VTE_LDFLAGS) \ - $(LIBCONFUSE_LDFLAGS) - -tilda_LDADD = $(AM_LDADD) \ - $(GTK_LIBS) \ - $(LIBGLADE_LIBS) \ - $(VTE_LIBS) \ - $(LIBCONFUSE_LIBS) \ - $(LTLIBINTL) \ - $(LEXLIB) - -maintainer-clean-generic: - -rm Makefile.in - diff --git a/src/debug.h b/src/debug.h index 11d7c0d2..3f52a8bb 100644 --- a/src/debug.h +++ b/src/debug.h @@ -18,8 +18,6 @@ #ifndef DEBUG_H #define DEBUG_H -#include - #include #include diff --git a/src/tilda-config.h b/src/tilda-config.h new file mode 100644 index 00000000..f9aa35ed --- /dev/null +++ b/src/tilda-config.h @@ -0,0 +1 @@ +#define TILDA_VERSION PACKAGE_NAME " " PACKAGE_VERSION