Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Get things working on Debian 10, tcl 8.6 and Tk 8.6 #7

Open
wants to merge 4 commits into
base: trunk
Choose a base branch
from
Open

Get things working on Debian 10, tcl 8.6 and Tk 8.6 #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1cd0aea
Fix build errors on Debian 10 with tcl 8.6 and Tk 8.6
andyjpb Aug 11, 2023
ff83ff9
Fix reference to `wish` executable in demo scripts
andyjpb Aug 11, 2023
5df9900
Help the demos find the library and their resources
andyjpb Aug 11, 2023
8f65b92
Fix up the comments that explain the fancytext.tcl demo script.
andyjpb Aug 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions demos/dragger.tcl
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,11 @@
# $Id: demo.tcl,v 1.1 1997/09/17 21:10:23 donal Exp donal $

# Now we make cunning use of the backslash/shell trick \
[ -x `dirname $0`/../shapewish ] && exec `dirname $0`/../shapewish $0 ${1+"$@"} || exec wish8.0 $0 ${1+"$@"} || { echo "`basename $0`: couldn't start wish" >&2 ; exit 1; }
[ -x `dirname $0`/../shapewish ] && exec `dirname $0`/../shapewish $0 ${1+"$@"} || exec wish $0 ${1+"$@"} || { echo "`basename $0`: couldn't start wish" >&2 ; exit 1; }

set dir [file join [pwd] [file dirname [info script]] ..]
set dir [file join [pwd] [file dirname [info script]] .]
package ifneeded Shape 0.4 "package require Tk 8\n\
[list tclPkgSetup "$dir/../unix/" Shape 0.4 {{libshape04.so.1.0 load shape}}]"
lappend auto_path [file join $dir ..]
package require Shape

Expand Down
11 changes: 7 additions & 4 deletions demos/fancytext.tcl
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
#!/bin/sh

# dragger.tcl ---
# fancytext.tcl ---
#
# Quick demo using the shape library to provide a coloured cursor
# Make a piece of text look interesting by suggesting the shape of the
# letters
#
# Copyright (c) 1997 by Donal K. Fellows
#
Expand Down Expand Up @@ -32,9 +33,11 @@
# $Id: demo.tcl,v 1.1 1997/09/17 21:10:23 donal Exp donal $

# Now we make cunning use of the backslash/shell trick \
[ -x `dirname $0`/../shapewish ] && exec `dirname $0`/../shapewish $0 ${1+"$@"} || exec wish8.0 $0 ${1+"$@"} || { echo "`basename $0`: couldn't start wish" >&2 ; exit 1; }
[ -x `dirname $0`/../shapewish ] && exec `dirname $0`/../shapewish $0 ${1+"$@"} || exec wish $0 ${1+"$@"} || { echo "`basename $0`: couldn't start wish" >&2 ; exit 1; }

set dir [file join [pwd] [file dirname [info script]] ..]
set dir [file join [pwd] [file dirname [info script]] .]
package ifneeded Shape 0.4 "package require Tk 8\n\
[list tclPkgSetup "$dir/../unix/" Shape 0.4 {{libshape04.so.1.0 load shape}}]"
lappend auto_path [file join $dir ..]
package require Shape

Expand Down
6 changes: 4 additions & 2 deletions demos/fingerprint.tcl
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,11 @@
# a little in order to increase its effectiveness.

# Now we make cunning use of the backslash/shell trick \
[ -x `dirname $0`/../shapewish ] && exec `dirname $0`/../shapewish $0 ${1+"$@"} || exec wish8.0 $0 ${1+"$@"} || { echo "`basename $0`: couldn't start wish" >&2 ; exit 1; }
[ -x `dirname $0`/../shapewish ] && exec `dirname $0`/../shapewish $0 ${1+"$@"} || exec wish $0 ${1+"$@"} || { echo "`basename $0`: couldn't start wish" >&2 ; exit 1; }

set dir [file join [pwd] [file dirname [info script]] ..]
set dir [file join [pwd] [file dirname [info script]] .]
package ifneeded Shape 0.4 "package require Tk 8\n\
[list tclPkgSetup "$dir/../unix/" Shape 0.4 {{libshape04.so.1.0 load shape}}]"
lappend auto_path [file join $dir ..]
package require Shape

Expand Down
2 changes: 1 addition & 1 deletion generic/shape.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,7 +428,7 @@ shapePhoto(
static int
shapeSetUpdateOps(
Tk_Window tkwin0,
Tcl_Interp *interp;
Tcl_Interp *interp,
int opnum,
int objc,
Tcl_Obj *const objv[])
Expand Down
2 changes: 1 addition & 1 deletion include/panic.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#define PANIC_H

#ifdef __GNUC__
EXTERN void panic(char *message, ...) __attribute__((__noreturn__ , __format__(printf,1,2)));
/* EXTERN void panic(char *message, ...) __attribute__((__noreturn__ , __format__(printf,1,2))); */
#else
EXTERN void panic(char *message, ...);
#endif
Expand Down
6 changes: 3 additions & 3 deletions unix/shapeUnixImpl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#include <tk.h> /* Includes conventional X stuff. */
#include <X11/Xutil.h> /* For Region declaration. */
#include <X11/extensions/shape.h>
#include "shape.h"
#include "shapeInt.h"

#ifdef DKF_SHAPE_DEBUGGING
static int
Expand Down Expand Up @@ -364,11 +364,11 @@ int
Shape_CombineWindow(
Tcl_Interp *interp,
Tk_Window tkwin,
Tk_Window srcwin,
int kind,
int op,
int x,
int y)
int y,
Tk_Window srcwin)
{
Display *dpy = Tk_Display(tkwin);
Display *sdpy = Tk_Display(srcwin);
Expand Down