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.189 by root, Mon May 8 22:17:24 2006 UTC vs.
Revision 1.223 by elmex, Tue May 23 18:10:51 2006 UTC

1	package CFClient::UI;	1	package CFClient::UI;
2		2
		3	use utf8;
3	use strict;	4	use strict;
4		5
5	use Scalar::Util ();	6	use Scalar::Util ();
6	use List::Util ();	7	use List::Util ();
7		8
…		…
10	our ($FOCUS, $HOVER, $GRAB); # various widgets	11	our ($FOCUS, $HOVER, $GRAB); # various widgets
11		12
12	our $ROOT;	13	our $ROOT;
13	our $TOOLTIP;	14	our $TOOLTIP;
14	our $BUTTON_STATE;	15	our $BUTTON_STATE;
		16
		17	our %WIDGET; # all widgets, weak-referenced
15		18
16	sub check_tooltip {	19	sub check_tooltip {
17	if (!$GRAB) {	20	if (!$GRAB) {
18	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	21	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19	if (length $widget->{tooltip}) {	22	if (length $widget->{tooltip}) {
…		…
23		26
24	my $tip = $widget->{tooltip};	27	my $tip = $widget->{tooltip};
25		28
26	$tip = $tip->($widget) if CODE:: eq ref $tip;	29	$tip = $tip->($widget) if CODE:: eq ref $tip;
27		30
28	$TOOLTIP->set_markup ($widget->{tooltip});	31	$TOOLTIP->set_tooltip_from ($widget);
29
30	$TOOLTIP->show;	32	$TOOLTIP->show;
31		33
32	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	34	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33		35
34	if ($x + $TOOLTIP->{w} > $::WIDTH) {
35	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);	36	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
36	}	37	if $x + $TOOLTIP->{w} > $::WIDTH;
37		38
38	$TOOLTIP->move ($x, $y);	39	$TOOLTIP->move ($x, $y);
		40	$TOOLTIP->check_size;
		41	$TOOLTIP->update;
39	}	42	}
40		43
41	return;	44	return;
42	}	45	}
43	}	46	}
…		…
130		133
131	for (@$vals) {	134	for (@$vals) {
132	my $i = int $_ + $rem;	135	my $i = int $_ + $rem;
133	$rem += $_ - $i;	136	$rem += $_ - $i;
134	$_ = $i;	137	$_ = $i;
		138	}
		139	}
		140
		141	sub full_refresh {
		142	# make a copy, otherwise for complains about freed values.
		143	my @widgets = values %WIDGET;
		144
		145	$_->update
		146	for @widgets;
		147	}
		148
		149	# call when resolution changes etc.
		150	sub rescale_widgets {
		151	my ($sx, $sy) = @_;
		152
		153	# make a copy, otherwise for complains about freed values.
		154	my @widgets = values %WIDGET;
		155
		156	for my $widget (@widgets) {
		157	if ($widget->{toplevel}) {
		158	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
		159	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
		160	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
		161	$widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
		162	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
		163	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
		164	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
		165	$widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
		166	}
		167
		168	$widget->reconfigure;
135	}	169	}
136	}	170	}
137		171
138	#############################################################################	172	#############################################################################
139		173
…		…
158	if (/^connect_(.*)$/) {	192	if (/^connect_(.*)$/) {
159	$self->connect ($1 => delete $self->{$_});	193	$self->connect ($1 => delete $self->{$_});
160	}	194	}
161	}	195	}
162		196
		197	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
		198
163	$self	199	$self
164	}	200	}
165		201
166	sub destroy {	202	sub destroy {
167	my ($self) = @_;	203	my ($self) = @_;
…		…
170	%$self = ();	206	%$self = ();
171	}	207	}
172		208
173	sub show {	209	sub show {
174	my ($self) = @_;	210	my ($self) = @_;
175
176	return if $self->{parent};	211	return if $self->{parent};
177		212
178	$CFClient::UI::ROOT->add ($self);	213	$CFClient::UI::ROOT->add ($self);
		214	}
		215
		216	sub show_centered {
		217	my ($self) = @_;
		218	return if $self->{parent};
		219
		220	$self->show;
		221
		222	$CFClient::UI::ROOT->on_post_alloc (
		223	"centered $self" => sub {
		224	$self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
		225	},
		226	);
179	}	227	}
180		228
181	sub hide {	229	sub hide {
182	my ($self) = @_;	230	my ($self) = @_;
183		231
…		…
232	$self->{y} = $y;	280	$self->{y} = $y;
233	$self->update;	281	$self->update;
234	}	282	}
235		283
236	if ($self->{w} != $w || $self->{h} != $h) {	284	if ($self->{w} != $w || $self->{h} != $h) {
237	$self->{w} = $w;	285	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
238	$self->{h} = $h;
239
240	$self->size_allocate ($w, $h);
241	$self->update;
242	$self->emit (size_allocate => $w, $h);
243	}	286	}
244	}	287	}
245		288
246	sub size_allocate {	289	sub size_allocate {
247	# nothing to be done	290	# nothing to be done
248	}	291	}
249		292
		293	sub reconfigure {
		294	my ($self) = @_;
		295
		296	$self->check_size (1);
		297	$self->update;
		298	}
		299
250	sub children {	300	sub children {
251	}
252
253	# call when resolution changes etc.
254	sub reconfigure {
255	my ($self) = @_;
256
257	$_->reconfigure
258	for $self->children;
259
260	$self->check_size;
261	$self->size_allocate ($self->{w}, $self->{h});
262	$self->update;
263	}	301	}
264		302
265	sub set_max_size {	303	sub set_max_size {
266	my ($self, $w, $h) = @_;	304	my ($self, $w, $h) = @_;
267		305
268	delete $self->{max_w}; $self->{max_w} = $w if $w;	306	delete $self->{max_w}; $self->{max_w} = $w if $w;
269	delete $self->{max_h}; $self->{max_h} = $h if $h;	307	delete $self->{max_h}; $self->{max_h} = $h if $h;
270	}	308	}
271		309
272	# return top left coordinates	310	sub set_tooltip {
273	sub _topleft {
274	my ($self, $x, $y) = @_;	311	my ($self, $tooltip) = @_;
275		312
276	$self->{parent}	313	$self->{tooltip} = $tooltip;
277	or Carp::confess "no parent widget in _topleft\n";#d#
278		314
279	$self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});	315	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
		316	delete $CFClient::UI::TOOLTIP->{owner};
		317	CFClient::UI::check_tooltip;
		318	}
280	}	319	}
281		320
282	# translate global coordinates to local coordinate system	321	# translate global coordinates to local coordinate system
283	sub coord2local {	322	sub coord2local {
284	my ($self, $x, $y) = @_;	323	my ($self, $x, $y) = @_;
285		324
286	my ($X, $Y) = $self->_topleft;	325	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
287	($x - $X, $y - $Y)
288	}	326	}
289		327
290	# translate local coordinates to global coordinate system	328	# translate local coordinates to global coordinate system
291	sub coord2global {	329	sub coord2global {
292	my ($self, $x, $y) = @_;	330	my ($self, $x, $y) = @_;
293		331
294	my ($X, $Y) = $self->_topleft;	332	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
295	($x + $X, $y + $Y)
296	}	333	}
297		334
298	sub focus_in {	335	sub focus_in {
299	my ($self) = @_;	336	my ($self) = @_;
300		337
…		…
372	glVertex $self->{w}, 0;	409	glVertex $self->{w}, 0;
373	glVertex $self->{w}, $self->{h};	410	glVertex $self->{w}, $self->{h};
374	glVertex 0 , $self->{h};	411	glVertex 0 , $self->{h};
375	glEnd;	412	glEnd;
376	glPopMatrix;	413	glPopMatrix;
377	CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	414	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
378	}	415	}
379	}	416	}
380		417
381	sub _draw {	418	sub _draw {
382	my ($self) = @_;	419	my ($self) = @_;
…		…
398		435
399	sub set_parent {	436	sub set_parent {
400	my ($self, $parent) = @_;	437	my ($self, $parent) = @_;
401		438
402	Scalar::Util::weaken ($self->{parent} = $parent);	439	Scalar::Util::weaken ($self->{parent} = $parent);
		440
		441	# TODO: req_w _does_change after ->reconfigure
		442	$self->check_size
		443	unless exists $self->{req_w};
		444
		445	$self->show;
403	}	446	}
404		447
405	sub check_size {	448	sub check_size {
406	my ($self) = @_;	449	my ($self, $forced) = @_;
407		450
408	$self->_check_size;	451	$self->{force_alloc} = 1 if $forced;
409	return;
410	my $check_size = $CFClient::UI::ROOT->{_check_size} ||= {};
411
412	$check_size->{$self} = $self;
413
414	$CFClient::UI::ROOT->on_refresh (_check_size => sub {
415	while (%$check_size) {
416	my @widgets = values %$check_size;
417	$_->_check_size
418	for @widgets;
419	}
420	});
421	}
422
423	sub _check_size {
424	my ($self) = @_;
425
426	delete $CFClient::UI::ROOT->{_check_size}{$self};	452	$CFClient::UI::ROOT->{check_size}{$self} = $self;
427
428	$self->{parent}
429	or return 1;
430
431	my ($w, $h) = $self->{user_w} && $self->{user_h}
432	? @$self{qw(user_w user_h)}
433	: $self->size_request;
434
435	if ($w != $self->{req_w} || $h != $self->{req_h}) {
436	$self->{req_w} = $w;
437	$self->{req_h} = $h;
438
439	$self->{parent}->_check_size
440	or $self->size_allocate (
441	(List::Util::max $self->{w}, $w),
442	(List::Util::max $self->{h}, $h),
443	);
444
445	1
446	} else {
447	0
448	}
449	}	453	}
450		454
451	sub update {	455	sub update {
452	my ($self) = @_;	456	my ($self) = @_;
453		457
454	my $update = $CFClient::UI::ROOT->{_update} ||= {};	458	$self->{parent}->update
455		459	if $self->{parent};
456	$update->{$self} = $self;
457
458	$CFClient::UI::ROOT->on_refresh (_update => sub {
459	while (%$update) {
460	my @widgets = values %$update;
461	%$update = ();
462
463	$_->{parent} && $_->{parent}->update
464	for @widgets;
465	}
466	});
467	}	460	}
468		461
469	sub connect {	462	sub connect {
470	my ($self, $signal, $cb) = @_;	463	my ($self, $signal, $cb) = @_;
471		464
…		…
479	}	472	}
480		473
481	sub DESTROY {	474	sub DESTROY {
482	my ($self) = @_;	475	my ($self) = @_;
483		476
		477	delete $WIDGET{$self+0};
484	#$self->deactivate;	478	#$self->deactivate;
485	}	479	}
486		480
487	#############################################################################	481	#############################################################################
488		482
…		…
497	my $class = shift;	491	my $class = shift;
498		492
499	# range [value, low, high, page]	493	# range [value, low, high, page]
500		494
501	$class->SUPER::new (	495	$class->SUPER::new (
502	bg => [0, 0, 0, 0.2],	496	#bg => [0, 0, 0, 0.2],
503	active_bg => [1, 1, 1, 0.5],	497	#active_bg => [1, 1, 1, 0.5],
504	@_	498	@_
505	)	499	)
506	}	500	}
507		501
508	sub _draw {	502	sub _draw {
509	my ($self) = @_;	503	my ($self) = @_;
510		504
		505	my $color = $FOCUS == $self && $self->{active_bg}
		506	? $self->{active_bg}
		507	: $self->{bg};
		508
		509	if ($color && (@$color < 4 || $color->[3])) {
511	my ($w, $h) = @$self{qw(w h)};	510	my ($w, $h) = @$self{qw(w h)};
512		511
513	glEnable GL_BLEND;	512	glEnable GL_BLEND;
514	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	513	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
515	glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };	514	glColor @$color;
516		515
517	glBegin GL_QUADS;	516	glBegin GL_QUADS;
518	glVertex 0 , 0;	517	glVertex 0 , 0;
519	glVertex 0 , $h;	518	glVertex 0 , $h;
520	glVertex $w, $h;	519	glVertex $w, $h;
521	glVertex $w, 0;	520	glVertex $w, 0;
522	glEnd;	521	glEnd;
523		522
524	glDisable GL_BLEND;	523	glDisable GL_BLEND;
		524	}
525	}	525	}
526		526
527	#############################################################################	527	#############################################################################
528		528
529	package CFClient::UI::Empty;	529	package CFClient::UI::Empty;
…		…
573	$self->{children} = [	573	$self->{children} = [
574	sort { $a->{z} <=> $b->{z} }	574	sort { $a->{z} <=> $b->{z} }
575	@{$self->{children}}, @widgets	575	@{$self->{children}}, @widgets
576	];	576	];
577		577
578	$_->check_size	578	$self->check_size (1);
579	for @widgets;
580
581	$self->update;	579	$self->update;
582	}	580	}
583		581
584	sub children {	582	sub children {
585	@{ $_[0]{children} }	583	@{ $_[0]{children} }
…		…
692	}	690	}
693		691
694	sub update {	692	sub update {
695	my ($self) = @_;	693	my ($self) = @_;
696		694
697	$ROOT->on_refresh ($self => sub { $self->render_child });	695	$ROOT->on_post_alloc ($self => sub { $self->render_child });
698	$self->SUPER::update;	696	$self->SUPER::update;
699	}	697	}
700		698
701	sub size_allocate {	699	sub size_allocate {
702	my ($self, $w, $h) = @_;	700	my ($self, $w, $h) = @_;
…		…
715	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	713	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
716	glClearColor 0, 0, 0, 0;	714	glClearColor 0, 0, 0, 0;
717	glClear GL_COLOR_BUFFER_BIT;	715	glClear GL_COLOR_BUFFER_BIT;
718		716
719	$self->_render;	717	$self->_render;
720	# glColorMask 1, 1, 1, 0;
721	# glEnable GL_BLEND;
722	# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
723	# glRasterPos 0, 0;
724	# glCopyPixels 0, 0, $self->{w}, $self->{h};
725	# glDisable GL_BLEND;
726	# glColorMask 1, 1, 1, 1;
727	};	718	};
728	}	719	}
729		720
730	sub _draw {	721	sub _draw {
731	my ($self) = @_;	722	my ($self) = @_;
…		…
733	my ($w, $h) = ($self->w, $self->h);	724	my ($w, $h) = ($self->w, $self->h);
734		725
735	my $tex = $self->{texture}	726	my $tex = $self->{texture}
736	or return;	727	or return;
737		728
738	glEnable GL_BLEND;
739	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
740	glEnable GL_TEXTURE_2D;	729	glEnable GL_TEXTURE_2D;
741	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	730	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
742	glColor 0, 0, 0, 1;	731	glColor 1, 1, 1, 1;
743		732
744	$tex->draw_quad (0, 0, $w, $h);	733	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
745		734
746	glDisable GL_BLEND;
747	glDisable GL_TEXTURE_2D;	735	glDisable GL_TEXTURE_2D;
748	}	736	}
749		737
750	#############################################################################	738	#############################################################################
751		739
…		…
775	$self->{view_y} = int $y;	763	$self->{view_y} = int $y;
776		764
777	$self->update;	765	$self->update;
778	}	766	}
779		767
780	# hmm, this does not work for topleft of $self... but we should not aks for that	768	# hmm, this does not work for topleft of $self... but we should not ask for that
781	sub _topleft {	769	sub coord2local {
782	my ($self, $x, $y) = @_;	770	my ($self, $x, $y) = @_;
783		771
784	$self->SUPER::_topleft ($x - $self->{view_x}, $y - $self->{view_y})	772	$self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
		773	}
		774
		775	sub coord2global {
		776	my ($self, $x, $y) = @_;
		777
		778	$x = List::Util::min $self->{w}, $x - $self->{view_x};
		779	$y = List::Util::min $self->{h}, $y - $self->{view_y};
		780
		781	$self->SUPER::coord2global ($x, $y)
785	}	782	}
786		783
787	sub find_widget {	784	sub find_widget {
788	my ($self, $x, $y) = @_;	785	my ($self, $x, $y) = @_;
789		786
…		…
822	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));	819	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
823	},	820	},
824	;	821	;
825		822
826	$self = $class->SUPER::new (	823	$self = $class->SUPER::new (
827	vp => (new CFClient::UI::ViewPort),	824	vp => (new CFClient::UI::ViewPort expand => 1),
828	slider => $slider,	825	slider => $slider,
829	@_,	826	@_,
830	);	827	);
831		828
832	$self->{vp}->add ($self->{scrolled});	829	$self->{vp}->add ($self->{scrolled});
…		…
834	$self->add ($self->{slider});	831	$self->add ($self->{slider});
835		832
836	$self	833	$self
837	}	834	}
838		835
839	#TODO# update range on size_allocate depeneing on child	836	#TODO# update range on size_allocate depending on child
840	# update viewport offset on scroll	837	# update viewport offset on scroll
841		838
842	#############################################################################	839	#############################################################################
843		840
844	package CFClient::UI::Frame;	841	package CFClient::UI::Frame;
…		…
848	use CFClient::OpenGL;	845	use CFClient::OpenGL;
849		846
850	sub new {	847	sub new {
851	my $class = shift;	848	my $class = shift;
852		849
853	my $self = $class->SUPER::new (	850	$class->SUPER::new (
854	bg => [1, 1, 1, 1],	851	bg => undef,
855	border_bg => [1, 1, 1, 1],
856	border => 0.8,
857	@_	852	@_,
858	);	853	)
859
860	$self
861	}	854	}
862		855
863	sub _draw {	856	sub _draw {
864	my ($self) = @_;	857	my ($self) = @_;
865		858
866	my ($w, $h) = ($self->{w}, $self->{h});	859	if ($self->{bg}) {
		860	my ($w, $h) = @$self{qw(w h)};
867		861
868	glEnable GL_BLEND;	862	glEnable GL_BLEND;
869	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	863	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
870	glEnable GL_TEXTURE_2D;	864	glColor @{ $self->{bg} };
871	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
872		865
873	# glBegin GL_QUADS;	866	glBegin GL_QUADS;
874	# glColor 0, 0, 0, 0;
875	# glVertex 0 , 0;	867	glVertex 0 , 0;
876	# glVertex 0 , $h;	868	glVertex 0 , $h;
877	# glVertex $w, $h;	869	glVertex $w, $h;
878	# glVertex $w, 0;	870	glVertex $w, 0;
879	# glEnd;	871	glEnd;
880		872
881
882	$self->child->draw;
883	glDisable GL_BLEND;	873	glDisable GL_BLEND;
884	glDisable GL_TEXTURE_2D;	874	}
		875
		876	$self->SUPER::_draw;
885	}	877	}
886		878
887	#############################################################################	879	#############################################################################
888		880
889	package CFClient::UI::FancyFrame;	881	package CFClient::UI::FancyFrame;
…		…
903		895
904	my $self = $class->SUPER::new (	896	my $self = $class->SUPER::new (
905	bg => [1, 1, 1, 1],	897	bg => [1, 1, 1, 1],
906	border_bg => [1, 1, 1, 1],	898	border_bg => [1, 1, 1, 1],
907	border => 0.6,	899	border => 0.6,
		900	toplevel => 1,
908	can_events => 1,	901	can_events => 1,
909	@_	902	@_
910	);	903	);
911		904
912	$self->{title} &&= new CFClient::UI::Label	905	$self->{title} &&= new CFClient::UI::Label
…		…
937	my ($self, $w, $h) = @_;	930	my ($self, $w, $h) = @_;
938		931
939	$h -= List::Util::max 0, $self->border * 2;	932	$h -= List::Util::max 0, $self->border * 2;
940	$w -= List::Util::max 0, $self->border * 2;	933	$w -= List::Util::max 0, $self->border * 2;
941		934
942	$self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)	935	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
943	if $self->{title};	936	if $self->{title};
944		937
945	$self->child->configure ($self->border, $self->border, $w, $h);	938	$self->child->configure ($self->border, $self->border, $w, $h);
946	}	939	}
947		940
…		…
1005	my ($self) = @_;	998	my ($self) = @_;
1006		999
1007	my ($w, $h ) = ($self->{w}, $self->{h});	1000	my ($w, $h ) = ($self->{w}, $self->{h});
1008	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1001	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
1009		1002
1010	glEnable GL_BLEND;
1011	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1012	glEnable GL_TEXTURE_2D;	1003	glEnable GL_TEXTURE_2D;
1013	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1004	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1014		1005
1015	my $border = $self->border;	1006	my $border = $self->border;
1016		1007
1017	glColor @{ $self->{border_bg} };	1008	glColor @{ $self->{border_bg} };
1018	$tex[1]->draw_quad (0, 0, $w, $border);	1009	$tex[1]->draw_quad_alpha (0, 0, $w, $border);
1019	$tex[3]->draw_quad (0, $border, $border, $ch);	1010	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);
1020	$tex[2]->draw_quad ($w - $border, $border, $border, $ch);	1011	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1021	$tex[4]->draw_quad (0, $h - $border, $w, $border);	1012	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
1022		1013
1023	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1014	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1024	my $bg = $tex[0];	1015	my $bg = $tex[0];
1025		1016
1026	# TODO: repeat texture not scale	1017	# TODO: repeat texture not scale
…		…
1030	glColor @{ $self->{bg} };	1021	glColor @{ $self->{bg} };
1031		1022
1032	$bg->{s} = $rep_x;	1023	$bg->{s} = $rep_x;
1033	$bg->{t} = $rep_y;	1024	$bg->{t} = $rep_y;
1034	$bg->{wrap_mode} = 1;	1025	$bg->{wrap_mode} = 1;
1035	$bg->draw_quad ($border, $border, $cw, $ch);	1026	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
		1027	}
1036		1028
1037	glDisable GL_TEXTURE_2D;	1029	glDisable GL_TEXTURE_2D;
1038	glDisable GL_BLEND;
1039	}
1040		1030
1041	$self->{title}->draw if $self->{title};	1031	$self->{title}->draw if $self->{title};
1042		1032
1043	$self->child->draw;	1033	$self->child->draw;
1044	}	1034	}
…		…
1271	}	1261	}
1272		1262
1273	sub size_allocate {	1263	sub size_allocate {
1274	my ($self, $w, $h) = @_;	1264	my ($self, $w, $h) = @_;
1275		1265
		1266	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
		1267
1276	my $children = $self->{children};	1268	my $children = $self->{children};
1277		1269
1278	my @h = map $_->{req_h}, @$children;	1270	my @h = map $_->{req_h}, @$children;
1279		1271
1280	my $req_h = List::Util::sum @h;	1272	my $req_h = List::Util::sum @h;
…		…
1309		1301
1310	#############################################################################	1302	#############################################################################
1311		1303
1312	package CFClient::UI::Label;	1304	package CFClient::UI::Label;
1313		1305
1314	our @ISA = CFClient::UI::Base::;	1306	our @ISA = CFClient::UI::DrawBG::;
1315		1307
1316	use CFClient::OpenGL;	1308	use CFClient::OpenGL;
1317		1309
1318	sub new {	1310	sub new {
1319	my ($class, %arg) = @_;	1311	my ($class, %arg) = @_;
1320		1312
1321	my $self = $class->SUPER::new (	1313	my $self = $class->SUPER::new (
1322	fg => [1, 1, 1],	1314	fg => [1, 1, 1],
		1315	#bg => none
		1316	#active_bg => none
1323	#font => default_font	1317	#font => default_font
		1318	#text => initial text
		1319	#markup => initial narkup
		1320	#max_w => maximum pixel width
		1321	ellipsise => 3, # end
		1322	layout => (new CFClient::Layout),
1324	fontsize => 1,	1323	fontsize => 1,
1325	text => "",
1326	align => -1,	1324	align => -1,
1327	valign => -1,	1325	valign => -1,
1328	padding => 2,	1326	padding => 2,
1329	layout => new CFClient::Layout,
1330	can_events => 0,	1327	can_events => 0,
1331	%arg	1328	%arg
1332	);	1329	);
1333		1330
1334	if (exists $self->{template}) {	1331	if (exists $self->{template}) {
1335	my $layout = new CFClient::Layout;	1332	my $layout = new CFClient::Layout;
1336	$layout->set_text (delete $self->{template});	1333	$layout->set_text (delete $self->{template});
1337	$self->{template} = $layout;	1334	$self->{template} = $layout;
1338	}	1335	}
1339		1336
1340	$self->set_text (delete $self->{text}) if exists $self->{text};	1337	if (exists $self->{markup}) {
1341	$self->set_markup (delete $self->{markup}) if exists $self->{markup};	1338	$self->set_markup (delete $self->{markup});
		1339	} else {
		1340	$self->set_text (delete $self->{text});
		1341	}
1342		1342
1343	$self	1343	$self
1344	}	1344	}
1345		1345
1346	sub escape {	1346	sub escape($) {
1347	local $_ = $_[1];	1347	local $_ = $_[0];
1348		1348
1349	s/&/&amp;/g;	1349	s/&/&amp;/g;
1350	s/>/&gt;/g;	1350	s/>/&gt;/g;
1351	s/</&lt;/g;	1351	s/</&lt;/g;
1352		1352
1353	$_[1]	1353	$_
1354	}	1354	}
1355		1355
1356	sub update {	1356	sub update {
1357	my ($self) = @_;	1357	my ($self) = @_;
1358		1358
…		…
1364	my ($self, $text) = @_;	1364	my ($self, $text) = @_;
1365		1365
1366	return if $self->{text} eq "T$text";	1366	return if $self->{text} eq "T$text";
1367	$self->{text} = "T$text";	1367	$self->{text} = "T$text";
1368		1368
		1369	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1369	$self->{layout}->set_text ($text);	1370	$self->{layout}->set_text ($text);
1370		1371
1371	delete $self->{texture};
1372	$self->update;	1372	$self->update;
1373	$self->check_size;	1373	$self->check_size;
1374	}	1374	}
1375		1375
1376	sub set_markup {	1376	sub set_markup {
1377	my ($self, $markup) = @_;	1377	my ($self, $markup) = @_;
1378		1378
1379	return if $self->{text} eq "M$markup";	1379	return if $self->{text} eq "M$markup";
1380	$self->{text} = "M$markup";	1380	$self->{text} = "M$markup";
1381		1381
		1382	my $rgba = $markup =~ /span.*(?:foreground|background)/;
		1383
		1384	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1382	$self->{layout}->set_markup ($markup);	1385	$self->{layout}->set_markup ($markup);
1383		1386
1384	delete $self->{texture};
1385	$self->update;	1387	$self->update;
1386	$self->check_size;	1388	$self->check_size;
1387	}	1389	}
1388		1390
1389	sub size_request {	1391	sub size_request {
1390	my ($self) = @_;	1392	my ($self) = @_;
1391		1393
1392	$self->{layout}->set_font ($self->{font}) if $self->{font};	1394	$self->{layout}->set_font ($self->{font}) if $self->{font};
1393	$self->{layout}->set_width ($self->{max_w} || -1);	1395	$self->{layout}->set_width ($self->{max_w} || -1);
		1396	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1397	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1394	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1398	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1395		1399
1396	my ($w, $h) = $self->{layout}->size;	1400	my ($w, $h) = $self->{layout}->size;
1397		1401
1398	if (exists $self->{template}) {	1402	if (exists $self->{template}) {
…		…
1428	}	1432	}
1429		1433
1430	sub _draw {	1434	sub _draw {
1431	my ($self) = @_;	1435	my ($self) = @_;
1432		1436
		1437	$self->SUPER::_draw; # draw background, if applicable
		1438
1433	my $tex = $self->{texture} ||= do {	1439	my $tex = $self->{texture} ||= do {
		1440	$self->{layout}->set_foreground (@{$self->{fg}});
1434	$self->{layout}->set_font ($self->{font}) if $self->{font};	1441	$self->{layout}->set_font ($self->{font}) if $self->{font};
1435	$self->{layout}->set_width ($self->{w});	1442	$self->{layout}->set_width ($self->{w});
		1443	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1444	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1436	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);	1445	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
		1446
1437	new_from_layout CFClient::Texture $self->{layout}	1447	my $tex = new_from_layout CFClient::Texture $self->{layout};
		1448
		1449	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}
		1450	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
		1451	: ($self->{w} - $tex->{w}) * 0.5);
		1452
		1453	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
		1454	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
		1455	: ($self->{h} - $tex->{h}) * 0.5);
		1456
		1457	$tex
1438	};	1458	};
1439		1459
1440	glEnable GL_BLEND;
1441	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1442	glEnable GL_TEXTURE_2D;	1460	glEnable GL_TEXTURE_2D;
1443	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1461	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1444		1462
		1463	if ($tex->{format} == GL_ALPHA) {
1445	glColor @{$self->{fg}};	1464	glColor @{$self->{fg}};
1446
1447	$self->{ox} = int (
1448	$self->{align} < 0 ? $self->{padding}
1449	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1450	: ($self->{w} - $tex->{w}) * 0.5
1451	);
1452
1453	$self->{oy} = int (
1454	$self->{valign} < 0 ? $self->{padding}
1455	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1456	: ($self->{h} - $tex->{h}) * 0.5
1457	);
1458
1459	$tex->draw_quad ($self->{ox}, $self->{oy});	1465	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});
		1466	} else {
		1467	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
		1468	}
1460		1469
1461	glDisable GL_TEXTURE_2D;	1470	glDisable GL_TEXTURE_2D;
1462	glDisable GL_BLEND;
1463	}	1471	}
1464		1472
1465	#############################################################################	1473	#############################################################################
1466		1474
1467	package CFClient::UI::EntryBase;	1475	package CFClient::UI::EntryBase;
…		…
1502	$self->{layout}->set_text ("$text ");	1510	$self->{layout}->set_text ("$text ");
1503		1511
1504	$self->emit (changed => $self->{text});	1512	$self->emit (changed => $self->{text});
1505	}	1513	}
1506		1514
1507	sub get_text {
1508	$_[0]{text}
1509	}
1510
1511	sub size_request {
1512	my ($self) = @_;
1513
1514	my ($w, $h) = $self->SUPER::size_request;
1515
1516	($w + 1, $h) # add 1 for cursor
1517	}
1518
1519	sub size_allocate {
1520	my ($self, $w, $h) = @_;
1521
1522	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1523	}
1524
1525	sub set_text {	1515	sub set_text {
1526	my ($self, $text) = @_;	1516	my ($self, $text) = @_;
1527		1517
1528	$self->{cursor} = length $text;	1518	$self->{cursor} = length $text;
1529	$self->_set_text ($text);	1519	$self->_set_text ($text);
1530	$self->update;	1520	$self->update;
		1521	$self->check_size;
		1522	}
		1523
		1524	sub get_text {
		1525	$_[0]{text}
		1526	}
		1527
		1528	sub size_request {
		1529	my ($self) = @_;
		1530
		1531	my ($w, $h) = $self->SUPER::size_request;
		1532
		1533	($w + 1, $h) # add 1 for cursor
		1534	}
		1535
		1536	sub size_allocate {
		1537	my ($self, $w, $h) = @_;
		1538
		1539	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1531	}	1540	}
1532		1541
1533	sub key_down {	1542	sub key_down {
1534	my ($self, $ev) = @_;	1543	my ($self, $ev) = @_;
1535		1544
…		…
1537	my $sym = $ev->{sym};	1546	my $sym = $ev->{sym};
1538	my $uni = $ev->{unicode};	1547	my $uni = $ev->{unicode};
1539		1548
1540	my $text = $self->get_text;	1549	my $text = $self->get_text;
1541		1550
1542	if ($sym == 8) {	1551	if ($uni == 8) {
1543	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1552	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1544	} elsif ($sym == 127) {	1553	} elsif ($uni == 127) {
1545	substr $text, $self->{cursor}, 1, "";	1554	substr $text, $self->{cursor}, 1, "";
1546	} elsif ($sym == CFClient::SDLK_LEFT) {	1555	} elsif ($sym == CFClient::SDLK_LEFT) {
1547	--$self->{cursor} if $self->{cursor};	1556	--$self->{cursor} if $self->{cursor};
1548	} elsif ($sym == CFClient::SDLK_RIGHT) {	1557	} elsif ($sym == CFClient::SDLK_RIGHT) {
1549	++$self->{cursor} if $self->{cursor} < length $self->{text};	1558	++$self->{cursor} if $self->{cursor} < length $self->{text};
1550	} elsif ($sym == CFClient::SDLK_HOME) {	1559	} elsif ($sym == CFClient::SDLK_HOME) {
1551	$self->{cursor} = 0;	1560	$self->{cursor} = 0;
1552	} elsif ($sym == CFClient::SDLK_END) {	1561	} elsif ($sym == CFClient::SDLK_END) {
1553	$self->{cursor} = length $text;	1562	$self->{cursor} = length $text;
1554	} elsif ($sym == 27) {	1563	} elsif ($uni == 27) {
1555	$self->emit ('escape');	1564	$self->emit ('escape');
1556	} elsif ($uni) {	1565	} elsif ($uni) {
1557	substr $text, $self->{cursor}++, 0, chr $uni;	1566	substr $text, $self->{cursor}++, 0, chr $uni;
1558	}	1567	}
1559		1568
1560	$self->_set_text ($text);	1569	$self->_set_text ($text);
1561	$self->update;	1570	$self->update;
		1571	$self->check_size;
1562	}	1572	}
1563		1573
1564	sub focus_in {	1574	sub focus_in {
1565	my ($self) = @_;	1575	my ($self) = @_;
1566		1576
…		…
1695	my $class = shift;	1705	my $class = shift;
1696		1706
1697	$class->SUPER::new (	1707	$class->SUPER::new (
1698	padding => 4,	1708	padding => 4,
1699	fg => [1, 1, 1],	1709	fg => [1, 1, 1],
1700	bg => [1, 1, 1, 0.2],
1701	active_fg => [0, 0, 1],	1710	active_fg => [0, 0, 1],
1702	can_hover => 1,	1711	can_hover => 1,
1703	align => 0,	1712	align => 0,
1704	valign => 0,	1713	valign => 0,
1705	can_events => 1,	1714	can_events => 1,
…		…
1723		1732
1724	if ($GRAB == $self) {	1733	if ($GRAB == $self) {
1725	$self->{fg} = $self->{active_fg};	1734	$self->{fg} = $self->{active_fg};
1726	}	1735	}
1727		1736
1728	glEnable GL_BLEND;
1729	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1730	glEnable GL_TEXTURE_2D;	1737	glEnable GL_TEXTURE_2D;
1731	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1738	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1732	glColor 0, 0, 0, 1;	1739	glColor 0, 0, 0, 1;
1733		1740
1734	$tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});	1741	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1735		1742
1736	glDisable GL_TEXTURE_2D;	1743	glDisable GL_TEXTURE_2D;
1737	glDisable GL_BLEND;
1738		1744
1739	$self->SUPER::_draw;	1745	$self->SUPER::_draw;
1740	}	1746	}
1741		1747
1742	#############################################################################	1748	#############################################################################
…		…
1756		1762
1757	$class->SUPER::new (	1763	$class->SUPER::new (
1758	padding => 2,	1764	padding => 2,
1759	fg => [1, 1, 1],	1765	fg => [1, 1, 1],
1760	active_fg => [1, 1, 0],	1766	active_fg => [1, 1, 0],
		1767	bg => [0, 0, 0, 0.2],
		1768	active_bg => [1, 1, 1, 0.5],
1761	state => 0,	1769	state => 0,
1762	can_hover => 1,	1770	can_hover => 1,
1763	@_	1771	@_
1764	)	1772	)
1765	}	1773	}
…		…
1789		1797
1790	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1798	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1791		1799
1792	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1800	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1793		1801
1794	glEnable GL_BLEND;	1802	my $tex = $self->{state} ? $tex[1] : $tex[0];
		1803
1795	glEnable GL_TEXTURE_2D;	1804	glEnable GL_TEXTURE_2D;
1796	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1797
1798	my $tex = $self->{state} ? $tex[1] : $tex[0];
1799
1800	$tex->draw_quad (0, 0, $s, $s);	1805	$tex->draw_quad_alpha (0, 0, $s, $s);
1801
1802	glDisable GL_TEXTURE_2D;	1806	glDisable GL_TEXTURE_2D;
1803	glDisable GL_BLEND;
1804	}	1807	}
1805		1808
1806	#############################################################################	1809	#############################################################################
1807		1810
1808	package CFClient::UI::Image;	1811	package CFClient::UI::Image;
…		…
1851	glTranslate 0, -$self->{w}, 0;	1854	glTranslate 0, -$self->{w}, 0;
1852		1855
1853	($w, $h) = ($h, $w);	1856	($w, $h) = ($h, $w);
1854	}	1857	}
1855		1858
1856	glEnable GL_BLEND;
1857	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1858	glEnable GL_TEXTURE_2D;	1859	glEnable GL_TEXTURE_2D;
1859	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1860	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1860		1861
1861	$tex->draw_quad (0, 0, $w, $h);	1862	$tex->draw_quad_alpha (0, 0, $w, $h);
1862		1863
1863	glDisable GL_BLEND;
1864	glDisable GL_TEXTURE_2D;	1864	glDisable GL_TEXTURE_2D;
1865	}	1865	}
1866		1866
1867	#############################################################################	1867	#############################################################################
1868		1868
…		…
2057	qw(s1_slider.png s1_slider_bg.png);	2057	qw(s1_slider.png s1_slider_bg.png);
2058		2058
2059	sub new {	2059	sub new {
2060	my $class = shift;	2060	my $class = shift;
2061		2061
2062	# range [value, low, high, page]	2062	# range [value, low, high, page, unit]
2063		2063
2064	# TODO: 0-width page	2064	# TODO: 0-width page
2065	# TODO: req_w/h are wrong with vertical	2065	# TODO: req_w/h are wrong with vertical
2066	# TODO: calculations are off	2066	# TODO: calculations are off
2067	my $self = $class->SUPER::new (	2067	my $self = $class->SUPER::new (
2068	fg => [1, 1, 1],	2068	fg => [1, 1, 1],
2069	active_fg => [0, 0, 0],	2069	active_fg => [0, 0, 0],
		2070	bg => [0, 0, 0, 0.2],
		2071	active_bg => [1, 1, 1, 0.5],
2070	range => [0, 0, 100, 10],	2072	range => [0, 0, 100, 10],
2071	req_w => $::WIDTH / 80,	2073	req_w => $::WIDTH / 80,
2072	req_h => $::WIDTH / 80,	2074	req_h => $::WIDTH / 80,
2073	vertical => 0,	2075	vertical => 0,
2074	can_hover => 1,	2076	can_hover => 1,
2075	inner_pad => 5,	2077	inner_pad => 0.02,
2076	@_	2078	@_
2077	);	2079	);
2078		2080
		2081	$self->set_value ($self->{range}[0]);
		2082	$self->update;
		2083
2079	$self	2084	$self
		2085	}
		2086
		2087	sub set_value {
		2088	my ($self, $value) = @_;
		2089
		2090	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
		2091
		2092	$hi = $lo + 1 if $hi <= $lo;
		2093
		2094	$value = $lo if $value < $lo;
		2095	$value = $hi if $value > $hi;
		2096
		2097	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
		2098	if $unit;
		2099
		2100	$page = $hi - $lo if $page > $hi - $lo;
		2101
		2102	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
		2103
		2104	if ($value != $old_value) {
		2105	$self->emit (changed => $value);
		2106	$self->update;
		2107	}
2080	}	2108	}
2081		2109
2082	sub size_request {	2110	sub size_request {
2083	my ($self) = @_;	2111	my ($self) = @_;
2084		2112
…		…
2097		2125
2098	sub mouse_motion {	2126	sub mouse_motion {
2099	my ($self, $ev, $x, $y) = @_;	2127	my ($self, $ev, $x, $y) = @_;
2100		2128
2101	if ($GRAB == $self) {	2129	if ($GRAB == $self) {
		2130	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
		2131
		2132	my (undef, $lo, $hi, $page) = @{$self->{range}};
		2133
		2134	$x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};
		2135
		2136	$self->set_value ($x * ($hi - $lo) + $lo);
		2137	}
		2138	}
		2139
		2140	sub update {
		2141	my ($self) = @_;
		2142
		2143	$CFClient::UI::ROOT->on_post_alloc ($self => sub {
		2144	$self->set_value ($self->{range}[0]);
		2145
2102	my ($value, $lo, $hi, $page) = @{$self->{range}};	2146	my ($value, $lo, $hi, $page) = @{$self->{range}};
2103		2147
2104	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2148	my $inner_w = 1 - 2 * $self->{inner_pad};
2105		2149
2106	my $inner_pad_px = $self->_calc_inner_pad_px ($w);	2150	$self->{scale} = ($inner_w / ($hi - $lo)) || 1;
2107	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2108		2151
2109	$x -= $inner_pad_px; # substract the padding	2152	$page = $self->{scale} * $page || 10 / ($self->{w} || 1);
2110	$x = $x * ($hi - $lo) / $inner_w + $lo;	2153	$value = $self->{scale} * ($value - $lo);
2111	$x = $lo if $x < $lo;
2112	$x = $hi - $page if $x > $hi - $page;
2113	$self->{range}[0] = $x;
2114		2154
2115	$self->emit (changed => $x);	2155	$value = $self->{inner_pad} + ($value - $page * 0.5);
2116	$self->update;	2156
		2157	$value = 0 if $value < 0;
		2158	$page = 1 - $value if $value + $page > 1;
		2159
		2160	$self->{knob_x} = $value;
		2161	$self->{knob_w} = $page;
2117	}	2162	});
2118	}
2119		2163
2120	# the inner_* stuff is for generating a padding for the slider handle,	2164	$self->SUPER::update;
2121	# so that the handle doesn't leave the texture. This calculation isn't 100%
2122	# correct propably, but it does the job for now
2123	sub _calc_inner_pad_px {
2124	my ($self, $w) = @_;
2125	($w / 100) * $self->{inner_pad} # % to pixels
2126	}	2165	}
2127		2166
2128	sub _draw {	2167	sub _draw {
2129	my ($self) = @_;	2168	my ($self) = @_;
2130		2169
2131	$self->SUPER::_draw ();	2170	$self->SUPER::_draw ();
2132		2171
2133	my ($w, $h) = @$self{qw(w h)};	2172	glScale $self->{w}, $self->{h};
2134		2173
2135	if ($self->{vertical}) {	2174	if ($self->{vertical}) {
2136	# draw a vertical slider like a rotated horizontal slider	2175	# draw a vertical slider like a rotated horizontal slider
2137		2176
		2177	glTranslate 1, 0, 0;
2138	glRotate 90, 0, 0, 1;	2178	glRotate 90, 0, 0, 1;
2139	glTranslate 0, -$self->{w}, 0;
2140
2141	($w, $h) = ($h, $w);
2142	}	2179	}
2143		2180
2144	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	2181	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2145	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	2182	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2146		2183
2147	my ($value, $lo, $hi, $page) = @{$self->{range}};
2148
2149	$hi = $value + 1 if $lo == $hi;
2150
2151	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2152	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2153
2154	$page = int $page * $inner_w / ($hi - $lo);
2155	$value = int +($value - $lo) * $inner_w / ($hi - $lo);
2156
2157	$w -= $page;
2158	$page &= ~1;
2159	glTranslate $page * 0.5, 0, 0;
2160	$page ||= 2;
2161
2162	my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2163	my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2164
2165	glEnable GL_BLEND;
2166	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2167	glEnable GL_TEXTURE_2D;	2184	glEnable GL_TEXTURE_2D;
2168	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2185	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2169		2186
2170	# draw background	2187	# draw background
2171	$tex[1]->draw_quad (0, 0, $w, $h);	2188	$tex[1]->draw_quad_alpha (0, 0, 1, 1);
2172		2189
2173	# draw handle	2190	# draw handle
2174	$tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);	2191	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2175		2192
2176	glDisable GL_BLEND;
2177	glDisable GL_TEXTURE_2D;	2193	glDisable GL_TEXTURE_2D;
2178	}	2194	}
2179		2195
2180	#############################################################################	2196	#############################################################################
2181		2197
…		…
2192	fontsize => 1,	2208	fontsize => 1,
2193	can_events => 0,	2209	can_events => 0,
2194	#font => default_font	2210	#font => default_font
2195	@_,	2211	@_,
2196		2212
2197	layout => (new CFClient::Layout),	2213	layout => (new CFClient::Layout 1),
2198	par => [],	2214	par => [],
2199	height => 0,	2215	height => 0,
2200	children => [	2216	children => [
2201	(new CFClient::UI::Empty expand => 1),	2217	(new CFClient::UI::Empty expand => 1),
2202	(new CFClient::UI::Slider vertical => 1),	2218	(new CFClient::UI::Slider vertical => 1),
…		…
2213		2229
2214	$self->{fontsize} = $fontsize;	2230	$self->{fontsize} = $fontsize;
2215	$self->reflow;	2231	$self->reflow;
2216	}	2232	}
2217		2233
2218	sub text_height {
2219	my ($self, $text) = @_;
2220
2221	my $layout = $self->{layout};
2222
2223	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2224	$layout->set_width ($self->{children}[0]{w});
2225	$layout->set_text ($text);
2226
2227	($layout->size)[1]
2228	}
2229
2230	sub reflow {
2231	my ($self) = @_;
2232
2233	$self->{need_reflow}++;
2234	$self->update;
2235	}
2236
2237	sub size_allocate {	2234	sub size_allocate {
2238	my ($self, $w, $h) = @_;	2235	my ($self, $w, $h) = @_;
2239		2236
2240	$self->SUPER::size_allocate ($w, $h);	2237	$self->SUPER::size_allocate ($w, $h);
2241		2238
…		…
2244	$self->{layout}->set_width ($self->{children}[0]{w});	2241	$self->{layout}->set_width ($self->{children}[0]{w});
2245		2242
2246	$self->reflow;	2243	$self->reflow;
2247	}	2244	}
2248		2245
		2246	sub text_height {
		2247	my ($self, $text, $indent) = @_;
		2248
		2249	my $layout = $self->{layout};
		2250
		2251	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2252	$layout->set_width ($self->{children}[0]{w} - $indent);
		2253	$layout->set_markup ($text);
		2254
		2255	($layout->size)[1]
		2256	}
		2257
		2258	sub reflow {
		2259	my ($self) = @_;
		2260
		2261	$self->{need_reflow}++;
		2262	$self->update;
		2263	}
		2264
2249	sub add_paragraph {	2265	sub add_paragraph {
2250	my ($self, $color, $text) = @_;	2266	my ($self, $color, $text, $indent) = @_;
2251		2267
2252	#TODO: intelligently "reformat" paragraph	2268	#TODO: intelligently "reformat" paragraph
2253		2269
		2270	for my $line (split /\n/, $text) {
2254	my $height = $self->text_height ($text);	2271	my $height = $self->text_height ($line);
2255
2256	$self->{height} += $height;	2272	$self->{height} += $height;
2257
2258	push @{$self->{par}}, [$height, $color, $text];	2273	push @{$self->{par}}, [$height, $color, $indent, $line];
		2274	}
2259		2275
2260	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];	2276	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
2261	$self->{children}[1]->update;	2277	$self->{children}[1]->update;
2262	}	2278	}
2263		2279
…		…
2268		2284
2269	return unless $self->{h} > 0;	2285	return unless $self->{h} > 0;
2270		2286
2271	delete $self->{texture};	2287	delete $self->{texture};
2272		2288
2273	$ROOT->on_refresh ($self, sub {	2289	$ROOT->on_post_alloc ($self, sub {
2274	if (delete $self->{need_reflow}) {	2290	if (delete $self->{need_reflow}) {
2275	my $height = 0;	2291	my $height = 0;
2276		2292
2277	$height += $_->[0] = $self->text_height ($_->[2])	2293	$height += $_->[0] = $self->text_height ($_->[3], $_->[2])
2278	for @{$self->{par}};	2294	for @{$self->{par}};
2279		2295
2280	$self->{height} = $height;	2296	$self->{height} = $height;
2281		2297
2282	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2298	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
		2299	$self->{children}[1]->update;
2283		2300
2284	delete $self->{texture};	2301	delete $self->{texture};
2285	}	2302	}
2286		2303
2287	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {	2304	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2288	glClearColor 0, 0, 0, 0;	2305	glClearColor 0.5, 0.5, 0.5, 0;
2289	glClear GL_COLOR_BUFFER_BIT;	2306	glClear GL_COLOR_BUFFER_BIT;
2290
2291	glEnable GL_BLEND;
2292	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2293	glEnable GL_TEXTURE_2D;
2294	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2295		2307
2296	my $top = int $self->{children}[1]{range}[0];	2308	my $top = int $self->{children}[1]{range}[0];
2297		2309
2298	my $y0 = $top;	2310	my $y0 = $top;
2299	my $y1 = $top + $self->{h};	2311	my $y1 = $top + $self->{h};
…		…
2302		2314
2303	my $layout = $self->{layout};	2315	my $layout = $self->{layout};
2304		2316
2305	$layout->set_font ($self->{font}) if $self->{font};	2317	$layout->set_font ($self->{font}) if $self->{font};
2306		2318
		2319	glEnable GL_BLEND;
		2320	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		2321
2307	for my $par (@{$self->{par}}) {	2322	for my $par (@{$self->{par}}) {
2308	my $h = $par->[0];	2323	my $h = $par->[0];
2309		2324
2310	if ($y0 < $y + $h && $y < $y1) {	2325	if ($y0 < $y + $h && $y < $y1) {
		2326	$layout->set_foreground (@{ $par->[1] });
		2327	$layout->set_width ($self->{w} - $par->[2]);
2311	$layout->set_text ($par->[2]);	2328	$layout->set_markup ($par->[3]);
2312		2329
2313	glColor @{ $par->[1] };	2330	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2314	my ($W, $H) = $layout->size;	2331
2315	CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);	2332	glRasterPos $par->[2], $y - $y0;
		2333	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2316	}	2334	}
2317		2335
2318	$y += $h;	2336	$y += $h;
2319	}	2337	}
2320		2338
2321	glDisable GL_TEXTURE_2D;
2322	glDisable GL_BLEND;	2339	glDisable GL_BLEND;
2323	};	2340	};
2324	});	2341	});
2325	}	2342	}
2326		2343
2327	sub _draw {	2344	sub _draw {
2328	my ($self) = @_;	2345	my ($self) = @_;
2329		2346
2330	glEnable GL_BLEND;
2331	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2332	glEnable GL_TEXTURE_2D;	2347	glEnable GL_TEXTURE_2D;
2333	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2348	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2334	glColor 1, 1, 1, 1;	2349	glColor 1, 1, 1, 1;
2335	$self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2350	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2336	glDisable GL_TEXTURE_2D;	2351	glDisable GL_TEXTURE_2D;
2337	glDisable GL_BLEND;
2338		2352
2339	$self->{children}[1]->draw;	2353	$self->{children}[1]->draw;
2340		2354
2341	}	2355	}
2342		2356
…		…
2436	@_,	2450	@_,
2437	can_events => 0,	2451	can_events => 0,
2438	)	2452	)
2439	}	2453	}
2440		2454
2441	sub set_markup {	2455	sub set_tooltip_from {
2442	my ($self, $text) = @_;	2456	my ($self, $widget) = @_;
2443		2457
2444	$self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];	2458	$self->add (new CFClient::UI::Label
2445	$self->{label}->set_markup ($text);	2459	markup => $widget->{tooltip},
2446	$self->add ($self->{label});	2460	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
		2461	fontsize => 0.8,
		2462	fg => [0, 0, 0, 1],
		2463	ellipsise => 0,
		2464	font => ($widget->{tooltip_font} || $::FONT_PROP),
		2465	);
2447	}	2466	}
2448		2467
2449	sub size_request {	2468	sub size_request {
2450	my ($self) = @_;	2469	my ($self) = @_;
2451
2452	$self->child->set_max_size ($::WIDTH * 0.3);
2453		2470
2454	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	2471	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2455		2472
2456	($w + 4, $h + 4)	2473	($w + 4, $h + 4)
2457	}	2474	}
…		…
2463	}	2480	}
2464		2481
2465	sub _draw {	2482	sub _draw {
2466	my ($self) = @_;	2483	my ($self) = @_;
2467		2484
2468	glPushMatrix;
2469	glTranslate 0.375, 0.375;	2485	glTranslate 0.375, 0.375;
2470		2486
2471	my ($w, $h) = @$self{qw(w h)};	2487	my ($w, $h) = @$self{qw(w h)};
2472		2488
2473	glColor 1, 0.8, 0.4;	2489	glColor 1, 0.8, 0.4;
…		…
2484	glVertex 0 , $h;	2500	glVertex 0 , $h;
2485	glVertex $w, $h;	2501	glVertex $w, $h;
2486	glVertex $w, 0;	2502	glVertex $w, 0;
2487	glEnd;	2503	glEnd;
2488		2504
2489	glPopMatrix;	2505	glTranslate 2 - 0.375, 2 - 0.375;
2490
2491	glTranslate 2, 2;
2492	$self->SUPER::_draw;	2506	$self->SUPER::_draw;
2493	}	2507	}
2494		2508
2495	#############################################################################	2509	#############################################################################
2496		2510
…		…
2501	use CFClient::OpenGL;	2515	use CFClient::OpenGL;
2502		2516
2503	sub new {	2517	sub new {
2504	my $class = shift;	2518	my $class = shift;
2505		2519
2506	$class->SUPER::new (	2520	my $self = $class->SUPER::new (
2507	aspect => 1,	2521	aspect => 1,
2508	@_,	2522	@_,
2509	)	2523	);
		2524
		2525	if ($self->{anim} && $self->{animspeed}) {
		2526	Scalar::Util::weaken (my $widget = $self);
		2527
		2528	$self->{timer} = Event->timer (
		2529	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
		2530	hard => 1,
		2531	interval => $self->{animspeed},
		2532	cb => sub {
		2533	++$widget->{frame};
		2534	$widget->update;
		2535	},
		2536	);
		2537	}
		2538
		2539	$self
2510	}	2540	}
2511		2541
2512	sub size_request {	2542	sub size_request {
2513	(32, 8)	2543	(32, 8)
2514	}	2544	}
2515		2545
		2546	sub update {
		2547	my ($self) = @_;
		2548
		2549	return unless $self->{visible};
		2550
		2551	$self->SUPER::update;
		2552	}
		2553
2516	sub _draw {	2554	sub _draw {
2517	my ($self) = @_;	2555	my ($self) = @_;
2518		2556
2519	return unless $::CONN;#d# manage and cache textures differently	2557	return unless $::CONN;#d# manage and cache textures differently
		2558
		2559	my $face;
		2560
		2561	if ($self->{frame}) {
		2562	my $anim = $::CONN->{anim}[$self->{anim}];
		2563
		2564	$face = $anim->[ $self->{frame} % @$anim ]
		2565	if $anim && @$anim;
		2566	}
		2567
2520	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	2568	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2521		2569
2522	# TODO animation
2523	if ($tex) {	2570	if ($tex) {
2524	glEnable GL_BLEND;
2525	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2526	glEnable GL_TEXTURE_2D;	2571	glEnable GL_TEXTURE_2D;
2527	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2572	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2528	glColor 1, 1, 1, 1;	2573	glColor 1, 1, 1, 1;
2529	$tex->draw_quad (0, 0, $self->{w}, $self->{h});	2574	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2530	glDisable GL_TEXTURE_2D;	2575	glDisable GL_TEXTURE_2D;
2531	glDisable GL_BLEND;
2532	}	2576	}
		2577	}
		2578
		2579	sub DESTROY {
		2580	my ($self) = @_;
		2581
		2582	$self->{timer}->cancel
		2583	if $self->{timer};
		2584
		2585	$self->SUPER::DESTROY;
2533	}	2586	}
2534		2587
2535	#############################################################################	2588	#############################################################################
2536		2589
2537	package CFClient::UI::InventoryItem;	2590	package CFClient::UI::InventoryItem;
2538		2591
2539	our @ISA = CFClient::UI::HBox::;	2592	our @ISA = CFClient::UI::HBox::;
		2593
		2594	sub _item_to_desc {
		2595	my ($item) = @_;
		2596
		2597	my $desc =
		2598	$item->{nrof} < 2
		2599	? $item->{name}
		2600	: "$item->{nrof} × $item->{name_pl}";
		2601
		2602	$item->{flags} & Crossfire::Protocol::F_OPEN
		2603	and $desc .= " (open)";
		2604	$item->{flags} & Crossfire::Protocol::F_APPLIED
		2605	and $desc .= " (applied)";
		2606	$item->{flags} & Crossfire::Protocol::F_UNPAID
		2607	and $desc .= " (unpaid)";
		2608	$item->{flags} & Crossfire::Protocol::F_MAGIC
		2609	and $desc .= " (magic)";
		2610	$item->{flags} & Crossfire::Protocol::F_CURSED
		2611	and $desc .= " (cursed)";
		2612	$item->{flags} & Crossfire::Protocol::F_DAMNED
		2613	and $desc .= " (damned)";
		2614	$item->{flags} & Crossfire::Protocol::F_LOCKED
		2615	and $desc .= " *";
		2616
		2617	$desc
		2618	}
2540		2619
2541	sub new {	2620	sub new {
2542	my $class = shift;	2621	my $class = shift;
2543		2622
2544	my %args = @_;	2623	my %args = @_;
2545		2624
2546	my $item = $args{item};	2625	my $item = delete $args{item};
2547		2626
2548	my $desc = $item->{nrof} < 2	2627	my $desc = _item_to_desc ($item);
2549	? $item->{name}
2550	: "$item->{nrof} $item->{name_pl}";
2551
2552		2628
2553	my $self = $class->SUPER::new (	2629	my $self = $class->SUPER::new (
2554	can_hover => 1,	2630	can_hover => 1,
2555	can_events => 1,	2631	can_events => 1,
2556	tooltip => (CFClient::UI::Label->escape ($desc)	2632	tooltip => ((CFClient::UI::Label::escape $desc)
2557	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),	2633	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2558	connect_button_down => sub {	2634	connect_button_down => sub {
2559	my ($self, $ev, $x, $y) = @_;	2635	my ($self, $ev, $x, $y) = @_;
2560		2636
2561	# todo: maybe put examine on 1? but should just be a tooltip :(	2637	# todo: maybe put examine on 1? but should just be a tooltip :(
2562	if ($ev->{button} == 1) {	2638	if ($ev->{button} == 1) {
		2639	my $targ = $::CONN->{player}{tag};
		2640
		2641	if ($item->{container} == $::CONN->{player}{tag}) {
		2642	$targ = $main::OPENCONT;
		2643	}
		2644
2563	$::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");	2645	$::CONN->send ("move $targ $item->{tag} 0");
2564	} elsif ($ev->{button} == 2) {	2646	} elsif ($ev->{button} == 2) {
2565	$::CONN->send ("apply $item->{tag}");	2647	$::CONN->send ("apply $item->{tag}");
2566	} elsif ($ev->{button} == 3) {	2648	} elsif ($ev->{button} == 3) {
2567	CFClient::UI::Menu->new (	2649	my @menu_items = (
2568	items => [
2569	["examine", sub { $::CONN->send ("examine $item->{tag}") }],	2650	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2570	[
2571	$item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2572	sub { $::CONN->send ("lock $item->{tag}") },
2573	],
2574	["mark", sub { $::CONN->send ("mark $item->{tag}") }],	2651	["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2575	["apply", sub { $::CONN->send ("apply $item->{tag}") }],	2652	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
		2653	(
		2654	$item->{flags} & Crossfire::Protocol::F_LOCKED
		2655	? (
		2656	["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
		2657	)
		2658	: (
		2659	["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2576	["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],	2660	["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
		2661	)
2577	],	2662	),
2578	)->popup ($ev);	2663	);
		2664
		2665	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2579	}	2666	}
2580		2667
2581	1	2668	1
2582	},	2669	},
2583	%args	2670	%args
2584	);	2671	);
		2672
		2673
2585	$self->add(new CFClient::UI::Face	2674	$self->add (new CFClient::UI::Face
2586	can_events => 0,	2675	can_events => 0,
2587	face => $item->{face},	2676	face => $item->{face},
2588	anim => $item->{anim},	2677	anim => $item->{anim},
2589	animspeed => $item->{animspeed});	2678	animspeed => $item->{animspeed},
2590	$self->add(new CFClient::UI::Label	2679	);
2591	can_events => 0,	2680
2592	text => $desc);	2681	$self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
		2682
		2683	$self->{item} = $item;
		2684
		2685	$self->update_item;
2593		2686
2594	$self	2687	$self
		2688	}
		2689
		2690	sub update_item {
		2691	my ($self) = @_;
		2692
		2693	my $desc = _item_to_desc ($self->{item});
		2694
		2695	$self->{name_lbl}->set_text ($desc);
2595	}	2696	}
2596		2697
2597	#############################################################################	2698	#############################################################################
2598		2699
2599	package CFClient::UI::Inventory;	2700	package CFClient::UI::Inventory;
…		…
2615	my ($self, $items) = @_;	2716	my ($self, $items) = @_;
2616		2717
2617	$self->{scrolled}->clear;	2718	$self->{scrolled}->clear;
2618	return unless $items;	2719	return unless $items;
2619		2720
2620	my @items = sort { $a->{type} <=> $b->{type} } @$items;	2721	my @items = sort {
		2722	($a->{type} <=> $b->{type})
		2723	or ($a->{name} cmp $b->{name})
		2724	} @$items;
2621		2725
2622	$self->{real_items} = \@items;	2726	$self->{real_items} = \@items;
2623		2727
2624	for my $item (@items) {	2728	for my $item (@items) {
2625	my $desc = $item->{nrof} < 2
2626	? $item->{name}
2627	: "$item->{nrof} $item->{name_pl}";
2628
2629	$self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item);	2729	$item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
		2730	$item->update_item ();
2630	}	2731	}
		2732
		2733	$self->{scrolled}->add (@items);
2631		2734
2632	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];	2735	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2633	}	2736	}
2634		2737
2635	sub size_request {	2738	sub size_request {
…		…
2709	}	2812	}
2710	}	2813	}
2711		2814
2712	#############################################################################	2815	#############################################################################
2713		2816
		2817	package CFClient::UI::Statusbox;
		2818
		2819	our @ISA = CFClient::UI::VBox::;
		2820
		2821	sub new {
		2822	my $class = shift;
		2823
		2824	$class->SUPER::new (
		2825	fontsize => 0.8,
		2826	@_,
		2827	)
		2828	}
		2829
		2830	sub reorder {
		2831	my ($self) = @_;
		2832	my $NOW = time;
		2833
		2834	while (my ($k, $v) = each %{ $self->{item} }) {
		2835	delete $self->{item}{$k} if $v->{timeout} < $NOW;
		2836	}
		2837
		2838	my @widgets;
		2839
		2840	my @items = sort {
		2841	$a->{pri} <=> $b->{pri}
		2842	or $b->{id} <=> $a->{id}
		2843	} values %{ $self->{item} };
		2844
		2845	my $count = 10 + 1;
		2846	for my $item (@items) {
		2847	last unless --$count;
		2848
		2849	push @widgets, $item->{label} ||= do {
		2850	# TODO: doesn't handle markup well (read as: at all)
		2851	my $short = $item->{count} > 1
		2852	? "<b>$item->{count} ×</b> $item->{text}"
		2853	: $item->{text};
		2854
		2855	for ($short) {
		2856	s/^\s+//;
		2857	s/\s+/ /g;
		2858	}
		2859
		2860	new CFClient::UI::Label
		2861	markup => $short,
		2862	tooltip => $item->{tooltip},
		2863	tooltip_font => $::FONT_PROP,
		2864	tooltip_width => 0.67,
		2865	fontsize => $item->{fontsize} || $self->{fontsize},
		2866	max_w => $::WIDTH * 0.44,
		2867	fg => $item->{fg},
		2868	can_events => 1,
		2869	can_hover => 1
		2870	};
		2871	}
		2872
		2873	$self->clear;
		2874	$self->SUPER::add (reverse @widgets);
		2875	}
		2876
		2877	sub add {
		2878	my ($self, $text, %arg) = @_;
		2879
		2880	$text =~ s/^\s+//;
		2881	$text =~ s/\s+$//;
		2882
		2883	my $timeout = time + ((delete $arg{timeout}) || 60);
		2884
		2885	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
		2886
		2887	if (my $item = $self->{item}{$group}) {
		2888	if ($item->{text} eq $text) {
		2889	$item->{count}++;
		2890	} else {
		2891	$item->{count} = 1;
		2892	$item->{text} = $item->{tooltip} = $text;
		2893	}
		2894	$item->{id} = ++$self->{id};
		2895	$item->{timeout} = $timeout;
		2896	delete $item->{label};
		2897	} else {
		2898	$self->{item}{$group} = {
		2899	id => ++$self->{id},
		2900	text => $text,
		2901	timeout => $timeout,
		2902	tooltip => $text,
		2903	fg => [0.8, 0.8, 0.8, 0.8],
		2904	pri => 0,
		2905	count => 1,
		2906	%arg,
		2907	};
		2908	}
		2909
		2910	$self->reorder;
		2911	}
		2912
		2913	sub reconfigure {
		2914	my ($self) = @_;
		2915
		2916	delete $_->{label}
		2917	for values %{ $self->{item} || {} };
		2918
		2919	$self->reorder;
		2920	$self->SUPER::reconfigure;
		2921	}
		2922
		2923	#############################################################################
		2924
2714	package CFClient::UI::Root;	2925	package CFClient::UI::Root;
2715		2926
2716	our @ISA = CFClient::UI::Container::;	2927	our @ISA = CFClient::UI::Container::;
2717		2928
2718	use CFClient::OpenGL;	2929	use CFClient::OpenGL;
2719		2930
		2931	sub new {
		2932	my $class = shift;
		2933
		2934	$class->SUPER::new (
		2935	@_,
		2936	)
		2937	}
		2938
		2939	sub configure {
		2940	my ($self, $x, $y, $w, $h) = @_;
		2941
		2942	$self->{w} = $w;
		2943	$self->{h} = $h;
		2944	}
		2945
2720	sub check_size {	2946	sub check_size {
2721	my ($self) = @_;	2947	my ($self) = @_;
2722		2948
2723	$self->configure (0, 0, $self->{w}, $self->{h});	2949	$self->size_allocate ($self->{w}, $self->{h})
		2950	if $self->{w};
2724	}	2951	}
2725		2952
2726	sub size_request {	2953	sub size_request {
2727	my ($self) = @_;	2954	my ($self) = @_;
2728		2955
…		…
2730	}	2957	}
2731		2958
2732	sub size_allocate {	2959	sub size_allocate {
2733	my ($self, $w, $h) = @_;	2960	my ($self, $w, $h) = @_;
2734		2961
2735	my $old_w = $self->{old_w};	2962	my $old_w = $self->{old_w}; $self->{old_w} = $w;
2736	my $old_h = $self->{old_h};	2963	my $old_h = $self->{old_h}; $self->{old_h} = $h;
2737		2964
2738	if ($old_w && $old_h) {	2965	CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2739	for my $child ($self->children) {	2966	if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2740	$child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2741	$child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2742	$child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2743	$child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2744	$child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2745	$child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2746	$child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2747	$child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2748	}
2749	}
2750
2751	$self->{old_w} = $w;
2752	$self->{old_h} = $h;
2753	}
2754
2755	sub configure {
2756	my ($self, $x, $y, $w, $h) = @_;
2757
2758	$self->SUPER::configure ($x, $y, $w, $h);
2759		2967
2760	for my $child ($self->children) {	2968	for my $child ($self->children) {
2761	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	2969	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2762		2970
		2971	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
		2972	if exists $child->{req_x};
		2973
		2974	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
		2975	if exists $child->{req_y};
		2976
2763	$X = List::Util::max 0, List::Util::min $w - $W, $X;	2977	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2764	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;	2978	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
		2979
2765	$child->configure ($X, $Y, $W, $H);	2980	$child->configure ($X, $Y, $W, $H);
2766	}	2981	}
2767	}	2982	}
2768		2983
2769	sub _topleft {	2984	sub coord2local {
2770	my ($self, $x, $y) = @_;	2985	my ($self, $x, $y) = @_;
2771		2986
2772	($x, $y)	2987	($x, $y)
2773	}	2988	}
2774		2989
		2990	sub coord2global {
		2991	my ($self, $x, $y) = @_;
		2992
		2993	($x, $y)
		2994	}
		2995
2775	sub update {	2996	sub update {
2776	my ($self) = @_;	2997	my ($self) = @_;
2777		2998
2778	$self->check_size;	2999	$self->check_size;
2779	::refresh ();	3000	$::WANT_REFRESH++;
2780	}	3001	}
2781		3002
2782	sub add {	3003	sub add {
2783	my ($self, $child) = @_;	3004	my ($self, @children) = @_;
2784		3005
		3006	for my $child (@children) {
		3007	$child->{toplevel} = 1;
		3008
2785	# integerize window positions	3009	# integerise window positions
2786	$child->{x} = int $child->{x};	3010	$child->{x} = int $child->{x};
2787	$child->{y} = int $child->{y};	3011	$child->{y} = int $child->{y};
		3012	}
2788		3013
2789	$self->SUPER::add ($child);	3014	$self->SUPER::add (@children);
		3015
		3016	while (@children) {
		3017	my $w = pop @children;
		3018	push @children, $w->children;
		3019	$w->{visible} = 1;
		3020	}
		3021	}
		3022
		3023	sub remove {
		3024	my ($self, @children) = @_;
		3025
		3026	$self->SUPER::remove (@children);
		3027
		3028	while (@children) {
		3029	my $w = pop @children;
		3030	push @children, $w->children;
		3031	delete $w->{visible};
		3032	}
2790	}	3033	}
2791		3034
2792	sub on_refresh {	3035	sub on_refresh {
2793	my ($self, $id, $cb) = @_;	3036	my ($self, $id, $cb) = @_;
2794		3037
2795	$self->{refresh_hook}{$id} = $cb;	3038	$self->{refresh_hook}{$id} = $cb;
2796	}	3039	}
2797		3040
		3041	sub on_post_alloc {
		3042	my ($self, $id, $cb) = @_;
		3043
		3044	$self->{post_alloc_hook}{$id} = $cb;
		3045	}
		3046
2798	sub draw {	3047	sub draw {
2799	my ($self) = @_;	3048	my ($self) = @_;
2800		3049
2801	while (my $rcb = delete $self->{refresh_hook}) {	3050	while ($self->{refresh_hook}) {
2802	$_->() for values %$rcb;	3051	$_->()
		3052	for values %{delete $self->{refresh_hook}};
		3053	}
		3054
		3055	if ($self->{check_size}) {
		3056	my @queue = ([], []);
		3057
		3058	for (;;) {
		3059	if ($self->{check_size}) {
		3060	# heuristic: check containers last
		3061	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
		3062	for values %{delete $self->{check_size}}
		3063	}
		3064
		3065	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
		3066
		3067	my ($w, $h) = $widget->{user_w} && $widget->{user_h}
		3068	? @$widget{qw(user_w user_h)}
		3069	: $widget->size_request;
		3070
		3071	if (delete $widget->{force_alloc}
		3072	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
		3073	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
		3074
		3075	$widget->{req_w} = $w;
		3076	$widget->{req_h} = $h;
		3077
		3078	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
		3079
		3080	$widget->{parent}->check_size
		3081	if $widget->{parent};
		3082	}
		3083	}
		3084	}
		3085
		3086	while ($self->{size_alloc}) {
		3087	for (values %{delete $self->{size_alloc}}) {
		3088	my ($widget, $w, $h) = @$_;
		3089
		3090	$w = 0 if $w < 0;
		3091	$h = 0 if $h < 0;
		3092
		3093	$widget->{w} = $w;
		3094	$widget->{h} = $h;
		3095	$widget->size_allocate ($w, $h);
		3096	$widget->emit (size_allocate => $w, $h);
		3097	}
		3098	}
		3099
		3100	while ($self->{post_alloc_hook}) {
		3101	$_->()
		3102	for values %{delete $self->{post_alloc_hook}};
2803	}	3103	}
2804		3104
2805	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3105	glViewport 0, 0, $::WIDTH, $::HEIGHT;
2806	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3106	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2807	glClear GL_COLOR_BUFFER_BIT;	3107	glClear GL_COLOR_BUFFER_BIT;
2808		3108
2809	glMatrixMode GL_PROJECTION;	3109	glMatrixMode GL_PROJECTION;
2810	glLoadIdentity;	3110	glLoadIdentity;
2811	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;	3111	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2812	glMatrixMode GL_MODELVIEW;	3112	glMatrixMode GL_MODELVIEW;
2813	glLoadIdentity;	3113	glLoadIdentity;
2814		3114
2815	$self->_draw;	3115	$self->_draw;
2816	}	3116	}
…		…
2818	#############################################################################	3118	#############################################################################
2819		3119
2820	package CFClient::UI;	3120	package CFClient::UI;
2821		3121
2822	$ROOT = new CFClient::UI::Root;	3122	$ROOT = new CFClient::UI::Root;
2823	$TOOLTIP = new CFClient::UI::Tooltip;	3123	$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2824		3124
2825	1	3125	1
2826		3126

Diff Legend

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