Skip to content

Commit

Permalink
ski: drop all of gtk support code
Browse files Browse the repository at this point in the history
The interfase is stuck on gtk2 gnome libraries. It does not provide much
details besides looking at the register values. Let's drop it.
  • Loading branch information
trofi committed Jul 4, 2024
1 parent 8ebe0cb commit 6cd6e33
Show file tree
Hide file tree
Showing 12 changed files with 6 additions and 1,669 deletions.
3 changes: 1 addition & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,5 @@ Makefile
.dirstamp
/src/bski
/src/fake-xterm/ski-fake-xterm
/src/gski
/src/ski
/ski-bootloader/ski-bootloader
/ski-bootloader/ski-bootloader
3 changes: 0 additions & 3 deletions INSTALL
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,6 @@ Some optional features require extra depepdencies:
* DWARF support:
* libbfd library (from binutils)
* unwind library (like libunwind)
* GTK support:
* libglade
* libgnomeui
* Motif support
* motif
* libX11
Expand Down
4 changes: 0 additions & 4 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,3 @@ install-exec-hook:
$(LN_S) -f ski.1 $(DESTDIR)/$(mandir)/man1/bski.1;
$(LN_S) -f ski $(DESTDIR)/$(bindir)/bskinc;
$(LN_S) -f ski.1 $(DESTDIR)/$(mandir)/man1/bskinc.1;
if WITH_GTK_INTERFACE
$(LN_S) -f ski $(DESTDIR)/$(bindir)/gski
$(LN_S) -f ski.1 $(DESTDIR)/$(mandir)/man1/gski.1
endif
13 changes: 0 additions & 13 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -66,19 +66,6 @@ AC_DEFINE_UNQUOTED([PAGER], ["$PAGER"], [Define to the pager program.])
dnl Initialize maintainer mode
AM_MAINTAINER_MODE

dnl See if we build GTK
AC_ARG_WITH([gtk],
AS_HELP_STRING([--with-gtk],
[Enable building the GTK Ski interface default=no]))

AS_IF([test "x$with_gtk" = "xyes"], [
PKG_CHECK_MODULES([GSKI], [libglade-2.0 libgnomeui-2.0 >= 1.110.0])
AC_DEFINE(HAVE_GTK, 1, [define if you have GTK support])
])
AC_SUBST(GSKI_CFLAGS)
AC_SUBST(GSKI_LIBS)
AM_CONDITIONAL(WITH_GTK_INTERFACE, test "x$with_gtk" = "xyes")

dnl Check for host endianness
AC_CACHE_CHECK([whether host byte ordering is defined in sys/param.h],
ski_cv_c_bigendian_compile,
Expand Down
28 changes: 4 additions & 24 deletions src/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ AM_CPPFLAGS = \
-I$(srcdir)/encoder \
-I$(top_builddir)/src/encoder \
-I$(top_builddir)/src/decoder \
$(GSKI_CFLAGS) \
-DSKI_DATA_DIR=\"$(pkgdatadir)\"

bin_PROGRAMS = ski
Expand Down Expand Up @@ -287,8 +286,6 @@ ski_SOURCES = \
cur.h \
firmware.c \
firmware.h \
ssGtk.c \
ssGtk.h \
syscall_api.h \
asm.c \
$(EXPR_SCANNER_DERIVED) \
Expand All @@ -312,21 +309,13 @@ ski_SOURCES = \
encoder/encoder.h \
$(ENCODER_DERIVED)

if WITH_GTK_INTERFACE
# gski exports some callbacks to gski.glade for
# dynamic discovery.
ski_LDFLAGS=-Wl,--export-dynamic
endif

ski_LDADD = \
$(DWARF_LIBS) \
$(GSKI_LIBS)
$(DWARF_LIBS)

EXTRA_DIST = \
exec.incl.c \
ia_decoder.tmpl.c \
$(COMBFNS_FILES) \
$(gski_DATA) \
$(noinst_DATA) \
$(noinst_SCRIPTS) \
$(EXPR_SCANNER_FILES) \
Expand All @@ -337,18 +326,9 @@ EXTRA_ski_SOURCES = \
$(EXTRA_hpux_FILES) \
$(EXTRA_freebsd_FILES)

if WITH_GTK_INTERFACE
gskidir= $(datadir)/ski
gski_DATA= \
gski.glade
GSKI= gski
else
GSKI=
endif

all-local: bski $(GSKI)
all-local: bski

bski $(GSKI) : ski
bski: ski
@rm -f $@; ln ski $@

## DERIVED sources rules:
Expand Down Expand Up @@ -499,4 +479,4 @@ eparse.gen.c eparse.gen.h: eparse.y


distclean-local:
-rm -f $(GSKI) bski $(BUILT_SOURCES)
-rm -f bski $(BUILT_SOURCES)
854 changes: 0 additions & 854 deletions src/gski.glade

This file was deleted.

3 changes: 0 additions & 3 deletions src/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -196,9 +196,6 @@ int main(int argc, char *argv[])
case 'b':
interface = BATCH;
break;
case 'g':
interface = GTK_INTERFACE;
break;
case 's':
interface = CURSES_INTERFACE;
break;
Expand Down
18 changes: 0 additions & 18 deletions src/ski.c
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@
#include "ssDBT.h"
#include "syscall_api.h"
#include "ssDPrs.h"
#include "ssGtk.h"
#include "state.h"
#include "trace.h"
#include "ui.h"
Expand Down Expand Up @@ -344,14 +343,6 @@ static void stepIt(CTR cnt)
}
cmdwSetStatus("Running...");
switch (interface) {
case GTK_INTERFACE:
#ifdef HAVE_GTK
stepIt_setupGtk(cnt);
#else
fprintf (stderr,
"Sorry, GTK support has not been compiled in.\n");
#endif
break;
case CURSES_INTERFACE:
case BATCH:
(void)stepIt_loop(cnt);
Expand Down Expand Up @@ -411,15 +402,6 @@ void runIt(BOOL showIrate)
}
cmdwSetStatus("Running...");
switch (interface) {
case GTK_INTERFACE:
#ifdef HAVE_GTK
runIt_setupGtk();
break;
#else
fprintf (stderr,
"Sorry, GTK support has not been compiled in.\n");
exit(-1);
#endif
case CURSES_INTERFACE:
case BATCH:
(void)runIt_loop();
Expand Down
Loading

0 comments on commit 6cd6e33

Please sign in to comment.