20100310-1612

forsyth committed 16 years ago

Commit 97731151 parent 1bd87427 files · +29 −27Browse files

Unified · Split

7 files

CHANGES +2 −0
appl/lib/tabs.b +11 −11
dis/lib/tabs.dis +0 −0
include/tk.h +1 −1
include/version.h +1 −1
man/9/bind +12 −12
man/9/variable +3 −3

@@ -1,3 +1,5 @@
		1	20100310
		2	stop tabs(2) from issuing pointless tk cmd that produces diagnostics
1	20100305	3	20100305
2	add emu/Linux/audio-oss.c from saoret.one [issue 226]	4	add emu/Linux/audio-oss.c from saoret.one [issue 226]
3	20100226	5	20100226

appl/lib/tabs.b+11−11

@@ -138,23 +138,23 @@ tabsctl(t: ref Tk->Toplevel, · 137 unmodified lines
138	(lab, widg) = tabs[id];	138	(lab, widg) = tabs[id];
139	tag := "tag" + string id;	139	tag := "tag" + string id;
140	cmd(t, dot+" lower sel" + string id);	140	cmd(t, dot+" lower sel" + string id);
141	pos := cmd(t, dot+" coords " + tag);	141	# pos := cmd(t, dot+" coords " + tag);
142	if(len pos >= 1 && pos[0] != '!'){	142	# if(len pos >= 1 && pos[0] != '!'){
143	(p, nil) := parsept(pos);	143	# (p, nil) := parsept(pos);
144	cmd(t, dot+" coords "+tag+" "+string(p.x+1)+	144	# cmd(t, dot+" coords "+tag+" "+string(p.x+1)+
145	" "+string(p.y+1));	145	# " "+string(p.y+1));
146	}	146	# }
147	if(id > 0)	147	if(id > 0)
148	cmd(t, dot+" lower "+ tag + " tag"+string (id - 1));	148	cmd(t, dot+" lower "+ tag + " tag"+string (id - 1));
149	cmd(t, dot+" delete win" + string id);	149	cmd(t, dot+" delete win" + string id);
150	}	150	}
151	id = nid;	151	id = nid;
152	(lab, widg) = tabs[id];	152	(lab, widg) = tabs[id];
153	pos := tk->cmd(t, dot+" coords tag" + string id);	153	# pos := tk->cmd(t, dot+" coords tag" + string id);
154	if(len pos >= 1 && pos[0] != '!'){	154	# if(len pos >= 1 && pos[0] != '!'){
155	(p, nil) := parsept(pos);	155	# (p, nil) := parsept(pos);
156	cmd(t, dot+" coords tag"+string id+" "+string(p.x-1)+" "+string(p.y-1));	156	# cmd(t, dot+" coords tag"+string id+" "+string(p.x-1)+" "+string(p.y-1));
157	}	157	# }
158	cmd(t, dot+" raise tag"+string id);	158	cmd(t, dot+" raise tag"+string id);
159	cmd(t, dot+" raise sel"+string id);	159	cmd(t, dot+" raise sel"+string id);
160	cmd(t, dot+" create window "+string TABSBord+" "+	160	cmd(t, dot+" create window "+string TABSBord+" "+

dis/lib/tabs.dis+0−0

Binary file not shown.

include/tk.h+1−1

@@ -216,7 +216,7 @@ struct TkVar · 215 unmodified lines
216		216
217	struct TkPanelimage	217	struct TkPanelimage
218	{	218	{
219	void* image; /* really Draw_Image */	219	void* image; /* Image paired with Draw_Image: see lookupimage in libinterp/draw.c */
220	int ref;	220	int ref;
221	TkPanelimage* link;	221	TkPanelimage* link;
222	};	222	};

include/version.h+1−1

@@ -1 +1 @@
1	#define VERSION "Fourth Edition (20100307)"	1	#define VERSION "Fourth Edition (20100310)"

man/9/bind+12−12

@@ -5,7 +5,7 @@ bind \- Arrange for events to invoke Tk scripts · 4 unmodified lines
5	\f5bind\fI tag sequence script\fR	5	\f5bind\fI tag sequence script\fR
6	.sp	6	.sp
7	\f5bind\fI tag sequence \f5+\fIscript\fR	7	\f5bind\fI tag sequence \f5+\fIscript\fR
8	.SH INTRODUCTION	8	.SH DESCRIPTION
9	The \f5bind\fR command associates Tk scripts with window events.	9	The \f5bind\fR command associates Tk scripts with window events.
10	If all three arguments are specified, \f5bind\fR will	10	If all three arguments are specified, \f5bind\fR will
11	arrange for \fIscript\fR (a Tk script) to be evaluated whenever	11	arrange for \fIscript\fR (a Tk script) to be evaluated whenever
@@ -22,7 +22,7 @@ If \fIscript\fR is prefixed with a ``-'', then any existing binding for · 10 unmodified lines
22	\fIsequence\fR, whose script is exactly the same as \fIscript\fR, is removed.	22	\fIsequence\fR, whose script is exactly the same as \fIscript\fR, is removed.
23	The \fItag\fR argument gives the pathname of the window	23	The \fItag\fR argument gives the pathname of the window
24	to which \fIsequence\fR is bound.	24	to which \fIsequence\fR is bound.
25	.SH "EVENT PATTERNS"	25	.SS Event Patterns
26	The \fIsequence\fR argument specifies a sequence of one or more	26	The \fIsequence\fR argument specifies a sequence of one or more
27	event patterns, with optional white space between the patterns. Each	27	event patterns, with optional white space between the patterns. Each
28	event pattern may	28	event pattern may
@@ -32,11 +32,11 @@ may not be a space character or the character \f5<\fR. This form of · 3 unmodified lines
32	pattern matches a \f5KeyPress\fR event for the particular	32	pattern matches a \f5KeyPress\fR event for the particular
33	character. The second form of pattern is longer but more general.	33	character. The second form of pattern is longer but more general.
34	It has the following syntax:	34	It has the following syntax:
35	.RS	35	.IP
36	.EX	36	.EX
37	\f5<\fIevent\f5-\fIevent\f5-\fR...\f5-\fIevent\f5>\fR	37	\f5<\fIevent\f5-\fIevent\f5-\fR...\f5-\fIevent\f5>\fR
38	.EE	38	.EE
39	.RE	39	.PP
40	The following events are accepted:	40	The following events are accepted:
41	.TP	41	.TP
42	.BR Key \ or\ Keypress	42	.BR Key \ or\ Keypress
@@ -98,7 +98,14 @@ The event of the widget getting the keyboard focus. · 55 unmodified lines
98	.TP	98	.TP
99	.B FocusOut	99	.B FocusOut
100	The event of the widget losing the keyboard focus.	100	The event of the widget losing the keyboard focus.
		101	.TP
		102	.B Destroy
		103	The event of the widget being destroyed.
		104	See
		105	.IR destroy (9)
		106	for details of widget destruction.
101	.RE	107	.RE
		108	.PP
102	The event sequence can contain any combination of the above	109	The event sequence can contain any combination of the above
103	events. They are treated independently, and if any of the	110	events. They are treated independently, and if any of the
104	events occur, the sequence matches. You cannot combine	111	events occur, the sequence matches. You cannot combine
@@ -106,14 +113,7 @@ key presses of more than one key. Events will not be combined · 1 unmodified line
106	on delivery, except that	113	on delivery, except that
107	.B Motion	114	.B Motion
108	events may be combined with button presses (possibly doubled).	115	events may be combined with button presses (possibly doubled).
109	.TP	116	.SS Binding Scripts and Substitutions
110	.B Destroy
111	The event of the widget being destroyed.
112	See
113	.IR destroy (9)
114	for details of widget destruction.
115
116	.SH "BINDING SCRIPTS AND SUBSTITUTIONS"
117	The \fIscript\fR argument to \f5bind\fR is a Tk script,	117	The \fIscript\fR argument to \f5bind\fR is a Tk script,
118	which will be executed whenever the given event sequence occurs.	118	which will be executed whenever the given event sequence occurs.
119	If \fIscript\fR contains	119	If \fIscript\fR contains

man/9/variable+3−3

@@ -20,6 +20,6 @@ The special variable · 19 unmodified lines
20	holds the text of the last Tk error encountered.	20	holds the text of the last Tk error encountered.
21	It resets when queried.	21	It resets when queried.
22	.SH SEE ALSO	22	.SH SEE ALSO
23	.IR checkbutton (9)	23	.IR checkbutton (9),
24	.IR choicebutton (9)	24	.IR choicebutton (9),
25	.IR radiobutton (9),	25	.IR radiobutton (9)

20100310-1612

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code