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.252 by root, Sun May 28 23:21:28 2006 UTC vs.
Revision 1.283 by root, Mon Jun 5 02:28:30 2006 UTC

…		…
17	our $BUTTON_STATE;	17	our $BUTTON_STATE;
18		18
19	our %WIDGET; # all widgets, weak-referenced	19	our %WIDGET; # all widgets, weak-referenced
20		20
21	sub get_layout {	21	sub get_layout {
		22	my $layout;
		23
22	for (grep { $_->{name} } values %WIDGET) {	24	for (grep { $_->{name} } values %WIDGET) {
23	$LAYOUT->{$_->{name}} = {	25	my $win = $layout->{$_->{name}} = { };
24	x => $_->{x} / $::WIDTH,
25	y => $_->{y} / $::HEIGHT,
26	w => $_->{w} / $::WIDTH,
27	h => $_->{h} / $::HEIGHT
28	};	26
29	}	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};
30		31
31	return $LAYOUT;	32	$win->{show} = $_->{visible} && $_->{is_toplevel};
		33	}
		34
		35	$layout
32	}	36	}
33		37
34	sub set_layout {	38	sub set_layout {
35	my ($layout) = @_;	39	my ($layout) = @_;
		40
36	$LAYOUT = $layout;	41	$LAYOUT = $layout;
37	}	42	}
38		43
39	sub check_tooltip {	44	sub check_tooltip {
		45	return if $ENV{CFPLUS_DEBUG} & 8;
		46
40	if (!$GRAB) {	47	if (!$GRAB) {
41	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	48	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
42	if (length $widget->{tooltip}) {	49	if (length $widget->{tooltip}) {
43
44	if ($TOOLTIP->{owner} != $widget) {	50	if ($TOOLTIP->{owner} != $widget) {
		51	$TOOLTIP->hide;
		52
45	$TOOLTIP->{owner} = $widget;	53	$TOOLTIP->{owner} = $widget;
46		54
47	my $tip = $widget->{tooltip};	55	my $tip = $widget->{tooltip};
48		56
49	$tip = $tip->($widget) if CODE:: eq ref $tip;	57	$tip = $tip->($widget) if CODE:: eq ref $tip;
50		58
51	$TOOLTIP->set_tooltip_from ($widget);	59	$TOOLTIP->set_tooltip_from ($widget);
52
53	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
54
55	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
56	if $x + $TOOLTIP->{w} > $::WIDTH;
57
58	$TOOLTIP->move ($x, $y);
59	$TOOLTIP->show;	60	$TOOLTIP->show;
60	}	61	}
61		62
62	return;	63	return;
63	}	64	}
…		…
170	sub rescale_widgets {	171	sub rescale_widgets {
171	my ($sx, $sy) = @_;	172	my ($sx, $sy) = @_;
172		173
173	for my $widget (values %WIDGET) {	174	for my $widget (values %WIDGET) {
174	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
175	$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.]+$/;
176	$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};
177	$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};
178	$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.]+$/;
179	$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};
180	$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};
		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
181	}	189	}
182	}	190	}
183		191
184	reconfigure_widgets;	192	reconfigure_widgets;
185	}	193	}
…		…
194		202
195	sub new {	203	sub new {
196	my $class = shift;	204	my $class = shift;
197		205
198	my $self = bless {	206	my $self = bless {
199	x => 0,	207	x => "center",
200	y => 0,	208	y => "center",
201	z => 0,	209	z => 0,
		210	w => undef,
		211	h => undef,
202	can_events => 1,	212	can_events => 1,
203	@_	213	@_
204	}, $class;	214	}, $class;
		215
		216	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
205		217
206	for (keys %$self) {	218	for (keys %$self) {
207	if (/^on_(.*)$/) {	219	if (/^on_(.*)$/) {
208	$self->connect ($1 => delete $self->{$_});	220	$self->connect ($1 => delete $self->{$_});
209	}	221	}
210	}	222	}
211		223
212	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
213
214	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {	224	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
215	$self->{req_x} = $layout->{x} * $::WIDTH;	225	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
216	$self->{req_y} = $layout->{y} * $::HEIGHT;	226	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
217	$self->{def_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH;	227	$self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
218	$self->{def_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT;	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};
219	}	234	}
220		235
221	$self	236	$self
222	}	237	}
223		238
…		…
232	my ($self) = @_;	247	my ($self) = @_;
233		248
234	return if $self->{parent};	249	return if $self->{parent};
235		250
236	$CFClient::UI::ROOT->add ($self);	251	$CFClient::UI::ROOT->add ($self);
237	}
238
239	sub center {
240	my ($self) = @_;
241
242	$CFClient::UI::ROOT->on_post_alloc (
243	"center_$self" => sub {
244	$self->move (($self->{parent}{w} - $self->{w}) * 0.5, ($self->{parent}{h} - $self->{h}) * 0.5);
245	},
246	);
247
248	$self->update;
249	}	252	}
250		253
251	sub set_visible {	254	sub set_visible {
252	my ($self) = @_;	255	my ($self) = @_;
253		256
…		…
308		311
309	$self->{parent}->remove ($self)	312	$self->{parent}->remove ($self)
310	if $self->{parent};	313	if $self->{parent};
311	}	314	}
312		315
313	sub move {	316	sub move_abs {
314	my ($self, $x, $y, $z) = @_;	317	my ($self, $x, $y, $z) = @_;
315		318
316	$self->{x} = int $x;	319	$self->{x} = List::Util::max 0, int $x;
317	$self->{y} = int $y;	320	$self->{y} = List::Util::max 0, int $y;
318	$self->{z} = $z if defined $z;	321	$self->{z} = $z if defined $z;
319		322
320	$self->update;	323	$self->update;
321	}	324	}
322		325
323	sub set_size {	326	sub set_size {
324	my ($self, $w, $h) = @_;	327	my ($self, $w, $h) = @_;
325		328
326	$self->{def_w} = $w;	329	$self->{force_w} = $w;
327	$self->{def_h} = $h;	330	$self->{force_h} = $h;
328		331
329	$self->realloc;	332	$self->realloc;
330	}	333	}
331		334
332	sub size_request {	335	sub size_request {
…		…
336		339
337	sub configure {	340	sub configure {
338	my ($self, $x, $y, $w, $h) = @_;	341	my ($self, $x, $y, $w, $h) = @_;
339		342
340	if ($self->{aspect}) {	343	if ($self->{aspect}) {
		344	my ($ow, $oh) = ($w, $h);
		345
341	my $w2 = List::Util::min $w, int $h * $self->{aspect};	346	$w = List::Util::min $w, int $h * $self->{aspect};
342	my $h2 = List::Util::min $h, int $w / $self->{aspect};	347	$h = List::Util::min $h, int $w / $self->{aspect};
343		348
344	# use alignment to adjust x, y	349	# use alignment to adjust x, y
345		350
346	$x += int +($w - $w2) * 0.5;	351	$x += int 0.5 * ($ow - $w);
347	$y += int +($h - $h2) * 0.5;	352	$y += int 0.5 * ($oh - $h);
348
349	($w, $h) = ($w2, $h2);
350	}	353	}
351		354
352	if ($self->{x} != $x || $self->{y} != $y) {	355	if ($self->{x} ne $x || $self->{y} ne $y) {
353	$self->{x} = $x;	356	$self->{x} = $x;
354	$self->{y} = $y;	357	$self->{y} = $y;
355	$self->update;	358	$self->update;
356	}	359	}
357		360
358	if ($self->{w} != $w || $self->{h} != $h) {	361	if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
359	return unless $self->{visible};	362	return unless $self->{visible};
360		363
		364	$self->{alloc_w} = $w;
		365	$self->{alloc_h} = $h;
		366
361	$self->{root}->{size_alloc}{$self+0} = [$self, $w, $h];	367	$self->{root}{size_alloc}{$self+0} = $self;
362	}	368	}
363	}	369	}
364		370
365	sub size_allocate {	371	sub size_allocate {
366	# nothing to be done	372	# nothing to be done
367	}	373	}
368		374
369	sub children {	375	sub children {
		376	# nop
		377	}
		378
		379	sub visible_children {
		380	$_[0]->children
370	}	381	}
371		382
372	sub set_max_size {	383	sub set_max_size {
373	my ($self, $w, $h) = @_;	384	my ($self, $w, $h) = @_;
374		385
375	delete $self->{max_w}; $self->{max_w} = $w if $w;	386	$self->{max_w} = int $w if defined $w;
376	delete $self->{max_h}; $self->{max_h} = $h if $h;	387	$self->{max_h} = int $h if defined $h;
		388
		389	$self->realloc;
377	}	390	}
378		391
379	sub set_tooltip {	392	sub set_tooltip {
380	my ($self, $tooltip) = @_;	393	my ($self, $tooltip) = @_;
381		394
…		…
433		446
434	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus	447	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
435	unless $FOCUS;	448	unless $FOCUS;
436	}	449	}
437		450
438	sub mouse_motion { }	451	sub mouse_motion { 0 }
439	sub button_up { }	452	sub button_up { 0 }
440	sub key_down { }	453	sub key_down { 0 }
441	sub key_up { }	454	sub key_up { 0 }
442		455
443	sub button_down {	456	sub button_down {
444	my ($self, $ev, $x, $y) = @_;	457	my ($self, $ev, $x, $y) = @_;
445		458
446	$self->focus_in;	459	$self->focus_in;
447	}
448		460
449	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	461	0
450	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	462	}
451	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
452	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
453	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
454		463
455	sub find_widget {	464	sub find_widget {
456	my ($self, $x, $y) = @_;	465	my ($self, $x, $y) = @_;
457		466
458	return () unless $self->{can_events};	467	return () unless $self->{can_events};
…		…
466		475
467	sub set_parent {	476	sub set_parent {
468	my ($self, $parent) = @_;	477	my ($self, $parent) = @_;
469		478
470	Scalar::Util::weaken ($self->{parent} = $parent);	479	Scalar::Util::weaken ($self->{parent} = $parent);
471
472	$self->set_visible if $parent->{visible};	480	$self->set_visible if $parent->{visible};
473	}	481	}
474		482
475	sub connect {	483	sub connect {
476	my ($self, $signal, $cb) = @_;	484	my ($self, $signal, $cb) = @_;
…		…
497		505
498	sub realloc {	506	sub realloc {
499	my ($self) = @_;	507	my ($self) = @_;
500		508
501	if ($self->{visible}) {	509	if ($self->{visible}) {
502	return if $self->{root}{realloc}{$self};	510	return if $self->{root}{realloc}{$self+0};
503		511
504	$self->{root}{realloc}{$self} = $self;	512	$self->{root}{realloc}{$self+0} = $self;
505	$self->{root}->update;	513	$self->{root}->update;
506	} else {	514	} else {
507	delete $self->{req_w};	515	delete $self->{req_w};
		516	delete $self->{req_h};
508	}	517	}
509	}	518	}
510		519
511	sub update {	520	sub update {
512	my ($self) = @_;	521	my ($self) = @_;
513		522
514	$self->{parent}->update	523	$self->{parent}->update
515	if $self->{parent};	524	if $self->{parent};
516	}	525	}
517		526
		527	sub reconfigure {
		528	my ($self) = @_;
		529
		530	$self->realloc;
		531	$self->update;
		532	}
		533
		534	# using global variables seems a bit hacky, but passing through all drawing
		535	# functions seems pointless.
		536	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
		537
518	sub draw {	538	sub draw {
519	my ($self) = @_;	539	my ($self) = @_;
520		540
521	return unless $self->{h} && $self->{w};	541	return unless $self->{h} && $self->{w};
		542
		543	# update screen rectangle
		544	local $draw_x = $draw_x + $self->{x};
		545	local $draw_y = $draw_y + $self->{y};
		546	local $draw_w = $draw_x + $self->{w};
		547	local $draw_h = $draw_y + $self->{h};
		548
		549	# skip widgets that are entirely outside the drawing area
		550	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
		551	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
522		552
523	glPushMatrix;	553	glPushMatrix;
524	glTranslate $self->{x}, $self->{y}, 0;	554	glTranslate $self->{x}, $self->{y}, 0;
525	$self->_draw;
526	glPopMatrix;
527		555
528	if ($self == $HOVER && $self->{can_hover}) {	556	if ($self == $HOVER && $self->{can_hover}) {
529	my ($x, $y) = @$self{qw(x y)};
530
531	glColor 1, 0.8, 0.5, 0.2;	557	glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
532	glEnable GL_BLEND;	558	glEnable GL_BLEND;
533	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	559	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
534	glBegin GL_QUADS;	560	glBegin GL_QUADS;
535	glVertex $x , $y;	561	glVertex 0 , 0;
536	glVertex $x + $self->{w}, $y;	562	glVertex $self->{w}, 0;
537	glVertex $x + $self->{w}, $y + $self->{h};	563	glVertex $self->{w}, $self->{h};
538	glVertex $x , $y + $self->{h};	564	glVertex 0 , $self->{h};
539	glEnd;	565	glEnd;
540	glDisable GL_BLEND;	566	glDisable GL_BLEND;
541	}	567	}
542		568
543	if ($ENV{PCLIENT_DEBUG}) {	569	if ($ENV{CFPLUS_DEBUG} & 1) {
544	glPushMatrix;	570	glPushMatrix;
545	glColor 1, 1, 0, 1;	571	glColor 1, 1, 0, 1;
546	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	572	glTranslate 0.375, 0.375;
547	glBegin GL_LINE_LOOP;	573	glBegin GL_LINE_LOOP;
548	glVertex 0 , 0;	574	glVertex 0 , 0;
549	glVertex $self->{w} - 1, 0;	575	glVertex $self->{w} - 1, 0;
550	glVertex $self->{w} - 1, $self->{h} - 1;	576	glVertex $self->{w} - 1, $self->{h} - 1;
551	glVertex 0 , $self->{h} - 1;	577	glVertex 0 , $self->{h} - 1;
552	glEnd;	578	glEnd;
553	glPopMatrix;	579	glPopMatrix;
554	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	580	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
555	}	581	}
		582
		583	$self->_draw;
		584	glPopMatrix;
556	}	585	}
557		586
558	sub _draw {	587	sub _draw {
559	my ($self) = @_;	588	my ($self) = @_;
560		589
…		…
598		627
599	if ($color && (@$color < 4 || $color->[3])) {	628	if ($color && (@$color < 4 || $color->[3])) {
600	my ($w, $h) = @$self{qw(w h)};	629	my ($w, $h) = @$self{qw(w h)};
601		630
602	glEnable GL_BLEND;	631	glEnable GL_BLEND;
603	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	632	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
604	glColor @$color;	633	glColor_premultiply @$color;
605		634
606	glBegin GL_QUADS;	635	glBegin GL_QUADS;
607	glVertex 0 , 0;	636	glVertex 0 , 0;
608	glVertex 0 , $h;	637	glVertex 0 , $h;
609	glVertex $w, $h;	638	glVertex $w, $h;
…		…
624	my ($class, %arg) = @_;	653	my ($class, %arg) = @_;
625	$class->SUPER::new (can_events => 0, %arg);	654	$class->SUPER::new (can_events => 0, %arg);
626	}	655	}
627		656
628	sub size_request {	657	sub size_request {
629	(0, 0)	658	my ($self) = @_;
		659
		660	($self->{w} + 0, $self->{h} + 0)
630	}	661	}
631		662
632	sub draw { }	663	sub draw { }
633		664
634	#############################################################################	665	#############################################################################
…		…
638	our @ISA = CFClient::UI::Base::;	669	our @ISA = CFClient::UI::Base::;
639		670
640	sub new {	671	sub new {
641	my ($class, %arg) = @_;	672	my ($class, %arg) = @_;
642		673
643	my $children = delete $arg{children} || [];	674	my $children = delete $arg{children};
644		675
645	my $self = $class->SUPER::new (	676	my $self = $class->SUPER::new (
646	children => [],	677	children => [],
647	can_events => 0,	678	can_events => 0,
648	%arg,	679	%arg,
649	);	680	);
		681
650	$self->add ($_) for @$children;	682	$self->add (@$children)
		683	if $children;
651		684
652	$self	685	$self
653	}	686	}
654		687
655	sub add {	688	sub add {
…		…
703	$x -= $self->{x};	736	$x -= $self->{x};
704	$y -= $self->{y};	737	$y -= $self->{y};
705		738
706	my $res;	739	my $res;
707		740
708	for (reverse @{ $self->{children} }) {	741	for (reverse $self->visible_children) {
709	$res = $_->find_widget ($x, $y)	742	$res = $_->find_widget ($x, $y)
710	and return $res;	743	and return $res;
711	}	744	}
712		745
713	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})	746	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
…		…
755	sub size_request {	788	sub size_request {
756	$_[0]{children}[0]->size_request	789	$_[0]{children}[0]->size_request
757	}	790	}
758		791
759	sub size_allocate {	792	sub size_allocate {
760	my ($self, $w, $h, $changed) = @_;	793	my ($self, $w, $h) = @_;
761		794
762	$self->{children}[0]->configure (0, 0, $w, $h);	795	$self->{children}[0]->configure (0, 0, $w, $h);
763	}	796	}
764		797
765	#############################################################################	798	#############################################################################
		799
		800	# back-buffered drawing area
766		801
767	package CFClient::UI::Window;	802	package CFClient::UI::Window;
768		803
769	our @ISA = CFClient::UI::Bin::;	804	our @ISA = CFClient::UI::Bin::;
770		805
…		…
782	$ROOT->on_post_alloc ($self => sub { $self->render_child });	817	$ROOT->on_post_alloc ($self => sub { $self->render_child });
783	$self->SUPER::update;	818	$self->SUPER::update;
784	}	819	}
785		820
786	sub size_allocate {	821	sub size_allocate {
787	my ($self, $w, $h, $changed) = @_;	822	my ($self, $w, $h) = @_;
788		823
789	$self->SUPER::size_allocate ($w, $h, $changed);	824	$self->SUPER::size_allocate ($w, $h);
790	$self->update	825	$self->update;
791	if $changed;
792	}	826	}
793		827
794	sub _render {	828	sub _render {
		829	my ($self) = @_;
		830
795	$_[0]{children}[0]->draw;	831	$self->{children}[0]->draw;
796	}	832	}
797		833
798	sub render_child {	834	sub render_child {
799	my ($self) = @_;	835	my ($self) = @_;
800		836
801	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	837	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
802	glClearColor 0, 0, 0, 0;	838	glClearColor 0, 0, 0, 0;
803	glClear GL_COLOR_BUFFER_BIT;	839	glClear GL_COLOR_BUFFER_BIT;
804		840
		841	{
		842	package CFClient::UI::Base;
		843
		844	($draw_x, $draw_y, $draw_w, $draw_h) =
		845	(0, 0, $self->{w}, $self->{h});
		846	}
		847
805	$self->_render;	848	$self->_render;
806	};	849	};
807	}	850	}
808		851
809	sub _draw {	852	sub _draw {
810	my ($self) = @_;	853	my ($self) = @_;
811		854
812	my ($w, $h) = ($self->w, $self->h);	855	my ($w, $h) = @$self{qw(w h)};
813		856
814	my $tex = $self->{texture}	857	my $tex = $self->{texture}
815	or return;	858	or return;
816		859
817	glEnable GL_TEXTURE_2D;	860	glEnable GL_TEXTURE_2D;
818	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	861	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
819	glColor 1, 1, 1, 1;	862	glColor 0, 0, 0, 1;
820		863
821	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	864	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
822		865
823	glDisable GL_TEXTURE_2D;	866	glDisable GL_TEXTURE_2D;
824	}	867	}
…		…
840	}	883	}
841		884
842	sub size_request {	885	sub size_request {
843	my ($self) = @_;	886	my ($self) = @_;
844		887
845	my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	888	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
846		889
847	$w = 10 if $self->{scroll_x};	890	$w = 10 if $self->{scroll_x};
848	$h = 10 if $self->{scroll_y};	891	$h = 10 if $self->{scroll_y};
849		892
850	($w, $h)	893	($w, $h)
851	}	894	}
852		895
853	sub size_allocate {	896	sub size_allocate {
854	my ($self, $w, $h, $changed) = @_;	897	my ($self, $w, $h) = @_;
855		898
		899	my $child = $self->child;
		900
856	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};	901	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
857	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};	902	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
858		903
859	$self->child->configure (0, 0, $w, $h);	904	$self->child->configure (0, 0, $w, $h);
860	$self->update;	905	$self->update;
861	}	906	}
862		907
…		…
898	}	943	}
899		944
900	sub _render {	945	sub _render {
901	my ($self) = @_;	946	my ($self) = @_;
902		947
		948	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
		949	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
		950
903	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	951	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
904		952
905	$self->SUPER::_render;	953	$self->SUPER::_render;
906	}	954	}
907		955
…		…
910	package CFClient::UI::ScrolledWindow;	958	package CFClient::UI::ScrolledWindow;
911		959
912	our @ISA = CFClient::UI::HBox::;	960	our @ISA = CFClient::UI::HBox::;
913		961
914	sub new {	962	sub new {
915	my $class = shift;	963	my ($class, %arg) = @_;
		964
		965	my $child = delete $arg{child};
916		966
917	my $self;	967	my $self;
918		968
919	my $slider = new CFClient::UI::Slider	969	my $slider = new CFClient::UI::Slider
920	vertical => 1,	970	vertical => 1,
…		…
925	;	975	;
926		976
927	$self = $class->SUPER::new (	977	$self = $class->SUPER::new (
928	vp => (new CFClient::UI::ViewPort expand => 1),	978	vp => (new CFClient::UI::ViewPort expand => 1),
929	slider => $slider,	979	slider => $slider,
930	@_,	980	%arg,
931	);	981	);
932		982
933	$self->{vp}->add ($self->{scrolled});
934	$self->add ($self->{vp});
935	$self->add ($self->{slider});	983	$self->SUPER::add ($self->{vp}, $self->{slider});
		984	$self->add ($child) if $child;
936		985
937	$self	986	$self
		987	}
		988
		989	sub add {
		990	my ($self, $widget) = @_;
		991
		992	$self->{vp}->add ($self->{child} = $widget);
938	}	993	}
939		994
940	sub update {	995	sub update {
941	my ($self) = @_;	996	my ($self) = @_;
942		997
…		…
946	my $child = $self->{vp}->child;	1001	my $child = $self->{vp}->child;
947	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);	1002	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
948	}	1003	}
949		1004
950	sub size_allocate {	1005	sub size_allocate {
951	my ($self, $w, $h, $changed) = @_;	1006	my ($self, $w, $h) = @_;
952		1007
953	$self->SUPER::size_allocate ($w, $h, $changed);	1008	$self->SUPER::size_allocate ($w, $h);
954		1009
955	my $child = $self->{vp}->child;	1010	my $child = $self->{vp}->child;
956	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);	1011	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
957	}	1012	}
958		1013
…		…
981		1036
982	if ($self->{bg}) {	1037	if ($self->{bg}) {
983	my ($w, $h) = @$self{qw(w h)};	1038	my ($w, $h) = @$self{qw(w h)};
984		1039
985	glEnable GL_BLEND;	1040	glEnable GL_BLEND;
986	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1041	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
987	glColor @{ $self->{bg} };	1042	glColor_premultiply @{ $self->{bg} };
988		1043
989	glBegin GL_QUADS;	1044	glBegin GL_QUADS;
990	glVertex 0 , 0;	1045	glVertex 0 , 0;
991	glVertex 0 , $h;	1046	glVertex 0 , $h;
992	glVertex $w, $h;	1047	glVertex $w, $h;
…		…
1005		1060
1006	our @ISA = CFClient::UI::Bin::;	1061	our @ISA = CFClient::UI::Bin::;
1007		1062
1008	use CFClient::OpenGL;	1063	use CFClient::OpenGL;
1009		1064
1010	my @tex =	1065	my $bg =
		1066	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
		1067	mipmap => 1, wrap => 1;
		1068
		1069	my @border =
1011	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1070	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1012	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1071	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1013		1072
1014	sub new {	1073	sub new {
1015	my $class = shift;	1074	my ($class, %arg) = @_;
		1075
		1076	my $title = delete $arg{title};
1016		1077
1017	my $self = $class->SUPER::new (	1078	my $self = $class->SUPER::new (
1018	bg => [1, 1, 1, 1],	1079	bg => [1, 1, 1, 1],
1019	border_bg => [1, 1, 1, 1],	1080	border_bg => [1, 1, 1, 1],
1020	border => 0.6,	1081	border => 0.6,
1021	is_toplevel => 1,
1022	can_events => 1,	1082	can_events => 1,
1023	@_	1083	min_w => 16,
		1084	min_h => 16,
		1085	%arg,
1024	);	1086	);
1025		1087
1026	$self->{title} &&= new CFClient::UI::Label	1088	$self->{title} = new CFClient::UI::Label
1027	align => 0,	1089	align => 0,
1028	valign => 1,	1090	valign => 1,
1029	text => $self->{title},	1091	text => $title,
1030	fontsize => $self->{border};	1092	fontsize => $self->{border}
		1093	if defined $title;
1031		1094
1032	$self	1095	$self
		1096	}
		1097
		1098	sub add {
		1099	my ($self, @widgets) = @_;
		1100
		1101	$self->SUPER::add (@widgets);
		1102	$self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
1033	}	1103	}
1034		1104
1035	sub border {	1105	sub border {
1036	int $_[0]{border} * $::FONTSIZE	1106	int $_[0]{border} * $::FONTSIZE
1037	}	1107	}
1038		1108
1039	sub size_request {	1109	sub size_request {
1040	my ($self) = @_;	1110	my ($self) = @_;
		1111
		1112	$self->{title}->size_request
		1113	if $self->{title};
1041		1114
1042	my ($w, $h) = $self->SUPER::size_request;	1115	my ($w, $h) = $self->SUPER::size_request;
1043		1116
1044	(	1117	(
1045	$w + $self->border * 2,	1118	$w + $self->border * 2,
1046	$h + $self->border * 2,	1119	$h + $self->border * 2,
1047	)	1120	)
1048	}	1121	}
1049		1122
1050	sub size_allocate {	1123	sub size_allocate {
1051	my ($self, $w, $h, $changed) = @_;	1124	my ($self, $w, $h) = @_;
1052		1125
1053	return unless $changed;	1126	if ($self->{title}) {
		1127	$self->{title}{w} = $w;
		1128	$self->{title}{h} = $h;
		1129	$self->{title}->size_allocate ($w, $h);
		1130	}
1054		1131
		1132	my $border = $self->border;
		1133
1055	$h -= List::Util::max 0, $self->border * 2;	1134	$h -= List::Util::max 0, $border * 2;
1056	$w -= List::Util::max 0, $self->border * 2;	1135	$w -= List::Util::max 0, $border * 2;
1057		1136
1058	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1059	if $self->{title};
1060
1061	$self->child->configure ($self->border, $self->border, $w, $h);	1137	$self->child->configure ($border, $border, $w, $h);
1062	}	1138	}
1063		1139
1064	sub button_down {	1140	sub button_down {
1065	my ($self, $ev, $x, $y) = @_;	1141	my ($self, $ev, $x, $y) = @_;
1066		1142
…		…
1082	my ($ev, $x, $y) = @_;	1158	my ($ev, $x, $y) = @_;
1083		1159
1084	my $dx = $ev->{x} - $ox;	1160	my $dx = $ev->{x} - $ox;
1085	my $dy = $ev->{y} - $oy;	1161	my $dy = $ev->{y} - $oy;
1086		1162
1087	$self->{user_x} = $wx + $dx * $mx;
1088	$self->{user_y} = $wy + $dy * $my;
1089	$self->{def_w} = $bw + $dx * ($mx ? -1 : 1);	1163	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1090	$self->{def_h} = $bh + $dy * ($my ? -1 : 1);	1164	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1091	$self->move ($self->{user_x}, $self->{user_y});	1165
		1166	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1092	$self->realloc;	1167	$self->realloc;
1093	};	1168	};
1094		1169
1095	} elsif ($lr ^ $td) {	1170	} elsif ($lr ^ $td) {
1096	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1171	my ($ox, $oy) = ($ev->{x}, $ev->{y});
…		…
1099	$self->{motion} = sub {	1174	$self->{motion} = sub {
1100	my ($ev, $x, $y) = @_;	1175	my ($ev, $x, $y) = @_;
1101		1176
1102	($x, $y) = ($ev->{x}, $ev->{y});	1177	($x, $y) = ($ev->{x}, $ev->{y});
1103		1178
1104	$self->{user_x} = $bx + $x - $ox;	1179	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1105	$self->{user_y} = $by + $y - $oy;	1180	# HACK: the next line is required to enforce placement
1106		1181	$self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1107	$self->move ($self->{user_x}, $self->{user_y});
1108	$self->realloc;
1109	};	1182	};
		1183	} else {
		1184	return 0;
		1185	}
		1186
1110	}	1187	1
1111	}	1188	}
1112		1189
1113	sub button_up {	1190	sub button_up {
1114	my ($self, $ev, $x, $y) = @_;	1191	my ($self, $ev, $x, $y) = @_;
1115		1192
1116	delete $self->{motion};	1193	!!delete $self->{motion}
1117	}	1194	}
1118		1195
1119	sub mouse_motion {	1196	sub mouse_motion {
1120	my ($self, $ev, $x, $y) = @_;	1197	my ($self, $ev, $x, $y) = @_;
1121		1198
1122	$self->{motion}->($ev, $x, $y) if $self->{motion};	1199	$self->{motion}->($ev, $x, $y) if $self->{motion};
		1200
		1201	!!$self->{motion}
1123	}	1202	}
1124		1203
1125	sub _draw {	1204	sub _draw {
1126	my ($self) = @_;	1205	my ($self) = @_;
1127		1206
		1207	my $child = $self->{children}[0];
		1208
1128	my ($w, $h ) = ($self->{w}, $self->{h});	1209	my ($w, $h ) = ($self->{w}, $self->{h});
1129	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1210	my ($cw, $ch) = ($child->{w}, $child->{h});
1130		1211
1131	glEnable GL_TEXTURE_2D;	1212	glEnable GL_TEXTURE_2D;
1132	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1213	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1133		1214
1134	my $border = $self->border;	1215	my $border = $self->border;
1135		1216
1136	glColor @{ $self->{border_bg} };	1217	glColor @{ $self->{border_bg} };
1137	$tex[1]->draw_quad_alpha (0, 0, $w, $border);	1218	$border[0]->draw_quad_alpha (0, 0, $w, $border);
1138	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);	1219	$border[1]->draw_quad_alpha (0, $border, $border, $ch);
1139	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1220	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1140	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);	1221	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1141		1222
1142	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1223	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1143	my $bg = $tex[0];	1224	glColor @{ $self->{bg} };
1144		1225
1145	# TODO: repeat texture not scale	1226	# TODO: repeat texture not scale
		1227	# solve this better(?)
1146	my $rep_x = $cw / $bg->{w};	1228	$bg->{s} = $cw / $bg->{w};
1147	my $rep_y = $ch / $bg->{h};	1229	$bg->{t} = $ch / $bg->{h};
1148
1149	glColor @{ $self->{bg} };
1150
1151	$bg->{s} = $rep_x;
1152	$bg->{t} = $rep_y;
1153	$bg->{wrap_mode} = 1;
1154	$bg->draw_quad_alpha ($border, $border, $cw, $ch);	1230	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1155	}	1231	}
1156		1232
1157	glDisable GL_TEXTURE_2D;	1233	glDisable GL_TEXTURE_2D;
1158		1234
1159	$self->{title}->draw if $self->{title};
1160
1161	$self->child->draw;	1235	$child->draw;
		1236
		1237	if ($self->{title}) {
		1238	glTranslate 0, $border - $self->{h};
		1239	$self->{title}->_draw;
		1240	}
1162	}	1241	}
1163		1242
1164	#############################################################################	1243	#############################################################################
1165		1244
1166	package CFClient::UI::Table;	1245	package CFClient::UI::Table;
…		…
1240	(sum @$hs),	1319	(sum @$hs),
1241	)	1320	)
1242	}	1321	}
1243		1322
1244	sub size_allocate {	1323	sub size_allocate {
1245	my ($self, $w, $h, $changed) = @_;	1324	my ($self, $w, $h) = @_;
1246		1325
1247	my ($ws, $hs) = $self->get_wh;	1326	my ($ws, $hs) = $self->get_wh;
1248		1327
1249	my $req_w = (sum @$ws) || 1;	1328	my $req_w = (sum @$ws) || 1;
1250	my $req_h = (sum @$hs) || 1;	1329	my $req_h = (sum @$hs) || 1;
…		…
1328	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1407	(List::Util::max map $_->{req_h}, @{$self->{children}}),
1329	)	1408	)
1330	}	1409	}
1331		1410
1332	sub size_allocate {	1411	sub size_allocate {
1333	my ($self, $w, $h, $changed) = @_;	1412	my ($self, $w, $h) = @_;
1334		1413
1335	my $space = $self->{vertical} ? $h : $w;	1414	my $space = $self->{vertical} ? $h : $w;
1336	my $children = $self->{children};	1415	my $children = $self->{children};
1337		1416
1338	my @req;	1417	my @req;
…		…
1421	ellipsise => 3, # end	1500	ellipsise => 3, # end
1422	layout => (new CFClient::Layout),	1501	layout => (new CFClient::Layout),
1423	fontsize => 1,	1502	fontsize => 1,
1424	align => -1,	1503	align => -1,
1425	valign => -1,	1504	valign => -1,
1426	padding => 2,	1505	padding_x => 2,
		1506	padding_y => 2,
1427	can_events => 0,	1507	can_events => 0,
1428	%arg	1508	%arg
1429	);	1509	);
1430		1510
1431	if (exists $self->{template}) {	1511	if (exists $self->{template}) {
…		…
1458		1538
1459	delete $self->{texture};	1539	delete $self->{texture};
1460	$self->SUPER::update;	1540	$self->SUPER::update;
1461	}	1541	}
1462		1542
		1543	sub realloc {
		1544	my ($self) = @_;
		1545
		1546	delete $self->{ox};
		1547	$self->SUPER::realloc;
		1548	}
		1549
1463	sub set_text {	1550	sub set_text {
1464	my ($self, $text) = @_;	1551	my ($self, $text) = @_;
1465		1552
1466	return if $self->{text} eq "T$text";	1553	return if $self->{text} eq "T$text";
1467	$self->{text} = "T$text";	1554	$self->{text} = "T$text";
1468		1555
1469	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1556	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1470	$self->{layout}->set_text ($text);	1557	$self->{layout}->set_text ($text);
		1558	delete $self->{req_h};
1471		1559
1472	$self->realloc;	1560	$self->realloc;
1473	$self->update;	1561	$self->update;
1474	}	1562	}
1475		1563
…		…
1481		1569
1482	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1570	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1483		1571
1484	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;	1572	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1485	$self->{layout}->set_markup ($markup);	1573	$self->{layout}->set_markup ($markup);
		1574	delete $self->{req_h};
1486		1575
1487	$self->realloc;	1576	$self->realloc;
1488	$self->update;	1577	$self->update;
1489	}	1578	}
1490		1579
1491	sub size_request {	1580	sub size_request {
1492	my ($self) = @_;	1581	my ($self) = @_;
1493		1582
		1583	if (exists $self->{req_h}) {
		1584	@$self{qw(req_w req_h)}
		1585	} else {
1494	$self->{layout}->set_font ($self->{font}) if $self->{font};	1586	$self->{layout}->set_font ($self->{font}) if $self->{font};
1495	$self->{layout}->set_width ($self->{max_w} || -1);	1587	$self->{layout}->set_width ($self->{max_w} || -1);
1496	$self->{layout}->set_ellipsise ($self->{ellipsise});	1588	$self->{layout}->set_ellipsise ($self->{ellipsise});
1497	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1589	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1498	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1590	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1499		1591
1500	my ($w, $h) = $self->{layout}->size;	1592	my ($w, $h) = $self->{layout}->size;
1501		1593
1502	if (exists $self->{template}) {	1594	if (exists $self->{template}) {
1503	$self->{template}->set_font ($self->{font}) if $self->{font};	1595	$self->{template}->set_font ($self->{font}) if $self->{font};
1504	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1596	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1505		1597
1506	my ($w2, $h2) = $self->{template}->size;	1598	my ($w2, $h2) = $self->{template}->size;
1507		1599
1508	$w = List::Util::max $w, $w2;	1600	$w = List::Util::max $w, $w2;
1509	$h = List::Util::max $h, $h2;	1601	$h = List::Util::max $h, $h2;
1510	}	1602	}
1511		1603
		1604	($w, $h)
1512	(	1605	}
1513	$w + $self->{padding} * 2,
1514	$h + $self->{padding} * 2,
1515	)
1516	}	1606	}
1517		1607
1518	sub size_allocate {	1608	sub size_allocate {
1519	my ($self, $w, $h, $changed) = @_;	1609	my ($self, $w, $h) = @_;
		1610
		1611	delete $self->{ox};
1520		1612
1521	delete $self->{texture}	1613	delete $self->{texture}
1522	if $changed;	1614	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1523	}	1615	}
1524		1616
1525	sub set_fontsize {	1617	sub set_fontsize {
1526	my ($self, $fontsize) = @_;	1618	my ($self, $fontsize) = @_;
1527		1619
…		…
1542	$self->{layout}->set_width ($self->{w});	1634	$self->{layout}->set_width ($self->{w});
1543	$self->{layout}->set_ellipsise ($self->{ellipsise});	1635	$self->{layout}->set_ellipsise ($self->{ellipsise});
1544	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1636	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1545	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1637	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1546		1638
1547	my $tex = new_from_layout CFClient::Texture $self->{layout};	1639	new_from_layout CFClient::Texture $self->{layout}
		1640	};
1548		1641
		1642	unless (exists $self->{ox}) {
1549	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}	1643	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1550	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1644	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1551	: ($self->{w} - $tex->{w}) * 0.5);	1645	: ($self->{w} - $tex->{w}) * 0.5);
1552		1646
1553	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}	1647	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1554	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1648	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1555	: ($self->{h} - $tex->{h}) * 0.5);	1649	: ($self->{h} - $tex->{h}) * 0.5);
1556
1557	$tex
1558	};	1650	};
1559		1651
1560	glEnable GL_TEXTURE_2D;	1652	glEnable GL_TEXTURE_2D;
1561	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1653	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1562		1654
		1655	glColor_premultiply @{$self->{fg}}
1563	if ($tex->{format} == GL_ALPHA) {	1656	if $tex->{format} == GL_ALPHA;
1564	glColor @{$self->{fg}};	1657
1565	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1566	} else {
1567	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});	1658	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1568	}
1569		1659
1570	glDisable GL_TEXTURE_2D;	1660	glDisable GL_TEXTURE_2D;
1571	}	1661	}
1572		1662
1573	#############################################################################	1663	#############################################################################
…		…
1600		1690
1601	delete $self->{cur_h};	1691	delete $self->{cur_h};
1602		1692
1603	return if $self->{text} eq $text;	1693	return if $self->{text} eq $text;
1604		1694
1605	delete $self->{texture};
1606
1607	$self->{last_activity} = $::NOW;	1695	$self->{last_activity} = $::NOW;
1608	$self->{text} = $text;	1696	$self->{text} = $text;
1609		1697
1610	$text =~ s/./*/g if $self->{hidden};	1698	$text =~ s/./*/g if $self->{hidden};
1611	$self->{layout}->set_text ("$text ");	1699	$self->{layout}->set_text ("$text ");
		1700	delete $self->{req_h};
1612		1701
1613	$self->_emit (changed => $self->{text});	1702	$self->_emit (changed => $self->{text});
		1703
		1704	$self->realloc;
		1705	$self->update;
1614	}	1706	}
1615		1707
1616	sub set_text {	1708	sub set_text {
1617	my ($self, $text) = @_;	1709	my ($self, $text) = @_;
1618		1710
1619	$self->{cursor} = length $text;	1711	$self->{cursor} = length $text;
1620	$self->_set_text ($text);	1712	$self->_set_text ($text);
1621
1622	$self->realloc;
1623	}	1713	}
1624		1714
1625	sub get_text {	1715	sub get_text {
1626	$_[0]{text}	1716	$_[0]{text}
1627	}	1717	}
…		…
1657	$self->{cursor} = length $text;	1747	$self->{cursor} = length $text;
1658	} elsif ($uni == 27) {	1748	} elsif ($uni == 27) {
1659	$self->_emit ('escape');	1749	$self->_emit ('escape');
1660	} elsif ($uni) {	1750	} elsif ($uni) {
1661	substr $text, $self->{cursor}++, 0, chr $uni;	1751	substr $text, $self->{cursor}++, 0, chr $uni;
		1752	} else {
		1753	return 0;
1662	}	1754	}
1663		1755
1664	$self->_set_text ($text);	1756	$self->_set_text ($text);
1665		1757
1666	$self->realloc;	1758	$self->realloc;
		1759
		1760	1
1667	}	1761	}
1668		1762
1669	sub focus_in {	1763	sub focus_in {
1670	my ($self) = @_;	1764	my ($self) = @_;
1671		1765
…		…
1686	utf8::encode $text;	1780	utf8::encode $text;
1687	$self->{cursor} = length substr $text, 0, $idx;	1781	$self->{cursor} = length substr $text, 0, $idx;
1688		1782
1689	$self->_set_text ($self->{text});	1783	$self->_set_text ($self->{text});
1690	$self->update;	1784	$self->update;
		1785
		1786	1
1691	}	1787	}
1692		1788
1693	sub mouse_motion {	1789	sub mouse_motion {
1694	my ($self, $ev, $x, $y) = @_;	1790	my ($self, $ev, $x, $y) = @_;
1695	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	1791	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
		1792
		1793	0
1696	}	1794	}
1697		1795
1698	sub _draw {	1796	sub _draw {
1699	my ($self) = @_;	1797	my ($self) = @_;
1700		1798
1701	local $self->{fg} = $self->{fg};	1799	local $self->{fg} = $self->{fg};
1702		1800
1703	if ($FOCUS == $self) {	1801	if ($FOCUS == $self) {
1704	glColor @{$self->{active_bg}};	1802	glColor_premultiply @{$self->{active_bg}};
1705	$self->{fg} = $self->{active_fg};	1803	$self->{fg} = $self->{active_fg};
1706	} else {	1804	} else {
1707	glColor @{$self->{bg}};	1805	glColor_premultiply @{$self->{bg}};
1708	}	1806	}
1709		1807
1710	glEnable GL_BLEND;	1808	glEnable GL_BLEND;
1711	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1809	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1712	glBegin GL_QUADS;	1810	glBegin GL_QUADS;
1713	glVertex 0 , 0;	1811	glVertex 0 , 0;
1714	glVertex 0 , $self->{h};	1812	glVertex 0 , $self->{h};
1715	glVertex $self->{w}, $self->{h};	1813	glVertex $self->{w}, $self->{h};
1716	glVertex $self->{w}, 0;	1814	glVertex $self->{w}, 0;
…		…
1777	} else {	1875	} else {
1778	$self->set_text ($self->{history_saveback});	1876	$self->set_text ($self->{history_saveback});
1779	}	1877	}
1780		1878
1781	} else {	1879	} else {
1782	$self->SUPER::key_down ($ev);	1880	return $self->SUPER::key_down ($ev)
		1881	}
		1882
1783	}	1883	1
1784
1785	}	1884	}
1786		1885
1787	#############################################################################	1886	#############################################################################
1788		1887
1789	package CFClient::UI::Button;	1888	package CFClient::UI::Button;
…		…
1798		1897
1799	sub new {	1898	sub new {
1800	my $class = shift;	1899	my $class = shift;
1801		1900
1802	$class->SUPER::new (	1901	$class->SUPER::new (
1803	padding => 4,	1902	padding_x => 4,
		1903	padding_y => 4,
1804	fg => [1, 1, 1],	1904	fg => [1, 1, 1],
1805	active_fg => [0, 0, 1],	1905	active_fg => [0, 0, 1],
1806	can_hover => 1,	1906	can_hover => 1,
1807	align => 0,	1907	align => 0,
1808	valign => 0,	1908	valign => 0,
…		…
1817	my ($self, $ev, $x, $y) = @_;	1917	my ($self, $ev, $x, $y) = @_;
1818		1918
1819	$self->emit ("activate")	1919	$self->emit ("activate")
1820	if $x >= 0 && $x < $self->{w}	1920	if $x >= 0 && $x < $self->{w}
1821	&& $y >= 0 && $y < $self->{h};	1921	&& $y >= 0 && $y < $self->{h};
		1922
		1923	1
1822	}	1924	}
1823		1925
1824	sub _draw {	1926	sub _draw {
1825	my ($self) = @_;	1927	my ($self) = @_;
1826		1928
1827	local $self->{fg} = $self->{fg};	1929	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1828
1829	if ($GRAB == $self) {
1830	$self->{fg} = $self->{active_fg};
1831	}
1832		1930
1833	glEnable GL_TEXTURE_2D;	1931	glEnable GL_TEXTURE_2D;
1834	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1932	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1835	glColor 0, 0, 0, 1;	1933	glColor 0, 0, 0, 1;
1836		1934
…		…
1855		1953
1856	sub new {	1954	sub new {
1857	my $class = shift;	1955	my $class = shift;
1858		1956
1859	$class->SUPER::new (	1957	$class->SUPER::new (
1860	padding => 2,	1958	padding_x => 2,
		1959	padding_y => 2,
1861	fg => [1, 1, 1],	1960	fg => [1, 1, 1],
1862	active_fg => [1, 1, 0],	1961	active_fg => [1, 1, 0],
1863	bg => [0, 0, 0, 0.2],	1962	bg => [0, 0, 0, 0.2],
1864	active_bg => [1, 1, 1, 0.5],	1963	active_bg => [1, 1, 1, 0.5],
1865	state => 0,	1964	state => 0,
…		…
1869	}	1968	}
1870		1969
1871	sub size_request {	1970	sub size_request {
1872	my ($self) = @_;	1971	my ($self) = @_;
1873		1972
1874	($self->{padding} * 2 + 6) x 2	1973	(6) x 2
1875	}	1974	}
1876		1975
1877	sub button_down {	1976	sub button_down {
1878	my ($self, $ev, $x, $y) = @_;	1977	my ($self, $ev, $x, $y) = @_;
1879		1978
1880	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1979	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1881	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1980	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1882	$self->{state} = !$self->{state};	1981	$self->{state} = !$self->{state};
1883	$self->_emit (changed => $self->{state});	1982	$self->_emit (changed => $self->{state});
		1983	} else {
		1984	return 0
		1985	}
		1986
1884	}	1987	1
1885	}	1988	}
1886		1989
1887	sub _draw {	1990	sub _draw {
1888	my ($self) = @_;	1991	my ($self) = @_;
1889		1992
1890	$self->SUPER::_draw;	1993	$self->SUPER::_draw;
1891		1994
1892	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;	1995	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1893		1996
1894	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1997	my ($w, $h) = @$self{qw(w h)};
		1998
		1999	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1895		2000
1896	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	2001	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1897		2002
1898	my $tex = $self->{state} ? $tex[1] : $tex[0];	2003	my $tex = $self->{state} ? $tex[1] : $tex[0];
1899		2004
…		…
2054		2159
2055	my $h1 = $self->{h} * (1 - $ycut1);	2160	my $h1 = $self->{h} * (1 - $ycut1);
2056	my $h2 = $self->{h} * (1 - $ycut2);	2161	my $h2 = $self->{h} * (1 - $ycut2);
2057		2162
2058	glEnable GL_BLEND;	2163	glEnable GL_BLEND;
2059	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	2164	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		2165	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2060	glEnable GL_TEXTURE_2D;	2166	glEnable GL_TEXTURE_2D;
2061	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2167	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2062		2168
2063	glBindTexture GL_TEXTURE_2D, $t1->{name};	2169	glBindTexture GL_TEXTURE_2D, $t1->{name};
2064	glBegin GL_QUADS;	2170	glBegin GL_QUADS;
…		…
2164	fg => [1, 1, 1],	2270	fg => [1, 1, 1],
2165	active_fg => [0, 0, 0],	2271	active_fg => [0, 0, 0],
2166	bg => [0, 0, 0, 0.2],	2272	bg => [0, 0, 0, 0.2],
2167	active_bg => [1, 1, 1, 0.5],	2273	active_bg => [1, 1, 1, 0.5],
2168	range => [0, 0, 100, 10, 0],	2274	range => [0, 0, 100, 10, 0],
2169	req_w => $::WIDTH / 80,	2275	min_w => $::WIDTH / 80,
2170	req_h => $::WIDTH / 80,	2276	min_h => $::WIDTH / 80,
2171	vertical => 0,	2277	vertical => 0,
2172	can_hover => 1,	2278	can_hover => 1,
2173	inner_pad => 0.02,	2279	inner_pad => 0.02,
2174	@_	2280	@_
2175	);	2281	);
…		…
2215	}	2321	}
2216		2322
2217	sub size_request {	2323	sub size_request {
2218	my ($self) = @_;	2324	my ($self) = @_;
2219		2325
2220	my $w = $self->{req_w};	2326	($self->{req_w}, $self->{req_h})
2221	my $h = $self->{req_h};
2222
2223	$self->{vertical} ? ($h, $w) : ($w, $h)
2224	}	2327	}
2225		2328
2226	sub button_down {	2329	sub button_down {
2227	my ($self, $ev, $x, $y) = @_;	2330	my ($self, $ev, $x, $y) = @_;
2228		2331
2229	$self->SUPER::button_down ($ev, $x, $y);	2332	$self->SUPER::button_down ($ev, $x, $y);
2230		2333
2231	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2334	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2232		2335
2233	$self->mouse_motion ($ev, $x, $y);	2336	$self->mouse_motion ($ev, $x, $y)
2234	}	2337	}
2235		2338
2236	sub mouse_motion {	2339	sub mouse_motion {
2237	my ($self, $ev, $x, $y) = @_;	2340	my ($self, $ev, $x, $y) = @_;
2238		2341
…		…
2242	my (undef, $lo, $hi, $page) = @{$self->{range}};	2345	my (undef, $lo, $hi, $page) = @{$self->{range}};
2243		2346
2244	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});	2347	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2245		2348
2246	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));	2349	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2350	} else {
		2351	return 0;
		2352	}
		2353
2247	}	2354	1
2248	}	2355	}
2249		2356
2250	sub update {	2357	sub update {
2251	my ($self) = @_;	2358	my ($self) = @_;
2252		2359
2253	$CFClient::UI::ROOT->on_post_alloc ($self => sub {	2360	delete $self->{knob_w};
		2361	$self->SUPER::update;
		2362	}
		2363
		2364	sub _draw {
		2365	my ($self) = @_;
		2366
		2367	unless ($self->{knob_w}) {
2254	$self->set_value ($self->{range}[0]);	2368	$self->set_value ($self->{range}[0]);
2255		2369
2256	my ($value, $lo, $hi, $page) = @{$self->{range}};	2370	my ($value, $lo, $hi, $page) = @{$self->{range}};
2257	my $range = ($hi - $page - $lo) || 1e-100;	2371	my $range = ($hi - $page - $lo) || 1e-100;
2258		2372
…		…
2264	$value = ($value - $lo) / $range;	2378	$value = ($value - $lo) / $range;
2265	$value = $value * $self->{scale} + $self->{offset};	2379	$value = $value * $self->{scale} + $self->{offset};
2266		2380
2267	$self->{knob_x} = $value - $knob_w * 0.5;	2381	$self->{knob_x} = $value - $knob_w * 0.5;
2268	$self->{knob_w} = $knob_w;	2382	$self->{knob_w} = $knob_w;
2269	});	2383	}
2270
2271	$self->SUPER::update;
2272	}
2273
2274	sub _draw {
2275	my ($self) = @_;
2276		2384
2277	$self->SUPER::_draw ();	2385	$self->SUPER::_draw ();
2278		2386
2279	glScale $self->{w}, $self->{h};	2387	glScale $self->{w}, $self->{h};
2280		2388
…		…
2378	$self->{fontsize} = $fontsize;	2486	$self->{fontsize} = $fontsize;
2379	$self->reflow;	2487	$self->reflow;
2380	}	2488	}
2381		2489
2382	sub size_allocate {	2490	sub size_allocate {
2383	my ($self, $w, $h, $changed) = @_;	2491	my ($self, $w, $h) = @_;
2384		2492
2385	$self->SUPER::size_allocate ($w, $h, $changed);	2493	$self->SUPER::size_allocate ($w, $h);
2386
2387	return unless $changed;
2388		2494
2389	$self->{layout}->set_font ($self->{font}) if $self->{font};	2495	$self->{layout}->set_font ($self->{font}) if $self->{font};
2390	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2496	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2391	$self->{layout}->set_width ($self->{children}[0]{w});	2497	$self->{layout}->set_width ($self->{children}[0]{w});
2392		2498
…		…
2476		2582
2477	delete $self->{texture};	2583	delete $self->{texture};
2478	}	2584	}
2479		2585
2480	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	2586	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2481	glClearColor 0.5, 0.5, 0.5, 0;	2587	glClearColor 0, 0, 0, 0;
2482	glClear GL_COLOR_BUFFER_BIT;	2588	glClear GL_COLOR_BUFFER_BIT;
2483		2589
2484	my $top = int $self->{children}[1]{range}[0];	2590	my $top = int $self->{children}[1]{range}[0];
2485		2591
2486	my $y0 = $top;	2592	my $y0 = $top;
…		…
2521	sub _draw {	2627	sub _draw {
2522	my ($self) = @_;	2628	my ($self) = @_;
2523		2629
2524	glEnable GL_TEXTURE_2D;	2630	glEnable GL_TEXTURE_2D;
2525	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2631	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2526	glColor 1, 1, 1, 1;	2632	glColor 0, 0, 0, 1;
2527	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2633	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2528	glDisable GL_TEXTURE_2D;	2634	glDisable GL_TEXTURE_2D;
2529		2635
2530	$self->{children}[1]->draw;	2636	$self->{children}[1]->draw;
2531		2637
2532	}	2638	}
…		…
2615	}	2721	}
2616		2722
2617	sub set_tooltip_from {	2723	sub set_tooltip_from {
2618	my ($self, $widget) = @_;	2724	my ($self, $widget) = @_;
2619		2725
		2726	my $tooltip = $widget->{tooltip};
		2727
		2728	if ($ENV{CFPLUS_DEBUG} & 2) {
		2729	$tooltip .= "\n\n" . (ref $widget) . "\n"
		2730	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
		2731	. "req $widget->{req_w} $widget->{req_h}\n"
		2732	. "visible $widget->{visible}";
		2733	}
		2734
2620	$self->add (new CFClient::UI::Label	2735	$self->add (new CFClient::UI::Label
2621	markup => $widget->{tooltip},	2736	markup => $tooltip,
2622	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2737	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2623	fontsize => 0.8,	2738	fontsize => 0.8,
2624	fg => [0, 0, 0, 1],	2739	fg => [0, 0, 0, 1],
2625	ellipsise => 0,	2740	ellipsise => 0,
2626	font => ($widget->{tooltip_font} || $::FONT_PROP),	2741	font => ($widget->{tooltip_font} || $::FONT_PROP),
…		…
2634		2749
2635	($w + 4, $h + 4)	2750	($w + 4, $h + 4)
2636	}	2751	}
2637		2752
2638	sub size_allocate {	2753	sub size_allocate {
2639	my ($self, $w, $h, $changed) = @_;	2754	my ($self, $w, $h) = @_;
2640		2755
2641	return unless $changed;
2642
2643	$self->SUPER::size_allocate ($w - 4, $h - 4, $changed);	2756	$self->SUPER::size_allocate ($w - 4, $h - 4);
		2757	}
		2758
		2759	sub visibility_change {
		2760	my ($self, $visible) = @_;
		2761
		2762	return unless $visible;
		2763
		2764	$self->{root}->on_post_alloc ("move_$self" => sub {
		2765	my $widget = $self->{owner}
		2766	or return;
		2767
		2768	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
		2769
		2770	($x, $y) = $widget->coord2global (-$self->{w}, 0)
		2771	if $x + $self->{w} > $::WIDTH;
		2772
		2773	$self->move_abs ($x, $y);
		2774	});
2644	}	2775	}
2645		2776
2646	sub _draw {	2777	sub _draw {
2647	my ($self) = @_;	2778	my ($self) = @_;
2648		2779
…		…
2734	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];	2865	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2735		2866
2736	if ($tex) {	2867	if ($tex) {
2737	glEnable GL_TEXTURE_2D;	2868	glEnable GL_TEXTURE_2D;
2738	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2869	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2739	glColor 1, 1, 1, 1;	2870	glColor 0, 0, 0, 1;
2740	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2871	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2741	glDisable GL_TEXTURE_2D;	2872	glDisable GL_TEXTURE_2D;
2742	}	2873	}
2743	}	2874	}
2744		2875
…		…
2751	$self->SUPER::DESTROY;	2882	$self->SUPER::DESTROY;
2752	}	2883	}
2753		2884
2754	#############################################################################	2885	#############################################################################
2755		2886
2756	package CFClient::UI::Inventory;	2887	package CFClient::UI::Buttonbar;
2757		2888
2758	our @ISA = CFClient::UI::ScrolledWindow::;	2889	our @ISA = CFClient::UI::HBox::;
2759		2890
2760	sub new {	2891	# TODO: should actualyl wrap buttons and other goodies.
2761	my $class = shift;
2762
2763	my $self = $class->SUPER::new (
2764	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2765	@_,
2766	);
2767
2768	$self
2769	}
2770
2771	sub set_items {
2772	my ($self, $items) = @_;
2773
2774	$self->{scrolled}->clear;
2775	return unless $items;
2776
2777	my @items = sort {
2778	($a->{type} <=> $b->{type})
2779	or ($a->{name} cmp $b->{name})
2780	} @$items;
2781
2782	$self->{real_items} = \@items;
2783
2784	my $row = 0;
2785	for my $item (@items) {
2786	CFClient::Item::update_widgets $item;
2787
2788	$self->{scrolled}->add (0, $row, $item->{face_widget});
2789	$self->{scrolled}->add (1, $row, $item->{desc_widget});
2790	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2791
2792	$row++;
2793	}
2794	}
2795		2892
2796	#############################################################################	2893	#############################################################################
2797		2894
2798	package CFClient::UI::Menu;	2895	package CFClient::UI::Menu;
2799		2896
…		…
2840	# maybe save $GRAB? must be careful about events...	2937	# maybe save $GRAB? must be careful about events...
2841	$GRAB = $self;	2938	$GRAB = $self;
2842	$self->{button} = $ev->{button};	2939	$self->{button} = $ev->{button};
2843		2940
2844	$self->show;	2941	$self->show;
2845	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	2942	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2846	}	2943	}
2847		2944
2848	sub mouse_motion {	2945	sub mouse_motion {
2849	my ($self, $ev, $x, $y) = @_;	2946	my ($self, $ev, $x, $y) = @_;
2850		2947
2851	# TODO: should use vbox->find_widget or so	2948	# TODO: should use vbox->find_widget or so
2852	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	2949	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2853	$self->{hover} = $self->{item}{$HOVER};	2950	$self->{hover} = $self->{item}{$HOVER};
		2951
		2952	0
2854	}	2953	}
2855		2954
2856	sub button_up {	2955	sub button_up {
2857	my ($self, $ev, $x, $y) = @_;	2956	my ($self, $ev, $x, $y) = @_;
2858		2957
…		…
2860	undef $GRAB;	2959	undef $GRAB;
2861	$self->hide;	2960	$self->hide;
2862		2961
2863	$self->_emit ("popdown");	2962	$self->_emit ("popdown");
2864	$self->{hover}[1]->() if $self->{hover};	2963	$self->{hover}[1]->() if $self->{hover};
		2964	} else {
		2965	return 0
		2966	}
		2967
2865	}	2968	1
2866	}	2969	}
2867		2970
2868	#############################################################################	2971	#############################################################################
2869		2972
2870	package CFClient::UI::Statusbox;	2973	package CFClient::UI::Multiplexer;
2871		2974
2872	our @ISA = CFClient::UI::VBox::;	2975	our @ISA = CFClient::UI::Container::;
2873		2976
2874	sub new {	2977	sub new {
2875	my $class = shift;	2978	my $class = shift;
2876		2979
2877	$class->SUPER::new (	2980	my $self = $class->SUPER::new (
		2981	@_,
		2982	);
		2983
		2984	$self->{current} = $self->{children}[0]
		2985	if @{ $self->{children} };
		2986
		2987	$self
		2988	}
		2989
		2990	sub add {
		2991	my ($self, @widgets) = @_;
		2992
		2993	$self->SUPER::add (@widgets);
		2994
		2995	$self->{current} = $self->{children}[0]
		2996	if @{ $self->{children} };
		2997	}
		2998
		2999	sub set_current_page {
		3000	my ($self, $page_or_widget) = @_;
		3001
		3002	my $widget = ref $page_or_widget
		3003	? $page_or_widget
		3004	: $self->{children}[$page_or_widget];
		3005
		3006	$self->{current} = $widget;
		3007	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
		3008
		3009	$self->_emit (page_changed => $self->{current});
		3010
		3011	$self->realloc;
		3012	}
		3013
		3014	sub visible_children {
		3015	$_[0]{current}
		3016	}
		3017
		3018	sub size_request {
		3019	my ($self) = @_;
		3020
		3021	$self->{current}->size_request
		3022	}
		3023
		3024	sub size_allocate {
		3025	my ($self, $w, $h) = @_;
		3026
		3027	$self->{current}->configure (0, 0, $w, $h);
		3028	}
		3029
		3030	sub _draw {
		3031	my ($self) = @_;
		3032
		3033	$self->{current}->draw;
		3034	}
		3035
		3036	#############################################################################
		3037
		3038	package CFClient::UI::Notebook;
		3039
		3040	our @ISA = CFClient::UI::VBox::;
		3041
		3042	sub new {
		3043	my $class = shift;
		3044
		3045	my $self = $class->SUPER::new (
		3046	buttonbar => (new CFClient::UI::Buttonbar),
		3047	multiplexer => (new CFClient::UI::Multiplexer expand => 1),
		3048	# filter => # will be put between multiplexer and $self
		3049	@_,
		3050	);
		3051
		3052	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
		3053	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
		3054
		3055	$self
		3056	}
		3057
		3058	sub add {
		3059	my ($self, $title, $widget, $tooltip) = @_;
		3060
		3061	Scalar::Util::weaken $self;
		3062
		3063	$self->{buttonbar}->add (new CFClient::UI::Button
		3064	markup => $title,
		3065	tooltip => $tooltip,
		3066	on_activate => sub { $self->set_current_page ($widget) },
		3067	);
		3068
		3069	$self->{multiplexer}->add ($widget);
		3070	}
		3071
		3072	sub set_current_page {
		3073	my ($self, $page) = @_;
		3074
		3075	$self->{multiplexer}->set_current_page ($page);
		3076	$self->_emit (page_changed => $self->{multiplexer}{current});
		3077	}
		3078
		3079	#############################################################################
		3080
		3081	package CFClient::UI::Statusbox;
		3082
		3083	our @ISA = CFClient::UI::VBox::;
		3084
		3085	sub new {
		3086	my $class = shift;
		3087
		3088	my $self = $class->SUPER::new (
2878	fontsize => 0.8,	3089	fontsize => 0.8,
2879	@_,	3090	@_,
2880	)	3091	);
		3092
		3093	Scalar::Util::weaken (my $this = $self);
		3094
		3095	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
		3096
		3097	$self
2881	}	3098	}
2882		3099
2883	sub reorder {	3100	sub reorder {
2884	my ($self) = @_;	3101	my ($self) = @_;
2885	my $NOW = time;	3102	my $NOW = Time::HiRes::time;
		3103
		3104	# freeze display when hovering over any label
		3105	return if $CFClient::UI::TOOLTIP->{owner}
		3106	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
		3107	values %{ $self->{item} };
2886		3108
2887	while (my ($k, $v) = each %{ $self->{item} }) {	3109	while (my ($k, $v) = each %{ $self->{item} }) {
2888	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3110	delete $self->{item}{$k} if $v->{timeout} < $NOW;
2889	}	3111	}
2890		3112
…		…
2893	my @items = sort {	3115	my @items = sort {
2894	$a->{pri} <=> $b->{pri}	3116	$a->{pri} <=> $b->{pri}
2895	or $b->{id} <=> $a->{id}	3117	or $b->{id} <=> $a->{id}
2896	} values %{ $self->{item} };	3118	} values %{ $self->{item} };
2897		3119
		3120	$self->{timer}->interval (1);
		3121
2898	my $count = 10 + 1;	3122	my $count = 10 + 1;
2899	for my $item (@items) {	3123	for my $item (@items) {
2900	last unless --$count;	3124	last unless --$count;
2901		3125
2902	push @widgets, $item->{label} ||= do {	3126	my $label = $item->{label} ||= do {
2903	# TODO: doesn't handle markup well (read as: at all)	3127	# TODO: doesn't handle markup well (read as: at all)
2904	my $short = $item->{count} > 1	3128	my $short = $item->{count} > 1
2905	? "<b>$item->{count} ×</b> $item->{text}"	3129	? "<b>$item->{count} ×</b> $item->{text}"
2906	: $item->{text};	3130	: $item->{text};
2907		3131
…		…
2915	tooltip => $item->{tooltip},	3139	tooltip => $item->{tooltip},
2916	tooltip_font => $::FONT_PROP,	3140	tooltip_font => $::FONT_PROP,
2917	tooltip_width => 0.67,	3141	tooltip_width => 0.67,
2918	fontsize => $item->{fontsize} || $self->{fontsize},	3142	fontsize => $item->{fontsize} || $self->{fontsize},
2919	max_w => $::WIDTH * 0.44,	3143	max_w => $::WIDTH * 0.44,
2920	fg => $item->{fg},	3144	fg => [@{ $item->{fg} }],
2921	can_events => 1,	3145	can_events => 1,
2922	can_hover => 1	3146	can_hover => 1
2923	};	3147	};
		3148
		3149	if ((my $diff = $item->{timeout} - $NOW) < 2) {
		3150	$label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
		3151	$label->update;
		3152	$label->set_max_size (undef, $label->{req_h} * $diff)
		3153	if $diff < 1;
		3154	$self->{timer}->interval (1/30);
		3155	} else {
		3156	$label->{fg}[3] = $item->{fg}[3] || 1;
		3157	}
		3158
		3159	push @widgets, $label;
2924	}	3160	}
2925		3161
2926	$self->clear;	3162	$self->clear;
2927	$self->SUPER::add (reverse @widgets);	3163	$self->SUPER::add (reverse @widgets);
2928	}	3164	}
…		…
2933	$text =~ s/^\s+//;	3169	$text =~ s/^\s+//;
2934	$text =~ s/\s+$//;	3170	$text =~ s/\s+$//;
2935		3171
2936	return unless $text;	3172	return unless $text;
2937		3173
2938	my $timeout = time + ((delete $arg{timeout}) || 60);	3174	my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2939		3175
2940	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	3176	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2941		3177
2942	if (my $item = $self->{item}{$group}) {	3178	if (my $item = $self->{item}{$group}) {
2943	if ($item->{text} eq $text) {	3179	if ($item->{text} eq $text) {
…		…
2973		3209
2974	$self->reorder;	3210	$self->reorder;
2975	$self->SUPER::reconfigure;	3211	$self->SUPER::reconfigure;
2976	}	3212	}
2977		3213
		3214	sub DESTROY {
		3215	my ($self) = @_;
		3216
		3217	$self->{timer}->cancel;
		3218
		3219	$self->SUPER::DESTROY;
		3220	}
		3221
2978	#############################################################################	3222	#############################################################################
2979		3223
		3224	package CFClient::UI::Inventory;
		3225
		3226	our @ISA = CFClient::UI::ScrolledWindow::;
		3227
		3228	sub new {
		3229	my $class = shift;
		3230
		3231	my $self = $class->SUPER::new (
		3232	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
		3233	@_,
		3234	);
		3235
		3236	$self
		3237	}
		3238
		3239	sub set_items {
		3240	my ($self, $items) = @_;
		3241
		3242	$self->{child}->clear;
		3243	return unless $items;
		3244
		3245	my @items = sort {
		3246	($a->{type} <=> $b->{type})
		3247	or ($a->{name} cmp $b->{name})
		3248	} @$items;
		3249
		3250	$self->{real_items} = \@items;
		3251
		3252	my $row = 0;
		3253	for my $item (@items) {
		3254	CFClient::Item::update_widgets $item;
		3255
		3256	$self->{child}->add (0, $row, $item->{face_widget});
		3257	$self->{child}->add (1, $row, $item->{desc_widget});
		3258	$self->{child}->add (2, $row, $item->{weight_widget});
		3259
		3260	$row++;
		3261	}
		3262	}
		3263
		3264	#############################################################################
		3265
		3266	package CFClient::UI::BindEditor;
		3267
		3268	our @ISA = CFClient::UI::FancyFrame::;
		3269
		3270	sub new {
		3271	my $class = shift;
		3272
		3273	my $self = $class->SUPER::new (binding => [], commands => [], @_);
		3274
		3275	$self->add (my $vb = new CFClient::UI::VBox);
		3276
		3277
		3278	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
		3279	text => "start recording",
		3280	tooltip => "Start/Stops recording of actions."
		3281	."All subsequent actions after the recording started will be captured."
		3282	."The actions are displayed after the record was stopped."
		3283	."To bind the action you have to click on the 'Bind' button",
		3284	on_activate => sub {
		3285	unless ($self->{recording}) {
		3286	$self->start;
		3287	} else {
		3288	$self->stop;
		3289	}
		3290	});
		3291
		3292	$vb->add (new CFClient::UI::Label text => "Actions:");
		3293	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
		3294
		3295	$vb->add (new CFClient::UI::Label text => "Bound to: ");
		3296	$vb->add (my $hb = new CFClient::UI::HBox);
		3297	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
		3298	$hb->add (new CFClient::UI::Button
		3299	text => "bind",
		3300	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
		3301	on_activate => sub {
		3302	$self->ask_for_bind;
		3303	});
		3304
		3305	$vb->add (my $hb = new CFClient::UI::HBox);
		3306	$hb->add (new CFClient::UI::Button
		3307	text => "ok",
		3308	expand => 1,
		3309	tooltip => "This closes the binding editor and saves the binding",
		3310	on_activate => sub {
		3311	$self->hide;
		3312	$self->commit;
		3313	});
		3314
		3315	$hb->add (new CFClient::UI::Button
		3316	text => "cancel",
		3317	expand => 1,
		3318	tooltip => "This closes the binding editor without saving",
		3319	on_activate => sub {
		3320	$self->hide;
		3321	$self->{binding_cancel}->()
		3322	if $self->{binding_cancel};
		3323	});
		3324
		3325	$self->update_binding_widgets;
		3326
		3327	$self
		3328	}
		3329
		3330	sub commit {
		3331	my ($self) = @_;
		3332	my ($mod, $sym, $cmds) = $self->get_binding;
		3333	if ($sym != 0 && @$cmds > 0) {
		3334	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
		3335	."'. Don't forget 'Save Config'!");
		3336	$self->{binding_change}->($mod, $sym, $cmds)
		3337	if $self->{binding_change};
		3338	} else {
		3339	$::STATUSBOX->add ("No action bound, no key or action specified!");
		3340	$self->{binding_cancel}->()
		3341	if $self->{binding_cancel};
		3342	}
		3343	}
		3344
		3345	sub start {
		3346	my ($self) = @_;
		3347
		3348	$self->{rec_btn}->set_text ("stop recording");
		3349	$self->{recording} = 1;
		3350	$self->clear_command_list;
		3351	$::CONN->start_record if $::CONN;
		3352	}
		3353
		3354	sub stop {
		3355	my ($self) = @_;
		3356
		3357	$self->{rec_btn}->set_text ("start recording");
		3358	$self->{recording} = 0;
		3359
		3360	my $rec;
		3361	$rec = $::CONN->stop_record if $::CONN;
		3362	return unless ref $rec eq 'ARRAY';
		3363	$self->set_command_list ($rec);
		3364	}
		3365
		3366
		3367	sub ask_for_bind_and_commit {
		3368	my ($self) = @_;
		3369	$self->ask_for_bind (1);
		3370	}
		3371
		3372	sub ask_for_bind {
		3373	my ($self, $commit) = @_;
		3374
		3375	CFClient::Binder::open_binding_dialog (sub {
		3376	my ($mod, $sym) = @_;
		3377	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
		3378	$self->update_binding_widgets;
		3379	$self->commit if $commit;
		3380	});
		3381	}
		3382
		3383	# $mod and $sym are the modifiers and key symbol
		3384	# $cmds is a array ref of strings (the commands)
		3385	# $cb is the callback that is executed on OK
		3386	# $ccb is the callback that is executed on CANCEL and
		3387	# when the binding was unsuccessful on OK
		3388	sub set_binding {
		3389	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
		3390
		3391	$self->clear_command_list;
		3392	$self->{recording} = 0;
		3393	$self->{rec_btn}->set_text ("start recording");
		3394
		3395	$self->{binding} = [$mod, $sym];
		3396	$self->{commands} = $cmds;
		3397
		3398	$self->{binding_change} = $cb;
		3399	$self->{binding_cancel} = $ccb;
		3400
		3401	$self->update_binding_widgets;
		3402	}
		3403
		3404	# this is a shortcut method that asks for a binding
		3405	# and then just binds it.
		3406	sub do_quick_binding {
		3407	my ($self, $cmds) = @_;
		3408	$self->set_binding (undef, undef, $cmds, sub {
		3409	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
		3410	});
		3411	$self->ask_for_bind (1);
		3412	}
		3413
		3414	sub update_binding_widgets {
		3415	my ($self) = @_;
		3416	my ($mod, $sym, $cmds) = $self->get_binding;
		3417	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
		3418	$self->set_command_list ($cmds);
		3419	}
		3420
		3421	sub get_binding {
		3422	my ($self) = @_;
		3423	return (
		3424	$self->{binding}->[0],
		3425	$self->{binding}->[1],
		3426	[ grep { defined $_ } @{$self->{commands}} ]
		3427	);
		3428	}
		3429
		3430	sub clear_command_list {
		3431	my ($self) = @_;
		3432	$self->{cmdbox}->clear ();
		3433	}
		3434
		3435	sub set_command_list {
		3436	my ($self, $cmds) = @_;
		3437
		3438	$self->{cmdbox}->clear ();
		3439	$self->{commands} = $cmds;
		3440
		3441	my $idx = 0;
		3442
		3443	for (@$cmds) {
		3444	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
		3445
		3446	my $i = $idx;
		3447	$hb->add (new CFClient::UI::Label text => $_);
		3448	$hb->add (new CFClient::UI::Button
		3449	text => "delete",
		3450	tooltip => "Deletes the action from the record",
		3451	on_activate => sub {
		3452	$self->{cmdbox}->remove ($hb);
		3453	$cmds->[$i] = undef;
		3454	});
		3455
		3456
		3457	$idx++
		3458	}
		3459	}
		3460
		3461	#############################################################################
		3462
		3463	package CFClient::UI::SpellList;
		3464
		3465	our @ISA = CFClient::UI::Table::;
		3466
		3467	sub new {
		3468	my $class = shift;
		3469
		3470	my $self = $class->SUPER::new (
		3471	binding => [],
		3472	commands => [],
		3473	@_,
		3474	)
		3475	}
		3476
		3477	# XXX: Do sorting? Argl...
		3478	sub add_spell {
		3479	my ($self, $spell) = @_;
		3480	$self->{spells}->{$spell->{name}} = $spell;
		3481
		3482	$self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
		3483	face => $spell->{face},
		3484	can_hover => 1,
		3485	can_events => 1,
		3486	tooltip => $spell->{message});
		3487
		3488	$self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
		3489	text => $spell->{name},
		3490	can_hover => 1,
		3491	can_events => 1,
		3492	tooltip => $spell->{message},
		3493	expand => 1);
		3494
		3495	$self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
		3496	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
		3497	$spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
		3498	expand => 1);
		3499
		3500	$self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
		3501	text => "bind to key",
		3502	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
		3503	}
		3504
		3505	sub rebuild_spell_list {
		3506	my ($self) = @_;
		3507	$self->{tbl_idx} = 0;
		3508	$self->add_spell ($_) for values %{$self->{spells}};
		3509	}
		3510
		3511	sub remove_spell {
		3512	my ($self, $spell) = @_;
		3513	delete $self->{spells}->{$spell->{name}};
		3514	$self->rebuild_spell_list;
		3515	}
		3516
		3517	#############################################################################
		3518
2980	package CFClient::UI::Root;	3519	package CFClient::UI::Root;
2981		3520
2982	our @ISA = CFClient::UI::Container::;	3521	our @ISA = CFClient::UI::Container::;
		3522
		3523	use List::Util qw(min max);
2983		3524
2984	use CFClient::OpenGL;	3525	use CFClient::OpenGL;
2985		3526
2986	sub new {	3527	sub new {
2987	my $class = shift;	3528	my $class = shift;
…		…
2994	Scalar::Util::weaken ($self->{root} = $self);	3535	Scalar::Util::weaken ($self->{root} = $self);
2995		3536
2996	$self	3537	$self
2997	}	3538	}
2998		3539
2999	sub configure {
3000	my ($self, $x, $y, $w, $h) = @_;
3001
3002	$self->{w} = $w;
3003	$self->{h} = $h;
3004	}
3005
3006	sub reconfigure {
3007	my ($self) = @_;
3008
3009	$self->SUPER::reconfigure;
3010
3011	$self->size_allocate ($self->{w}, $self->{h}, 1)
3012	if $self->{w};
3013	}
3014
3015	sub size_request {	3540	sub size_request {
3016	my ($self) = @_;	3541	my ($self) = @_;
3017		3542
3018	($self->{w}, $self->{h})	3543	($self->{w}, $self->{h})
3019	}	3544	}
3020		3545
		3546	sub _to_pixel {
		3547	my ($coord, $size, $max) = @_;
		3548
		3549	$coord =
		3550	$coord eq "center" ? ($max - $size) * 0.5
		3551	: $coord eq "max" ? $max
		3552	: $coord;
		3553
		3554	$coord = 0 if $coord < 0;
		3555	$coord = $max - $size if $coord > $max - $size;
		3556
		3557	int $coord + 0.5
		3558	}
		3559
3021	sub size_allocate {	3560	sub size_allocate {
3022	my ($self, $w, $h, $changed) = @_;	3561	my ($self, $w, $h) = @_;
3023		3562
3024	for my $child ($self->children) {	3563	for my $child ($self->children) {
3025	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3564	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3026		3565
3027	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3566	$X = $child->{force_x} if exists $child->{force_x};
3028	if exists $child->{req_x};	3567	$Y = $child->{force_y} if exists $child->{force_y};
3029		3568
3030	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3569	$X = _to_pixel $X, $W, $self->{w};
3031	if exists $child->{req_y};	3570	$Y = _to_pixel $Y, $H, $self->{h};
3032
3033	#delete @$child{qw(req_x req_y)};#d# def_x, def_y
3034
3035	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3036	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3037		3571
3038	$child->configure ($X, $Y, $W, $H);	3572	$child->configure ($X, $Y, $W, $H);
3039	}	3573	}
3040	}	3574	}
3041		3575
…		…
3058	}	3592	}
3059		3593
3060	sub add {	3594	sub add {
3061	my ($self, @children) = @_;	3595	my ($self, @children) = @_;
3062		3596
3063	for my $child (@children) {
3064	$child->{is_toplevel} = 1;	3597	$_->{is_toplevel} = 1
3065		3598	for @children;
3066	# integerise window positions
3067	$child->{x} = int $child->{x};
3068	$child->{y} = int $child->{y};
3069	}
3070		3599
3071	$self->SUPER::add (@children);	3600	$self->SUPER::add (@children);
3072	}	3601	}
3073		3602
3074	sub remove {	3603	sub remove {
3075	my ($self, @children) = @_;	3604	my ($self, @children) = @_;
3076		3605
3077	$self->SUPER::remove (@children);	3606	$self->SUPER::remove (@children);
		3607
		3608	delete $self->{is_toplevel}
		3609	for @children;
3078		3610
3079	while (@children) {	3611	while (@children) {
3080	my $w = pop @children;	3612	my $w = pop @children;
3081	push @children, $w->children;	3613	push @children, $w->children;
3082	$w->set_invisible;	3614	$w->set_invisible;
…		…
3102	$_->()	3634	$_->()
3103	for values %{delete $self->{refresh_hook}};	3635	for values %{delete $self->{refresh_hook}};
3104	}	3636	}
3105		3637
3106	if ($self->{realloc}) {	3638	if ($self->{realloc}) {
		3639	my %queue;
3107	my @queue;	3640	my @queue;
		3641	my $widget;
3108		3642
		3643	outer:
3109	while () {	3644	while () {
3110	if ($self->{realloc}) {	3645	if (my $realloc = delete $self->{realloc}) {
3111	#TODO use array-of-depth approach	3646	for $widget (values %$realloc) {
		3647	$widget->{visible} or next; # do not resize invisible widgets
3112		3648
3113	@queue = sort { $a->{visible} <=> $b->{visible} }	3649	$queue{$widget+0}++ and next; # duplicates are common
3114	@queue, values %{delete $self->{realloc}};	3650
		3651	push @{ $queue[$widget->{visible}] }, $widget;
		3652	}
3115	}	3653	}
3116		3654
		3655	while () {
		3656	@queue or last outer;
		3657
		3658	$widget = pop @{ $queue[-1] || [] }
		3659	and last;
		3660
		3661	pop @queue;
		3662	}
		3663
		3664	delete $queue{$widget+0};
		3665
		3666	my ($w, $h) = $widget->size_request;
		3667
		3668	$w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
		3669	$h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
		3670
		3671	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		3672	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		3673
		3674	$w = $widget->{force_w} if exists $widget->{force_w};
		3675	$h = $widget->{force_h} if exists $widget->{force_h};
		3676
		3677	if ($widget->{req_w} != $w || $widget->{req_h} != $h
		3678	|| delete $widget->{force_realloc}) {
		3679	$widget->{req_w} = $w;
		3680	$widget->{req_h} = $h;
		3681
		3682	$self->{size_alloc}{$widget+0} = $widget;
		3683
		3684	if (my $parent = $widget->{parent}) {
		3685	$self->{realloc}{$parent+0} = $parent
		3686	unless $queue{$parent+0};
		3687
		3688	$parent->{force_size_alloc} = 1;
		3689	$self->{size_alloc}{$parent+0} = $parent;
		3690	}
		3691	}
		3692
		3693	delete $self->{realloc}{$widget+0};
		3694	}
		3695	}
		3696
		3697	while (my $size_alloc = delete $self->{size_alloc}) {
		3698	my @queue = sort { $b->{visible} <=> $a->{visible} }
		3699	values %$size_alloc;
		3700
		3701	while () {
3117	my $widget = pop @queue || last;	3702	my $widget = pop @queue || last;
3118		3703
3119	$widget->{visible} or last; # do not resize invisible widgets	3704	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3120
3121	my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3122	? @$widget{qw(def_w def_h)}
3123	: $widget->size_request;
3124
3125	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3126
3127	$widget->{req_w} = $w;
3128	$widget->{req_h} = $h;
3129
3130	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
3131
3132	push @queue, $widget->{parent}
3133	if $widget->{parent};
3134	}
3135	}
3136
3137	while (my $size_alloc = delete $self->{size_alloc}) {
3138	my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3139	values %$size_alloc;
3140
3141	while () {
3142	my ($widget, $w, $h) = @{ pop @queue or last };
3143		3705
3144	$w = 0 if $w < 0;	3706	$w = 0 if $w < 0;
3145	$h = 0 if $h < 0;	3707	$h = 0 if $h < 0;
3146		3708
3147	my $changed = $widget->{w} != $w || $widget->{h} != $h;	3709	$w = int $w + 0.5;
		3710	$h = int $h + 0.5;
3148		3711
		3712	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
		3713	$widget->{old_w} = $widget->{w};
		3714	$widget->{old_h} = $widget->{h};
		3715
3149	$widget->{w} = $w;	3716	$widget->{w} = $w;
3150	$widget->{h} = $h;	3717	$widget->{h} = $h;
3151		3718
3152	$widget->emit (size_allocate => $w, $h, $changed);	3719	$widget->emit (size_allocate => $w, $h);
		3720	}
3153	}	3721	}
3154	}	3722	}
3155		3723
3156	while ($self->{post_alloc_hook}) {	3724	while ($self->{post_alloc_hook}) {
3157	$_->()	3725	$_->()
3158	for values %{delete $self->{post_alloc_hook}};	3726	for values %{delete $self->{post_alloc_hook}};
3159	}	3727	}
		3728
3160		3729
3161	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3730	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3162	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3731	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3163	glClear GL_COLOR_BUFFER_BIT;	3732	glClear GL_COLOR_BUFFER_BIT;
3164		3733
…		…
3166	glLoadIdentity;	3735	glLoadIdentity;
3167	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3736	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3168	glMatrixMode GL_MODELVIEW;	3737	glMatrixMode GL_MODELVIEW;
3169	glLoadIdentity;	3738	glLoadIdentity;
3170		3739
		3740	{
		3741	package CFClient::UI::Base;
		3742
		3743	($draw_x, $draw_y, $draw_w, $draw_h) =
		3744	(0, 0, $self->{w}, $self->{h});
		3745	}
		3746
3171	$self->_draw;	3747	$self->_draw;
3172	}	3748	}
3173		3749
3174	#############################################################################	3750	#############################################################################
3175		3751

Diff Legend

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