pegasus/weechat
1
0
Fork 0
mirror of https://github.com/weechat/weechat.git synced 2026-06-29 01:25:41 +02:00
Code Activity

core: remove Gtk interface (obsolete sources not working)

Browse Source
This commit is contained in:
Sebastien Helleu
2013-02-17 15:47:52 +01:00
parent bc079b007d
commit 4e4fd3f54d
19 changed files with 2 additions and 2554 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
-1
View File
@@ -47,4 +47,3 @@ weechat.pc
stamp*
src/gui/curses/weechat-curses
src/gui/gtk/weechat-gtk
CMakeLists.txt
-2
View File
@@ -64,7 +64,6 @@ ELSE(DEFINED INCLUDEDIR)
ENDIF(DEFINED INCLUDEDIR)
OPTION(ENABLE_NCURSES "Enable Ncurses interface" ON)
OPTION(ENABLE_GTK "Enable GTK interface" OFF)
OPTION(ENABLE_NLS "Enable Native Language Support" ON)
OPTION(ENABLE_GNUTLS "Enable SSLv3/TLS support" ON)
OPTION(ENABLE_LARGEFILE "Enable Large File Support" ON)
@@ -157,7 +156,6 @@ SET(CPACK_SOURCE_IGNORE_FILES "/\\\\.git" "/build/" "/m4/"
"/ltmain\\\\.sh$" "/\\\\.deps/" "/html/" "/html1/" "/Makefile$"
"/Makefile\\\\.in$" "stamp" "/po/.*\\\\.header$" "\\\\.gmo$" "~$" "\\\\.o$"
"\\\\.lo$" "\\\\.a$" "\\\\.la$" "\\\\.lai$" "\\\\.Plo$" "/weechat-curses$"
"/weechat-gtk$"
)
INCLUDE(CPack)
configure.in
+1 -25
View File
@@ -124,7 +124,6 @@ AH_VERBATIM([WEECHAT_HOME], [#define WEECHAT_HOME "~/.weechat"])
# Arguments for ./configure
AC_ARG_ENABLE(ncurses, [ --disable-ncurses turn off ncurses interface (default=compiled if found)],enable_ncurses=$enableval,enable_ncurses=yes)
AC_ARG_ENABLE(gtk, [ --enable-gtk turn on Gtk interface (default=off)],enable_gtk=$enableval,enable_gtk=no)
AC_ARG_ENABLE(gnutls, [ --disable-gnutls turn off gnutls support (default=compiled if found)],enable_gnutls=$enableval,enable_gnutls=yes)
AC_ARG_ENABLE(largefile, [ --disable-largefile turn off Large File Support (default=on)],enable_largefile=$enableval,enable_largefile=yes)
AC_ARG_ENABLE(alias, [ --disable-alias turn off Alias plugin (default=compiled)],enable_alias=$enableval,enable_alias=yes)
@@ -207,24 +206,6 @@ else
not_asked="$not_asked ncurses"
fi
if test "x$enable_gtk" = "xyes" ; then
AM_PATH_GTK_2_0(2.4.0, LIBGTK_FOUND=1, LIBGTK_FOUND=0)
if test "$LIBGTK_FOUND" = "0" ; then
AC_MSG_WARN([
*** Gtk library not found!
*** WeeChat will be built without Gtk support.])
enable_gtk="no"
not_found="$not_found gtk"
else
GTK_CFLAGS=`pkg-config --cflags gtk+-2.0`
GTK_LFLAGS=`pkg-config --libs gtk+-2.0`
AC_SUBST(GTK_CFLAGS)
AC_SUBST(GTK_LFLAGS)
fi
else
not_asked="$not_asked gtk"
fi
# ------------------------------------------------------------------------------
# iconv
# ------------------------------------------------------------------------------
@@ -1072,7 +1053,6 @@ AM_CONDITIONAL(HAVE_GNUTLS, test "$enable_gnutls" = "yes")
AM_CONDITIONAL(HAVE_FLOCK, test "$enable_flock" = "yes")
AM_CONDITIONAL(HAVE_EAT_NEWLINE_GLITCH, test "$enable_eatnewlineglitch" = "yes")
AM_CONDITIONAL(GUI_NCURSES, test "$enable_ncurses" = "yes")
AM_CONDITIONAL(GUI_GTK, test "$enable_gtk" = "yes")
AM_CONDITIONAL(PLUGIN_ALIAS, test "$enable_alias" = "yes")
AM_CONDITIONAL(PLUGIN_ASPELL, test "$enable_aspell" = "yes")
AM_CONDITIONAL(PLUGIN_CHARSET, test "$enable_charset" = "yes")
@@ -1124,7 +1104,6 @@ AC_OUTPUT([Makefile
src/plugins/xfer/Makefile
src/gui/Makefile
src/gui/curses/Makefile
src/gui/gtk/Makefile
intl/Makefile
po/Makefile.in])
@@ -1136,14 +1115,11 @@ listgui=""
if test "x$enable_ncurses" = "xyes" ; then
listgui="$listgui ncurses"
fi
if test "x$enable_gtk" = "xyes" ; then
listgui="$listgui gtk"
fi
if test "x$listgui" = "x" ; then
AC_MSG_ERROR([
*** No interface specified...
*** Please enable at least ncurses or gtk.])
*** Please enable at least ncurses.])
fi
listplugins=""
doc/en/weechat_dev.en.txt
-10
View File
@@ -51,7 +51,6 @@ The main WeeChat directories are:
| core/ | Core functions: entry point, internal structures
| gui/ | Functions for buffers, windows, ... (used by all interfaces)
| curses/ | Curses interface
| gtk/ | Gtk interface (not working)
| plugins/ | Plugin and scripting API
| alias/ | Alias plugin
| aspell/ | Aspell plugin
@@ -145,15 +144,6 @@ WeeChat "core" reside in following directories:
| gui-curses-mouse.c | Mouse
| gui-curses-term.c | Functions about terminal
| gui-curses-window.c | Windows
| gtk/ | Gtk interface (not working)
| gui-gtk-bar-window.c | Display in bar windows
| gui-gtk-chat.c | Display in chat area (messages)
| gui-gtk-color.c | Color functions
| gui-gtk-key.c | Keyboard functions
| gui-gtk-main.c | WeeChat main loop (waiting for keyboard/network events)
| gui-gtk-mouse.c | Mouse
| gui-gtk-term.c | Functions about terminal
| gui-gtk-window.c | Windows
|========================================
[[sources_plugins]]
po/POTFILES.in
-8
View File
@@ -50,14 +50,6 @@
./src/gui/curses/gui-curses-main.c
./src/gui/curses/gui-curses-mouse.c
./src/gui/curses/gui-curses-window.c
./src/gui/gtk/gui-gtk-bar-window.c
./src/gui/gtk/gui-gtk-chat.c
./src/gui/gtk/gui-gtk-color.c
./src/gui/gtk/gui-gtk.h
./src/gui/gtk/gui-gtk-key.c
./src/gui/gtk/gui-gtk-main.c
./src/gui/gtk/gui-gtk-mouse.c
./src/gui/gtk/gui-gtk-window.c
./src/gui/gui-bar.c
./src/gui/gui-bar.h
./src/gui/gui-bar-item.c
po/srcfiles.cmake
-8
View File
@@ -51,14 +51,6 @@ SET(WEECHAT_SOURCES
./src/gui/curses/gui-curses-main.c
./src/gui/curses/gui-curses-mouse.c
./src/gui/curses/gui-curses-window.c
./src/gui/gtk/gui-gtk-bar-window.c
./src/gui/gtk/gui-gtk-chat.c
./src/gui/gtk/gui-gtk-color.c
./src/gui/gtk/gui-gtk.h
./src/gui/gtk/gui-gtk-key.c
./src/gui/gtk/gui-gtk-main.c
./src/gui/gtk/gui-gtk-mouse.c
./src/gui/gtk/gui-gtk-window.c
./src/gui/gui-bar.c
./src/gui/gui-bar.h
./src/gui/gui-bar-item.c
src/gui/CMakeLists.txt
-4
View File
@@ -45,7 +45,3 @@ ADD_LIBRARY(weechat_gui_common STATIC ${LIB_GUI_COMMON_SRC})
IF(ENABLE_NCURSES)
SUBDIRS( curses )
ENDIF(ENABLE_NCURSES)
IF(ENABLE_GTK)
ADD_SUBDIRECTORY( gtk )
ENDIF(ENABLE_GTK)
src/gui/Makefile.am
+1 -5
View File
@@ -65,10 +65,6 @@ if GUI_NCURSES
curses_dir=curses
endif
if GUI_GTK
gtk_dir=gtk
endif
SUBDIRS = . $(curses_dir) $(gtk_dir)
SUBDIRS = . $(curses_dir)
EXTRA_DIST = CMakeLists.txt
src/gui/gtk/CMakeLists.txt
-72
View File
@@ -1,72 +0,0 @@
#
# Copyright (C) 2003-2013 Sebastien Helleu <flashcode@flashtux.org>
# Copyright (C) 2007 Julien Louis <ptitlouis@sysif.net>
#
# This file is part of WeeChat, the extensible chat client.
#
# WeeChat 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 3 of the License, or
# (at your option) any later version.
#
# WeeChat 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 WeeChat. If not, see <http://www.gnu.org/licenses/>.
#
SET(WEECHAT_GTK_SRC
gui-gtk.h
gui-gtk-bar-window.c
gui-gtk-chat.c
gui-gtk-color.c
gui-gtk-key.c
gui-gtk-main.c
gui-gtk-mouse.c
gui-gtk-term.c
gui-gtk-window.c)
SET(EXECUTABLE weechat-gtk)
FIND_PACKAGE(PkgConfig)
IF(PKG_CONFIG_FOUND)
pkg_check_modules(GTK2 gtk+-x11-2.0)
IF(GTK2_FOUND)
INCLUDE_DIRECTORIES( ${GTK2_INCLUDE_DIRS} )
LIST(APPEND EXTRA_LIBS ${GTK2_LIBRARIES})
# ELSE(GTK2_FOUND)
# MESSAGE(FATAL_ERROR "Missing dependency, aborting configuration phase")
ENDIF(GTK2_FOUND)
ENDIF(PKG_CONFIG_FOUND)
IF(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
IF(HAVE_BACKTRACE)
LIST(APPEND EXTRA_LIBS "execinfo")
ENDIF(HAVE_BACKTRACE)
ENDIF(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
IF(${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD")
LIST(APPEND EXTRA_LIBS "pthread")
ENDIF(${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD")
IF(ICONV_LIBRARY)
LIST(APPEND EXTRA_LIBS ${ICONV_LIBRARY})
ENDIF(ICONV_LIBRARY)
IF(LIBINTL_LIBRARY)
LIST(APPEND EXTRA_LIBS ${LIBINTL_LIBRARY})
ENDIF(LIBINTL_LIBRARY)
LIST(APPEND EXTRA_LIBS ${CURL_LIBRARIES})
ADD_EXECUTABLE(${EXECUTABLE} ${WEECHAT_GTK_SRC})
INCLUDE_DIRECTORIES(.. ../../core ../../plugins)
# Because of a linker bug, we have to link 2 times with libweechat_core.a
TARGET_LINK_LIBRARIES(${EXECUTABLE} ${STATIC_LIBS} ${EXTRA_LIBS} ${STATIC_LIBS})
INSTALL(TARGETS ${EXECUTABLE} RUNTIME DESTINATION bin)
src/gui/gtk/Makefile.am
-46
View File
@@ -1,46 +0,0 @@
#
# Copyright (C) 2003-2013 Sebastien Helleu <flashcode@flashtux.org>
#
# This file is part of WeeChat, the extensible chat client.
#
# WeeChat 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 3 of the License, or
# (at your option) any later version.
#
# WeeChat 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 WeeChat. If not, see <http://www.gnu.org/licenses/>.
#
INCLUDES = -DLOCALEDIR=\"$(datadir)/locale\" $(GTK_CFLAGS)
bin_PROGRAMS = weechat-gtk
# Because of a linker bug, we have to link 2 times with lib_weechat_core.a
# (and it must be 2 different path/names to be kept by linker)
weechat_gtk_LDADD = ./../../core/lib_weechat_core.a \
../../plugins/lib_weechat_plugins.a \
../lib_weechat_gui_common.a \
../../core/lib_weechat_core.a \
$(PLUGINS_LFLAGS) \
$(GTK_LFLAGS) \
$(GCRYPT_LFLAGS) \
$(GNUTLS_LFLAGS) \
$(CURL_LFLAGS)
weechat_gtk_SOURCES = gui-gtk-bar-window.c \
gui-gtk-chat.c \
gui-gtk-color.c \
gui-gtk-key.c \
gui-gtk-main.c \
gui-gtk-mouse.c \
gui-gtk-term.c \
gui-gtk-window.c \
gui-gtk.h
EXTRA_DIST = CMakeLists.txt
src/gui/gtk/gui-gtk-bar-window.c
-122
View File
File diff suppressed because it is too large Load Diff
src/gui/gtk/gui-gtk-chat.c
-371
View File
File diff suppressed because it is too large Load Diff
src/gui/gtk/gui-gtk-color.c
-357
View File
File diff suppressed because it is too large Load Diff
src/gui/gtk/gui-gtk-key.c
-56
View File
@@ -1,56 +0,0 @@
/*
* gui-gtk-keyboard.c - keyboard functions for Gtk GUI
*
* Copyright (C) 2003-2013 Sebastien Helleu <flashcode@flashtux.org>
*
* This file is part of WeeChat, the extensible chat client.
*
* WeeChat 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 3 of the License, or
* (at your option) any later version.
*
* WeeChat 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 WeeChat. If not, see <http://www.gnu.org/licenses/>.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <stdlib.h>
#include <string.h>
#include "../../core/weechat.h"
#include "../../core/wee-utf8.h"
#include "../../plugins/plugin.h"
#include "../gui-key.h"
#include "../gui-buffer.h"
#include "gui-gtk.h"
/*
* Creates default key bindings.
*/
void
gui_key_default_bindings (int context)
{
/* TODO: write this function for Gtk */
(void) context;
}
/*
* Reads keyboard chars.
*/
void
gui_key_read ()
{
/* TODO: write this function for Gtk */
}
src/gui/gtk/gui-gtk-main.c
-284
View File
File diff suppressed because it is too large Load Diff
src/gui/gtk/gui-gtk-mouse.c
-104
View File
File diff suppressed because it is too large Load Diff
src/gui/gtk/gui-gtk-term.c
-35
View File
@@ -1,35 +0,0 @@
/*
* gui-gtk-term.c - terminal functions for Gtk GUI
*
* Copyright (C) 2011-2013 Sebastien Helleu <flashcode@flashtux.org>
*
* This file is part of WeeChat, the extensible chat client.
*
* WeeChat 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 3 of the License, or
* (at your option) any later version.
*
* WeeChat 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 WeeChat. If not, see <http://www.gnu.org/licenses/>.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
/*
* Not used in Gtk GUI.
*/
void
gui_term_set_eat_newline_glitch (int value)
{
/* make C compiler happy */
(void) value;
}
src/gui/gtk/gui-gtk-window.c
-935
View File
File diff suppressed because it is too large Load Diff
src/gui/gtk/gui-gtk.h
-109
View File
File diff suppressed because it is too large Load Diff