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

Diff Legend

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