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.239 by root, Thu May 25 22:29:57 2006 UTC vs.
Revision 1.277 by root, Sun Jun 4 00:21:52 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	}
…		…
152	sub rescale_widgets {	171	sub rescale_widgets {
153	my ($sx, $sy) = @_;	172	my ($sx, $sy) = @_;
154		173
155	for my $widget (values %WIDGET) {	174	for my $widget (values %WIDGET) {
156	if ($widget->{is_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
157	$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.]+$/;
158	$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};
159	$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};
160	$widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
161	$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.]+$/;
162	$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};
163	$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};
164	$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
165	}	189	}
166	}	190	}
167		191
168	reconfigure_widgets;	192	reconfigure_widgets;
169	}	193	}
…		…
178		202
179	sub new {	203	sub new {
180	my $class = shift;	204	my $class = shift;
181		205
182	my $self = bless {	206	my $self = bless {
183	x => 0,	207	x => "center",
184	y => 0,	208	y => "center",
185	z => 0,	209	z => 0,
		210	w => undef,
		211	h => undef,
186	can_events => 1,	212	can_events => 1,
187	@_	213	@_
188	}, $class;	214	}, $class;
189		215
		216	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
		217
190	for (keys %$self) {	218	for (keys %$self) {
191	if (/^connect_(.*)$/) {	219	if (/^on_(.*)$/) {
192	$self->connect ($1 => delete $self->{$_});	220	$self->connect ($1 => delete $self->{$_});
193	}	221	}
194	}	222	}
195		223
196	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	}
197		235
198	$self	236	$self
199	}	237	}
200		238
201	sub destroy {	239	sub destroy {
…		…
205	%$self = ();	243	%$self = ();
206	}	244	}
207		245
208	sub show {	246	sub show {
209	my ($self) = @_;	247	my ($self) = @_;
		248
210	return if $self->{parent};	249	return if $self->{parent};
211		250
212	$CFClient::UI::ROOT->add ($self);	251	$CFClient::UI::ROOT->add ($self);
213	}	252	}
214		253
215	sub show_centered {	254	sub set_visible {
216	my ($self) = @_;	255	my ($self) = @_;
		256
217	return if $self->{parent};	257	return if $self->{visible};
218		258
219	$self->show;	259	$self->{root} = $self->{parent}{root};
		260	$self->{visible} = $self->{parent}{visible} + 1;
220		261
221	$CFClient::UI::ROOT->on_post_alloc (	262	$self->emit (visibility_change => 1);
222	"centered $self" => sub {	263
223	$self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);	264	$self->realloc if !exists $self->{req_w};
224	},	265
225	);	266	$_->set_visible for $self->children;
226	}	267	}
227		268
228	sub set_invisible {	269	sub set_invisible {
229	my ($self) = @_;	270	my ($self) = @_;
230		271
231	# broken show/hide model	272	return unless $self->{visible};
232		273
		274	$_->set_invisible for $self->children;
		275
		276	delete $self->{root};
233	delete $self->{visible};	277	delete $self->{visible};
234		278
235	undef $GRAB if $GRAB == $self;	279	undef $GRAB if $GRAB == $self;
236	undef $HOVER if $HOVER == $self;	280	undef $HOVER if $HOVER == $self;
237		281
238	CFClient::UI::check_tooltip	282	CFClient::UI::check_tooltip
239	if $CFClient::UI::TOOLTIP->{owner} == $self;	283	if $TOOLTIP->{owner} == $self;
240		284
241	$self->focus_out;	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;
242	}	305	}
243		306
244	sub hide {	307	sub hide {
245	my ($self) = @_;	308	my ($self) = @_;
246		309
…		…
248		311
249	$self->{parent}->remove ($self)	312	$self->{parent}->remove ($self)
250	if $self->{parent};	313	if $self->{parent};
251	}	314	}
252		315
253	sub move {	316	sub move_abs {
254	my ($self, $x, $y, $z) = @_;	317	my ($self, $x, $y, $z) = @_;
255		318
256	$self->{x} = int $x;	319	$self->{x} = List::Util::max 0, int $x;
257	$self->{y} = int $y;	320	$self->{y} = List::Util::max 0, int $y;
258	$self->{z} = $z if defined $z;	321	$self->{z} = $z if defined $z;
259		322
260	$self->update;	323	$self->update;
261	}	324	}
262		325
263	sub set_size {	326	sub set_size {
264	my ($self, $w, $h) = @_;	327	my ($self, $w, $h) = @_;
265		328
266	$self->{user_w} = $w;	329	$self->{force_w} = $w;
267	$self->{user_h} = $h;	330	$self->{force_h} = $h;
268		331
269	$self->check_size;	332	$self->realloc;
270	}	333	}
271		334
272	sub size_request {	335	sub size_request {
273	require Carp;	336	require Carp;
274	Carp::confess "size_request is abstract";	337	Carp::confess "size_request is abstract";
…		…
276		339
277	sub configure {	340	sub configure {
278	my ($self, $x, $y, $w, $h) = @_;	341	my ($self, $x, $y, $w, $h) = @_;
279		342
280	if ($self->{aspect}) {	343	if ($self->{aspect}) {
		344	my ($ow, $oh) = ($w, $h);
		345
281	my $w2 = List::Util::min $w, int $h * $self->{aspect};	346	$w = List::Util::min $w, int $h * $self->{aspect};
282	my $h2 = List::Util::min $h, int $w / $self->{aspect};	347	$h = List::Util::min $h, int $w / $self->{aspect};
283		348
284	# use alignment to adjust x, y	349	# use alignment to adjust x, y
285		350
286	$x += int +($w - $w2) * 0.5;	351	$x += int 0.5 * ($ow - $w);
287	$y += int +($h - $h2) * 0.5;	352	$y += int 0.5 * ($oh - $h);
288
289	($w, $h) = ($w2, $h2);
290	}	353	}
291		354
292	if ($self->{x} != $x || $self->{y} != $y) {	355	if ($self->{x} ne $x || $self->{y} ne $y) {
293	$self->{x} = $x;	356	$self->{x} = $x;
294	$self->{y} = $y;	357	$self->{y} = $y;
295	$self->update;	358	$self->update;
296	}	359	}
297		360
298	if ($self->{w} != $w || $self->{h} != $h) {	361	if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
299	$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;
300	}	368	}
301	}	369	}
302		370
303	sub size_allocate {	371	sub size_allocate {
304	# nothing to be done	372	# nothing to be done
305	}	373	}
306		374
307	sub reconfigure {
308	my ($self) = @_;
309
310	$self->check_size (1);
311	$self->update;
312	}
313
314	sub children {	375	sub children {
		376	# nop
		377	}
		378
		379	sub visible_children {
		380	$_[0]->children
315	}	381	}
316		382
317	sub set_max_size {	383	sub set_max_size {
318	my ($self, $w, $h) = @_;	384	my ($self, $w, $h) = @_;
319		385
…		…
378		444
379	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus	445	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
380	unless $FOCUS;	446	unless $FOCUS;
381	}	447	}
382		448
383	sub mouse_motion { }	449	sub mouse_motion { 0 }
384	sub button_up { }	450	sub button_up { 0 }
385	sub key_down { }	451	sub key_down { 0 }
386	sub key_up { }	452	sub key_up { 0 }
387		453
388	sub button_down {	454	sub button_down {
389	my ($self, $ev, $x, $y) = @_;	455	my ($self, $ev, $x, $y) = @_;
390		456
391	$self->focus_in;	457	$self->focus_in;
392	}
393		458
394	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	459	0
395	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	460	}
396	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }	461
397	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }	462	sub find_widget {
398	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }	463	my ($self, $x, $y) = @_;
		464
		465	return () unless $self->{can_events};
		466
		467	return $self
		468	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
		469	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
		470
		471	()
		472	}
		473
		474	sub set_parent {
		475	my ($self, $parent) = @_;
		476
		477	Scalar::Util::weaken ($self->{parent} = $parent);
		478	$self->set_visible if $parent->{visible};
		479	}
		480
		481	sub connect {
		482	my ($self, $signal, $cb) = @_;
		483
		484	push @{ $self->{signal_cb}{$signal} }, $cb;
		485	}
		486
		487	sub _emit {
		488	my ($self, $signal, @args) = @_;
		489
		490	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
		491	}
		492
		493	sub emit {
		494	my ($self, $signal, @args) = @_;
		495
		496	$self->_emit ($signal, @args)
		497	|| $self->$signal (@args);
		498	}
		499
		500	sub visibility_change {
		501	#my ($self, $visible) = @_;
		502	}
		503
		504	sub realloc {
		505	my ($self) = @_;
		506
		507	if ($self->{visible}) {
		508	return if $self->{root}{realloc}{$self+0};
		509
		510	$self->{root}{realloc}{$self+0} = $self;
		511	$self->{root}->update;
		512	} else {
		513	delete $self->{req_w};
		514	delete $self->{req_h};
		515	}
		516	}
		517
		518	sub update {
		519	my ($self) = @_;
		520
		521	$self->{parent}->update
		522	if $self->{parent};
		523	}
		524
		525	sub reconfigure {
		526	my ($self) = @_;
		527
		528	$self->realloc;
		529	$self->update;
		530	}
		531
		532	# using global variables seems a bit hacky, but passing through all drawing
		533	# functions seems pointless.
		534	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
399		535
400	sub draw {	536	sub draw {
401	my ($self) = @_;	537	my ($self) = @_;
402		538
403	return unless $self->{h} && $self->{w};	539	return unless $self->{h} && $self->{w};
		540
		541	# update screen rectangle
		542	local $draw_x = $draw_x + $self->{x};
		543	local $draw_y = $draw_y + $self->{y};
		544	local $draw_w = $draw_x + $self->{w};
		545	local $draw_h = $draw_y + $self->{h};
		546
		547	# skip widgets that are entirely outside the drawing area
		548	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
		549	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
404		550
405	glPushMatrix;	551	glPushMatrix;
406	glTranslate $self->{x}, $self->{y}, 0;	552	glTranslate $self->{x}, $self->{y}, 0;
407	$self->_draw;	553	$self->_draw;
408	glPopMatrix;	554	glPopMatrix;
…		…
420	glVertex $x , $y + $self->{h};	566	glVertex $x , $y + $self->{h};
421	glEnd;	567	glEnd;
422	glDisable GL_BLEND;	568	glDisable GL_BLEND;
423	}	569	}
424		570
425	if ($ENV{PCLIENT_DEBUG}) {	571	if ($ENV{CFPLUS_DEBUG} & 1) {
426	glPushMatrix;	572	glPushMatrix;
427	glColor 1, 1, 0, 1;	573	glColor 1, 1, 0, 1;
428	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	574	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
429	glBegin GL_LINE_LOOP;	575	glBegin GL_LINE_LOOP;
430	glVertex 0 , 0;	576	glVertex 0 , 0;
…		…
441	my ($self) = @_;	587	my ($self) = @_;
442		588
443	warn "no draw defined for $self\n";	589	warn "no draw defined for $self\n";
444	}	590	}
445		591
446	sub find_widget {
447	my ($self, $x, $y) = @_;
448
449	return () unless $self->{can_events};
450
451	return $self
452	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
453	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
454
455	()
456	}
457
458	sub set_parent {
459	my ($self, $parent) = @_;
460
461	Scalar::Util::weaken ($self->{parent} = $parent);
462
463	$self->{root} = $parent->{root};
464	$self->{visible} = $parent->{visible};
465
466	# TODO: req_w _does_change after ->reconfigure
467	$self->check_size
468	unless exists $self->{req_w};
469
470	$self->show;
471	}
472
473	sub check_size {
474	my ($self, $forced) = @_;
475
476	$self->{force_alloc} = 1 if $forced;
477	$CFClient::UI::ROOT->{check_size}{$self} = $self;
478	}
479
480	sub update {
481	my ($self) = @_;
482
483	$self->{parent}->update
484	if $self->{parent};
485	}
486
487	sub connect {
488	my ($self, $signal, $cb) = @_;
489
490	push @{ $self->{signal_cb}{$signal} }, $cb;
491	}
492
493	sub _emit {
494	my ($self, $signal, @args) = @_;
495
496	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
497	}
498
499	sub emit {
500	my ($self, $signal, @args) = @_;
501
502	$self->_emit ($signal, @args)
503	|| $self->$signal (@args);
504	}
505
506	sub DESTROY {	592	sub DESTROY {
507	my ($self) = @_;	593	my ($self) = @_;
508		594
509	delete $WIDGET{$self+0};	595	delete $WIDGET{$self+0};
510	#$self->deactivate;	596	#$self->deactivate;
…		…
566	my ($class, %arg) = @_;	652	my ($class, %arg) = @_;
567	$class->SUPER::new (can_events => 0, %arg);	653	$class->SUPER::new (can_events => 0, %arg);
568	}	654	}
569		655
570	sub size_request {	656	sub size_request {
571	(0, 0)	657	my ($self) = @_;
		658
		659	($self->{w} + 0, $self->{h} + 0)
572	}	660	}
573		661
574	sub draw { }	662	sub draw { }
575		663
576	#############################################################################	664	#############################################################################
…		…
580	our @ISA = CFClient::UI::Base::;	668	our @ISA = CFClient::UI::Base::;
581		669
582	sub new {	670	sub new {
583	my ($class, %arg) = @_;	671	my ($class, %arg) = @_;
584		672
585	my $children = delete $arg{children} || [];	673	my $children = delete $arg{children};
586		674
587	my $self = $class->SUPER::new (	675	my $self = $class->SUPER::new (
588	children => [],	676	children => [],
589	can_events => 0,	677	can_events => 0,
590	%arg,	678	%arg,
591	);	679	);
		680
592	$self->add ($_) for @$children;	681	$self->add (@$children)
		682	if $children;
593		683
594	$self	684	$self
595	}	685	}
596		686
597	sub add {	687	sub add {
…		…
605	$self->{children} = [	695	$self->{children} = [
606	sort { $a->{z} <=> $b->{z} }	696	sort { $a->{z} <=> $b->{z} }
607	@{$self->{children}}, @widgets	697	@{$self->{children}}, @widgets
608	];	698	];
609		699
610	$self->check_size (1);	700	$self->realloc;
611	$self->update;
612	}	701	}
613		702
614	sub children {	703	sub children {
615	@{ $_[0]{children} }	704	@{ $_[0]{children} }
616	}	705	}
…		…
621	delete $child->{parent};	710	delete $child->{parent};
622	$child->hide;	711	$child->hide;
623		712
624	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	713	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
625		714
626	$self->check_size (1);	715	$self->realloc;
627	$self->update;
628	}	716	}
629		717
630	sub clear {	718	sub clear {
631	my ($self) = @_;	719	my ($self) = @_;
632		720
…		…
636	for (@$children) {	724	for (@$children) {
637	delete $_->{parent};	725	delete $_->{parent};
638	$_->hide;	726	$_->hide;
639	}	727	}
640		728
641	$self->check_size;	729	$self->realloc;
642	$self->update;
643	}	730	}
644		731
645	sub find_widget {	732	sub find_widget {
646	my ($self, $x, $y) = @_;	733	my ($self, $x, $y) = @_;
647		734
648	$x -= $self->{x};	735	$x -= $self->{x};
649	$y -= $self->{y};	736	$y -= $self->{y};
650		737
651	my $res;	738	my $res;
652		739
653	for (reverse @{ $self->{children} }) {	740	for (reverse $self->visible_children) {
654	$res = $_->find_widget ($x, $y)	741	$res = $_->find_widget ($x, $y)
655	and return $res;	742	and return $res;
656	}	743	}
657		744
658	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})	745	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
…		…
707	$self->{children}[0]->configure (0, 0, $w, $h);	794	$self->{children}[0]->configure (0, 0, $w, $h);
708	}	795	}
709		796
710	#############################################################################	797	#############################################################################
711		798
		799	# back-buffered drawing area
		800
712	package CFClient::UI::Window;	801	package CFClient::UI::Window;
713		802
714	our @ISA = CFClient::UI::Bin::;	803	our @ISA = CFClient::UI::Bin::;
715		804
716	use CFClient::OpenGL;	805	use CFClient::OpenGL;
…		…
734	$self->SUPER::size_allocate ($w, $h);	823	$self->SUPER::size_allocate ($w, $h);
735	$self->update;	824	$self->update;
736	}	825	}
737		826
738	sub _render {	827	sub _render {
		828	my ($self) = @_;
		829
739	$_[0]{children}[0]->draw;	830	$self->{children}[0]->draw;
740	}	831	}
741		832
742	sub render_child {	833	sub render_child {
743	my ($self) = @_;	834	my ($self) = @_;
744		835
745	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	836	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
746	glClearColor 0, 0, 0, 0;	837	glClearColor 0, 0, 0, 0;
747	glClear GL_COLOR_BUFFER_BIT;	838	glClear GL_COLOR_BUFFER_BIT;
748		839
		840	{
		841	package CFClient::UI::Base;
		842
		843	($draw_x, $draw_y, $draw_w, $draw_h) =
		844	(0, 0, $self->{w}, $self->{h});
		845	}
		846
749	$self->_render;	847	$self->_render;
750	};	848	};
751	}	849	}
752		850
753	sub _draw {	851	sub _draw {
754	my ($self) = @_;	852	my ($self) = @_;
755		853
756	my ($w, $h) = ($self->w, $self->h);	854	my ($w, $h) = @$self{qw(w h)};
757		855
758	my $tex = $self->{texture}	856	my $tex = $self->{texture}
759	or return;	857	or return;
760		858
761	glEnable GL_TEXTURE_2D;	859	glEnable GL_TEXTURE_2D;
…		…
784	}	882	}
785		883
786	sub size_request {	884	sub size_request {
787	my ($self) = @_;	885	my ($self) = @_;
788		886
789	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	887	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
790		888
791	@$self{qw(child_w child_h)}	889	$w = 10 if $self->{scroll_x};
		890	$h = 10 if $self->{scroll_y};
		891
		892	($w, $h)
792	}	893	}
793		894
794	sub size_allocate {	895	sub size_allocate {
795	my ($self, $w, $h) = @_;	896	my ($self, $w, $h) = @_;
796		897
		898	my $child = $self->child;
		899
797	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};	900	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
798	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};	901	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
799		902
800	$self->child->configure (0, 0, $w, $h);	903	$self->child->configure (0, 0, $w, $h);
801	$self->update;	904	$self->update;
802	}	905	}
803		906
…		…
839	}	942	}
840		943
841	sub _render {	944	sub _render {
842	my ($self) = @_;	945	my ($self) = @_;
843		946
		947	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
		948	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
		949
844	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	950	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
845		951
846	$self->SUPER::_render;	952	$self->SUPER::_render;
847	}	953	}
848		954
…		…
851	package CFClient::UI::ScrolledWindow;	957	package CFClient::UI::ScrolledWindow;
852		958
853	our @ISA = CFClient::UI::HBox::;	959	our @ISA = CFClient::UI::HBox::;
854		960
855	sub new {	961	sub new {
856	my $class = shift;	962	my ($class, %arg) = @_;
		963
		964	my $child = delete $arg{child};
857		965
858	my $self;	966	my $self;
859		967
860	my $slider = new CFClient::UI::Slider	968	my $slider = new CFClient::UI::Slider
861	vertical => 1,	969	vertical => 1,
862	range => [0, 0, 1, 0.01], # HACK fix	970	range => [0, 0, 1, 0.01], # HACK fix
863	connect_changed => sub {	971	on_changed => sub {
864	$self->{vp}->set_offset (0, $_[1]);	972	$self->{vp}->set_offset (0, $_[1]);
865	},	973	},
866	;	974	;
867		975
868	$self = $class->SUPER::new (	976	$self = $class->SUPER::new (
869	vp => (new CFClient::UI::ViewPort expand => 1),	977	vp => (new CFClient::UI::ViewPort expand => 1),
870	slider => $slider,	978	slider => $slider,
871	@_,	979	%arg,
872	);	980	);
873		981
874	$self->{vp}->add ($self->{scrolled});
875	$self->add ($self->{vp});
876	$self->add ($self->{slider});	982	$self->SUPER::add ($self->{vp}, $self->{slider});
		983	$self->add ($child) if $child;
877		984
878	$self	985	$self
		986	}
		987
		988	sub add {
		989	my ($self, $widget) = @_;
		990
		991	$self->{vp}->add ($self->{child} = $widget);
879	}	992	}
880		993
881	sub update {	994	sub update {
882	my ($self) = @_;	995	my ($self) = @_;
883		996
…		…
946		1059
947	our @ISA = CFClient::UI::Bin::;	1060	our @ISA = CFClient::UI::Bin::;
948		1061
949	use CFClient::OpenGL;	1062	use CFClient::OpenGL;
950		1063
951	my @tex =	1064	my $bg =
		1065	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
		1066	mipmap => 1, wrap => 1;
		1067
		1068	my @border =
952	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1069	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
953	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1070	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
954		1071
955	sub new {	1072	sub new {
956	my $class = shift;	1073	my ($class, %arg) = @_;
957		1074
958	# TODO: user_x, user_y, overwrite moveto?	1075	my $title = delete $arg{title};
959		1076
960	my $self = $class->SUPER::new (	1077	my $self = $class->SUPER::new (
961	bg => [1, 1, 1, 1],	1078	bg => [1, 1, 1, 1],
962	border_bg => [1, 1, 1, 1],	1079	border_bg => [1, 1, 1, 1],
963	border => 0.6,	1080	border => 0.6,
964	is_toplevel => 1,
965	can_events => 1,	1081	can_events => 1,
966	@_	1082	min_w => 16,
		1083	min_h => 16,
		1084	%arg,
967	);	1085	);
968		1086
969	$self->{title} &&= new CFClient::UI::Label	1087	$self->{title} = new CFClient::UI::Label
970	align => 0,	1088	align => 0,
971	valign => 1,	1089	valign => 1,
972	text => $self->{title},	1090	text => $title,
973	fontsize => $self->{border};	1091	fontsize => $self->{border}
		1092	if defined $title;
974		1093
975	$self	1094	$self
		1095	}
		1096
		1097	sub add {
		1098	my ($self, @widgets) = @_;
		1099
		1100	$self->SUPER::add (@widgets);
		1101	$self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
976	}	1102	}
977		1103
978	sub border {	1104	sub border {
979	int $_[0]{border} * $::FONTSIZE	1105	int $_[0]{border} * $::FONTSIZE
980	}	1106	}
981		1107
982	sub size_request {	1108	sub size_request {
983	my ($self) = @_;	1109	my ($self) = @_;
		1110
		1111	$self->{title}->size_request
		1112	if $self->{title};
984		1113
985	my ($w, $h) = $self->SUPER::size_request;	1114	my ($w, $h) = $self->SUPER::size_request;
986		1115
987	(	1116	(
988	$w + $self->border * 2,	1117	$w + $self->border * 2,
…		…
991	}	1120	}
992		1121
993	sub size_allocate {	1122	sub size_allocate {
994	my ($self, $w, $h) = @_;	1123	my ($self, $w, $h) = @_;
995		1124
		1125	if ($self->{title}) {
		1126	$self->{title}{w} = $w;
		1127	$self->{title}{h} = $h;
		1128	$self->{title}->size_allocate ($w, $h);
		1129	}
		1130
		1131	my $border = $self->border;
		1132
996	$h -= List::Util::max 0, $self->border * 2;	1133	$h -= List::Util::max 0, $border * 2;
997	$w -= List::Util::max 0, $self->border * 2;	1134	$w -= List::Util::max 0, $border * 2;
998		1135
999	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1000	if $self->{title};
1001
1002	$self->child->configure ($self->border, $self->border, $w, $h);	1136	$self->child->configure ($border, $border, $w, $h);
1003	}	1137	}
1004		1138
1005	sub button_down {	1139	sub button_down {
1006	my ($self, $ev, $x, $y) = @_;	1140	my ($self, $ev, $x, $y) = @_;
1007		1141
…		…
1023	my ($ev, $x, $y) = @_;	1157	my ($ev, $x, $y) = @_;
1024		1158
1025	my $dx = $ev->{x} - $ox;	1159	my $dx = $ev->{x} - $ox;
1026	my $dy = $ev->{y} - $oy;	1160	my $dy = $ev->{y} - $oy;
1027		1161
1028	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1162	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1029	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1163	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
		1164
1030	$self->move ($wx + $dx * $mx, $wy + $dy * $my);	1165	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1031	$self->check_size;	1166	$self->realloc;
1032	};	1167	};
1033		1168
1034	} elsif ($lr ^ $td) {	1169	} elsif ($lr ^ $td) {
1035	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1170	my ($ox, $oy) = ($ev->{x}, $ev->{y});
1036	my ($bx, $by) = ($self->{x}, $self->{y});	1171	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
1038	$self->{motion} = sub {	1173	$self->{motion} = sub {
1039	my ($ev, $x, $y) = @_;	1174	my ($ev, $x, $y) = @_;
1040		1175
1041	($x, $y) = ($ev->{x}, $ev->{y});	1176	($x, $y) = ($ev->{x}, $ev->{y});
1042		1177
1043	$self->move ($bx + $x - $ox, $by + $y - $oy);	1178	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1044	$self->update;	1179	# HACK: the next line is required to enforce placement
		1180	$self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1045	};	1181	};
		1182	} else {
		1183	return 0;
		1184	}
		1185
1046	}	1186	1
1047	}	1187	}
1048		1188
1049	sub button_up {	1189	sub button_up {
1050	my ($self, $ev, $x, $y) = @_;	1190	my ($self, $ev, $x, $y) = @_;
1051		1191
1052	delete $self->{motion};	1192	!!delete $self->{motion}
1053	}	1193	}
1054		1194
1055	sub mouse_motion {	1195	sub mouse_motion {
1056	my ($self, $ev, $x, $y) = @_;	1196	my ($self, $ev, $x, $y) = @_;
1057		1197
1058	$self->{motion}->($ev, $x, $y) if $self->{motion};	1198	$self->{motion}->($ev, $x, $y) if $self->{motion};
		1199
		1200	!!$self->{motion}
1059	}	1201	}
1060		1202
1061	sub _draw {	1203	sub _draw {
1062	my ($self) = @_;	1204	my ($self) = @_;
1063		1205
		1206	my $child = $self->{children}[0];
		1207
1064	my ($w, $h ) = ($self->{w}, $self->{h});	1208	my ($w, $h ) = ($self->{w}, $self->{h});
1065	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1209	my ($cw, $ch) = ($child->{w}, $child->{h});
1066		1210
1067	glEnable GL_TEXTURE_2D;	1211	glEnable GL_TEXTURE_2D;
1068	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1212	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1069		1213
1070	my $border = $self->border;	1214	my $border = $self->border;
1071		1215
1072	glColor @{ $self->{border_bg} };	1216	glColor @{ $self->{border_bg} };
1073	$tex[1]->draw_quad_alpha (0, 0, $w, $border);	1217	$border[0]->draw_quad_alpha (0, 0, $w, $border);
1074	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);	1218	$border[1]->draw_quad_alpha (0, $border, $border, $ch);
1075	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1219	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1076	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);	1220	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1077		1221
1078	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1222	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1079	my $bg = $tex[0];	1223	glColor @{ $self->{bg} };
1080		1224
1081	# TODO: repeat texture not scale	1225	# TODO: repeat texture not scale
		1226	# solve this better(?)
1082	my $rep_x = $cw / $bg->{w};	1227	$bg->{s} = $cw / $bg->{w};
1083	my $rep_y = $ch / $bg->{h};	1228	$bg->{t} = $ch / $bg->{h};
1084
1085	glColor @{ $self->{bg} };
1086
1087	$bg->{s} = $rep_x;
1088	$bg->{t} = $rep_y;
1089	$bg->{wrap_mode} = 1;
1090	$bg->draw_quad_alpha ($border, $border, $cw, $ch);	1229	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1091	}	1230	}
1092		1231
1093	glDisable GL_TEXTURE_2D;	1232	glDisable GL_TEXTURE_2D;
1094		1233
1095	$self->{title}->draw if $self->{title};
1096
1097	$self->child->draw;	1234	$child->draw;
		1235
		1236	if ($self->{title}) {
		1237	glTranslate 0, $border - $self->{h};
		1238	$self->{title}->_draw;
		1239	}
1098	}	1240	}
1099		1241
1100	#############################################################################	1242	#############################################################################
1101		1243
1102	package CFClient::UI::Table;	1244	package CFClient::UI::Table;
…		…
1124	my ($self, $x, $y, $child) = @_;	1266	my ($self, $x, $y, $child) = @_;
1125		1267
1126	$child->set_parent ($self);	1268	$child->set_parent ($self);
1127	$self->{children}[$y][$x] = $child;	1269	$self->{children}[$y][$x] = $child;
1128		1270
1129	$self->check_size (1);	1271	$self->realloc;
1130	}	1272	}
1131		1273
1132	# TODO: move to container class maybe? send children a signal on removal?	1274	# TODO: move to container class maybe? send children a signal on removal?
1133	sub clear {	1275	sub clear {
1134	my ($self) = @_;	1276	my ($self) = @_;
…		…
1139	for (@children) {	1281	for (@children) {
1140	delete $_->{parent};	1282	delete $_->{parent};
1141	$_->hide;	1283	$_->hide;
1142	}	1284	}
1143		1285
1144	$self->check_size (1);	1286	$self->realloc;
1145	$self->update;
1146	}	1287	}
1147		1288
1148	sub get_wh {	1289	sub get_wh {
1149	my ($self) = @_;	1290	my ($self) = @_;
1150		1291
…		…
1246	}	1387	}
1247	}	1388	}
1248		1389
1249	#############################################################################	1390	#############################################################################
1250		1391
1251	package CFClient::UI::HBox;	1392	package CFClient::UI::Box;
1252
1253	# TODO: wrap into common Box base class
1254		1393
1255	our @ISA = CFClient::UI::Container::;	1394	our @ISA = CFClient::UI::Container::;
1256		1395
1257	sub size_request {	1396	sub size_request {
1258	my ($self) = @_;	1397	my ($self) = @_;
1259		1398
1260	my @alloc = map [$_->size_request], @{$self->{children}};	1399	$self->{vertical}
1261		1400	? (
1262	(	1401	(List::Util::max map $_->{req_w}, @{$self->{children}}),
1263	(List::Util::sum map $_->[0], @alloc),	1402	(List::Util::sum map $_->{req_h}, @{$self->{children}}),
1264	(List::Util::max map $_->[1], @alloc),	1403	)
1265	)	1404	: (
		1405	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
		1406	(List::Util::max map $_->{req_h}, @{$self->{children}}),
		1407	)
1266	}	1408	}
1267		1409
1268	sub size_allocate {	1410	sub size_allocate {
1269	my ($self, $w, $h) = @_;	1411	my ($self, $w, $h) = @_;
1270		1412
1271	($h, $w) = ($w, $h);	1413	my $space = $self->{vertical} ? $h : $w;
1272
1273	my $children = $self->{children};	1414	my $children = $self->{children};
1274		1415
1275	my @h = map $_->{req_w}, @$children;	1416	my @req;
1276		1417
1277	my $req_h = List::Util::sum @h;	1418	if ($self->{homogeneous}) {
1278		1419	@req = ($space / (@$children || 1)) x @$children;
1279	if ($req_h > $h) {
1280	# ah well, not enough space
1281	$_ *= $h / $req_h for @h;
1282	} else {	1420	} else {
		1421	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
		1422	my $req = List::Util::sum @req;
		1423
		1424	if ($req > $space) {
		1425	# ah well, not enough space
		1426	$_ *= $space / $req for @req;
		1427	} else {
1283	my $exp = List::Util::sum map $_->{expand}, @$children;	1428	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1284	$exp ||= 1;
1285		1429
		1430	$space = ($space - $req) / $expand; # remaining space to give away
		1431
		1432	$req[$_] += $space * $children->[$_]{expand}
1286	for (0 .. $#$children) {	1433	for 0 .. $#$children;
1287	my $child = $children->[$_];
1288
1289	my $alloc_h = $h[$_];
1290	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1291	$h[$_] = $alloc_h;
1292	}	1434	}
1293	}	1435	}
1294		1436
1295	CFClient::UI::harmonize \@h;	1437	CFClient::UI::harmonize \@req;
1296		1438
1297	my $y = 0;	1439	my $pos = 0;
1298	for (0 .. $#$children) {	1440	for (0 .. $#$children) {
1299	my $child = $children->[$_];
1300	my $h = $h[$_];	1441	my $alloc = $req[$_];
1301	$child->configure ($y, 0, $h, $w);	1442	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1302		1443
1303	$y += $h;	1444	$pos += $alloc;
1304	}	1445	}
1305		1446
1306	1	1447	1
1307	}	1448	}
1308		1449
1309	#############################################################################	1450	#############################################################################
1310		1451
		1452	package CFClient::UI::HBox;
		1453
		1454	our @ISA = CFClient::UI::Box::;
		1455
		1456	sub new {
		1457	my $class = shift;
		1458
		1459	$class->SUPER::new (
		1460	vertical => 0,
		1461	@_,
		1462	)
		1463	}
		1464
		1465	#############################################################################
		1466
1311	package CFClient::UI::VBox;	1467	package CFClient::UI::VBox;
1312		1468
1313	# TODO: wrap into common Box base class
1314
1315	our @ISA = CFClient::UI::Container::;	1469	our @ISA = CFClient::UI::Box::;
1316		1470
1317	sub size_request {	1471	sub new {
1318	my ($self) = @_;	1472	my $class = shift;
1319		1473
1320	my @alloc = map [$_->size_request], @{$self->{children}};	1474	$class->SUPER::new (
1321		1475	vertical => 1,
1322	(	1476	@_,
1323	(List::Util::max map $_->[0], @alloc),
1324	(List::Util::sum map $_->[1], @alloc),
1325	)	1477	)
1326	}
1327
1328	sub size_allocate {
1329	my ($self, $w, $h) = @_;
1330
1331	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1332
1333	my $children = $self->{children};
1334
1335	my @h = map $_->{req_h}, @$children;
1336
1337	my $req_h = List::Util::sum @h;
1338
1339	if ($req_h > $h) {
1340	# ah well, not enough space
1341	$_ *= $h / $req_h for @h;
1342	} else {
1343	my $exp = List::Util::sum map $_->{expand}, @$children;
1344	$exp ||= 1;
1345
1346	for (0 .. $#$children) {
1347	my $child = $children->[$_];
1348
1349	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1350	}
1351	}
1352
1353	CFClient::UI::harmonize \@h;
1354
1355	my $y = 0;
1356	for (0 .. $#$children) {
1357	my $child = $children->[$_];
1358	my $h = $h[$_];
1359	$child->configure (0, $y, $w, $h);
1360
1361	$y += $h;
1362	}
1363
1364	1
1365	}	1478	}
1366		1479
1367	#############################################################################	1480	#############################################################################
1368		1481
1369	package CFClient::UI::Label;	1482	package CFClient::UI::Label;
…		…
1386	ellipsise => 3, # end	1499	ellipsise => 3, # end
1387	layout => (new CFClient::Layout),	1500	layout => (new CFClient::Layout),
1388	fontsize => 1,	1501	fontsize => 1,
1389	align => -1,	1502	align => -1,
1390	valign => -1,	1503	valign => -1,
1391	padding => 2,	1504	padding_x => 2,
		1505	padding_y => 2,
1392	can_events => 0,	1506	can_events => 0,
1393	%arg	1507	%arg
1394	);	1508	);
1395		1509
1396	if (exists $self->{template}) {	1510	if (exists $self->{template}) {
…		…
1432	$self->{text} = "T$text";	1546	$self->{text} = "T$text";
1433		1547
1434	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1548	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1435	$self->{layout}->set_text ($text);	1549	$self->{layout}->set_text ($text);
1436		1550
		1551	$self->realloc;
1437	$self->update;	1552	$self->update;
1438	$self->check_size;
1439	}	1553	}
1440		1554
1441	sub set_markup {	1555	sub set_markup {
1442	my ($self, $markup) = @_;	1556	my ($self, $markup) = @_;
1443		1557
…		…
1447	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1561	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1448		1562
1449	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;	1563	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1450	$self->{layout}->set_markup ($markup);	1564	$self->{layout}->set_markup ($markup);
1451		1565
		1566	$self->realloc;
1452	$self->update;	1567	$self->update;
1453	$self->check_size;
1454	}	1568	}
1455		1569
1456	sub size_request {	1570	sub size_request {
1457	my ($self) = @_;	1571	my ($self) = @_;
1458		1572
…		…
1472		1586
1473	$w = List::Util::max $w, $w2;	1587	$w = List::Util::max $w, $w2;
1474	$h = List::Util::max $h, $h2;	1588	$h = List::Util::max $h, $h2;
1475	}	1589	}
1476		1590
1477	(	1591	($w, $h)
1478	$w + $self->{padding} * 2,
1479	$h + $self->{padding} * 2,
1480	)
1481	}	1592	}
1482		1593
1483	sub size_allocate {	1594	sub size_allocate {
1484	my ($self, $w, $h) = @_;	1595	my ($self, $w, $h) = @_;
1485		1596
		1597	delete $self->{ox};
		1598
1486	delete $self->{texture};	1599	delete $self->{texture}
		1600	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1487	}	1601	}
1488		1602
1489	sub set_fontsize {	1603	sub set_fontsize {
1490	my ($self, $fontsize) = @_;	1604	my ($self, $fontsize) = @_;
1491		1605
1492	$self->{fontsize} = $fontsize;	1606	$self->{fontsize} = $fontsize;
1493	delete $self->{texture};	1607	delete $self->{texture};
1494		1608
1495	$self->update;	1609	$self->realloc;
1496	$self->check_size;
1497	}	1610	}
1498		1611
1499	sub _draw {	1612	sub _draw {
1500	my ($self) = @_;	1613	my ($self) = @_;
1501		1614
…		…
1507	$self->{layout}->set_width ($self->{w});	1620	$self->{layout}->set_width ($self->{w});
1508	$self->{layout}->set_ellipsise ($self->{ellipsise});	1621	$self->{layout}->set_ellipsise ($self->{ellipsise});
1509	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1622	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1510	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1623	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1511		1624
1512	my $tex = new_from_layout CFClient::Texture $self->{layout};	1625	new_from_layout CFClient::Texture $self->{layout}
		1626	};
1513		1627
		1628	unless (exists $self->{ox}) {
1514	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}	1629	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1515	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1630	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1516	: ($self->{w} - $tex->{w}) * 0.5);	1631	: ($self->{w} - $tex->{w}) * 0.5);
1517		1632
1518	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}	1633	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1519	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1634	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1520	: ($self->{h} - $tex->{h}) * 0.5);	1635	: ($self->{h} - $tex->{h}) * 0.5);
1521
1522	$tex
1523	};	1636	};
1524		1637
1525	glEnable GL_TEXTURE_2D;	1638	glEnable GL_TEXTURE_2D;
1526	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1639	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1527		1640
…		…
1565		1678
1566	delete $self->{cur_h};	1679	delete $self->{cur_h};
1567		1680
1568	return if $self->{text} eq $text;	1681	return if $self->{text} eq $text;
1569		1682
1570	delete $self->{texture};
1571
1572	$self->{last_activity} = $::NOW;	1683	$self->{last_activity} = $::NOW;
1573	$self->{text} = $text;	1684	$self->{text} = $text;
1574		1685
1575	$text =~ s/./*/g if $self->{hidden};	1686	$text =~ s/./*/g if $self->{hidden};
1576	$self->{layout}->set_text ("$text ");	1687	$self->{layout}->set_text ("$text ");
1577		1688
1578	$self->_emit (changed => $self->{text});	1689	$self->_emit (changed => $self->{text});
		1690	$self->update;
1579	}	1691	}
1580		1692
1581	sub set_text {	1693	sub set_text {
1582	my ($self, $text) = @_;	1694	my ($self, $text) = @_;
1583		1695
1584	$self->{cursor} = length $text;	1696	$self->{cursor} = length $text;
1585	$self->_set_text ($text);	1697	$self->_set_text ($text);
1586	$self->update;	1698
1587	$self->check_size;	1699	$self->realloc;
1588	}	1700	}
1589		1701
1590	sub get_text {	1702	sub get_text {
1591	$_[0]{text}	1703	$_[0]{text}
1592	}	1704	}
…		…
1622	$self->{cursor} = length $text;	1734	$self->{cursor} = length $text;
1623	} elsif ($uni == 27) {	1735	} elsif ($uni == 27) {
1624	$self->_emit ('escape');	1736	$self->_emit ('escape');
1625	} elsif ($uni) {	1737	} elsif ($uni) {
1626	substr $text, $self->{cursor}++, 0, chr $uni;	1738	substr $text, $self->{cursor}++, 0, chr $uni;
		1739	} else {
		1740	return 0;
1627	}	1741	}
1628		1742
1629	$self->_set_text ($text);	1743	$self->_set_text ($text);
1630	$self->update;	1744
1631	$self->check_size;	1745	$self->realloc;
		1746
		1747	1
1632	}	1748	}
1633		1749
1634	sub focus_in {	1750	sub focus_in {
1635	my ($self) = @_;	1751	my ($self) = @_;
1636		1752
…		…
1651	utf8::encode $text;	1767	utf8::encode $text;
1652	$self->{cursor} = length substr $text, 0, $idx;	1768	$self->{cursor} = length substr $text, 0, $idx;
1653		1769
1654	$self->_set_text ($self->{text});	1770	$self->_set_text ($self->{text});
1655	$self->update;	1771	$self->update;
		1772
		1773	1
1656	}	1774	}
1657		1775
1658	sub mouse_motion {	1776	sub mouse_motion {
1659	my ($self, $ev, $x, $y) = @_;	1777	my ($self, $ev, $x, $y) = @_;
1660	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	1778	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
		1779
		1780	0
1661	}	1781	}
1662		1782
1663	sub _draw {	1783	sub _draw {
1664	my ($self) = @_;	1784	my ($self) = @_;
1665		1785
…		…
1742	} else {	1862	} else {
1743	$self->set_text ($self->{history_saveback});	1863	$self->set_text ($self->{history_saveback});
1744	}	1864	}
1745		1865
1746	} else {	1866	} else {
1747	$self->SUPER::key_down ($ev);	1867	return $self->SUPER::key_down ($ev)
		1868	}
		1869
1748	}	1870	1
1749
1750	}	1871	}
1751		1872
1752	#############################################################################	1873	#############################################################################
1753		1874
1754	package CFClient::UI::Button;	1875	package CFClient::UI::Button;
…		…
1763		1884
1764	sub new {	1885	sub new {
1765	my $class = shift;	1886	my $class = shift;
1766		1887
1767	$class->SUPER::new (	1888	$class->SUPER::new (
1768	padding => 4,	1889	padding_x => 4,
		1890	padding_y => 4,
1769	fg => [1, 1, 1],	1891	fg => [1, 1, 1],
1770	active_fg => [0, 0, 1],	1892	active_fg => [0, 0, 1],
1771	can_hover => 1,	1893	can_hover => 1,
1772	align => 0,	1894	align => 0,
1773	valign => 0,	1895	valign => 0,
…		…
1782	my ($self, $ev, $x, $y) = @_;	1904	my ($self, $ev, $x, $y) = @_;
1783		1905
1784	$self->emit ("activate")	1906	$self->emit ("activate")
1785	if $x >= 0 && $x < $self->{w}	1907	if $x >= 0 && $x < $self->{w}
1786	&& $y >= 0 && $y < $self->{h};	1908	&& $y >= 0 && $y < $self->{h};
		1909
		1910	1
1787	}	1911	}
1788		1912
1789	sub _draw {	1913	sub _draw {
1790	my ($self) = @_;	1914	my ($self) = @_;
1791		1915
…		…
1820		1944
1821	sub new {	1945	sub new {
1822	my $class = shift;	1946	my $class = shift;
1823		1947
1824	$class->SUPER::new (	1948	$class->SUPER::new (
1825	padding => 2,	1949	padding_x => 2,
		1950	padding_y => 2,
1826	fg => [1, 1, 1],	1951	fg => [1, 1, 1],
1827	active_fg => [1, 1, 0],	1952	active_fg => [1, 1, 0],
1828	bg => [0, 0, 0, 0.2],	1953	bg => [0, 0, 0, 0.2],
1829	active_bg => [1, 1, 1, 0.5],	1954	active_bg => [1, 1, 1, 0.5],
1830	state => 0,	1955	state => 0,
…		…
1834	}	1959	}
1835		1960
1836	sub size_request {	1961	sub size_request {
1837	my ($self) = @_;	1962	my ($self) = @_;
1838		1963
1839	($self->{padding} * 2 + 6) x 2	1964	(6) x 2
1840	}	1965	}
1841		1966
1842	sub button_down {	1967	sub button_down {
1843	my ($self, $ev, $x, $y) = @_;	1968	my ($self, $ev, $x, $y) = @_;
1844		1969
1845	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1970	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1846	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1971	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1847	$self->{state} = !$self->{state};	1972	$self->{state} = !$self->{state};
1848	$self->_emit (changed => $self->{state});	1973	$self->_emit (changed => $self->{state});
		1974	} else {
		1975	return 0
		1976	}
		1977
1849	}	1978	1
1850	}	1979	}
1851		1980
1852	sub _draw {	1981	sub _draw {
1853	my ($self) = @_;	1982	my ($self) = @_;
1854		1983
1855	$self->SUPER::_draw;	1984	$self->SUPER::_draw;
1856		1985
1857	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;	1986	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1858		1987
1859	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1988	my ($w, $h) = @$self{qw(w h)};
		1989
		1990	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1860		1991
1861	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1992	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1862		1993
1863	my $tex = $self->{state} ? $tex[1] : $tex[0];	1994	my $tex = $self->{state} ? $tex[1] : $tex[0];
1864		1995
…		…
2129	fg => [1, 1, 1],	2260	fg => [1, 1, 1],
2130	active_fg => [0, 0, 0],	2261	active_fg => [0, 0, 0],
2131	bg => [0, 0, 0, 0.2],	2262	bg => [0, 0, 0, 0.2],
2132	active_bg => [1, 1, 1, 0.5],	2263	active_bg => [1, 1, 1, 0.5],
2133	range => [0, 0, 100, 10, 0],	2264	range => [0, 0, 100, 10, 0],
2134	req_w => $::WIDTH / 80,	2265	min_w => $::WIDTH / 80,
2135	req_h => $::WIDTH / 80,	2266	min_h => $::WIDTH / 80,
2136	vertical => 0,	2267	vertical => 0,
2137	can_hover => 1,	2268	can_hover => 1,
2138	inner_pad => 0.02,	2269	inner_pad => 0.02,
2139	@_	2270	@_
2140	);	2271	);
…		…
2143	$self->update;	2274	$self->update;
2144		2275
2145	$self	2276	$self
2146	}	2277	}
2147		2278
		2279	sub changed { }
		2280
2148	sub set_range {	2281	sub set_range {
2149	my ($self, $range) = @_;	2282	my ($self, $range) = @_;
2150		2283
2151	($range, $self->{range}) = ($self->{range}, $range);	2284	($range, $self->{range}) = ($self->{range}, $range);
2152		2285
…		…
2178	}	2311	}
2179		2312
2180	sub size_request {	2313	sub size_request {
2181	my ($self) = @_;	2314	my ($self) = @_;
2182		2315
2183	my $w = $self->{req_w};	2316	($self->{req_w}, $self->{req_h})
2184	my $h = $self->{req_h};
2185
2186	$self->{vertical} ? ($h, $w) : ($w, $h)
2187	}	2317	}
2188		2318
2189	sub button_down {	2319	sub button_down {
2190	my ($self, $ev, $x, $y) = @_;	2320	my ($self, $ev, $x, $y) = @_;
2191		2321
2192	$self->SUPER::button_down ($ev, $x, $y);	2322	$self->SUPER::button_down ($ev, $x, $y);
2193		2323
2194	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2324	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2195		2325
2196	$self->mouse_motion ($ev, $x, $y);	2326	$self->mouse_motion ($ev, $x, $y)
2197	}	2327	}
2198		2328
2199	sub mouse_motion {	2329	sub mouse_motion {
2200	my ($self, $ev, $x, $y) = @_;	2330	my ($self, $ev, $x, $y) = @_;
2201		2331
…		…
2205	my (undef, $lo, $hi, $page) = @{$self->{range}};	2335	my (undef, $lo, $hi, $page) = @{$self->{range}};
2206		2336
2207	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});	2337	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2208		2338
2209	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));	2339	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2340	} else {
		2341	return 0;
		2342	}
		2343
2210	}	2344	1
2211	}	2345	}
2212		2346
2213	sub update {	2347	sub update {
2214	my ($self) = @_;	2348	my ($self) = @_;
2215		2349
2216	$CFClient::UI::ROOT->on_post_alloc ($self => sub {	2350	delete $self->{knob_w};
		2351	$self->SUPER::update;
		2352	}
		2353
		2354	sub _draw {
		2355	my ($self) = @_;
		2356
		2357	unless ($self->{knob_w}) {
2217	$self->set_value ($self->{range}[0]);	2358	$self->set_value ($self->{range}[0]);
2218		2359
2219	my ($value, $lo, $hi, $page) = @{$self->{range}};	2360	my ($value, $lo, $hi, $page) = @{$self->{range}};
2220	my $range = ($hi - $page - $lo) || 1e-100;	2361	my $range = ($hi - $page - $lo) || 1e-100;
2221		2362
…		…
2227	$value = ($value - $lo) / $range;	2368	$value = ($value - $lo) / $range;
2228	$value = $value * $self->{scale} + $self->{offset};	2369	$value = $value * $self->{scale} + $self->{offset};
2229		2370
2230	$self->{knob_x} = $value - $knob_w * 0.5;	2371	$self->{knob_x} = $value - $knob_w * 0.5;
2231	$self->{knob_w} = $knob_w;	2372	$self->{knob_w} = $knob_w;
2232	});	2373	}
2233
2234	$self->SUPER::update;
2235	}
2236
2237	sub _draw {
2238	my ($self) = @_;
2239		2374
2240	$self->SUPER::_draw ();	2375	$self->SUPER::_draw ();
2241		2376
2242	glScale $self->{w}, $self->{h};	2377	glScale $self->{w}, $self->{h};
2243		2378
…		…
2542		2677
2543	sub new {	2678	sub new {
2544	my $class = shift;	2679	my $class = shift;
2545		2680
2546	my $self = $class->SUPER::new (	2681	my $self = $class->SUPER::new (
2547	state => 0,	2682	state => 0,
2548	connect_activate => \&toggle_flopper,	2683	on_activate => \&toggle_flopper,
2549	@_	2684	@_
2550	);	2685	);
2551		2686
2552	if ($self->{state}) {
2553	$self->{state} = 0;
2554	$self->toggle_flopper;
2555	}
2556
2557	$self	2687	$self
2558	}	2688	}
2559		2689
2560	sub toggle_flopper {	2690	sub toggle_flopper {
2561	my ($self) = @_;	2691	my ($self) = @_;
2562		2692
2563	# TODO: use animation	2693	$self->{other}->toggle_visibility;
2564	if ($self->{state} = !$self->{state}) {
2565	$CFClient::UI::ROOT->add ($self->{other});
2566	$self->{other}->move ($self->coord2global (0, $self->{h}));
2567	$self->_emit ("open");
2568	} else {
2569	$CFClient::UI::ROOT->remove ($self->{other});
2570	$self->_emit ("close");
2571	}
2572
2573	$self->_emit (changed => $self->{state});
2574	}	2694	}
2575		2695
2576	#############################################################################	2696	#############################################################################
2577		2697
2578	package CFClient::UI::Tooltip;	2698	package CFClient::UI::Tooltip;
…		…
2591	}	2711	}
2592		2712
2593	sub set_tooltip_from {	2713	sub set_tooltip_from {
2594	my ($self, $widget) = @_;	2714	my ($self, $widget) = @_;
2595		2715
		2716	my $tooltip = $widget->{tooltip};
		2717
		2718	if ($ENV{CFPLUS_DEBUG} & 2) {
		2719	$tooltip .= "\n\n" . (ref $widget) . "\n"
		2720	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
		2721	. "req $widget->{req_w} $widget->{req_h}\n"
		2722	. "visible $widget->{visible}";
		2723	}
		2724
2596	$self->add (new CFClient::UI::Label	2725	$self->add (new CFClient::UI::Label
2597	markup => $widget->{tooltip},	2726	markup => $tooltip,
2598	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2727	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2599	fontsize => 0.8,	2728	fontsize => 0.8,
2600	fg => [0, 0, 0, 1],	2729	fg => [0, 0, 0, 1],
2601	ellipsise => 0,	2730	ellipsise => 0,
2602	font => ($widget->{tooltip_font} || $::FONT_PROP),	2731	font => ($widget->{tooltip_font} || $::FONT_PROP),
…		…
2613		2742
2614	sub size_allocate {	2743	sub size_allocate {
2615	my ($self, $w, $h) = @_;	2744	my ($self, $w, $h) = @_;
2616		2745
2617	$self->SUPER::size_allocate ($w - 4, $h - 4);	2746	$self->SUPER::size_allocate ($w - 4, $h - 4);
		2747	}
		2748
		2749	sub visibility_change {
		2750	my ($self, $visible) = @_;
		2751
		2752	return unless $visible;
		2753
		2754	$self->{root}->on_post_alloc ("move_$self" => sub {
		2755	my $widget = $self->{owner}
		2756	or return;
		2757
		2758	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
		2759
		2760	($x, $y) = $widget->coord2global (-$self->{w}, 0)
		2761	if $x + $self->{w} > $::WIDTH;
		2762
		2763	$self->move_abs ($x, $y);
		2764	});
2618	}	2765	}
2619		2766
2620	sub _draw {	2767	sub _draw {
2621	my ($self) = @_;	2768	my ($self) = @_;
2622		2769
…		…
2639	glVertex $w, $h;	2786	glVertex $w, $h;
2640	glVertex $w, 0;	2787	glVertex $w, 0;
2641	glEnd;	2788	glEnd;
2642		2789
2643	glTranslate 2 - 0.375, 2 - 0.375;	2790	glTranslate 2 - 0.375, 2 - 0.375;
		2791
2644	$self->SUPER::_draw;	2792	$self->SUPER::_draw;
2645	}	2793	}
2646		2794
2647	#############################################################################	2795	#############################################################################
2648		2796
…		…
2724	$self->SUPER::DESTROY;	2872	$self->SUPER::DESTROY;
2725	}	2873	}
2726		2874
2727	#############################################################################	2875	#############################################################################
2728		2876
2729	package CFClient::UI::Inventory;	2877	package CFClient::UI::Buttonbar;
2730		2878
2731	our @ISA = CFClient::UI::ScrolledWindow::;	2879	our @ISA = CFClient::UI::HBox::;
2732		2880
2733	sub new {	2881	# TODO: should actualyl wrap buttons and other goodies.
2734	my $class = shift;
2735
2736	my $self = $class->SUPER::new (
2737	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2738	@_,
2739	);
2740
2741	$self
2742	}
2743
2744	sub set_items {
2745	my ($self, $items) = @_;
2746
2747	$self->{scrolled}->clear;
2748	return unless $items;
2749
2750	my @items = sort {
2751	($a->{type} <=> $b->{type})
2752	or ($a->{name} cmp $b->{name})
2753	} @$items;
2754
2755	$self->{real_items} = \@items;
2756
2757	my $row = 0;
2758	for my $item (@items) {
2759	CFClient::Item::update_widgets $item;
2760
2761	$self->{scrolled}->add (0, $row, $item->{face_widget});
2762	$self->{scrolled}->add (1, $row, $item->{desc_widget});
2763	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2764
2765	$row++;
2766	}
2767	}
2768
2769	sub size_request {
2770	my ($self) = @_;
2771	($self->{req_w}, $self->{req_h});
2772	}
2773		2882
2774	#############################################################################	2883	#############################################################################
2775		2884
2776	package CFClient::UI::Menu;	2885	package CFClient::UI::Menu;
2777		2886
…		…
2818	# maybe save $GRAB? must be careful about events...	2927	# maybe save $GRAB? must be careful about events...
2819	$GRAB = $self;	2928	$GRAB = $self;
2820	$self->{button} = $ev->{button};	2929	$self->{button} = $ev->{button};
2821		2930
2822	$self->show;	2931	$self->show;
2823	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	2932	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2824	}	2933	}
2825		2934
2826	sub mouse_motion {	2935	sub mouse_motion {
2827	my ($self, $ev, $x, $y) = @_;	2936	my ($self, $ev, $x, $y) = @_;
2828		2937
2829	# TODO: should use vbox->find_widget or so	2938	# TODO: should use vbox->find_widget or so
2830	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	2939	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2831	$self->{hover} = $self->{item}{$HOVER};	2940	$self->{hover} = $self->{item}{$HOVER};
		2941
		2942	0
2832	}	2943	}
2833		2944
2834	sub button_up {	2945	sub button_up {
2835	my ($self, $ev, $x, $y) = @_;	2946	my ($self, $ev, $x, $y) = @_;
2836		2947
…		…
2838	undef $GRAB;	2949	undef $GRAB;
2839	$self->hide;	2950	$self->hide;
2840		2951
2841	$self->_emit ("popdown");	2952	$self->_emit ("popdown");
2842	$self->{hover}[1]->() if $self->{hover};	2953	$self->{hover}[1]->() if $self->{hover};
		2954	} else {
		2955	return 0
		2956	}
		2957
		2958	1
		2959	}
		2960
		2961	#############################################################################
		2962
		2963	package CFClient::UI::Multiplexer;
		2964
		2965	our @ISA = CFClient::UI::Container::;
		2966
		2967	sub new {
		2968	my $class = shift;
		2969
		2970	my $self = $class->SUPER::new (
		2971	@_,
		2972	);
		2973
		2974	$self->{current} = $self->{children}[0]
		2975	if @{ $self->{children} };
		2976
		2977	$self
		2978	}
		2979
		2980	sub add {
		2981	my ($self, @widgets) = @_;
		2982
		2983	$self->SUPER::add (@widgets);
		2984
		2985	$self->{current} = $self->{children}[0]
		2986	if @{ $self->{children} };
		2987	}
		2988
		2989	sub set_current_page {
		2990	my ($self, $page_or_widget) = @_;
		2991
		2992	my $widget = ref $page_or_widget
		2993	? $page_or_widget
		2994	: $self->{children}[$page_or_widget];
		2995
		2996	$self->{current} = $widget;
		2997	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
		2998
		2999	$self->_emit (page_changed => $self->{current});
		3000
		3001	$self->realloc;
		3002	}
		3003
		3004	sub visible_children {
		3005	$_[0]{current}
		3006	}
		3007
		3008	sub size_request {
		3009	my ($self) = @_;
		3010
		3011	$self->{current}->size_request
		3012	}
		3013
		3014	sub size_allocate {
		3015	my ($self, $w, $h) = @_;
		3016
		3017	$self->{current}->configure (0, 0, $w, $h);
		3018	}
		3019
		3020	sub _draw {
		3021	my ($self) = @_;
		3022
		3023	$self->{current}->draw;
		3024	}
		3025
		3026	#############################################################################
		3027
		3028	package CFClient::UI::Notebook;
		3029
		3030	our @ISA = CFClient::UI::VBox::;
		3031
		3032	sub new {
		3033	my $class = shift;
		3034
		3035	my $self = $class->SUPER::new (
		3036	buttonbar => (new CFClient::UI::Buttonbar),
		3037	multiplexer => (new CFClient::UI::Multiplexer expand => 1),
		3038	# filter => # will be put between multiplexer and $self
		3039	@_,
		3040	);
2843	}	3041
		3042	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
		3043	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
		3044
		3045	$self
		3046	}
		3047
		3048	sub add {
		3049	my ($self, $title, $widget, $tooltip) = @_;
		3050
		3051	Scalar::Util::weaken $self;
		3052
		3053	$self->{buttonbar}->add (new CFClient::UI::Button
		3054	markup => $title,
		3055	tooltip => $tooltip,
		3056	on_activate => sub { $self->set_current_page ($widget) },
		3057	);
		3058
		3059	$self->{multiplexer}->add ($widget);
		3060	}
		3061
		3062	sub set_current_page {
		3063	my ($self, $page) = @_;
		3064
		3065	$self->{multiplexer}->set_current_page ($page);
		3066	$self->_emit (page_changed => $self->{multiplexer}{current});
2844	}	3067	}
2845		3068
2846	#############################################################################	3069	#############################################################################
2847		3070
2848	package CFClient::UI::Statusbox;	3071	package CFClient::UI::Statusbox;
…		…
2953	$self->SUPER::reconfigure;	3176	$self->SUPER::reconfigure;
2954	}	3177	}
2955		3178
2956	#############################################################################	3179	#############################################################################
2957		3180
2958	package CFClient::UI::Root;	3181	package CFClient::UI::Inventory;
2959		3182
2960	our @ISA = CFClient::UI::Container::;	3183	our @ISA = CFClient::UI::ScrolledWindow::;
2961
2962	use CFClient::OpenGL;
2963		3184
2964	sub new {	3185	sub new {
2965	my $class = shift;	3186	my $class = shift;
2966		3187
2967	$class->SUPER::new (	3188	my $self = $class->SUPER::new (
		3189	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
		3190	@_,
		3191	);
		3192
		3193	$self
		3194	}
		3195
		3196	sub set_items {
		3197	my ($self, $items) = @_;
		3198
		3199	$self->{child}->clear;
		3200	return unless $items;
		3201
		3202	my @items = sort {
		3203	($a->{type} <=> $b->{type})
		3204	or ($a->{name} cmp $b->{name})
		3205	} @$items;
		3206
		3207	$self->{real_items} = \@items;
		3208
		3209	my $row = 0;
		3210	for my $item (@items) {
		3211	CFClient::Item::update_widgets $item;
		3212
		3213	$self->{child}->add (0, $row, $item->{face_widget});
		3214	$self->{child}->add (1, $row, $item->{desc_widget});
		3215	$self->{child}->add (2, $row, $item->{weight_widget});
		3216
		3217	$row++;
		3218	}
		3219	}
		3220
		3221	#############################################################################
		3222
		3223	package CFClient::UI::BindEditor;
		3224
		3225	our @ISA = CFClient::UI::FancyFrame::;
		3226
		3227	sub new {
		3228	my $class = shift;
		3229
		3230	my $self = $class->SUPER::new (binding => [], commands => [], @_);
		3231
		3232	$self->add (my $vb = new CFClient::UI::VBox);
		3233
		3234
		3235	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
		3236	text => "start recording",
		3237	tooltip => "Start/Stops recording of actions."
		3238	."All subsequent actions after the recording started will be captured."
		3239	."The actions are displayed after the record was stopped."
		3240	."To bind the action you have to click on the 'Bind' button",
		3241	on_activate => sub {
		3242	unless ($self->{recording}) {
		3243	$self->start;
		3244	} else {
		3245	$self->stop;
		3246	}
		3247	});
		3248
		3249	$vb->add (new CFClient::UI::Label text => "Actions:");
		3250	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
		3251
		3252	$vb->add (new CFClient::UI::Label text => "Bound to: ");
		3253	$vb->add (my $hb = new CFClient::UI::HBox);
		3254	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
		3255	$hb->add (new CFClient::UI::Button
		3256	text => "bind",
		3257	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
		3258	on_activate => sub {
		3259	$self->ask_for_bind;
		3260	});
		3261
		3262	$vb->add (my $hb = new CFClient::UI::HBox);
		3263	$hb->add (new CFClient::UI::Button
		3264	text => "ok",
		3265	expand => 1,
		3266	tooltip => "This closes the binding editor and saves the binding",
		3267	on_activate => sub {
		3268	$self->hide;
		3269	$self->commit;
		3270	});
		3271
		3272	$hb->add (new CFClient::UI::Button
		3273	text => "cancel",
		3274	expand => 1,
		3275	tooltip => "This closes the binding editor without saving",
		3276	on_activate => sub {
		3277	$self->hide;
		3278	$self->{binding_cancel}->()
		3279	if $self->{binding_cancel};
		3280	});
		3281
		3282	$self->update_binding_widgets;
		3283
		3284	$self
		3285	}
		3286
		3287	sub commit {
		3288	my ($self) = @_;
		3289	my ($mod, $sym, $cmds) = $self->get_binding;
		3290	if ($sym != 0 && @$cmds > 0) {
		3291	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
		3292	."'. Don't forget 'Save Config'!");
		3293	$self->{binding_change}->($mod, $sym, $cmds)
		3294	if $self->{binding_change};
		3295	} else {
		3296	$::STATUSBOX->add ("No action bound, no key or action specified!");
		3297	$self->{binding_cancel}->()
		3298	if $self->{binding_cancel};
		3299	}
		3300	}
		3301
		3302	sub start {
		3303	my ($self) = @_;
		3304
		3305	$self->{rec_btn}->set_text ("stop recording");
		3306	$self->{recording} = 1;
		3307	$self->clear_command_list;
		3308	$::CONN->start_record if $::CONN;
		3309	}
		3310
		3311	sub stop {
		3312	my ($self) = @_;
		3313
		3314	$self->{rec_btn}->set_text ("start recording");
		3315	$self->{recording} = 0;
		3316
		3317	my $rec;
		3318	$rec = $::CONN->stop_record if $::CONN;
		3319	return unless ref $rec eq 'ARRAY';
		3320	$self->set_command_list ($rec);
		3321	}
		3322
		3323
		3324	sub ask_for_bind_and_commit {
		3325	my ($self) = @_;
		3326	$self->ask_for_bind (1);
		3327	}
		3328
		3329	sub ask_for_bind {
		3330	my ($self, $commit) = @_;
		3331
		3332	CFClient::Binder::open_binding_dialog (sub {
		3333	my ($mod, $sym) = @_;
		3334	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
		3335	$self->update_binding_widgets;
		3336	$self->commit if $commit;
		3337	});
		3338	}
		3339
		3340	# $mod and $sym are the modifiers and key symbol
		3341	# $cmds is a array ref of strings (the commands)
		3342	# $cb is the callback that is executed on OK
		3343	# $ccb is the callback that is executed on CANCEL and
		3344	# when the binding was unsuccessful on OK
		3345	sub set_binding {
		3346	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
		3347
		3348	$self->clear_command_list;
		3349	$self->{recording} = 0;
		3350	$self->{rec_btn}->set_text ("start recording");
		3351
		3352	$self->{binding} = [$mod, $sym];
		3353	$self->{commands} = $cmds;
		3354
		3355	$self->{binding_change} = $cb;
		3356	$self->{binding_cancel} = $ccb;
		3357
		3358	$self->update_binding_widgets;
		3359	}
		3360
		3361	# this is a shortcut method that asks for a binding
		3362	# and then just binds it.
		3363	sub do_quick_binding {
		3364	my ($self, $cmds) = @_;
		3365	$self->set_binding (undef, undef, $cmds, sub {
		3366	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
		3367	});
		3368	$self->ask_for_bind (1);
		3369	}
		3370
		3371	sub update_binding_widgets {
		3372	my ($self) = @_;
		3373	my ($mod, $sym, $cmds) = $self->get_binding;
		3374	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
		3375	$self->set_command_list ($cmds);
		3376	}
		3377
		3378	sub get_binding {
		3379	my ($self) = @_;
		3380	return (
		3381	$self->{binding}->[0],
		3382	$self->{binding}->[1],
		3383	[ grep { defined $_ } @{$self->{commands}} ]
		3384	);
		3385	}
		3386
		3387	sub clear_command_list {
		3388	my ($self) = @_;
		3389	$self->{cmdbox}->clear ();
		3390	}
		3391
		3392	sub set_command_list {
		3393	my ($self, $cmds) = @_;
		3394
		3395	$self->{cmdbox}->clear ();
		3396	$self->{commands} = $cmds;
		3397
		3398	my $idx = 0;
		3399
		3400	for (@$cmds) {
		3401	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
		3402
		3403	my $i = $idx;
		3404	$hb->add (new CFClient::UI::Label text => $_);
		3405	$hb->add (new CFClient::UI::Button
		3406	text => "delete",
		3407	tooltip => "Deletes the action from the record",
		3408	on_activate => sub {
		3409	$self->{cmdbox}->remove ($hb);
		3410	$cmds->[$i] = undef;
		3411	});
		3412
		3413
		3414	$idx++
		3415	}
		3416	}
		3417
		3418	#############################################################################
		3419
		3420	package CFClient::UI::SpellList;
		3421
		3422	our @ISA = CFClient::UI::Table::;
		3423
		3424	sub new {
		3425	my $class = shift;
		3426
		3427	my $self = $class->SUPER::new (
		3428	binding => [],
		3429	commands => [],
2968	@_,	3430	@_,
2969	)	3431	)
2970	}	3432	}
2971		3433
2972	sub configure {	3434	# XXX: Do sorting? Argl...
2973	my ($self, $x, $y, $w, $h) = @_;	3435	sub add_spell {
2974
2975	$self->{w} = $w;
2976	$self->{h} = $h;
2977	}
2978
2979	sub check_size {
2980	my ($self) = @_;	3436	my ($self, $spell) = @_;
		3437	$self->{spells}->{$spell->{name}} = $spell;
2981		3438
2982	$self->size_allocate ($self->{w}, $self->{h})	3439	$self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
2983	if $self->{w};	3440	face => $spell->{face},
		3441	can_hover => 1,
		3442	can_events => 1,
		3443	tooltip => $spell->{message});
		3444
		3445	$self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
		3446	text => $spell->{name},
		3447	can_hover => 1,
		3448	can_events => 1,
		3449	tooltip => $spell->{message},
		3450	expand => 1);
		3451
		3452	$self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
		3453	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
		3454	$spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
		3455	expand => 1);
		3456
		3457	$self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
		3458	text => "bind to key",
		3459	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
		3460	}
		3461
		3462	sub rebuild_spell_list {
		3463	my ($self) = @_;
		3464	$self->{tbl_idx} = 0;
		3465	$self->add_spell ($_) for values %{$self->{spells}};
		3466	}
		3467
		3468	sub remove_spell {
		3469	my ($self, $spell) = @_;
		3470	delete $self->{spells}->{$spell->{name}};
		3471	$self->rebuild_spell_list;
		3472	}
		3473
		3474	#############################################################################
		3475
		3476	package CFClient::UI::Root;
		3477
		3478	our @ISA = CFClient::UI::Container::;
		3479
		3480	use CFClient::OpenGL;
		3481
		3482	sub new {
		3483	my $class = shift;
		3484
		3485	my $self = $class->SUPER::new (
		3486	visible => 1,
		3487	@_,
		3488	);
		3489
		3490	Scalar::Util::weaken ($self->{root} = $self);
		3491
		3492	$self
2984	}	3493	}
2985		3494
2986	sub size_request {	3495	sub size_request {
2987	my ($self) = @_;	3496	my ($self) = @_;
2988		3497
2989	($self->{w}, $self->{h})	3498	($self->{w}, $self->{h})
		3499	}
		3500
		3501	sub _to_pixel {
		3502	my ($coord, $size, $max) = @_;
		3503
		3504	$coord =
		3505	$coord eq "center" ? ($max - $size) * 0.5
		3506	: $coord eq "max" ? $max
		3507	: $coord;
		3508
		3509	$coord = 0 if $coord < 0;
		3510	$coord = $max - $size if $coord > $max - $size;
		3511
		3512	int $coord + 0.5
2990	}	3513	}
2991		3514
2992	sub size_allocate {	3515	sub size_allocate {
2993	my ($self, $w, $h) = @_;	3516	my ($self, $w, $h) = @_;
2994		3517
2995	for my $child ($self->children) {	3518	for my $child ($self->children) {
2996	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3519	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2997		3520
2998	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3521	$X = $child->{force_x} if exists $child->{force_x};
2999	if exists $child->{req_x};	3522	$Y = $child->{force_y} if exists $child->{force_y};
3000		3523
3001	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3524	$X = _to_pixel $X, $W, $self->{w};
3002	if exists $child->{req_y};	3525	$Y = _to_pixel $Y, $H, $self->{h};
3003
3004	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3005	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3006		3526
3007	$child->configure ($X, $Y, $W, $H);	3527	$child->configure ($X, $Y, $W, $H);
3008	}	3528	}
3009	}	3529	}
3010		3530
…		…
3021	}	3541	}
3022		3542
3023	sub update {	3543	sub update {
3024	my ($self) = @_;	3544	my ($self) = @_;
3025		3545
3026	$self->check_size;
3027	$::WANT_REFRESH++;	3546	$::WANT_REFRESH++;
3028	}	3547	}
3029		3548
3030	sub add {	3549	sub add {
3031	my ($self, @children) = @_;	3550	my ($self, @children) = @_;
3032		3551
3033	for (my @widgets = @children; my $w = pop @widgets; ) {
3034	push @widgets, $w->children;
3035	$w->{root} = $self;
3036	$w->{visible} = 1;
3037	}
3038
3039	for my $child (@children) {
3040	$child->{is_toplevel} = 1;	3552	$_->{is_toplevel} = 1
3041		3553	for @children;
3042	# integerise window positions
3043	$child->{x} = int $child->{x};
3044	$child->{y} = int $child->{y};
3045	}
3046		3554
3047	$self->SUPER::add (@children);	3555	$self->SUPER::add (@children);
3048	}	3556	}
3049		3557
3050	sub remove {	3558	sub remove {
3051	my ($self, @children) = @_;	3559	my ($self, @children) = @_;
3052		3560
3053	$self->SUPER::remove (@children);	3561	$self->SUPER::remove (@children);
		3562
		3563	delete $self->{is_toplevel}
		3564	for @children;
3054		3565
3055	while (@children) {	3566	while (@children) {
3056	my $w = pop @children;	3567	my $w = pop @children;
3057	push @children, $w->children;	3568	push @children, $w->children;
3058	$w->set_invisible;	3569	$w->set_invisible;
…		…
3077	while ($self->{refresh_hook}) {	3588	while ($self->{refresh_hook}) {
3078	$_->()	3589	$_->()
3079	for values %{delete $self->{refresh_hook}};	3590	for values %{delete $self->{refresh_hook}};
3080	}	3591	}
3081		3592
3082	if ($self->{check_size}) {	3593	if ($self->{realloc}) {
3083	my @queue = ([], []);	3594	my %queue;
		3595	my @queue;
		3596	my $widget;
3084		3597
3085	for (;;) {	3598	outer:
3086	if ($self->{check_size}) {	3599	while () {
3087	# heuristic: check containers last	3600	if (my $realloc = delete $self->{realloc}) {
3088	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_	3601	for $widget (values %$realloc) {
3089	for values %{delete $self->{check_size}}	3602	$widget->{visible} or next; # do not resize invisible widgets
		3603
		3604	$queue{$widget+0}++ and next; # duplicates are common
		3605
		3606	push @{ $queue[$widget->{visible}] }, $widget;
		3607	}
3090	}	3608	}
3091		3609
3092	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;	3610	while () {
		3611	@queue or last outer;
3093		3612
3094	my ($w, $h) = $widget->{user_w} && $widget->{user_h}	3613	$widget = pop @{ $queue[-1] || [] }
3095	? @$widget{qw(user_w user_h)}	3614	and last;
3096	: $widget->size_request;
3097
3098	if (delete $widget->{force_alloc}
3099	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3100	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3101		3615
		3616	pop @queue;
		3617	}
		3618
		3619	delete $queue{$widget+0};
		3620
		3621	my ($w, $h) = $widget->size_request;
		3622
		3623	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
		3624	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
		3625
		3626	$w = $widget->{force_w} if exists $widget->{force_w};
		3627	$h = $widget->{force_h} if exists $widget->{force_h};
		3628
		3629	if ($widget->{req_w} != $w || $widget->{req_h} != $h
		3630	|| delete $widget->{force_realloc}) {
3102	$widget->{req_w} = $w;	3631	$widget->{req_w} = $w;
3103	$widget->{req_h} = $h;	3632	$widget->{req_h} = $h;
3104		3633
3105	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];	3634	$self->{size_alloc}{$widget+0} = $widget;
3106		3635
3107	$widget->{parent}->check_size
3108	if $widget->{parent};	3636	if (my $parent = $widget->{parent}) {
		3637	$self->{realloc}{$parent+0} = $parent
		3638	unless $queue{$parent+0};
		3639
		3640	$parent->{force_size_alloc} = 1;
		3641	$self->{size_alloc}{$parent+0} = $parent;
		3642	}
3109	}	3643	}
		3644
		3645	delete $self->{realloc}{$widget+0};
3110	}	3646	}
3111	}	3647	}
3112		3648
3113	while ($self->{size_alloc}) {	3649	while (my $size_alloc = delete $self->{size_alloc}) {
3114	for (values %{delete $self->{size_alloc}}) {	3650	my @queue = sort { $b->{visible} <=> $a->{visible} }
3115	my ($widget, $w, $h) = @$_;	3651	values %$size_alloc;
		3652
		3653	while () {
		3654	my $widget = pop @queue || last;
		3655
		3656	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3116		3657
3117	$w = 0 if $w < 0;	3658	$w = 0 if $w < 0;
3118	$h = 0 if $h < 0;	3659	$h = 0 if $h < 0;
3119		3660
		3661	$w = int $w + 0.5;
		3662	$h = int $h + 0.5;
		3663
		3664	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
		3665	$widget->{old_w} = $widget->{w};
		3666	$widget->{old_h} = $widget->{h};
		3667
3120	$widget->{w} = $w;	3668	$widget->{w} = $w;
3121	$widget->{h} = $h;	3669	$widget->{h} = $h;
		3670
3122	$widget->emit (size_allocate => $w, $h);	3671	$widget->emit (size_allocate => $w, $h);
		3672	}
3123	}	3673	}
3124	}	3674	}
3125		3675
3126	while ($self->{post_alloc_hook}) {	3676	while ($self->{post_alloc_hook}) {
3127	$_->()	3677	$_->()
3128	for values %{delete $self->{post_alloc_hook}};	3678	for values %{delete $self->{post_alloc_hook}};
3129	}	3679	}
		3680
3130		3681
3131	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3682	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3132	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3683	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3133	glClear GL_COLOR_BUFFER_BIT;	3684	glClear GL_COLOR_BUFFER_BIT;
3134		3685
…		…
3136	glLoadIdentity;	3687	glLoadIdentity;
3137	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3688	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3138	glMatrixMode GL_MODELVIEW;	3689	glMatrixMode GL_MODELVIEW;
3139	glLoadIdentity;	3690	glLoadIdentity;
3140		3691
		3692	{
		3693	package CFClient::UI::Base;
		3694
		3695	($draw_x, $draw_y, $draw_w, $draw_h) =
		3696	(0, 0, $self->{w}, $self->{h});
		3697	}
		3698
3141	$self->_draw;	3699	$self->_draw;
3142	}	3700	}
3143		3701
3144	#############################################################################	3702	#############################################################################
3145		3703

Diff Legend

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