ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/Deliantra-Client/DC/UI.pm

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.222 by root, Mon May 22 03:59:51 2006 UTC vs.
Revision 1.270 by elmex, Fri Jun 2 09:02:49 2006 UTC

…		…
5		5
6	use Scalar::Util ();	6	use Scalar::Util ();
7	use List::Util ();	7	use List::Util ();
8		8
9	use CFClient;	9	use CFClient;
		10	use CFClient::Texture;
10		11
11	our ($FOCUS, $HOVER, $GRAB); # various widgets	12	our ($FOCUS, $HOVER, $GRAB); # various widgets
12		13
		14	our $LAYOUT;
13	our $ROOT;	15	our $ROOT;
14	our $TOOLTIP;	16	our $TOOLTIP;
15	our $BUTTON_STATE;	17	our $BUTTON_STATE;
16		18
17	our %WIDGET; # all widgets, weak-referenced	19	our %WIDGET; # all widgets, weak-referenced
18		20
		21	sub get_layout {
		22	my $layout;
		23
		24	for (grep { $_->{name} } values %WIDGET) {
		25	my $win = $layout->{$_->{name}} = { };
		26
		27	$win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
		28	$win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
		29	$win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
		30	$win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
		31
		32	$win->{show} = $_->{visible} && $_->{is_toplevel};
		33	}
		34
		35	$layout
		36	}
		37
		38	sub set_layout {
		39	my ($layout) = @_;
		40
		41	$LAYOUT = $layout;
		42	}
		43
19	sub check_tooltip {	44	sub check_tooltip {
		45	return if $ENV{CFPLUS_DEBUG} & 8;
		46
20	if (!$GRAB) {	47	if (!$GRAB) {
21	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	48	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22	if (length $widget->{tooltip}) {	49	if (length $widget->{tooltip}) {
23
24	if ($TOOLTIP->{owner} != $widget) {	50	if ($TOOLTIP->{owner} != $widget) {
		51	$TOOLTIP->hide;
		52
25	$TOOLTIP->{owner} = $widget;	53	$TOOLTIP->{owner} = $widget;
26		54
27	my $tip = $widget->{tooltip};	55	my $tip = $widget->{tooltip};
28		56
29	$tip = $tip->($widget) if CODE:: eq ref $tip;	57	$tip = $tip->($widget) if CODE:: eq ref $tip;
30		58
31	$TOOLTIP->set_tooltip_from ($widget);	59	$TOOLTIP->set_tooltip_from ($widget);
32	$TOOLTIP->show;	60	$TOOLTIP->show;
33
34	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35
36	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
37	if $x + $TOOLTIP->{w} > $::WIDTH;
38
39	$TOOLTIP->move ($x, $y);
40	$TOOLTIP->check_size;
41	$TOOLTIP->update;
42	}	61	}
43		62
44	return;	63	return;
45	}	64	}
46	}	65	}
…		…
50	delete $TOOLTIP->{owner};	69	delete $TOOLTIP->{owner};
51	}	70	}
52		71
53	# class methods for events	72	# class methods for events
54	sub feed_sdl_key_down_event {	73	sub feed_sdl_key_down_event {
55	$FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])	74	$FOCUS->emit (key_down => $_[0])
56	if $FOCUS;	75	if $FOCUS;
57	}	76	}
58		77
59	sub feed_sdl_key_up_event {	78	sub feed_sdl_key_up_event {
60	$FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])	79	$FOCUS->emit (key_up => $_[0])
61	if $FOCUS;	80	if $FOCUS;
62	}	81	}
63		82
64	sub feed_sdl_button_down_event {	83	sub feed_sdl_button_down_event {
65	my ($ev) = @_;	84	my ($ev) = @_;
…		…
74	check_tooltip;	93	check_tooltip;
75	}	94	}
76		95
77	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	96	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
78		97
79	if ($GRAB) {	98	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
80	($x, $y) = $GRAB->coord2local ($x, $y);	99	if $GRAB;
81	$GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
82	}
83	}	100	}
84		101
85	sub feed_sdl_button_up_event {	102	sub feed_sdl_button_up_event {
86	my ($ev) = @_;	103	my ($ev) = @_;
87	my ($x, $y) = ($ev->{x}, $ev->{y});	104	my ($x, $y) = ($ev->{x}, $ev->{y});
88		105
89	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	106	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
90		107
91	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	108	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
92		109
93	if ($GRAB) {	110	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
94	($x, $y) = $GRAB->coord2local ($x, $y);	111	if $GRAB;
95	$GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
96	}
97		112
98	if (!$BUTTON_STATE) {	113	if (!$BUTTON_STATE) {
99	my $grab = $GRAB; undef $GRAB;	114	my $grab = $GRAB; undef $GRAB;
100	$grab->update if $grab;	115	$grab->update if $grab;
101	$GRAB->update if $GRAB;	116	$GRAB->update if $GRAB;
…		…
117	$HOVER->update if $HOVER && $HOVER->{can_hover};	132	$HOVER->update if $HOVER && $HOVER->{can_hover};
118		133
119	check_tooltip;	134	check_tooltip;
120	}	135	}
121		136
122	if ($HOVER) {
123	($x, $y) = $HOVER->coord2local ($x, $y);
124	$HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);	137	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
125	}	138	if $HOVER;
126	}	139	}
127		140
128	# convert position array to integers	141	# convert position array to integers
129	sub harmonize {	142	sub harmonize {
130	my ($vals) = @_;	143	my ($vals) = @_;
…		…
144		157
145	$_->update	158	$_->update
146	for @widgets;	159	for @widgets;
147	}	160	}
148		161
		162	sub reconfigure_widgets {
		163	# make a copy, otherwise C<for> complains about freed values.
		164	my @widgets = values %WIDGET;
		165
		166	$_->reconfigure
		167	for @widgets;
		168	}
		169
149	# call when resolution changes etc.	170	# call when resolution changes etc.
150	sub rescale_widgets {	171	sub rescale_widgets {
151	my ($sx, $sy) = @_;	172	my ($sx, $sy) = @_;
152		173
153	# make a copy, otherwise for complains about freed values.
154	my @widgets = values %WIDGET;	174	for my $widget (values %WIDGET) {
155
156	for my $widget (@widgets) {
157	if ($widget->{toplevel}) {	175	if ($widget->{is_toplevel}) {
		176	$widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
		177	$widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
		178
158	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};	179	$widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
159	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};	180	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
160	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};	181	$widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
161	$widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
162	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};	182	$widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
163	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};	183	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
164	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};	184	$widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
165	$widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};	185
		186	$widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
		187	$widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
		188
166	}	189	}
167
168	$widget->reconfigure;
169	}	190	}
		191
		192	reconfigure_widgets;
170	}	193	}
171		194
172	#############################################################################	195	#############################################################################
173		196
174	package CFClient::UI::Base;	197	package CFClient::UI::Base;
…		…
179		202
180	sub new {	203	sub new {
181	my $class = shift;	204	my $class = shift;
182		205
183	my $self = bless {	206	my $self = bless {
184	x => 0,	207	x => "center",
185	y => 0,	208	y => "center",
186	z => 0,	209	z => 0,
		210	w => undef,
		211	h => undef,
187	can_events => 1,	212	can_events => 1,
188	@_	213	@_
189	}, $class;	214	}, $class;
190		215
		216	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
		217
191	for (keys %$self) {	218	for (keys %$self) {
192	if (/^connect_(.*)$/) {	219	if (/^on_(.*)$/) {
193	$self->connect ($1 => delete $self->{$_});	220	$self->connect ($1 => delete $self->{$_});
194	}	221	}
195	}	222	}
196		223
197	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	224	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
		225	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
		226	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
		227	$self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
		228	$self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
		229
		230	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
		231	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
		232
		233	$self->show if $layout->{show};
		234	}
198		235
199	$self	236	$self
200	}	237	}
201		238
202	sub destroy {	239	sub destroy {
…		…
206	%$self = ();	243	%$self = ();
207	}	244	}
208		245
209	sub show {	246	sub show {
210	my ($self) = @_;	247	my ($self) = @_;
		248
211	return if $self->{parent};	249	return if $self->{parent};
212		250
213	$CFClient::UI::ROOT->add ($self);	251	$CFClient::UI::ROOT->add ($self);
214	}	252	}
215		253
216	sub hide {	254	sub set_visible {
217	my ($self) = @_;	255	my ($self) = @_;
		256
		257	return if $self->{visible};
		258
		259	$self->{root} = $self->{parent}{root};
		260	$self->{visible} = $self->{parent}{visible} + 1;
		261
		262	$self->emit (visibility_change => 1);
		263
		264	$self->realloc if !exists $self->{req_w};
		265
		266	$_->set_visible for $self->children;
		267	}
		268
		269	sub set_invisible {
		270	my ($self) = @_;
		271
		272	return unless $self->{visible};
		273
		274	$_->set_invisible for $self->children;
		275
		276	delete $self->{root};
		277	delete $self->{visible};
218		278
219	undef $GRAB if $GRAB == $self;	279	undef $GRAB if $GRAB == $self;
220	undef $HOVER if $HOVER == $self;	280	undef $HOVER if $HOVER == $self;
221		281
		282	CFClient::UI::check_tooltip
		283	if $TOOLTIP->{owner} == $self;
		284
		285	$self->focus_out;
		286
		287	$self->emit (visibility_change => 0);
		288	}
		289
		290	sub set_visibility {
		291	my ($self, $visible) = @_;
		292
		293	return if $self->{visible} == $visible;
		294
		295	$visible ? $self->hide
		296	: $self->show;
		297	}
		298
		299	sub toggle_visibility {
		300	my ($self) = @_;
		301
		302	$self->{visible}
		303	? $self->hide
		304	: $self->show;
		305	}
		306
		307	sub hide {
		308	my ($self) = @_;
		309
		310	$self->set_invisible;
		311
222	$self->{parent}->remove ($self)	312	$self->{parent}->remove ($self)
223	if $self->{parent};	313	if $self->{parent};
224	}	314	}
225		315
226	sub move {	316	sub move_abs {
227	my ($self, $x, $y, $z) = @_;	317	my ($self, $x, $y, $z) = @_;
228		318
229	$self->{x} = int $x;	319	$self->{x} = List::Util::max 0, int $x;
230	$self->{y} = int $y;	320	$self->{y} = List::Util::max 0, int $y;
231	$self->{z} = $z if defined $z;	321	$self->{z} = $z if defined $z;
232		322
233	$self->update;	323	$self->update;
234	}	324	}
235		325
236	sub set_size {	326	sub set_size {
237	my ($self, $w, $h) = @_;	327	my ($self, $w, $h) = @_;
238		328
239	$self->{user_w} = $w;	329	$self->{force_w} = $w;
240	$self->{user_h} = $h;	330	$self->{force_h} = $h;
241		331
242	$self->check_size;	332	$self->realloc;
243	}	333	}
244		334
245	sub size_request {	335	sub size_request {
246	require Carp;	336	require Carp;
247	Carp::confess "size_request is abstract";	337	Carp::confess "size_request is abstract";
…		…
249		339
250	sub configure {	340	sub configure {
251	my ($self, $x, $y, $w, $h) = @_;	341	my ($self, $x, $y, $w, $h) = @_;
252		342
253	if ($self->{aspect}) {	343	if ($self->{aspect}) {
		344	my ($ow, $oh) = ($w, $h);
		345
254	my $w2 = List::Util::min $w, int $h * $self->{aspect};	346	$w = List::Util::min $w, int $h * $self->{aspect};
255	my $h2 = List::Util::min $h, int $w / $self->{aspect};	347	$h = List::Util::min $h, int $w / $self->{aspect};
256		348
257	# use alignment to adjust x, y	349	# use alignment to adjust x, y
258		350
259	$x += int +($w - $w2) * 0.5;	351	$x += int 0.5 * ($ow - $w);
260	$y += int +($h - $h2) * 0.5;	352	$y += int 0.5 * ($oh - $h);
261
262	($w, $h) = ($w2, $h2);
263	}	353	}
264		354
265	if ($self->{x} != $x || $self->{y} != $y) {	355	if ($self->{x} ne $x || $self->{y} ne $y) {
266	$self->{x} = $x;	356	$self->{x} = $x;
267	$self->{y} = $y;	357	$self->{y} = $y;
268	$self->update;	358	$self->update;
269	}	359	}
270		360
271	if ($self->{w} != $w || $self->{h} != $h) {	361	if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
272	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];	362	return unless $self->{visible};
		363
		364	$self->{alloc_w} = $w;
		365	$self->{alloc_h} = $h;
		366
		367	$self->{root}{size_alloc}{$self+0} = $self;
273	}	368	}
274	}	369	}
275		370
276	sub size_allocate {	371	sub size_allocate {
277	# nothing to be done	372	# nothing to be done
278	}	373	}
279		374
280	sub reconfigure {
281	my ($self) = @_;
282
283	$self->check_size (1);
284	$self->update;
285	}
286
287	sub children {	375	sub children {
288	}	376	}
289		377
290	sub set_max_size {	378	sub set_max_size {
291	my ($self, $w, $h) = @_;	379	my ($self, $w, $h) = @_;
…		…
294	delete $self->{max_h}; $self->{max_h} = $h if $h;	382	delete $self->{max_h}; $self->{max_h} = $h if $h;
295	}	383	}
296		384
297	sub set_tooltip {	385	sub set_tooltip {
298	my ($self, $tooltip) = @_;	386	my ($self, $tooltip) = @_;
		387
		388	$tooltip =~ s/^\s+//;
		389	$tooltip =~ s/\s+$//;
		390
		391	return if $self->{tooltip} eq $tooltip;
299		392
300	$self->{tooltip} = $tooltip;	393	$self->{tooltip} = $tooltip;
301		394
302	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	395	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
303	delete $CFClient::UI::TOOLTIP->{owner};	396	delete $CFClient::UI::TOOLTIP->{owner};
…		…
325	return if $FOCUS == $self;	418	return if $FOCUS == $self;
326	return unless $self->{can_focus};	419	return unless $self->{can_focus};
327		420
328	my $focus = $FOCUS; $FOCUS = $self;	421	my $focus = $FOCUS; $FOCUS = $self;
329		422
330	$self->emit (focus_in => $focus);	423	$self->_emit (focus_in => $focus);
331		424
332	$focus->update if $focus;	425	$focus->update if $focus;
333	$FOCUS->update;	426	$FOCUS->update;
334	}	427	}
335		428
…		…
338		431
339	return unless $FOCUS == $self;	432	return unless $FOCUS == $self;
340		433
341	my $focus = $FOCUS; undef $FOCUS;	434	my $focus = $FOCUS; undef $FOCUS;
342		435
343	$self->emit (focus_out => $focus);	436	$self->_emit (focus_out => $focus);
344		437
345	$focus->update if $focus; #?	438	$focus->update if $focus; #?
		439
		440	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
		441	unless $FOCUS;
346	}	442	}
347		443
348	sub mouse_motion { }	444	sub mouse_motion { }
349	sub button_up { }	445	sub button_up { }
350	sub key_down { }	446	sub key_down { }
351	sub key_up { }	447	sub key_up { }
352		448
353	sub button_down {	449	sub button_down {
354	my ($self, $ev, $x, $y) = @_;	450	my ($self, $ev, $x, $y) = @_;
355		451
356	$self->focus_in;	452	$self->focus_in;
357	}	453	}
358		454
359	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	455	sub find_widget {
360	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	456	my ($self, $x, $y) = @_;
361	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }	457
362	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }	458	return () unless $self->{can_events};
363	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }	459
		460	return $self
		461	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
		462	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
		463
		464	()
		465	}
		466
		467	sub set_parent {
		468	my ($self, $parent) = @_;
		469
		470	Scalar::Util::weaken ($self->{parent} = $parent);
		471	$self->set_visible if $parent->{visible};
		472	}
		473
		474	sub connect {
		475	my ($self, $signal, $cb) = @_;
		476
		477	push @{ $self->{signal_cb}{$signal} }, $cb;
		478	}
		479
		480	sub _emit {
		481	my ($self, $signal, @args) = @_;
		482
		483	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
		484	}
		485
		486	sub emit {
		487	my ($self, $signal, @args) = @_;
		488
		489	$self->_emit ($signal, @args)
		490	|| $self->$signal (@args);
		491	}
		492
		493	sub visibility_change {
		494	#my ($self, $visible) = @_;
		495	}
		496
		497	sub realloc {
		498	my ($self) = @_;
		499
		500	if ($self->{visible}) {
		501	return if $self->{root}{realloc}{$self+0};
		502
		503	$self->{root}{realloc}{$self+0} = $self;
		504	$self->{root}->update;
		505	} else {
		506	delete $self->{req_w};
		507	delete $self->{req_h};
		508	}
		509	}
		510
		511	sub update {
		512	my ($self) = @_;
		513
		514	$self->{parent}->update
		515	if $self->{parent};
		516	}
		517
		518	sub reconfigure {
		519	my ($self) = @_;
		520
		521	$self->realloc;
		522	$self->update;
		523	}
		524
		525	# using global variables seems a bit hacky, but passing through all drawing
		526	# functions seems pointless.
		527	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
364		528
365	sub draw {	529	sub draw {
366	my ($self) = @_;	530	my ($self) = @_;
367		531
368	return unless $self->{h} && $self->{w};	532	return unless $self->{h} && $self->{w};
		533
		534	# update screen rectangle
		535	local $draw_x = $draw_x + $self->{x};
		536	local $draw_y = $draw_y + $self->{y};
		537	local $draw_w = $draw_x + $self->{w};
		538	local $draw_h = $draw_y + $self->{h};
		539
		540	# skip widgets that are entirely outside the drawing area
		541	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
		542	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
369		543
370	glPushMatrix;	544	glPushMatrix;
371	glTranslate $self->{x}, $self->{y}, 0;	545	glTranslate $self->{x}, $self->{y}, 0;
372	$self->_draw;	546	$self->_draw;
373	glPopMatrix;	547	glPopMatrix;
…		…
385	glVertex $x , $y + $self->{h};	559	glVertex $x , $y + $self->{h};
386	glEnd;	560	glEnd;
387	glDisable GL_BLEND;	561	glDisable GL_BLEND;
388	}	562	}
389		563
390	if ($ENV{PCLIENT_DEBUG}) {	564	if ($ENV{CFPLUS_DEBUG} & 1) {
391	glPushMatrix;	565	glPushMatrix;
392	glColor 1, 1, 0, 1;	566	glColor 1, 1, 0, 1;
393	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	567	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
394	glBegin GL_LINE_LOOP;	568	glBegin GL_LINE_LOOP;
395	glVertex 0 , 0;	569	glVertex 0 , 0;
396	glVertex $self->{w}, 0;	570	glVertex $self->{w} - 1, 0;
397	glVertex $self->{w}, $self->{h};	571	glVertex $self->{w} - 1, $self->{h} - 1;
398	glVertex 0 , $self->{h};	572	glVertex 0 , $self->{h} - 1;
399	glEnd;	573	glEnd;
400	glPopMatrix;	574	glPopMatrix;
401	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	575	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
402	}	576	}
403	}	577	}
404		578
405	sub _draw {	579	sub _draw {
406	my ($self) = @_;	580	my ($self) = @_;
407		581
408	warn "no draw defined for $self\n";	582	warn "no draw defined for $self\n";
409	}
410
411	sub find_widget {
412	my ($self, $x, $y) = @_;
413
414	return () unless $self->{can_events};
415
416	return $self
417	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
418	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
419
420	()
421	}
422
423	sub set_parent {
424	my ($self, $parent) = @_;
425
426	Scalar::Util::weaken ($self->{parent} = $parent);
427
428	# TODO: req_w _does_change after ->reconfigure
429	$self->check_size
430	unless exists $self->{req_w};
431
432	$self->show;
433	}
434
435	sub check_size {
436	my ($self, $forced) = @_;
437
438	$self->{force_alloc} = 1 if $forced;
439	$CFClient::UI::ROOT->{check_size}{$self} = $self;
440	}
441
442	sub update {
443	my ($self) = @_;
444
445	$self->{parent}->update
446	if $self->{parent};
447	}
448
449	sub connect {
450	my ($self, $signal, $cb) = @_;
451
452	push @{ $self->{signal_cb}{$signal} }, $cb;
453	}
454
455	sub emit {
456	my ($self, $signal, @args) = @_;
457
458	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
459	}	583	}
460		584
461	sub DESTROY {	585	sub DESTROY {
462	my ($self) = @_;	586	my ($self) = @_;
463		587
…		…
521	my ($class, %arg) = @_;	645	my ($class, %arg) = @_;
522	$class->SUPER::new (can_events => 0, %arg);	646	$class->SUPER::new (can_events => 0, %arg);
523	}	647	}
524		648
525	sub size_request {	649	sub size_request {
526	(0, 0)	650	my ($self) = @_;
		651
		652	($self->{w} + 0, $self->{h} + 0)
527	}	653	}
528		654
529	sub draw { }	655	sub draw { }
530		656
531	#############################################################################	657	#############################################################################
…		…
560	$self->{children} = [	686	$self->{children} = [
561	sort { $a->{z} <=> $b->{z} }	687	sort { $a->{z} <=> $b->{z} }
562	@{$self->{children}}, @widgets	688	@{$self->{children}}, @widgets
563	];	689	];
564		690
565	$self->check_size (1);	691	$self->realloc;
566	$self->update;
567	}	692	}
568		693
569	sub children {	694	sub children {
570	@{ $_[0]{children} }	695	@{ $_[0]{children} }
571	}	696	}
…		…
576	delete $child->{parent};	701	delete $child->{parent};
577	$child->hide;	702	$child->hide;
578		703
579	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	704	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
580		705
581	$self->check_size;	706	$self->realloc;
582	$self->update;
583	}	707	}
584		708
585	sub clear {	709	sub clear {
586	my ($self) = @_;	710	my ($self) = @_;
587		711
…		…
591	for (@$children) {	715	for (@$children) {
592	delete $_->{parent};	716	delete $_->{parent};
593	$_->hide;	717	$_->hide;
594	}	718	}
595		719
596	$self->check_size;	720	$self->realloc;
597	$self->update;
598	}	721	}
599		722
600	sub find_widget {	723	sub find_widget {
601	my ($self, $x, $y) = @_;	724	my ($self, $x, $y) = @_;
602		725
…		…
689	$self->SUPER::size_allocate ($w, $h);	812	$self->SUPER::size_allocate ($w, $h);
690	$self->update;	813	$self->update;
691	}	814	}
692		815
693	sub _render {	816	sub _render {
		817	my ($self) = @_;
		818
694	$_[0]{children}[0]->draw;	819	$self->{children}[0]->draw;
695	}	820	}
696		821
697	sub render_child {	822	sub render_child {
698	my ($self) = @_;	823	my ($self) = @_;
699		824
700	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	825	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
701	glClearColor 0, 0, 0, 0;	826	glClearColor 0, 0, 0, 0;
702	glClear GL_COLOR_BUFFER_BIT;	827	glClear GL_COLOR_BUFFER_BIT;
703		828
		829	{
		830	package CFClient::UI::Base;
		831
		832	($draw_x, $draw_y, $draw_w, $draw_h) =
		833	(0, 0, $self->{w}, $self->{h});
		834	}
		835
704	$self->_render;	836	$self->_render;
705	};	837	};
706	}	838	}
707		839
708	sub _draw {	840	sub _draw {
709	my ($self) = @_;	841	my ($self) = @_;
710		842
711	my ($w, $h) = ($self->w, $self->h);	843	my ($w, $h) = @$self{qw(w h)};
712		844
713	my $tex = $self->{texture}	845	my $tex = $self->{texture}
714	or return;	846	or return;
715		847
716	glEnable GL_TEXTURE_2D;	848	glEnable GL_TEXTURE_2D;
…		…
726		858
727	package CFClient::UI::ViewPort;	859	package CFClient::UI::ViewPort;
728		860
729	our @ISA = CFClient::UI::Window::;	861	our @ISA = CFClient::UI::Window::;
730		862
		863	sub new {
		864	my $class = shift;
		865
		866	$class->SUPER::new (
		867	scroll_x => 0,
		868	scroll_y => 1,
		869	@_,
		870	)
		871	}
		872
731	sub size_request {	873	sub size_request {
732	my ($self) = @_;	874	my ($self) = @_;
733		875
734	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	876	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
735	$self->child->configure (0, 0, @$self{qw(child_w child_h)});
736		877
737	@$self{qw(child_w child_h)}	878	$w = 10 if $self->{scroll_x};
		879	$h = 10 if $self->{scroll_y};
		880
		881	($w, $h)
738	}	882	}
739		883
740	sub size_allocate {	884	sub size_allocate {
741	my ($self, $w, $h) = @_;	885	my ($self, $w, $h) = @_;
742		886
		887	my $child = $self->child;
		888
		889	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
		890	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
		891
		892	$self->child->configure (0, 0, $w, $h);
743	$self->update;	893	$self->update;
744	}	894	}
745		895
746	sub set_offset {	896	sub set_offset {
747	my ($self, $x, $y) = @_;	897	my ($self, $x, $y) = @_;
…		…
781	}	931	}
782		932
783	sub _render {	933	sub _render {
784	my ($self) = @_;	934	my ($self) = @_;
785		935
		936	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
		937	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
		938
786	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	939	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
787		940
788	$self->SUPER::_render;	941	$self->SUPER::_render;
789	}	942	}
790		943
…		…
798	my $class = shift;	951	my $class = shift;
799		952
800	my $self;	953	my $self;
801		954
802	my $slider = new CFClient::UI::Slider	955	my $slider = new CFClient::UI::Slider
803	vertical => 1,	956	vertical => 1,
804	range => [0, 0, 1, 0.01], # HACK fix	957	range => [0, 0, 1, 0.01], # HACK fix
805	connect_changed => sub {	958	on_changed => sub {
806	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));	959	$self->{vp}->set_offset (0, $_[1]);
807	},	960	},
808	;	961	;
809		962
810	$self = $class->SUPER::new (	963	$self = $class->SUPER::new (
811	vp => (new CFClient::UI::ViewPort expand => 1),	964	vp => (new CFClient::UI::ViewPort expand => 1),
…		…
816	$self->{vp}->add ($self->{scrolled});	969	$self->{vp}->add ($self->{scrolled});
817	$self->add ($self->{vp});	970	$self->add ($self->{vp});
818	$self->add ($self->{slider});	971	$self->add ($self->{slider});
819		972
820	$self	973	$self
		974	}
		975
		976	sub update {
		977	my ($self) = @_;
		978
		979	$self->SUPER::update;
		980
		981	# todo: overwrite size_allocate of child
		982	my $child = $self->{vp}->child;
		983	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
		984	}
		985
		986	sub size_allocate {
		987	my ($self, $w, $h) = @_;
		988
		989	$self->SUPER::size_allocate ($w, $h);
		990
		991	my $child = $self->{vp}->child;
		992	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
821	}	993	}
822		994
823	#TODO# update range on size_allocate depending on child	995	#TODO# update range on size_allocate depending on child
824	# update viewport offset on scroll	996	# update viewport offset on scroll
825		997
…		…
869		1041
870	our @ISA = CFClient::UI::Bin::;	1042	our @ISA = CFClient::UI::Bin::;
871		1043
872	use CFClient::OpenGL;	1044	use CFClient::OpenGL;
873		1045
874	my @tex =	1046	my $bg =
		1047	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
		1048	mipmap => 1, wrap => 1;
		1049
		1050	my @border =
875	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1051	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
876	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1052	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
877		1053
878	sub new {	1054	sub new {
879	my $class = shift;	1055	my ($class, %arg) = @_;
880		1056
881	# TODO: user_x, user_y, overwrite moveto?	1057	my $title = delete $arg{title};
882		1058
883	my $self = $class->SUPER::new (	1059	my $self = $class->SUPER::new (
884	bg => [1, 1, 1, 1],	1060	bg => [1, 1, 1, 1],
885	border_bg => [1, 1, 1, 1],	1061	border_bg => [1, 1, 1, 1],
886	border => 0.6,	1062	border => 0.6,
887	toplevel => 1,
888	can_events => 1,	1063	can_events => 1,
889	@_	1064	min_w => 16,
		1065	min_h => 16,
		1066	%arg,
890	);	1067	);
891		1068
892	$self->{title} &&= new CFClient::UI::Label	1069	$self->{title} = new CFClient::UI::Label
893	align => 0,	1070	align => 0,
894	valign => 1,	1071	valign => 1,
895	text => $self->{title},	1072	text => $title,
896	fontsize => $self->{border};	1073	fontsize => $self->{border}
		1074	if defined $title;
897		1075
898	$self	1076	$self
		1077	}
		1078
		1079	sub add {
		1080	my ($self, @widgets) = @_;
		1081
		1082	$self->SUPER::add (@widgets);
		1083	$self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
899	}	1084	}
900		1085
901	sub border {	1086	sub border {
902	int $_[0]{border} * $::FONTSIZE	1087	int $_[0]{border} * $::FONTSIZE
903	}	1088	}
904		1089
905	sub size_request {	1090	sub size_request {
906	my ($self) = @_;	1091	my ($self) = @_;
		1092
		1093	$self->{title}->size_request
		1094	if $self->{title};
907		1095
908	my ($w, $h) = $self->SUPER::size_request;	1096	my ($w, $h) = $self->SUPER::size_request;
909		1097
910	(	1098	(
911	$w + $self->border * 2,	1099	$w + $self->border * 2,
…		…
914	}	1102	}
915		1103
916	sub size_allocate {	1104	sub size_allocate {
917	my ($self, $w, $h) = @_;	1105	my ($self, $w, $h) = @_;
918		1106
		1107	if ($self->{title}) {
		1108	$self->{title}{w} = $w;
		1109	$self->{title}{h} = $h;
		1110	$self->{title}->size_allocate ($w, $h);
		1111	}
		1112
		1113	my $border = $self->border;
		1114
919	$h -= List::Util::max 0, $self->border * 2;	1115	$h -= List::Util::max 0, $border * 2;
920	$w -= List::Util::max 0, $self->border * 2;	1116	$w -= List::Util::max 0, $border * 2;
921		1117
922	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
923	if $self->{title};
924
925	$self->child->configure ($self->border, $self->border, $w, $h);	1118	$self->child->configure ($border, $border, $w, $h);
926	}	1119	}
927		1120
928	sub button_down {	1121	sub button_down {
929	my ($self, $ev, $x, $y) = @_;	1122	my ($self, $ev, $x, $y) = @_;
930		1123
…		…
946	my ($ev, $x, $y) = @_;	1139	my ($ev, $x, $y) = @_;
947		1140
948	my $dx = $ev->{x} - $ox;	1141	my $dx = $ev->{x} - $ox;
949	my $dy = $ev->{y} - $oy;	1142	my $dy = $ev->{y} - $oy;
950		1143
951	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1144	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
952	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1145	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
		1146
		1147	$self->realloc;
953	$self->move ($wx + $dx * $mx, $wy + $dy * $my);	1148	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
954	$self->check_size;
955	};	1149	};
956		1150
957	} elsif ($lr ^ $td) {	1151	} elsif ($lr ^ $td) {
958	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1152	my ($ox, $oy) = ($ev->{x}, $ev->{y});
959	my ($bx, $by) = ($self->{x}, $self->{y});	1153	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
961	$self->{motion} = sub {	1155	$self->{motion} = sub {
962	my ($ev, $x, $y) = @_;	1156	my ($ev, $x, $y) = @_;
963		1157
964	($x, $y) = ($ev->{x}, $ev->{y});	1158	($x, $y) = ($ev->{x}, $ev->{y});
965		1159
966	$self->move ($bx + $x - $ox, $by + $y - $oy);	1160	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
967	$self->update;
968	};	1161	};
969	}	1162	}
970	}	1163	}
971		1164
972	sub button_up {	1165	sub button_up {
…		…
982	}	1175	}
983		1176
984	sub _draw {	1177	sub _draw {
985	my ($self) = @_;	1178	my ($self) = @_;
986		1179
		1180	my $child = $self->{children}[0];
		1181
987	my ($w, $h ) = ($self->{w}, $self->{h});	1182	my ($w, $h ) = ($self->{w}, $self->{h});
988	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1183	my ($cw, $ch) = ($child->{w}, $child->{h});
989		1184
990	glEnable GL_TEXTURE_2D;	1185	glEnable GL_TEXTURE_2D;
991	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1186	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
992		1187
993	my $border = $self->border;	1188	my $border = $self->border;
994		1189
995	glColor @{ $self->{border_bg} };	1190	glColor @{ $self->{border_bg} };
996	$tex[1]->draw_quad_alpha (0, 0, $w, $border);	1191	$border[0]->draw_quad_alpha (0, 0, $w, $border);
997	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);	1192	$border[1]->draw_quad_alpha (0, $border, $border, $ch);
998	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1193	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
999	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);	1194	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1000		1195
1001	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1196	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1002	my $bg = $tex[0];	1197	glColor @{ $self->{bg} };
1003		1198
1004	# TODO: repeat texture not scale	1199	# TODO: repeat texture not scale
		1200	# solve this better(?)
1005	my $rep_x = $cw / $bg->{w};	1201	$bg->{s} = $cw / $bg->{w};
1006	my $rep_y = $ch / $bg->{h};	1202	$bg->{t} = $ch / $bg->{h};
1007
1008	glColor @{ $self->{bg} };
1009
1010	$bg->{s} = $rep_x;
1011	$bg->{t} = $rep_y;
1012	$bg->{wrap_mode} = 1;
1013	$bg->draw_quad_alpha ($border, $border, $cw, $ch);	1203	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1014	}	1204	}
1015		1205
1016	glDisable GL_TEXTURE_2D;	1206	glDisable GL_TEXTURE_2D;
1017		1207
1018	$self->{title}->draw if $self->{title};
1019
1020	$self->child->draw;	1208	$child->draw;
		1209
		1210	if ($self->{title}) {
		1211	glTranslate 0, $border - $self->{h};
		1212	$self->{title}->_draw;
		1213	}
1021	}	1214	}
1022		1215
1023	#############################################################################	1216	#############################################################################
1024		1217
1025	package CFClient::UI::Table;	1218	package CFClient::UI::Table;
…		…
1033	sub new {	1226	sub new {
1034	my $class = shift;	1227	my $class = shift;
1035		1228
1036	$class->SUPER::new (	1229	$class->SUPER::new (
1037	col_expand => [],	1230	col_expand => [],
1038	@_	1231	@_,
1039	)	1232	)
		1233	}
		1234
		1235	sub children {
		1236	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1040	}	1237	}
1041		1238
1042	sub add {	1239	sub add {
1043	my ($self, $x, $y, $child) = @_;	1240	my ($self, $x, $y, $child) = @_;
1044		1241
1045	$child->set_parent ($self);	1242	$child->set_parent ($self);
1046	$self->{children}[$y][$x] = $child;	1243	$self->{children}[$y][$x] = $child;
1047		1244
1048	$child->check_size;	1245	$self->realloc;
1049	}	1246	}
1050		1247
1051	sub children {
1052	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1053	}
1054
1055	# TODO: move to container class maybe? send childs a signal on removal?	1248	# TODO: move to container class maybe? send children a signal on removal?
1056	sub clear {	1249	sub clear {
1057	my ($self) = @_;	1250	my ($self) = @_;
1058		1251
1059	my @children = $self->children;	1252	my @children = $self->children;
1060	delete $self->{children};	1253	delete $self->{children};
…		…
1062	for (@children) {	1255	for (@children) {
1063	delete $_->{parent};	1256	delete $_->{parent};
1064	$_->hide;	1257	$_->hide;
1065	}	1258	}
1066		1259
1067	$self->update;	1260	$self->realloc;
1068	}	1261	}
1069		1262
1070	sub get_wh {	1263	sub get_wh {
1071	my ($self) = @_;	1264	my ($self) = @_;
1072		1265
…		…
1103	sub size_allocate {	1296	sub size_allocate {
1104	my ($self, $w, $h) = @_;	1297	my ($self, $w, $h) = @_;
1105		1298
1106	my ($ws, $hs) = $self->get_wh;	1299	my ($ws, $hs) = $self->get_wh;
1107		1300
1108	my $req_w = sum @$ws;	1301	my $req_w = (sum @$ws) || 1;
1109	my $req_h = sum @$hs;	1302	my $req_h = (sum @$hs) || 1;
1110		1303
1111	# TODO: nicer code && do row_expand	1304	# TODO: nicer code && do row_expand
1112	my @col_expand = @{$self->{col_expand}};	1305	my @col_expand = @{$self->{col_expand}};
1113	@col_expand = (1) x @$ws unless @col_expand;	1306	@col_expand = (1) x @$ws unless @col_expand;
1114	my $col_expand = (sum @col_expand) || 1;	1307	my $col_expand = (sum @col_expand) || 1;
…		…
1168	}	1361	}
1169	}	1362	}
1170		1363
1171	#############################################################################	1364	#############################################################################
1172		1365
1173	package CFClient::UI::HBox;	1366	package CFClient::UI::Box;
1174
1175	# TODO: wrap into common Box base class
1176		1367
1177	our @ISA = CFClient::UI::Container::;	1368	our @ISA = CFClient::UI::Container::;
1178		1369
1179	sub size_request {	1370	sub size_request {
1180	my ($self) = @_;	1371	my ($self) = @_;
1181		1372
1182	my @alloc = map [$_->size_request], @{$self->{children}};	1373	$self->{vertical}
1183		1374	? (
1184	(	1375	(List::Util::max map $_->{req_w}, @{$self->{children}}),
1185	(List::Util::sum map $_->[0], @alloc),	1376	(List::Util::sum map $_->{req_h}, @{$self->{children}}),
1186	(List::Util::max map $_->[1], @alloc),	1377	)
1187	)	1378	: (
		1379	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
		1380	(List::Util::max map $_->{req_h}, @{$self->{children}}),
		1381	)
1188	}	1382	}
1189		1383
1190	sub size_allocate {	1384	sub size_allocate {
1191	my ($self, $w, $h) = @_;	1385	my ($self, $w, $h) = @_;
1192		1386
1193	($h, $w) = ($w, $h);	1387	my $space = $self->{vertical} ? $h : $w;
1194
1195	my $children = $self->{children};	1388	my $children = $self->{children};
1196		1389
1197	my @h = map $_->{req_w}, @$children;	1390	my @req;
1198		1391
1199	my $req_h = List::Util::sum @h;	1392	if ($self->{homogeneous}) {
1200		1393	@req = ($space / (@$children || 1)) x @$children;
1201	if ($req_h > $h) {
1202	# ah well, not enough space
1203	$_ *= $h / $req_h for @h;
1204	} else {	1394	} else {
		1395	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
		1396	my $req = List::Util::sum @req;
		1397
		1398	if ($req > $space) {
		1399	# ah well, not enough space
		1400	$_ *= $space / $req for @req;
		1401	} else {
1205	my $exp = List::Util::sum map $_->{expand}, @$children;	1402	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1206	$exp ||= 1;
1207		1403
		1404	$space = ($space - $req) / $expand; # remaining space to give away
		1405
		1406	$req[$_] += $space * $children->[$_]{expand}
1208	for (0 .. $#$children) {	1407	for 0 .. $#$children;
1209	my $child = $children->[$_];
1210
1211	my $alloc_h = $h[$_];
1212	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1213	$h[$_] = $alloc_h;
1214	}	1408	}
1215	}	1409	}
1216		1410
1217	CFClient::UI::harmonize \@h;	1411	CFClient::UI::harmonize \@req;
1218		1412
1219	my $y = 0;	1413	my $pos = 0;
1220	for (0 .. $#$children) {	1414	for (0 .. $#$children) {
1221	my $child = $children->[$_];
1222	my $h = $h[$_];	1415	my $alloc = $req[$_];
1223	$child->configure ($y, 0, $h, $w);	1416	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1224		1417
1225	$y += $h;	1418	$pos += $alloc;
1226	}	1419	}
1227		1420
1228	1	1421	1
1229	}	1422	}
1230		1423
1231	#############################################################################	1424	#############################################################################
1232		1425
		1426	package CFClient::UI::HBox;
		1427
		1428	our @ISA = CFClient::UI::Box::;
		1429
		1430	sub new {
		1431	my $class = shift;
		1432
		1433	$class->SUPER::new (
		1434	vertical => 0,
		1435	@_,
		1436	)
		1437	}
		1438
		1439	#############################################################################
		1440
1233	package CFClient::UI::VBox;	1441	package CFClient::UI::VBox;
1234		1442
1235	# TODO: wrap into common Box base class
1236
1237	our @ISA = CFClient::UI::Container::;	1443	our @ISA = CFClient::UI::Box::;
1238		1444
1239	sub size_request {	1445	sub new {
1240	my ($self) = @_;	1446	my $class = shift;
1241		1447
1242	my @alloc = map [$_->size_request], @{$self->{children}};	1448	$class->SUPER::new (
1243		1449	vertical => 1,
1244	(	1450	@_,
1245	(List::Util::max map $_->[0], @alloc),
1246	(List::Util::sum map $_->[1], @alloc),
1247	)	1451	)
1248	}
1249
1250	sub size_allocate {
1251	my ($self, $w, $h) = @_;
1252
1253	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1254
1255	my $children = $self->{children};
1256
1257	my @h = map $_->{req_h}, @$children;
1258
1259	my $req_h = List::Util::sum @h;
1260
1261	if ($req_h > $h) {
1262	# ah well, not enough space
1263	$_ *= $h / $req_h for @h;
1264	} else {
1265	my $exp = List::Util::sum map $_->{expand}, @$children;
1266	$exp ||= 1;
1267
1268	for (0 .. $#$children) {
1269	my $child = $children->[$_];
1270
1271	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1272	}
1273	}
1274
1275	CFClient::UI::harmonize \@h;
1276
1277	my $y = 0;
1278	for (0 .. $#$children) {
1279	my $child = $children->[$_];
1280	my $h = $h[$_];
1281	$child->configure (0, $y, $w, $h);
1282
1283	$y += $h;
1284	}
1285
1286	1
1287	}	1452	}
1288		1453
1289	#############################################################################	1454	#############################################################################
1290		1455
1291	package CFClient::UI::Label;	1456	package CFClient::UI::Label;
…		…
1308	ellipsise => 3, # end	1473	ellipsise => 3, # end
1309	layout => (new CFClient::Layout),	1474	layout => (new CFClient::Layout),
1310	fontsize => 1,	1475	fontsize => 1,
1311	align => -1,	1476	align => -1,
1312	valign => -1,	1477	valign => -1,
1313	padding => 2,	1478	padding_x => 2,
		1479	padding_y => 2,
1314	can_events => 0,	1480	can_events => 0,
1315	%arg	1481	%arg
1316	);	1482	);
1317		1483
1318	if (exists $self->{template}) {	1484	if (exists $self->{template}) {
…		…
1354	$self->{text} = "T$text";	1520	$self->{text} = "T$text";
1355		1521
1356	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1522	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1357	$self->{layout}->set_text ($text);	1523	$self->{layout}->set_text ($text);
1358		1524
		1525	$self->realloc;
1359	$self->update;	1526	$self->update;
1360	$self->check_size;
1361	}	1527	}
1362		1528
1363	sub set_markup {	1529	sub set_markup {
1364	my ($self, $markup) = @_;	1530	my ($self, $markup) = @_;
1365		1531
…		…
1369	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1535	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1370		1536
1371	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;	1537	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1372	$self->{layout}->set_markup ($markup);	1538	$self->{layout}->set_markup ($markup);
1373		1539
		1540	$self->realloc;
1374	$self->update;	1541	$self->update;
1375	$self->check_size;
1376	}	1542	}
1377		1543
1378	sub size_request {	1544	sub size_request {
1379	my ($self) = @_;	1545	my ($self) = @_;
1380		1546
…		…
1394		1560
1395	$w = List::Util::max $w, $w2;	1561	$w = List::Util::max $w, $w2;
1396	$h = List::Util::max $h, $h2;	1562	$h = List::Util::max $h, $h2;
1397	}	1563	}
1398		1564
1399	(	1565	($w, $h)
1400	$w + $self->{padding} * 2,
1401	$h + $self->{padding} * 2,
1402	)
1403	}	1566	}
1404		1567
1405	sub size_allocate {	1568	sub size_allocate {
1406	my ($self, $w, $h) = @_;	1569	my ($self, $w, $h) = @_;
1407		1570
		1571	delete $self->{ox};
		1572
1408	delete $self->{texture};	1573	delete $self->{texture}
		1574	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1409	}	1575	}
1410		1576
1411	sub set_fontsize {	1577	sub set_fontsize {
1412	my ($self, $fontsize) = @_;	1578	my ($self, $fontsize) = @_;
1413		1579
1414	$self->{fontsize} = $fontsize;	1580	$self->{fontsize} = $fontsize;
1415	delete $self->{texture};	1581	delete $self->{texture};
1416		1582
1417	$self->update;	1583	$self->realloc;
1418	$self->check_size;
1419	}	1584	}
1420		1585
1421	sub _draw {	1586	sub _draw {
1422	my ($self) = @_;	1587	my ($self) = @_;
1423		1588
…		…
1429	$self->{layout}->set_width ($self->{w});	1594	$self->{layout}->set_width ($self->{w});
1430	$self->{layout}->set_ellipsise ($self->{ellipsise});	1595	$self->{layout}->set_ellipsise ($self->{ellipsise});
1431	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1596	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1432	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1597	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1433		1598
1434	my $tex = new_from_layout CFClient::Texture $self->{layout};	1599	new_from_layout CFClient::Texture $self->{layout}
		1600	};
1435		1601
		1602	unless (exists $self->{ox}) {
1436	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}	1603	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1437	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1604	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1438	: ($self->{w} - $tex->{w}) * 0.5);	1605	: ($self->{w} - $tex->{w}) * 0.5);
1439		1606
1440	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}	1607	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1441	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1608	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1442	: ($self->{h} - $tex->{h}) * 0.5);	1609	: ($self->{h} - $tex->{h}) * 0.5);
1443
1444	$tex
1445	};	1610	};
1446		1611
1447	glEnable GL_TEXTURE_2D;	1612	glEnable GL_TEXTURE_2D;
1448	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1613	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1449		1614
…		…
1475	active_fg => [0, 0, 0],	1640	active_fg => [0, 0, 0],
1476	can_hover => 1,	1641	can_hover => 1,
1477	can_focus => 1,	1642	can_focus => 1,
1478	valign => 0,	1643	valign => 0,
1479	can_events => 1,	1644	can_events => 1,
		1645	#text => ...
1480	@_	1646	@_
1481	)	1647	)
1482	}	1648	}
1483		1649
1484	sub _set_text {	1650	sub _set_text {
…		…
1494	$self->{text} = $text;	1660	$self->{text} = $text;
1495		1661
1496	$text =~ s/./*/g if $self->{hidden};	1662	$text =~ s/./*/g if $self->{hidden};
1497	$self->{layout}->set_text ("$text ");	1663	$self->{layout}->set_text ("$text ");
1498		1664
1499	$self->emit (changed => $self->{text});	1665	$self->_emit (changed => $self->{text});
1500	}	1666	}
1501		1667
1502	sub set_text {	1668	sub set_text {
1503	my ($self, $text) = @_;	1669	my ($self, $text) = @_;
1504		1670
1505	$self->{cursor} = length $text;	1671	$self->{cursor} = length $text;
1506	$self->_set_text ($text);	1672	$self->_set_text ($text);
1507	$self->update;	1673
1508	$self->check_size;	1674	$self->realloc;
1509	}	1675	}
1510		1676
1511	sub get_text {	1677	sub get_text {
1512	$_[0]{text}	1678	$_[0]{text}
1513	}	1679	}
…		…
1516	my ($self) = @_;	1682	my ($self) = @_;
1517		1683
1518	my ($w, $h) = $self->SUPER::size_request;	1684	my ($w, $h) = $self->SUPER::size_request;
1519		1685
1520	($w + 1, $h) # add 1 for cursor	1686	($w + 1, $h) # add 1 for cursor
1521	}
1522
1523	sub size_allocate {
1524	my ($self, $w, $h) = @_;
1525
1526	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1527	}	1687	}
1528		1688
1529	sub key_down {	1689	sub key_down {
1530	my ($self, $ev) = @_;	1690	my ($self, $ev) = @_;
1531		1691
…		…
1546	} elsif ($sym == CFClient::SDLK_HOME) {	1706	} elsif ($sym == CFClient::SDLK_HOME) {
1547	$self->{cursor} = 0;	1707	$self->{cursor} = 0;
1548	} elsif ($sym == CFClient::SDLK_END) {	1708	} elsif ($sym == CFClient::SDLK_END) {
1549	$self->{cursor} = length $text;	1709	$self->{cursor} = length $text;
1550	} elsif ($uni == 27) {	1710	} elsif ($uni == 27) {
1551	$self->emit ('escape');	1711	$self->_emit ('escape');
1552	} elsif ($uni) {	1712	} elsif ($uni) {
1553	substr $text, $self->{cursor}++, 0, chr $uni;	1713	substr $text, $self->{cursor}++, 0, chr $uni;
1554	}	1714	}
1555		1715
1556	$self->_set_text ($text);	1716	$self->_set_text ($text);
1557	$self->update;	1717
1558	$self->check_size;	1718	$self->realloc;
1559	}	1719	}
1560		1720
1561	sub focus_in {	1721	sub focus_in {
1562	my ($self) = @_;	1722	my ($self) = @_;
1563		1723
…		…
1643	if ($sym == 13) {	1803	if ($sym == 13) {
1644	unshift @{$self->{history}},	1804	unshift @{$self->{history}},
1645	my $txt = $self->get_text;	1805	my $txt = $self->get_text;
1646	$self->{history_pointer} = -1;	1806	$self->{history_pointer} = -1;
1647	$self->{history_saveback} = '';	1807	$self->{history_saveback} = '';
1648	$self->emit (activate => $txt);	1808	$self->_emit (activate => $txt);
1649	$self->update;	1809	$self->update;
1650		1810
1651	} elsif ($sym == CFClient::SDLK_UP) {	1811	} elsif ($sym == CFClient::SDLK_UP) {
1652	if ($self->{history_pointer} < 0) {	1812	if ($self->{history_pointer} < 0) {
1653	$self->{history_saveback} = $self->get_text;	1813	$self->{history_saveback} = $self->get_text;
…		…
1690		1850
1691	sub new {	1851	sub new {
1692	my $class = shift;	1852	my $class = shift;
1693		1853
1694	$class->SUPER::new (	1854	$class->SUPER::new (
1695	padding => 4,	1855	padding_x => 4,
		1856	padding_y => 4,
1696	fg => [1, 1, 1],	1857	fg => [1, 1, 1],
1697	active_fg => [0, 0, 1],	1858	active_fg => [0, 0, 1],
1698	can_hover => 1,	1859	can_hover => 1,
1699	align => 0,	1860	align => 0,
1700	valign => 0,	1861	valign => 0,
1701	can_events => 1,	1862	can_events => 1,
1702	@_	1863	@_
1703	)	1864	)
1704	}	1865	}
1705		1866
		1867	sub activate { }
		1868
1706	sub button_up {	1869	sub button_up {
1707	my ($self, $ev, $x, $y) = @_;	1870	my ($self, $ev, $x, $y) = @_;
1708		1871
		1872	$self->emit ("activate")
1709	if ($x >= 0 && $x < $self->{w}	1873	if $x >= 0 && $x < $self->{w}
1710	&& $y >= 0 && $y < $self->{h}) {	1874	&& $y >= 0 && $y < $self->{h};
1711	$self->emit ("activate");
1712	}
1713	}	1875	}
1714		1876
1715	sub _draw {	1877	sub _draw {
1716	my ($self) = @_;	1878	my ($self) = @_;
1717		1879
…		…
1746		1908
1747	sub new {	1909	sub new {
1748	my $class = shift;	1910	my $class = shift;
1749		1911
1750	$class->SUPER::new (	1912	$class->SUPER::new (
1751	padding => 2,	1913	padding_x => 2,
		1914	padding_y => 2,
1752	fg => [1, 1, 1],	1915	fg => [1, 1, 1],
1753	active_fg => [1, 1, 0],	1916	active_fg => [1, 1, 0],
1754	bg => [0, 0, 0, 0.2],	1917	bg => [0, 0, 0, 0.2],
1755	active_bg => [1, 1, 1, 0.5],	1918	active_bg => [1, 1, 1, 0.5],
1756	state => 0,	1919	state => 0,
…		…
1760	}	1923	}
1761		1924
1762	sub size_request {	1925	sub size_request {
1763	my ($self) = @_;	1926	my ($self) = @_;
1764		1927
1765	($self->{padding} * 2 + 6) x 2	1928	(6) x 2
1766	}	1929	}
1767		1930
1768	sub button_down {	1931	sub button_down {
1769	my ($self, $ev, $x, $y) = @_;	1932	my ($self, $ev, $x, $y) = @_;
1770		1933
1771	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1934	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1772	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1935	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1773	$self->{state} = !$self->{state};	1936	$self->{state} = !$self->{state};
1774	$self->emit (changed => $self->{state});	1937	$self->_emit (changed => $self->{state});
1775	}	1938	}
1776	}	1939	}
1777		1940
1778	sub _draw {	1941	sub _draw {
1779	my ($self) = @_;	1942	my ($self) = @_;
1780		1943
1781	$self->SUPER::_draw;	1944	$self->SUPER::_draw;
1782		1945
1783	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;	1946	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1784		1947
1785	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1948	my ($w, $h) = @$self{qw(w h)};
		1949
		1950	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1786		1951
1787	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1952	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1788		1953
1789	my $tex = $self->{state} ? $tex[1] : $tex[0];	1954	my $tex = $self->{state} ? $tex[1] : $tex[0];
1790		1955
…		…
2054	my $self = $class->SUPER::new (	2219	my $self = $class->SUPER::new (
2055	fg => [1, 1, 1],	2220	fg => [1, 1, 1],
2056	active_fg => [0, 0, 0],	2221	active_fg => [0, 0, 0],
2057	bg => [0, 0, 0, 0.2],	2222	bg => [0, 0, 0, 0.2],
2058	active_bg => [1, 1, 1, 0.5],	2223	active_bg => [1, 1, 1, 0.5],
2059	range => [0, 0, 100, 10],	2224	range => [0, 0, 100, 10, 0],
2060	req_w => $::WIDTH / 80,	2225	min_w => $::WIDTH / 80,
2061	req_h => $::WIDTH / 80,	2226	min_h => $::WIDTH / 80,
2062	vertical => 0,	2227	vertical => 0,
2063	can_hover => 1,	2228	can_hover => 1,
2064	inner_pad => 0.02,	2229	inner_pad => 0.02,
2065	@_	2230	@_
2066	);	2231	);
…		…
2069	$self->update;	2234	$self->update;
2070		2235
2071	$self	2236	$self
2072	}	2237	}
2073		2238
		2239	sub changed { }
		2240
		2241	sub set_range {
		2242	my ($self, $range) = @_;
		2243
		2244	($range, $self->{range}) = ($self->{range}, $range);
		2245
		2246	$self->update
		2247	if "@$range" ne "@{$self->{range}}";
		2248	}
		2249
2074	sub set_value {	2250	sub set_value {
2075	my ($self, $value) = @_;	2251	my ($self, $value) = @_;
2076		2252
2077	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};	2253	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2078		2254
2079	$hi = $lo + 1 if $hi <= $lo;	2255	$hi = $lo + 1 if $hi <= $lo;
2080		2256
		2257	$page = $hi - $lo if $page > $hi - $lo;
		2258
2081	$value = $lo if $value < $lo;	2259	$value = $lo if $value < $lo;
2082	$value = $hi if $value > $hi;	2260	$value = $hi - $page if $value > $hi - $page;
2083		2261
2084	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit	2262	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2085	if $unit;	2263	if $unit;
2086		2264
2087	$page = $hi - $lo if $page > $hi - $lo;
2088
2089	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	2265	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2090		2266
2091	if ($value != $old_value) {	2267	if ($value != $old_value) {
2092	$self->emit (changed => $value);	2268	$self->_emit (changed => $value);
2093	$self->update;	2269	$self->update;
2094	}	2270	}
2095	}	2271	}
2096		2272
2097	sub size_request {	2273	sub size_request {
2098	my ($self) = @_;	2274	my ($self) = @_;
2099		2275
2100	my $w = $self->{req_w};	2276	($self->{req_w}, $self->{req_h})
2101	my $h = $self->{req_h};
2102
2103	$self->{vertical} ? ($h, $w) : ($w, $h)
2104	}	2277	}
2105		2278
2106	sub button_down {	2279	sub button_down {
2107	my ($self, $ev, $x, $y) = @_;	2280	my ($self, $ev, $x, $y) = @_;
2108		2281
2109	$self->SUPER::button_down ($ev, $x, $y);	2282	$self->SUPER::button_down ($ev, $x, $y);
		2283
		2284	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
		2285
2110	$self->mouse_motion ($ev, $x, $y);	2286	$self->mouse_motion ($ev, $x, $y);
2111	}	2287	}
2112		2288
2113	sub mouse_motion {	2289	sub mouse_motion {
2114	my ($self, $ev, $x, $y) = @_;	2290	my ($self, $ev, $x, $y) = @_;
…		…
2116	if ($GRAB == $self) {	2292	if ($GRAB == $self) {
2117	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2293	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2118		2294
2119	my (undef, $lo, $hi, $page) = @{$self->{range}};	2295	my (undef, $lo, $hi, $page) = @{$self->{range}};
2120		2296
2121	$x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};	2297	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2122		2298
2123	$self->set_value ($x * ($hi - $lo) + $lo);	2299	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2124	}	2300	}
2125	}	2301	}
2126		2302
2127	sub update {	2303	sub update {
2128	my ($self) = @_;	2304	my ($self) = @_;
2129		2305
2130	$CFClient::UI::ROOT->on_post_alloc ($self => sub {	2306	$CFClient::UI::ROOT->on_post_alloc ($self => sub {
2131	$self->set_value ($self->{range}[0]);	2307	$self->set_value ($self->{range}[0]);
2132		2308
2133	my ($value, $lo, $hi, $page) = @{$self->{range}};	2309	my ($value, $lo, $hi, $page) = @{$self->{range}};
		2310	my $range = ($hi - $page - $lo) || 1e-100;
2134		2311
2135	my $inner_w = 1 - 2 * $self->{inner_pad};	2312	my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2136		2313
2137	$self->{scale} = ($inner_w / ($hi - $lo)) || 1;	2314	$self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
		2315	$self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2138		2316
2139	$page = $self->{scale} * $page || 10 / ($self->{w} || 1);	2317	$value = ($value - $lo) / $range;
2140	$value = $self->{scale} * ($value - $lo);	2318	$value = $value * $self->{scale} + $self->{offset};
2141		2319
2142	$value = $self->{inner_pad} + ($value - $page * 0.5);
2143
2144	$value = 0 if $value < 0;
2145	$page = 1 - $value if $value + $page > 1;
2146
2147	$self->{knob_x} = $value;	2320	$self->{knob_x} = $value - $knob_w * 0.5;
2148	$self->{knob_w} = $page;	2321	$self->{knob_w} = $knob_w;
2149	});	2322	});
2150		2323
2151	$self->SUPER::update;	2324	$self->SUPER::update;
2152	}	2325	}
2153		2326
…		…
2177	# draw handle	2350	# draw handle
2178	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);	2351	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2179		2352
2180	glDisable GL_TEXTURE_2D;	2353	glDisable GL_TEXTURE_2D;
2181	}	2354	}
		2355
		2356	#############################################################################
		2357
		2358	package CFClient::UI::ValSlider;
		2359
		2360	our @ISA = CFClient::UI::HBox::;
		2361
		2362	sub new {
		2363	my ($class, %arg) = @_;
		2364
		2365	my $range = delete $arg{range};
		2366
		2367	my $self = $class->SUPER::new (
		2368	slider => (new CFClient::UI::Slider expand => 1, range => $range),
		2369	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
		2370	to_value => sub { shift },
		2371	from_value => sub { shift },
		2372	%arg,
		2373	);
		2374
		2375	$self->{slider}->connect (changed => sub {
		2376	my ($self, $value) = @_;
		2377	$self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
		2378	$self->{parent}->emit (changed => $value);
		2379	});
		2380
		2381	# $self->{entry}->connect (changed => sub {
		2382	# my ($self, $value) = @_;
		2383	# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
		2384	# $self->{parent}->emit (changed => $value);
		2385	# });
		2386
		2387	$self->add ($self->{slider}, $self->{entry});
		2388
		2389	$self->{slider}->emit (changed => $self->{slider}{range}[0]);
		2390
		2391	$self
		2392	}
		2393
		2394	sub set_range { shift->{slider}->set_range (@_) }
		2395	sub set_value { shift->{slider}->set_value (@_) }
2182		2396
2183	#############################################################################	2397	#############################################################################
2184		2398
2185	package CFClient::UI::TextView;	2399	package CFClient::UI::TextView;
2186		2400
…		…
2228	$self->{layout}->set_width ($self->{children}[0]{w});	2442	$self->{layout}->set_width ($self->{children}[0]{w});
2229		2443
2230	$self->reflow;	2444	$self->reflow;
2231	}	2445	}
2232		2446
2233	sub text_height {	2447	sub text_size {
2234	my ($self, $text, $indent) = @_;	2448	my ($self, $text, $indent) = @_;
2235		2449
2236	my $layout = $self->{layout};	2450	my $layout = $self->{layout};
2237		2451
2238	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2452	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2239	$layout->set_width ($self->{children}[0]{w} - $indent);	2453	$layout->set_width ($self->{children}[0]{w} - $indent);
2240	$layout->set_markup ($text);	2454	$layout->set_markup ($text);
2241		2455
2242	($layout->size)[1]	2456	$layout->size
2243	}	2457	}
2244		2458
2245	sub reflow {	2459	sub reflow {
2246	my ($self) = @_;	2460	my ($self) = @_;
2247		2461
2248	$self->{need_reflow}++;	2462	$self->{need_reflow}++;
2249	$self->update;	2463	$self->update;
2250	}	2464	}
2251		2465
		2466	sub set_offset {
		2467	my ($self, $offset) = @_;
		2468
		2469	# todo: base offset on lines or so, not on pixels
		2470	$self->{children}[1]->set_value ($offset);
		2471	}
		2472
		2473	sub clear {
		2474	my ($self) = @_;
		2475
		2476	$self->{par} = [];
		2477	$self->{height} = 0;
		2478	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
		2479	}
		2480
2252	sub add_paragraph {	2481	sub add_paragraph {
2253	my ($self, $color, $text, $indent) = @_;	2482	my ($self, $color, $text, $indent) = @_;
2254		2483
2255	#TODO: intelligently "reformat" paragraph
2256
2257	for my $line (split /\n/, $text) {	2484	for my $line (split /\n/, $text) {
2258	my $height = $self->text_height ($line);	2485	my ($w, $h) = $self->text_size ($line);
2259	$self->{height} += $height;	2486	$self->{height} += $h;
2260	push @{$self->{par}}, [$height, $color, $indent, $line];	2487	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2261	}	2488	}
2262		2489
2263	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];	2490	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2264	$self->{children}[1]->update;
2265	}	2491	}
2266		2492
2267	sub update {	2493	sub update {
2268	my ($self) = @_;	2494	my ($self) = @_;
2269		2495
…		…
2272	return unless $self->{h} > 0;	2498	return unless $self->{h} > 0;
2273		2499
2274	delete $self->{texture};	2500	delete $self->{texture};
2275		2501
2276	$ROOT->on_post_alloc ($self, sub {	2502	$ROOT->on_post_alloc ($self, sub {
		2503	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2504
2277	if (delete $self->{need_reflow}) {	2505	if (delete $self->{need_reflow}) {
2278	my $height = 0;	2506	my $height = 0;
2279		2507
2280	$height += $_->[0] = $self->text_height ($_->[3], $_->[2])	2508	my $layout = $self->{layout};
		2509
		2510	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2511
2281	for @{$self->{par}};	2512	for (@{$self->{par}}) {
		2513	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
		2514	$layout->set_width ($W - $_->[3]);
		2515	$layout->set_markup ($_->[4]);
		2516	my ($w, $h) = $layout->size;
		2517	$_->[0] = $w + $_->[3];
		2518	$_->[1] = $h;
		2519	}
		2520
		2521	$height += $_->[1];
		2522	}
2282		2523
2283	$self->{height} = $height;	2524	$self->{height} = $height;
2284		2525
2285	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2526	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2286	$self->{children}[1]->update;
2287		2527
2288	delete $self->{texture};	2528	delete $self->{texture};
2289	}	2529	}
2290		2530
2291	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {	2531	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2292	glClearColor 0.5, 0.5, 0.5, 0;	2532	glClearColor 0.5, 0.5, 0.5, 0;
2293	glClear GL_COLOR_BUFFER_BIT;	2533	glClear GL_COLOR_BUFFER_BIT;
2294		2534
2295	my $top = int $self->{children}[1]{range}[0];	2535	my $top = int $self->{children}[1]{range}[0];
2296		2536
2297	my $y0 = $top;	2537	my $y0 = $top;
2298	my $y1 = $top + $self->{h};	2538	my $y1 = $top + $H;
2299		2539
2300	my $y = 0;	2540	my $y = 0;
2301		2541
2302	my $layout = $self->{layout};	2542	my $layout = $self->{layout};
2303		2543
2304	$layout->set_font ($self->{font}) if $self->{font};	2544	$layout->set_font ($self->{font}) if $self->{font};
2305		2545
2306	glEnable GL_BLEND;	2546	glEnable GL_BLEND;
		2547	#TODO# not correct in windows where rgba is forced off
2307	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2548	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2308		2549
2309	for my $par (@{$self->{par}}) {	2550	for my $par (@{$self->{par}}) {
2310	my $h = $par->[0];	2551	my $h = $par->[1];
2311		2552
2312	if ($y0 < $y + $h && $y < $y1) {	2553	if ($y0 < $y + $h && $y < $y1) {
2313	$layout->set_foreground (@{ $par->[1] });	2554	$layout->set_foreground (@{ $par->[2] });
2314	$layout->set_width ($self->{w} - $par->[2]);	2555	$layout->set_width ($W - $par->[3]);
2315	$layout->set_markup ($par->[3]);	2556	$layout->set_markup ($par->[4]);
2316		2557
2317	my ($w, $h, $data, $format, $internalformat) = $layout->render;	2558	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2318		2559
2319	glRasterPos $par->[2], $y - $y0;	2560	glRasterPos $par->[3], $y - $y0;
2320	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;	2561	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2321	}	2562	}
2322		2563
2323	$y += $h;	2564	$y += $h;
2324	}	2565	}
…		…
2391		2632
2392	sub new {	2633	sub new {
2393	my $class = shift;	2634	my $class = shift;
2394		2635
2395	my $self = $class->SUPER::new (	2636	my $self = $class->SUPER::new (
2396	state => 0,	2637	state => 0,
2397	connect_activate => \&toggle_flopper,	2638	on_activate => \&toggle_flopper,
2398	@_	2639	@_
2399	);	2640	);
2400		2641
2401	if ($self->{state}) {
2402	$self->{state} = 0;
2403	$self->toggle_flopper;
2404	}
2405
2406	$self	2642	$self
2407	}	2643	}
2408		2644
2409	sub toggle_flopper {	2645	sub toggle_flopper {
2410	my ($self) = @_;	2646	my ($self) = @_;
2411		2647
2412	# TODO: use animation	2648	$self->{other}->toggle_visibility;
2413	if ($self->{state} = !$self->{state}) {
2414	$CFClient::UI::ROOT->add ($self->{other});
2415	$self->{other}->move ($self->coord2global (0, $self->{h}));
2416	$self->emit ("open");
2417	} else {
2418	$CFClient::UI::ROOT->remove ($self->{other});
2419	$self->emit ("close");
2420	}
2421
2422	$self->emit (changed => $self->{state});
2423	}	2649	}
2424		2650
2425	#############################################################################	2651	#############################################################################
2426		2652
2427	package CFClient::UI::Tooltip;	2653	package CFClient::UI::Tooltip;
…		…
2440	}	2666	}
2441		2667
2442	sub set_tooltip_from {	2668	sub set_tooltip_from {
2443	my ($self, $widget) = @_;	2669	my ($self, $widget) = @_;
2444		2670
		2671	my $tooltip = $widget->{tooltip};
		2672
		2673	if ($ENV{CFPLUS_DEBUG} & 2) {
		2674	$tooltip .= "\n\n" . (ref $widget) . "\n"
		2675	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
		2676	. "req $widget->{req_w} $widget->{req_h}\n"
		2677	. "visible $widget->{visible}";
		2678	}
		2679
2445	$self->add (new CFClient::UI::Label	2680	$self->add (new CFClient::UI::Label
2446	markup => $widget->{tooltip},	2681	markup => $tooltip,
2447	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2682	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2448	fontsize => 0.8,	2683	fontsize => 0.8,
2449	fg => [0, 0, 0, 1],	2684	fg => [0, 0, 0, 1],
2450	ellipsise => 0,	2685	ellipsise => 0,
2451	font => ($widget->{tooltip_font} || $::FONT_PROP),	2686	font => ($widget->{tooltip_font} || $::FONT_PROP),
…		…
2462		2697
2463	sub size_allocate {	2698	sub size_allocate {
2464	my ($self, $w, $h) = @_;	2699	my ($self, $w, $h) = @_;
2465		2700
2466	$self->SUPER::size_allocate ($w - 4, $h - 4);	2701	$self->SUPER::size_allocate ($w - 4, $h - 4);
		2702	}
		2703
		2704	sub visibility_change {
		2705	my ($self, $visible) = @_;
		2706
		2707	return unless $visible;
		2708
		2709	$self->{root}->on_post_alloc ("move_$self" => sub {
		2710	my $widget = $self->{owner}
		2711	or return;
		2712
		2713	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
		2714
		2715	($x, $y) = $widget->coord2global (-$self->{w}, 0)
		2716	if $x + $self->{w} > $::WIDTH;
		2717
		2718	$self->move_abs ($x, $y);
		2719	});
2467	}	2720	}
2468		2721
2469	sub _draw {	2722	sub _draw {
2470	my ($self) = @_;	2723	my ($self) = @_;
2471		2724
…		…
2488	glVertex $w, $h;	2741	glVertex $w, $h;
2489	glVertex $w, 0;	2742	glVertex $w, 0;
2490	glEnd;	2743	glEnd;
2491		2744
2492	glTranslate 2 - 0.375, 2 - 0.375;	2745	glTranslate 2 - 0.375, 2 - 0.375;
		2746
2493	$self->SUPER::_draw;	2747	$self->SUPER::_draw;
2494	}	2748	}
2495		2749
2496	#############################################################################	2750	#############################################################################
2497		2751
…		…
2503		2757
2504	sub new {	2758	sub new {
2505	my $class = shift;	2759	my $class = shift;
2506		2760
2507	my $self = $class->SUPER::new (	2761	my $self = $class->SUPER::new (
2508	aspect => 1,	2762	aspect => 1,
		2763	can_events => 0,
2509	@_,	2764	@_,
2510	);	2765	);
2511		2766
2512	if ($self->{anim} && $self->{animspeed}) {	2767	if ($self->{anim} && $self->{animspeed}) {
2513	Scalar::Util::weaken (my $widget = $self);	2768	Scalar::Util::weaken (my $widget = $self);
…		…
2539	}	2794	}
2540		2795
2541	sub _draw {	2796	sub _draw {
2542	my ($self) = @_;	2797	my ($self) = @_;
2543		2798
2544	return unless $::CONN;#d# manage and cache textures differently	2799	return unless $::CONN;
2545		2800
2546	my $face;	2801	my $face;
2547		2802
2548	if ($self->{frame}) {	2803	if ($self->{frame}) {
2549	my $anim = $::CONN->{anim}[$self->{anim}];	2804	my $anim = $::CONN->{anim}[$self->{anim}];
…		…
2568		2823
2569	$self->{timer}->cancel	2824	$self->{timer}->cancel
2570	if $self->{timer};	2825	if $self->{timer};
2571		2826
2572	$self->SUPER::DESTROY;	2827	$self->SUPER::DESTROY;
2573	}
2574
2575	#############################################################################
2576
2577	package CFClient::UI::InventoryItem;
2578
2579	our @ISA = CFClient::UI::HBox::;
2580
2581	sub _item_to_desc {
2582	my ($item) = @_;
2583
2584	my $desc =
2585	$item->{nrof} < 2
2586	? $item->{name}
2587	: "$item->{nrof} × $item->{name_pl}";
2588
2589	$item->{flags} & Crossfire::Protocol::F_OPEN
2590	and $desc .= " (open)";
2591	$item->{flags} & Crossfire::Protocol::F_APPLIED
2592	and $desc .= " (applied)";
2593	$item->{flags} & Crossfire::Protocol::F_UNPAID
2594	and $desc .= " (unpaid)";
2595	$item->{flags} & Crossfire::Protocol::F_MAGIC
2596	and $desc .= " (magic)";
2597	$item->{flags} & Crossfire::Protocol::F_CURSED
2598	and $desc .= " (cursed)";
2599	$item->{flags} & Crossfire::Protocol::F_DAMNED
2600	and $desc .= " (damned)";
2601	$item->{flags} & Crossfire::Protocol::F_LOCKED
2602	and $desc .= " *";
2603
2604	$desc
2605	}
2606
2607	sub new {
2608	my $class = shift;
2609
2610	my %args = @_;
2611
2612	my $item = delete $args{item};
2613
2614	my $desc = _item_to_desc ($item);
2615
2616	my $self = $class->SUPER::new (
2617	can_hover => 1,
2618	can_events => 1,
2619	tooltip => ((CFClient::UI::Label::escape $desc)
2620	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2621	connect_button_down => sub {
2622	my ($self, $ev, $x, $y) = @_;
2623
2624	# todo: maybe put examine on 1? but should just be a tooltip :(
2625	if ($ev->{button} == 1) {
2626	my $targ = $::CONN->{player}{tag};
2627
2628	if ($item->{container} == $::CONN->{player}{tag}) {
2629	$targ = $main::OPENCONT;
2630	}
2631
2632	$::CONN->send ("move $targ $item->{tag} 0");
2633	} elsif ($ev->{button} == 2) {
2634	$::CONN->send ("apply $item->{tag}");
2635	} elsif ($ev->{button} == 3) {
2636	my @menu_items = (
2637	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2638	["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2639	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2640	(
2641	$item->{flags} & Crossfire::Protocol::F_LOCKED
2642	? (
2643	["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2644	)
2645	: (
2646	["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2647	["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2648	)
2649	),
2650	);
2651
2652	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2653	}
2654
2655	1
2656	},
2657	%args
2658	);
2659
2660
2661	$self->add (new CFClient::UI::Face
2662	can_events => 0,
2663	face => $item->{face},
2664	anim => $item->{anim},
2665	animspeed => $item->{animspeed},
2666	);
2667
2668	$self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2669
2670	$self->{item} = $item;
2671
2672	$self->update_item;
2673
2674	$self
2675	}
2676
2677	sub update_item {
2678	my ($self) = @_;
2679
2680	my $desc = _item_to_desc ($self->{item});
2681
2682	$self->{name_lbl}->set_text ($desc);
2683	}
2684
2685	#############################################################################
2686
2687	package CFClient::UI::Inventory;
2688
2689	our @ISA = CFClient::UI::ScrolledWindow::;
2690
2691	sub new {
2692	my $class = shift;
2693
2694	my $self = $class->SUPER::new (
2695	scrolled => (new CFClient::UI::VBox),
2696	@_,
2697	);
2698
2699	$self
2700	}
2701
2702	sub set_items {
2703	my ($self, $items) = @_;
2704
2705	$self->{scrolled}->clear;
2706	return unless $items;
2707
2708	my @items = sort {
2709	($a->{type} <=> $b->{type})
2710	or ($a->{name} cmp $b->{name})
2711	} @$items;
2712
2713	$self->{real_items} = \@items;
2714
2715	for my $item (@items) {
2716	$item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2717	$item->update_item ();
2718	}
2719
2720	$self->{scrolled}->add (@items);
2721
2722	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2723	}
2724
2725	sub size_request {
2726	my ($self) = @_;
2727	($self->{req_w}, $self->{req_h});
2728	}	2828	}
2729		2829
2730	#############################################################################	2830	#############################################################################
2731		2831
2732	package CFClient::UI::Menu;	2832	package CFClient::UI::Menu;
…		…
2767		2867
2768	# popup given the event (must be a mouse button down event currently)	2868	# popup given the event (must be a mouse button down event currently)
2769	sub popup {	2869	sub popup {
2770	my ($self, $ev) = @_;	2870	my ($self, $ev) = @_;
2771		2871
2772	$self->emit ("popdown");	2872	$self->_emit ("popdown");
2773		2873
2774	# maybe save $GRAB? must be careful about events...	2874	# maybe save $GRAB? must be careful about events...
2775	$GRAB = $self;	2875	$GRAB = $self;
2776	$self->{button} = $ev->{button};	2876	$self->{button} = $ev->{button};
2777		2877
2778	$self->show;	2878	$self->show;
2779	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	2879	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2780	}	2880	}
2781		2881
2782	sub mouse_motion {	2882	sub mouse_motion {
2783	my ($self, $ev, $x, $y) = @_;	2883	my ($self, $ev, $x, $y) = @_;
2784		2884
…		…
2792		2892
2793	if ($ev->{button} == $self->{button}) {	2893	if ($ev->{button} == $self->{button}) {
2794	undef $GRAB;	2894	undef $GRAB;
2795	$self->hide;	2895	$self->hide;
2796		2896
2797	$self->emit ("popdown");	2897	$self->_emit ("popdown");
2798	$self->{hover}[1]->() if $self->{hover};	2898	$self->{hover}[1]->() if $self->{hover};
2799	}	2899	}
2800	}	2900	}
2801		2901
2802	#############################################################################	2902	#############################################################################
…		…
2864	sub add {	2964	sub add {
2865	my ($self, $text, %arg) = @_;	2965	my ($self, $text, %arg) = @_;
2866		2966
2867	$text =~ s/^\s+//;	2967	$text =~ s/^\s+//;
2868	$text =~ s/\s+$//;	2968	$text =~ s/\s+$//;
		2969
		2970	return unless $text;
2869		2971
2870	my $timeout = time + ((delete $arg{timeout}) || 60);	2972	my $timeout = time + ((delete $arg{timeout}) || 60);
2871		2973
2872	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	2974	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2873		2975
…		…
2907	$self->SUPER::reconfigure;	3009	$self->SUPER::reconfigure;
2908	}	3010	}
2909		3011
2910	#############################################################################	3012	#############################################################################
2911		3013
2912	package CFClient::UI::Root;	3014	package CFClient::UI::Inventory;
2913		3015
2914	our @ISA = CFClient::UI::Container::;	3016	our @ISA = CFClient::UI::ScrolledWindow::;
2915
2916	use CFClient::OpenGL;
2917		3017
2918	sub new {	3018	sub new {
2919	my $class = shift;	3019	my $class = shift;
2920		3020
2921	$class->SUPER::new (	3021	my $self = $class->SUPER::new (
		3022	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2922	@_,	3023	@_,
2923	)	3024	);
2924	}
2925		3025
2926	sub configure {	3026	$self
		3027	}
		3028
		3029	sub set_items {
		3030	my ($self, $items) = @_;
		3031
		3032	$self->{scrolled}->clear;
		3033	return unless $items;
		3034
		3035	my @items = sort {
		3036	($a->{type} <=> $b->{type})
		3037	or ($a->{name} cmp $b->{name})
		3038	} @$items;
		3039
		3040	$self->{real_items} = \@items;
		3041
		3042	my $row = 0;
		3043	for my $item (@items) {
		3044	CFClient::Item::update_widgets $item;
		3045
		3046	$self->{scrolled}->add (0, $row, $item->{face_widget});
		3047	$self->{scrolled}->add (1, $row, $item->{desc_widget});
		3048	$self->{scrolled}->add (2, $row, $item->{weight_widget});
		3049
		3050	$row++;
		3051	}
		3052	}
		3053
		3054	#############################################################################
		3055
		3056	package CFClient::UI::BindEditor;
		3057
		3058	our @ISA = CFClient::UI::FancyFrame::;
		3059
		3060	sub new {
		3061	my $class = shift;
		3062
		3063	my $self = $class->SUPER::new (binding => [], commands => [], @_);
		3064
		3065	$self->add (my $vb = new CFClient::UI::VBox);
		3066
		3067
		3068	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
		3069	text => "start recording",
		3070	tooltip => "Start/Stops recording of actions."
		3071	."All subsequent actions after the recording started will be captured."
		3072	."The actions are displayed after the record was stopped."
		3073	."To bind the action you have to click on the 'Bind' button",
		3074	on_activate => sub {
		3075	unless ($self->{recording}) {
		3076	$self->start;
		3077	} else {
		3078	$self->stop;
		3079	}
		3080	});
		3081
		3082	$vb->add (new CFClient::UI::Label text => "Actions:");
		3083	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
		3084
		3085	$vb->add (new CFClient::UI::Label text => "Bound to: ");
		3086	$vb->add (my $hb = new CFClient::UI::HBox);
		3087	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
		3088	$hb->add (new CFClient::UI::Button
		3089	text => "bind",
		3090	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
		3091	on_activate => sub {
		3092	$self->ask_for_bind;
		3093	});
		3094
		3095	$vb->add (my $hb = new CFClient::UI::HBox);
		3096	$hb->add (new CFClient::UI::Button
		3097	text => "ok",
		3098	expand => 1,
		3099	tooltip => "This closes the binding editor and saves the binding",
		3100	on_activate => sub {
		3101	$self->hide;
		3102	$self->commit;
		3103	});
		3104
		3105	$hb->add (new CFClient::UI::Button
		3106	text => "cancel",
		3107	expand => 1,
		3108	tooltip => "This closes the binding editor without saving",
		3109	on_activate => sub {
		3110	$self->hide;
		3111	$self->{binding_cancel}->()
		3112	if $self->{binding_cancel};
		3113	});
		3114
		3115	$self->update_binding_widgets;
		3116
		3117	$self
		3118	}
		3119
		3120	sub commit {
		3121	my ($self) = @_;
		3122	my ($mod, $sym, $cmds) = $self->get_binding;
		3123	if ($sym != 0 && @$cmds > 0) {
		3124	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
		3125	."'. Don't forget 'Save Config'!");
		3126	$self->{binding_change}->($mod, $sym, $cmds)
		3127	if $self->{binding_change};
		3128	} else {
		3129	$::STATUSBOX->add ("No action bound, no key or action specified!");
		3130	$self->{binding_cancel}->()
		3131	if $self->{binding_cancel};
		3132	}
		3133	}
		3134
		3135	sub start {
		3136	my ($self) = @_;
		3137
		3138	$self->{rec_btn}->set_text ("stop recording");
		3139	$self->{recording} = 1;
		3140	$self->clear_command_list;
		3141	$::CONN->start_record if $::CONN;
		3142	}
		3143
		3144	sub stop {
		3145	my ($self) = @_;
		3146
		3147	$self->{rec_btn}->set_text ("start recording");
		3148	$self->{recording} = 0;
		3149
		3150	my $rec;
		3151	$rec = $::CONN->stop_record if $::CONN;
		3152	return unless ref $rec eq 'ARRAY';
		3153	$self->set_command_list ($rec);
		3154	}
		3155
		3156
		3157	sub ask_for_bind_and_commit {
		3158	my ($self) = @_;
		3159	$self->ask_for_bind (1);
		3160	}
		3161
		3162	sub ask_for_bind {
		3163	my ($self, $commit) = @_;
		3164
		3165	CFClient::Binder::open_binding_dialog (sub {
		3166	my ($mod, $sym) = @_;
		3167	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
		3168	$self->update_binding_widgets;
		3169	$self->commit if $commit;
		3170	});
		3171	}
		3172
		3173	# $mod and $sym are the modifiers and key symbol
		3174	# $cmds is a array ref of strings (the commands)
		3175	# $cb is the callback that is executed on OK
		3176	# $ccb is the callback that is executed on CANCEL and
		3177	# when the binding was unsuccessful on OK
		3178	sub set_binding {
2927	my ($self, $x, $y, $w, $h) = @_;	3179	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
2928		3180
2929	$self->{w} = $w;	3181	$self->clear_command_list;
2930	$self->{h} = $h;	3182	$self->{recording} = 0;
2931	}	3183	$self->{rec_btn}->set_text ("start recording");
2932		3184
2933	sub check_size {	3185	$self->{binding} = [$mod, $sym];
		3186	$self->{commands} = $cmds;
		3187
		3188	$self->{binding_change} = $cb;
		3189	$self->{binding_cancel} = $ccb;
		3190
		3191	$self->update_binding_widgets;
		3192	}
		3193
		3194	# this is a shortcut method that asks for a binding
		3195	# and then just binds it.
		3196	sub do_quick_binding {
2934	my ($self) = @_;	3197	my ($self, $cmds) = @_;
		3198	$self->set_binding (undef, undef, $cmds, sub {
		3199	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
		3200	});
		3201	$self->ask_for_bind (1);
		3202	}
2935		3203
2936	$self->size_allocate ($self->{w}, $self->{h})	3204	sub update_binding_widgets {
2937	if $self->{w};	3205	my ($self) = @_;
		3206	my ($mod, $sym, $cmds) = $self->get_binding;
		3207	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
		3208	$self->set_command_list ($cmds);
		3209	}
		3210
		3211	sub get_binding {
		3212	my ($self) = @_;
		3213	return (
		3214	$self->{binding}->[0],
		3215	$self->{binding}->[1],
		3216	[ grep { defined $_ } @{$self->{commands}} ]
		3217	);
		3218	}
		3219
		3220	sub clear_command_list {
		3221	my ($self) = @_;
		3222	$self->{cmdbox}->clear ();
		3223	}
		3224
		3225	sub set_command_list {
		3226	my ($self, $cmds) = @_;
		3227
		3228	$self->{cmdbox}->clear ();
		3229	$self->{commands} = $cmds;
		3230
		3231	my $idx = 0;
		3232
		3233	for (@$cmds) {
		3234	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
		3235
		3236	my $i = $idx;
		3237	$hb->add (new CFClient::UI::Label text => $_);
		3238	$hb->add (new CFClient::UI::Button
		3239	text => "delete",
		3240	tooltip => "Deletes the action from the record",
		3241	on_activate => sub {
		3242	$self->{cmdbox}->remove ($hb);
		3243	$cmds->[$i] = undef;
		3244	});
		3245
		3246
		3247	$idx++
		3248	}
		3249	}
		3250
		3251	#############################################################################
		3252
		3253	package CFClient::UI::SpellList;
		3254
		3255	our @ISA = CFClient::UI::FancyFrame::;
		3256
		3257	sub new {
		3258	my $class = shift;
		3259
		3260	my $self = $class->SUPER::new (binding => [], commands => [], @_);
		3261
		3262	$self->add (new CFClient::UI::ScrolledWindow
		3263	scrolled => $self->{spellbox} = new CFClient::UI::Table);
		3264
		3265	$self;
		3266	}
		3267
		3268	# XXX: Do sorting? Argl...
		3269	sub add_spell {
		3270	my ($self, $spell) = @_;
		3271	$self->{spells}->{$spell->{name}} = $spell;
		3272
		3273	$self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
		3274	face => $spell->{face},
		3275	can_hover => 1,
		3276	can_events => 1,
		3277	tooltip => $spell->{message});
		3278
		3279	$self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
		3280	text => $spell->{name},
		3281	can_hover => 1,
		3282	can_events => 1,
		3283	tooltip => $spell->{message},
		3284	expand => 1);
		3285
		3286	$self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
		3287	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
		3288	$spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
		3289	expand => 1);
		3290
		3291	$self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
		3292	text => "bind to key",
		3293	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
		3294	}
		3295
		3296	sub rebuild_spell_list {
		3297	my ($self) = @_;
		3298	$self->{tbl_idx} = 0;
		3299	$self->add_spell ($_) for values %{$self->{spells}};
		3300	}
		3301
		3302	sub remove_spell {
		3303	my ($self, $spell) = @_;
		3304	delete $self->{spells}->{$spell->{name}};
		3305	$self->rebuild_spell_list;
		3306	}
		3307
		3308	#############################################################################
		3309
		3310	package CFClient::UI::Root;
		3311
		3312	our @ISA = CFClient::UI::Container::;
		3313
		3314	use CFClient::OpenGL;
		3315
		3316	sub new {
		3317	my $class = shift;
		3318
		3319	my $self = $class->SUPER::new (
		3320	visible => 1,
		3321	@_,
		3322	);
		3323
		3324	Scalar::Util::weaken ($self->{root} = $self);
		3325
		3326	$self
2938	}	3327	}
2939		3328
2940	sub size_request {	3329	sub size_request {
2941	my ($self) = @_;	3330	my ($self) = @_;
2942		3331
2943	($self->{w}, $self->{h})	3332	($self->{w}, $self->{h})
		3333	}
		3334
		3335	sub _to_pixel {
		3336	my ($coord, $size, $max) = @_;
		3337
		3338	$coord =
		3339	$coord eq "center" ? ($max - $size) * 0.5
		3340	: $coord eq "max" ? $max
		3341	: $coord;
		3342
		3343	$coord = 0 if $coord < 0;
		3344	$coord = $max - $size if $coord > $max - $size;
		3345
		3346	int $coord + 0.5
2944	}	3347	}
2945		3348
2946	sub size_allocate {	3349	sub size_allocate {
2947	my ($self, $w, $h) = @_;	3350	my ($self, $w, $h) = @_;
2948		3351
2949	my $old_w = $self->{old_w}; $self->{old_w} = $w;
2950	my $old_h = $self->{old_h}; $self->{old_h} = $h;
2951
2952	CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2953	if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2954
2955	for my $child ($self->children) {	3352	for my $child ($self->children) {
2956	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3353	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2957		3354
2958	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3355	$X = $child->{force_x} if exists $child->{force_x};
2959	if exists $child->{req_x};	3356	$Y = $child->{force_y} if exists $child->{force_y};
2960		3357
2961	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3358	$X = _to_pixel $X, $W, $self->{w};
2962	if exists $child->{req_y};	3359	$Y = _to_pixel $Y, $H, $self->{h};
2963
2964	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2965	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2966		3360
2967	$child->configure ($X, $Y, $W, $H);	3361	$child->configure ($X, $Y, $W, $H);
2968	}	3362	}
2969	}	3363	}
2970		3364
…		…
2981	}	3375	}
2982		3376
2983	sub update {	3377	sub update {
2984	my ($self) = @_;	3378	my ($self) = @_;
2985		3379
2986	$self->check_size;
2987	$::WANT_REFRESH++;	3380	$::WANT_REFRESH++;
2988	}	3381	}
2989		3382
2990	sub add {	3383	sub add {
2991	my ($self, @children) = @_;	3384	my ($self, @children) = @_;
2992		3385
2993	for my $child (@children) {
2994	$child->{toplevel} = 1;	3386	$_->{is_toplevel} = 1
2995		3387	for @children;
2996	# integerise window positions
2997	$child->{x} = int $child->{x};
2998	$child->{y} = int $child->{y};
2999	}
3000		3388
3001	$self->SUPER::add (@children);	3389	$self->SUPER::add (@children);
		3390	}
		3391
		3392	sub remove {
		3393	my ($self, @children) = @_;
		3394
		3395	$self->SUPER::remove (@children);
		3396
		3397	delete $self->{is_toplevel}
		3398	for @children;
3002		3399
3003	while (@children) {	3400	while (@children) {
3004	my $w = pop @children;	3401	my $w = pop @children;
3005	push @children, $w->children;	3402	push @children, $w->children;
3006	$w->{visible} = 1;	3403	$w->set_invisible;
3007	}
3008	}
3009
3010	sub remove {
3011	my ($self, @children) = @_;
3012
3013	$self->SUPER::remove (@children);
3014
3015	while (@children) {
3016	my $w = pop @children;
3017	push @children, $w->children;
3018	delete $w->{visible};
3019	}	3404	}
3020	}	3405	}
3021		3406
3022	sub on_refresh {	3407	sub on_refresh {
3023	my ($self, $id, $cb) = @_;	3408	my ($self, $id, $cb) = @_;
…		…
3037	while ($self->{refresh_hook}) {	3422	while ($self->{refresh_hook}) {
3038	$_->()	3423	$_->()
3039	for values %{delete $self->{refresh_hook}};	3424	for values %{delete $self->{refresh_hook}};
3040	}	3425	}
3041		3426
3042	if ($self->{check_size}) {	3427	if ($self->{realloc}) {
3043	my @queue = ([], []);	3428	my %queue;
		3429	my @queue;
		3430	my $widget;
3044		3431
3045	for (;;) {	3432	outer:
3046	if ($self->{check_size}) {	3433	while () {
3047	# heuristic: check containers last	3434	if (my $realloc = delete $self->{realloc}) {
3048	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_	3435	for $widget (values %$realloc) {
3049	for values %{delete $self->{check_size}}	3436	$widget->{visible} or next; # do not resize invisible widgets
		3437
		3438	$queue{$widget+0}++ and next; # duplicates are common
		3439
		3440	push @{ $queue[$widget->{visible}] }, $widget;
		3441	}
3050	}	3442	}
3051		3443
3052	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;	3444	while () {
		3445	@queue or last outer;
3053		3446
3054	my ($w, $h) = $widget->{user_w} && $widget->{user_h}	3447	$widget = pop @{ $queue[-1] || [] }
3055	? @$widget{qw(user_w user_h)}	3448	and last;
3056	: $widget->size_request;
3057
3058	if (delete $widget->{force_alloc}
3059	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3060	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3061		3449
		3450	pop @queue;
		3451	}
		3452
		3453	delete $queue{$widget+0};
		3454
		3455	my ($w, $h) = $widget->size_request;
		3456
		3457	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
		3458	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
		3459
		3460	$w = $widget->{force_w} if exists $widget->{force_w};
		3461	$h = $widget->{force_h} if exists $widget->{force_h};
		3462
		3463	if ($widget->{req_w} != $w || $widget->{req_h} != $h
		3464	|| delete $widget->{force_realloc}) {
3062	$widget->{req_w} = $w;	3465	$widget->{req_w} = $w;
3063	$widget->{req_h} = $h;	3466	$widget->{req_h} = $h;
3064		3467
3065	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];	3468	$self->{size_alloc}{$widget+0} = $widget;
3066		3469
3067	$widget->{parent}->check_size
3068	if $widget->{parent};	3470	if (my $parent = $widget->{parent}) {
		3471	$self->{realloc}{$parent+0} = $parent
		3472	unless $queue{$parent+0};
		3473
		3474	$parent->{force_size_alloc} = 1;
		3475	$self->{size_alloc}{$parent+0} = $parent;
		3476	}
3069	}	3477	}
		3478
		3479	delete $self->{realloc}{$widget+0};
3070	}	3480	}
3071	}	3481	}
3072		3482
3073	while ($self->{size_alloc}) {	3483	while (my $size_alloc = delete $self->{size_alloc}) {
3074	for (values %{delete $self->{size_alloc}}) {	3484	my @queue = sort { $b->{visible} <=> $a->{visible} }
3075	my ($widget, $w, $h) = @$_;	3485	values %$size_alloc;
		3486
		3487	while () {
		3488	my $widget = pop @queue || last;
		3489
		3490	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3076		3491
3077	$w = 0 if $w < 0;	3492	$w = 0 if $w < 0;
3078	$h = 0 if $h < 0;	3493	$h = 0 if $h < 0;
3079		3494
		3495	$w = int $w + 0.5;
		3496	$h = int $h + 0.5;
		3497
		3498	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
		3499	$widget->{old_w} = $widget->{w};
		3500	$widget->{old_h} = $widget->{h};
		3501
3080	$widget->{w} = $w;	3502	$widget->{w} = $w;
3081	$widget->{h} = $h;	3503	$widget->{h} = $h;
3082	$widget->size_allocate ($w, $h);	3504
3083	$widget->emit (size_allocate => $w, $h);	3505	$widget->emit (size_allocate => $w, $h);
		3506	}
3084	}	3507	}
3085	}	3508	}
3086		3509
3087	while ($self->{post_alloc_hook}) {	3510	while ($self->{post_alloc_hook}) {
3088	$_->()	3511	$_->()
3089	for values %{delete $self->{post_alloc_hook}};	3512	for values %{delete $self->{post_alloc_hook}};
3090	}	3513	}
		3514
3091		3515
3092	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3516	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3093	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3517	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3094	glClear GL_COLOR_BUFFER_BIT;	3518	glClear GL_COLOR_BUFFER_BIT;
3095		3519
…		…
3097	glLoadIdentity;	3521	glLoadIdentity;
3098	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3522	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3099	glMatrixMode GL_MODELVIEW;	3523	glMatrixMode GL_MODELVIEW;
3100	glLoadIdentity;	3524	glLoadIdentity;
3101		3525
		3526	{
		3527	package CFClient::UI::Base;
		3528
		3529	($draw_x, $draw_y, $draw_w, $draw_h) =
		3530	(0, 0, $self->{w}, $self->{h});
		3531	}
		3532
3102	$self->_draw;	3533	$self->_draw;
3103	}	3534	}
3104		3535
3105	#############################################################################	3536	#############################################################################
3106		3537

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines