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.159 by root, Mon Apr 24 03:19:42 2006 UTC vs.
Revision 1.208 by root, Mon May 15 22:52:17 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
…		…
11		12
12	our $ROOT;	13	our $ROOT;
13	our $TOOLTIP;	14	our $TOOLTIP;
14	our $BUTTON_STATE;	15	our $BUTTON_STATE;
15		16
		17	our %WIDGET; # all widgets, weak-referenced
		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 (exists $widget->{tooltip}) {	22	if (length $widget->{tooltip}) {
20		23
21	if ($TOOLTIP->{owner} != $widget) {	24	if ($TOOLTIP->{owner} != $widget) {
22	$TOOLTIP->{owner} = $widget;	25	$TOOLTIP->{owner} = $widget;
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_text ($widget->{tooltip});	31	$TOOLTIP->set_tooltip_from ($widget);
29	$TOOLTIP->move ($widget->coord2global ($widget->{w}, 0));
30	$TOOLTIP->show;	32	$TOOLTIP->show;
		33
		34	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
		35
		36	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
		37	if $x + $TOOLTIP->{w} > $::WIDTH;
		38
		39	$TOOLTIP->move ($x, $y);
		40	$TOOLTIP->check_size;
		41	$TOOLTIP->update;
31	}	42	}
32		43
33	return;	44	return;
34	}	45	}
35	}	46	}
…		…
39	delete $TOOLTIP->{owner};	50	delete $TOOLTIP->{owner};
40	}	51	}
41		52
42	# class methods for events	53	# class methods for events
43	sub feed_sdl_key_down_event {	54	sub feed_sdl_key_down_event {
44	$FOCUS->key_down ($_[0]) if $FOCUS;	55	$FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])
		56	if $FOCUS;
45	}	57	}
46		58
47	sub feed_sdl_key_up_event {	59	sub feed_sdl_key_up_event {
48	$FOCUS->key_up ($_[0]) if $FOCUS;	60	$FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])
		61	if $FOCUS;
49	}	62	}
50		63
51	sub feed_sdl_button_down_event {	64	sub feed_sdl_button_down_event {
52	my ($ev) = @_;	65	my ($ev) = @_;
53	my ($x, $y) = ($ev->{x}, $ev->{y});	66	my ($x, $y) = ($ev->{x}, $ev->{y});
…		…
61	check_tooltip;	74	check_tooltip;
62	}	75	}
63		76
64	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	77	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
65		78
66	$GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;	79	if ($GRAB) {
		80	($x, $y) = $GRAB->coord2local ($x, $y);
		81	$GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
		82	}
67	}	83	}
68		84
69	sub feed_sdl_button_up_event {	85	sub feed_sdl_button_up_event {
70	my ($ev) = @_;	86	my ($ev) = @_;
71	my ($x, $y) = ($ev->{x}, $ev->{y});	87	my ($x, $y) = ($ev->{x}, $ev->{y});
72		88
73	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	89	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
74		90
75	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	91	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
76		92
77	$GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;	93	if ($GRAB) {
		94	($x, $y) = $GRAB->coord2local ($x, $y);
		95	$GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
		96	}
78		97
79	if (!$BUTTON_STATE) {	98	if (!$BUTTON_STATE) {
80	my $grab = $GRAB; undef $GRAB;	99	my $grab = $GRAB; undef $GRAB;
81	$grab->update if $grab;	100	$grab->update if $grab;
82	$GRAB->update if $GRAB;	101	$GRAB->update if $GRAB;
…		…
98	$HOVER->update if $HOVER && $HOVER->{can_hover};	117	$HOVER->update if $HOVER && $HOVER->{can_hover};
99		118
100	check_tooltip;	119	check_tooltip;
101	}	120	}
102		121
103	$HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER;	122	if ($HOVER) {
		123	($x, $y) = $HOVER->coord2local ($x, $y);
		124	$HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);
		125	}
104	}	126	}
105		127
106	# convert position array to integers	128	# convert position array to integers
107	sub harmonize {	129	sub harmonize {
108	my ($vals) = @_;	130	my ($vals) = @_;
…		…
114	$rem += $_ - $i;	136	$rem += $_ - $i;
115	$_ = $i;	137	$_ = $i;
116	}	138	}
117	}	139	}
118		140
		141	# call when resolution changes etc.
		142	sub rescale_widgets {
		143	my ($sx, $sy) = @_;
		144
		145	for my $widget (values %WIDGET) {
		146	if ($widget->{toplevel}) {
		147	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
		148	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
		149	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
		150	$widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
		151	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
		152	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
		153	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
		154	$widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
		155	}
		156
		157	$widget->reconfigure;
		158	}
		159	}
		160
119	#############################################################################	161	#############################################################################
120		162
121	package CFClient::UI::Base;	163	package CFClient::UI::Base;
122		164
123	use strict;	165	use strict;
…		…
126		168
127	sub new {	169	sub new {
128	my $class = shift;	170	my $class = shift;
129		171
130	my $self = bless {	172	my $self = bless {
131	x => 0,	173	x => 0,
132	y => 0,	174	y => 0,
133	z => 0,	175	z => 0,
134	can_events => 1,	176	can_events => 1,
135	@_	177	@_
136	}, $class;	178	}, $class;
137		179
138	for (keys %$self) {	180	for (keys %$self) {
139	if (/^connect_(.*)$/) {	181	if (/^connect_(.*)$/) {
140	$self->connect ($1 => delete $self->{$_});	182	$self->connect ($1 => delete $self->{$_});
141	}	183	}
142	}	184	}
143		185
		186	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
		187
144	$self	188	$self
145	}	189	}
146		190
147	sub destroy {	191	sub destroy {
148	my ($self) = @_;	192	my ($self) = @_;
…		…
160	}	204	}
161		205
162	sub hide {	206	sub hide {
163	my ($self) = @_;	207	my ($self) = @_;
164		208
165	return unless $self->{parent};	209	undef $GRAB if $GRAB == $self;
		210	undef $HOVER if $HOVER == $self;
166		211
167	$self->{parent}->remove ($self);	212	$self->{parent}->remove ($self)
		213	if $self->{parent};
168	}	214	}
169		215
170	sub move {	216	sub move {
171	my ($self, $x, $y, $z) = @_;	217	my ($self, $x, $y, $z) = @_;
172		218
…		…
211	$self->{y} = $y;	257	$self->{y} = $y;
212	$self->update;	258	$self->update;
213	}	259	}
214		260
215	if ($self->{w} != $w || $self->{h} != $h) {	261	if ($self->{w} != $w || $self->{h} != $h) {
216	$self->{w} = $w;	262	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
217	$self->{h} = $h;
218
219	$self->size_allocate ($w, $h);
220	$self->update;
221	}	263	}
222	}	264	}
223		265
224	sub size_allocate {	266	sub size_allocate {
225	# nothing to be done	267	# nothing to be done
226	}	268	}
227		269
		270	sub reconfigure {
		271	my ($self) = @_;
		272
		273	$self->check_size (1);
		274	$self->update;
		275	}
		276
		277	sub children {
		278	}
		279
228	sub set_max_size {	280	sub set_max_size {
229	my ($self, $w, $h) = @_;	281	my ($self, $w, $h) = @_;
230		282
231	delete $self->{max_w}; $self->{max_w} = $w if $w;	283	delete $self->{max_w}; $self->{max_w} = $w if $w;
232	delete $self->{max_h}; $self->{max_h} = $h if $h;	284	delete $self->{max_h}; $self->{max_h} = $h if $h;
233	}
234
235	# return top left coordinates
236	sub _topleft {
237	my ($self, $x, $y) = @_;
238
239	$self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
240	}	285	}
241		286
242	# translate global coordinates to local coordinate system	287	# translate global coordinates to local coordinate system
243	sub coord2local {	288	sub coord2local {
244	my ($self, $x, $y) = @_;	289	my ($self, $x, $y) = @_;
245		290
246	my ($X, $Y) = $self->_topleft;	291	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
247	($x - $X, $y - $Y)
248	}	292	}
249		293
250	# translate local coordinates to global coordinate system	294	# translate local coordinates to global coordinate system
251	sub coord2global {	295	sub coord2global {
252	my ($self, $x, $y) = @_;	296	my ($self, $x, $y) = @_;
253		297
254	my ($X, $Y) = $self->_topleft;	298	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
255	($x + $X, $y + $Y)
256	}	299	}
257		300
258	sub focus_in {	301	sub focus_in {
259	my ($self) = @_;	302	my ($self) = @_;
260		303
…		…
320	glVertex $x + $self->{w}, $y + $self->{h};	363	glVertex $x + $self->{w}, $y + $self->{h};
321	glVertex $x , $y + $self->{h};	364	glVertex $x , $y + $self->{h};
322	glEnd;	365	glEnd;
323	glDisable GL_BLEND;	366	glDisable GL_BLEND;
324	}	367	}
		368
		369	if ($ENV{PCLIENT_DEBUG}) {
		370	glPushMatrix;
		371	glColor 1, 1, 0, 1;
		372	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
		373	glBegin GL_LINE_LOOP;
		374	glVertex 0 , 0;
		375	glVertex $self->{w}, 0;
		376	glVertex $self->{w}, $self->{h};
		377	glVertex 0 , $self->{h};
		378	glEnd;
		379	glPopMatrix;
		380	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
		381	}
325	}	382	}
326		383
327	sub _draw {	384	sub _draw {
328	my ($self) = @_;	385	my ($self) = @_;
329		386
…		…
344		401
345	sub set_parent {	402	sub set_parent {
346	my ($self, $parent) = @_;	403	my ($self, $parent) = @_;
347		404
348	Scalar::Util::weaken ($self->{parent} = $parent);	405	Scalar::Util::weaken ($self->{parent} = $parent);
		406
		407	# TODO: req_w _does_change after ->reconfigure
		408	$self->check_size
		409	unless exists $self->{req_w};
349	}	410	}
350		411
351	sub check_size {	412	sub check_size {
352	my ($self) = @_;	413	my ($self, $forced) = @_;
353		414
354	$self->{parent}	415	$self->{force_alloc} = 1 if $forced;
355	or return 1;	416	$CFClient::UI::ROOT->{check_size}{$self} = $self;
356
357	my ($w, $h) = $self->{user_w} && $self->{user_h}
358	? @$self{qw(user_w user_h)}
359	: $self->size_request;
360
361	if ($w != $self->{req_w} || $h != $self->{req_h}) {
362	$self->{req_w} = $w;
363	$self->{req_h} = $h;
364
365	$self->{parent}->check_size
366	or $self->size_allocate (
367	(List::Util::max $self->{w}, $w),
368	(List::Util::max $self->{h}, $h),
369	);
370
371	1
372	} else {
373	0
374	}
375	}	417	}
376		418
377	sub update {	419	sub update {
378	my ($self) = @_;	420	my ($self) = @_;
379		421
…		…
388	}	430	}
389		431
390	sub emit {	432	sub emit {
391	my ($self, $signal, @args) = @_;	433	my ($self, $signal, @args) = @_;
392		434
393	for my $cb (@{$self->{signal_cb}{$signal} || []}) {	435	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
394	$cb->($self, @args);
395	}
396	}	436	}
397		437
398	sub DESTROY {	438	sub DESTROY {
399	my ($self) = @_;	439	my ($self) = @_;
400		440
		441	delete $WIDGET{$self+0};
401	#$self->deactivate;	442	#$self->deactivate;
402	}	443	}
403		444
404	#############################################################################	445	#############################################################################
405		446
…		…
467	sub new {	508	sub new {
468	my ($class, %arg) = @_;	509	my ($class, %arg) = @_;
469		510
470	my $children = delete $arg{children} || [];	511	my $children = delete $arg{children} || [];
471		512
472	my $self = $class->SUPER::new (children => [], can_events => 0, %arg);	513	my $self = $class->SUPER::new (
		514	children => [],
		515	can_events => 0,
		516	%arg,
		517	);
473	$self->add ($_) for @$children;	518	$self->add ($_) for @$children;
474		519
475	$self	520	$self
476	}	521	}
477		522
478	sub add {	523	sub add {
479	my ($self, $child) = @_;	524	my ($self, @widgets) = @_;
480		525
481	$child->set_parent ($self);	526	$_->set_parent ($self)
		527	for @widgets;
482		528
483	use sort 'stable';	529	use sort 'stable';
484		530
485	$self->{children} = [	531	$self->{children} = [
486	sort { $a->{z} <=> $b->{z} }	532	sort { $a->{z} <=> $b->{z} }
487	@{$self->{children}}, $child	533	@{$self->{children}}, @widgets
488	];	534	];
489		535
490	$child->check_size;	536	$self->check_size (1);
		537	$self->update;
		538	}
		539
		540	sub children {
		541	@{ $_[0]{children} }
491	}	542	}
492		543
493	sub remove {	544	sub remove {
494	my ($self, $child) = @_;	545	my ($self, $child) = @_;
495		546
496	delete $child->{parent};	547	delete $child->{parent};
		548	$child->hide;
497		549
498	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	550	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
		551
		552	$self->check_size;
		553	$self->update;
		554	}
		555
		556	sub clear {
		557	my ($self) = @_;
		558
		559	my $children = delete $self->{children};
		560	$self->{children} = [];
		561
		562	for (@$children) {
		563	delete $_->{parent};
		564	$_->hide;
		565	}
499		566
500	$self->check_size;	567	$self->check_size;
501	$self->update;	568	$self->update;
502	}	569	}
503		570
…		…
581	}	648	}
582		649
583	sub update {	650	sub update {
584	my ($self) = @_;	651	my ($self) = @_;
585		652
586	# we want to do this delayed...	653	$ROOT->on_post_alloc ($self => sub { $self->render_child });
587	$self->render_chld;
588	$self->SUPER::update;	654	$self->SUPER::update;
589	}
590
591	sub render_chld {
592	my ($self) = @_;
593
594	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
595	glClearColor 0, 0, 0, 1;
596	glClear GL_COLOR_BUFFER_BIT;
597	$self->child->draw;
598	};
599	}	655	}
600		656
601	sub size_allocate {	657	sub size_allocate {
602	my ($self, $w, $h) = @_;	658	my ($self, $w, $h) = @_;
603		659
604	$self->child->configure (0, 0, $w, $h);	660	$self->SUPER::size_allocate ($w, $h);
		661	$self->update;
		662	}
605		663
		664	sub _render {
		665	$_[0]{children}[0]->draw;
		666	}
		667
		668	sub render_child {
		669	my ($self) = @_;
		670
		671	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
		672	glClearColor 0, 0, 0, 0;
		673	glClear GL_COLOR_BUFFER_BIT;
		674
606	$self->render_chld;	675	$self->_render;
		676	# glColorMask 1, 1, 1, 0;
		677	# glEnable GL_BLEND;
		678	# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
		679	# glRasterPos 0, 0;
		680	# glCopyPixels 0, 0, $self->{w}, $self->{h};
		681	# glDisable GL_BLEND;
		682	# glColorMask 1, 1, 1, 1;
		683	};
607	}	684	}
608		685
609	sub _draw {	686	sub _draw {
610	my ($self) = @_;	687	my ($self) = @_;
611		688
612	my ($w, $h) = ($self->w, $self->h);	689	my ($w, $h) = ($self->w, $self->h);
613		690
614	my $tex = $self->{texture}	691	my $tex = $self->{texture}
615	or return;	692	or return;
616		693
617	glEnable GL_BLEND;
618	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
619	glEnable GL_TEXTURE_2D;	694	glEnable GL_TEXTURE_2D;
620	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	695	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		696	glColor 0, 0, 0, 1;
621		697
622	$tex->draw_quad (0, 0, $w, $h);	698	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
623		699
624	glDisable GL_BLEND;
625	glDisable GL_TEXTURE_2D;	700	glDisable GL_TEXTURE_2D;
626	}	701	}
627		702
628	#############################################################################	703	#############################################################################
629		704
630	package CFClient::UI::ViewPort;	705	package CFClient::UI::ViewPort;
631		706
632	our @ISA = CFClient::UI::Window::;	707	our @ISA = CFClient::UI::Window::;
633		708
634	sub new { die }
635
636	sub size_request {	709	sub size_request {
637	my ($self) = @_;	710	my ($self) = @_;
638		711
639	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	712	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
640	$self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});	713	$self->child->configure (0, 0, @$self{qw(child_w child_h)});
641		714
642	@$self{qw(child_w child_h)}	715	@$self{qw(child_w child_h)}
643	}	716	}
644		717
645	sub _draw {	718	sub size_allocate {
646	my ($self) = @_;	719	my ($self, $w, $h) = @_;
647		720
648	$self->{children}[1]->draw;	721	$self->update;
649	}	722	}
650		723
		724	sub set_offset {
		725	my ($self, $x, $y) = @_;
651		726
652	#############################################################################	727	$self->{view_x} = int $x;
		728	$self->{view_y} = int $y;
653		729
		730	$self->update;
		731	}
		732
		733	# hmm, this does not work for topleft of $self... but we should not ask for that
		734	sub coord2local {
		735	my ($self, $x, $y) = @_;
		736
		737	$self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
		738	}
		739
		740	sub coord2global {
		741	my ($self, $x, $y) = @_;
		742
		743	$x = List::Util::min $self->{w}, $x - $self->{view_x};
		744	$y = List::Util::min $self->{h}, $y - $self->{view_y};
		745
		746	$self->SUPER::coord2global ($x, $y)
		747	}
		748
		749	sub find_widget {
		750	my ($self, $x, $y) = @_;
		751
		752	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
		753	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
		754	) {
		755	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
		756	} else {
		757	$self->CFClient::UI::Base::find_widget ($x, $y)
		758	}
		759	}
		760
		761	sub _render {
		762	my ($self) = @_;
		763
		764	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
		765
		766	$self->SUPER::_render;
		767	}
		768
		769	#############################################################################
		770
654	package CFClient::UI::Frame;	771	package CFClient::UI::ScrolledWindow;
655		772
656	our @ISA = CFClient::UI::Bin::;	773	our @ISA = CFClient::UI::HBox::;
657
658	use CFClient::OpenGL;
659		774
660	sub new {	775	sub new {
661	my $class = shift;	776	my $class = shift;
662		777
		778	my $self;
		779
		780	my $slider = new CFClient::UI::Slider
		781	vertical => 1,
		782	range => [0, 0, 1, 0.01], # HACK fix
		783	connect_changed => sub {
		784	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
		785	},
		786	;
		787
663	my $self = $class->SUPER::new (	788	$self = $class->SUPER::new (
664	bg => [1, 1, 1, 1],	789	vp => (new CFClient::UI::ViewPort),
665	border_bg => [1, 1, 1, 1],	790	slider => $slider,
666	border => 0.8,
667	@_	791	@_,
668	);	792	);
669		793
		794	$self->{vp}->add ($self->{scrolled});
		795	$self->add ($self->{vp});
		796	$self->add ($self->{slider});
		797
670	$self	798	$self
671	}	799	}
672		800
		801	#TODO# update range on size_allocate depending on child
		802	# update viewport offset on scroll
		803
		804	#############################################################################
		805
		806	package CFClient::UI::Frame;
		807
		808	our @ISA = CFClient::UI::Bin::;
		809
		810	use CFClient::OpenGL;
		811
		812	sub new {
		813	my $class = shift;
		814
		815	$class->SUPER::new (
		816	bg => undef,
		817	@_,
		818	)
		819	}
		820
673	sub _draw {	821	sub _draw {
674	my ($self) = @_;	822	my ($self) = @_;
675		823
676	my ($w, $h) = ($self->{w}, $self->{h});	824	if ($self->{bg}) {
		825	my ($w, $h) = @$self{qw(w h)};
677		826
678	glEnable GL_BLEND;	827	glEnable GL_BLEND;
679	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	828	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
680	glEnable GL_TEXTURE_2D;	829	glColor @{ $self->{bg} };
681	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
682		830
683	# glBegin GL_QUADS;	831	glBegin GL_QUADS;
684	# glColor 0, 0, 0, 0;
685	# glVertex 0 , 0;	832	glVertex 0 , 0;
686	# glVertex 0 , $h;	833	glVertex 0 , $h;
687	# glVertex $w, $h;	834	glVertex $w, $h;
688	# glVertex $w, 0;	835	glVertex $w, 0;
689	# glEnd;	836	glEnd;
690		837
691
692	$self->child->draw;
693	glDisable GL_BLEND;	838	glDisable GL_BLEND;
694	glDisable GL_TEXTURE_2D;	839	}
		840
		841	$self->SUPER::_draw;
695	}	842	}
696		843
697	#############################################################################	844	#############################################################################
698		845
699	package CFClient::UI::FancyFrame;	846	package CFClient::UI::FancyFrame;
…		…
710	my $class = shift;	857	my $class = shift;
711		858
712	# TODO: user_x, user_y, overwrite moveto?	859	# TODO: user_x, user_y, overwrite moveto?
713		860
714	my $self = $class->SUPER::new (	861	my $self = $class->SUPER::new (
715	bg => [1, 1, 1, 1],	862	bg => [1, 1, 1, 1],
716	border_bg => [1, 1, 1, 1],	863	border_bg => [1, 1, 1, 1],
717	border => 0.8,	864	border => 0.6,
		865	toplevel => 1,
718	can_events => 1,	866	can_events => 1,
719	@_	867	@_
720	);	868	);
721		869
722	$self->{title} &&= new CFClient::UI::Label	870	$self->{title} &&= new CFClient::UI::Label
723	align => 0,	871	align => 0,
724	valign => 1,	872	valign => 1,
725	text => $self->{title},	873	text => $self->{title},
726	fontsize => 1;	874	fontsize => $self->{border};
727		875
728	$self	876	$self
729	}	877	}
730		878
731	sub border {	879	sub border {
…		…
747	my ($self, $w, $h) = @_;	895	my ($self, $w, $h) = @_;
748		896
749	$h -= List::Util::max 0, $self->border * 2;	897	$h -= List::Util::max 0, $self->border * 2;
750	$w -= List::Util::max 0, $self->border * 2;	898	$w -= List::Util::max 0, $self->border * 2;
751		899
752	$self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)	900	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
753	if $self->{title};	901	if $self->{title};
754		902
755	$self->child->configure ($self->border, $self->border, $w, $h);	903	$self->child->configure ($self->border, $self->border, $w, $h);
756	}	904	}
757		905
758	sub button_down {	906	sub button_down {
759	my ($self, $ev, $x, $y) = @_;	907	my ($self, $ev, $x, $y) = @_;
760		908
		909	my ($w, $h) = @$self{qw(w h)};
761	my $border = $self->border;	910	my $border = $self->border;
762		911
763	if ($x < $self->{w} && $x >= $self->{w} - $border	912	my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
764	&& $y < $self->{h} && $y >= $self->{h} - $border) {	913	my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
765		914
		915	if ($lr & $td) {
		916	my ($wx, $wy) = ($self->{x}, $self->{y});
766	my ($ox, $oy) = ($ev->{x}, $ev->{y});	917	my ($ox, $oy) = ($ev->{x}, $ev->{y});
767	my ($bw, $bh) = ($self->{w}, $self->{h});	918	my ($bw, $bh) = ($self->{w}, $self->{h});
768		919
		920	my $mx = $x < $border;
		921	my $my = $y < $border;
		922
769	$self->{motion} = sub {	923	$self->{motion} = sub {
770	my ($ev, $x, $y) = @_;	924	my ($ev, $x, $y) = @_;
771		925
772	($x, $y) = ($ev->{x}, $ev->{y});	926	my $dx = $ev->{x} - $ox;
		927	my $dy = $ev->{y} - $oy;
773		928
774	$self->{user_w} = $bw + $x - $ox;	929	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
775	$self->{user_h} = $bh + $y - $oy;	930	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);
		931	$self->move ($wx + $dx * $mx, $wy + $dy * $my);
776	$self->check_size;	932	$self->check_size;
777	};	933	};
778		934
779	} elsif ($x >= 0 && $x < $self->{w}	935	} elsif ($lr ^ $td) {
780	&& $y >= 0 && $y < $border) {
781
782	my ($ox, $oy) = ($ev->{x}, $ev->{y});	936	my ($ox, $oy) = ($ev->{x}, $ev->{y});
783	my ($bx, $by) = ($self->{x}, $self->{y});	937	my ($bx, $by) = ($self->{x}, $self->{y});
784		938
785	$self->{motion} = sub {	939	$self->{motion} = sub {
786	my ($ev, $x, $y) = @_;	940	my ($ev, $x, $y) = @_;
…		…
809	my ($self) = @_;	963	my ($self) = @_;
810		964
811	my ($w, $h ) = ($self->{w}, $self->{h});	965	my ($w, $h ) = ($self->{w}, $self->{h});
812	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	966	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
813		967
814	glEnable GL_BLEND;
815	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
816	glEnable GL_TEXTURE_2D;	968	glEnable GL_TEXTURE_2D;
817	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	969	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
818		970
819	my $border = $self->border;	971	my $border = $self->border;
820		972
821	glColor @{ $self->{border_bg} };	973	glColor @{ $self->{border_bg} };
822	$tex[1]->draw_quad (0, 0, $w, $border);	974	$tex[1]->draw_quad_alpha (0, 0, $w, $border);
823	$tex[3]->draw_quad (0, $border, $border, $ch);	975	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);
824	$tex[2]->draw_quad ($w - $border, $border, $border, $ch);	976	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
825	$tex[4]->draw_quad (0, $h - $border, $w, $border);	977	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
826		978
		979	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
827	my $bg = $tex[0];	980	my $bg = $tex[0];
828		981
829	# TODO: repeat texture not scale	982	# TODO: repeat texture not scale
830	my $rep_x = $cw / $bg->{w};	983	my $rep_x = $cw / $bg->{w};
831	my $rep_y = $ch / $bg->{h};	984	my $rep_y = $ch / $bg->{h};
832		985
833	glColor @{ $self->{bg} };	986	glColor @{ $self->{bg} };
834		987
835	$bg->{s} = $rep_x;	988	$bg->{s} = $rep_x;
836	$bg->{t} = $rep_y;	989	$bg->{t} = $rep_y;
837	$bg->{wrap_mode} = 1;	990	$bg->{wrap_mode} = 1;
838	$bg->draw_quad ($border, $border, $cw, $ch);	991	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
		992	}
839		993
840	glDisable GL_TEXTURE_2D;	994	glDisable GL_TEXTURE_2D;
841	glDisable GL_BLEND;
842		995
843	$self->{title}->draw if $self->{title};	996	$self->{title}->draw if $self->{title};
		997
844	$self->child->draw;	998	$self->child->draw;
845	}	999	}
846		1000
847	#############################################################################	1001	#############################################################################
848		1002
…		…
870	$self->{children}[$y][$x] = $child;	1024	$self->{children}[$y][$x] = $child;
871		1025
872	$child->check_size;	1026	$child->check_size;
873	}	1027	}
874		1028
		1029	sub children {
		1030	grep $_, map @$_, grep $_, @{ $_[0]{children} }
		1031	}
		1032
875	# TODO: move to container class maybe? send childs a signal on removal?	1033	# TODO: move to container class maybe? send childs a signal on removal?
876	sub clear {	1034	sub clear {
877	my ($self) = @_;	1035	my ($self) = @_;
878		1036
		1037	my @children = $self->children;
879	delete $self->{children};	1038	delete $self->{children};
		1039
		1040	for (@children) {
		1041	delete $_->{parent};
		1042	$_->hide;
		1043	}
		1044
880	$self->update;	1045	$self->update;
881	}	1046	}
882		1047
883	sub get_wh {	1048	sub get_wh {
884	my ($self) = @_;	1049	my ($self) = @_;
…		…
1061	}	1226	}
1062		1227
1063	sub size_allocate {	1228	sub size_allocate {
1064	my ($self, $w, $h) = @_;	1229	my ($self, $w, $h) = @_;
1065		1230
		1231	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
		1232
1066	my $children = $self->{children};	1233	my $children = $self->{children};
1067		1234
1068	my @h = map $_->{req_h}, @$children;	1235	my @h = map $_->{req_h}, @$children;
1069		1236
1070	my $req_h = List::Util::sum @h;	1237	my $req_h = List::Util::sum @h;
…		…
1107		1274
1108	sub new {	1275	sub new {
1109	my ($class, %arg) = @_;	1276	my ($class, %arg) = @_;
1110		1277
1111	my $self = $class->SUPER::new (	1278	my $self = $class->SUPER::new (
1112	fg => [1, 1, 1],	1279	fg => [1, 1, 1],
1113	#font => default_font	1280	#font => default_font
		1281	#text => initial text
		1282	#markup => initial narkup
		1283	layout => (new CFClient::Layout),
1114	fontsize => 1,	1284	fontsize => 1,
1115	text => "",
1116	align => -1,	1285	align => -1,
1117	valign => -1,	1286	valign => -1,
1118	padding => 2,	1287	padding => 2,
1119	layout => new CFClient::Layout,
1120	can_events => 0,	1288	can_events => 0,
1121	%arg	1289	%arg
1122	);	1290	);
1123		1291
1124	if (exists $self->{template}) {	1292	if (exists $self->{template}) {
1125	my $layout = new CFClient::Layout;	1293	my $layout = new CFClient::Layout;
1126	$layout->set_text (delete $self->{template});	1294	$layout->set_text (delete $self->{template});
1127	$self->{template} = $layout;	1295	$self->{template} = $layout;
1128	}	1296	}
1129		1297
1130	$self->set_text (delete $self->{text}) if exists $self->{text};	1298	if (exists $self->{markup}) {
1131	$self->set_markup (delete $self->{markup}) if exists $self->{markup};	1299	$self->set_markup (delete $self->{markup});
		1300	} else {
		1301	$self->set_text (delete $self->{text});
		1302	}
1132		1303
1133	$self	1304	$self
1134	}	1305	}
1135		1306
1136	sub escape_text {	1307	sub escape {
1137	local $_ = $_[1];	1308	local $_ = $_[1];
1138		1309
1139	s/&/&amp;/g;	1310	s/&/&amp;/g;
1140	s/>/&gt;/g;	1311	s/>/&gt;/g;
1141	s/</&lt;/g;	1312	s/</&lt;/g;
1142		1313
1143	$_[1]	1314	$_[1]
1144	}	1315	}
1145		1316
		1317	sub update {
		1318	my ($self) = @_;
		1319
		1320	delete $self->{texture};
		1321	$self->SUPER::update;
		1322	}
		1323
1146	sub set_text {	1324	sub set_text {
1147	my ($self, $text) = @_;	1325	my ($self, $text) = @_;
1148		1326
		1327	return if $self->{text} eq "T$text";
		1328	$self->{text} = "T$text";
		1329
		1330	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1149	$self->{layout}->set_text ($text);	1331	$self->{layout}->set_text ($text);
1150		1332
1151	delete $self->{texture};	1333	$self->update;
1152	$self->check_size;	1334	$self->check_size;
1153	$self->update;
1154	}	1335	}
1155		1336
1156	sub set_markup {	1337	sub set_markup {
1157	my ($self, $markup) = @_;	1338	my ($self, $markup) = @_;
1158		1339
		1340	return if $self->{text} eq "M$markup";
		1341	$self->{text} = "M$markup";
		1342
		1343	my $rgba = $markup =~ /span.*(?:foreground|background)/;
		1344
		1345	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1159	$self->{layout}->set_markup ($markup);	1346	$self->{layout}->set_markup ($markup);
1160		1347
1161	delete $self->{texture};	1348	$self->update;
1162	$self->check_size;	1349	$self->check_size;
1163	$self->update;
1164	}	1350	}
1165		1351
1166	sub size_request {	1352	sub size_request {
1167	my ($self) = @_;	1353	my ($self) = @_;
1168		1354
…		…
1197	sub set_fontsize {	1383	sub set_fontsize {
1198	my ($self, $fontsize) = @_;	1384	my ($self, $fontsize) = @_;
1199		1385
1200	$self->{fontsize} = $fontsize;	1386	$self->{fontsize} = $fontsize;
1201	delete $self->{texture};	1387	delete $self->{texture};
		1388
		1389	$self->update;
1202	$self->check_size;	1390	$self->check_size;
1203	$self->update;
1204	}	1391	}
1205		1392
1206	sub _draw {	1393	sub _draw {
1207	my ($self) = @_;	1394	my ($self) = @_;
1208		1395
1209	my $tex = $self->{texture} ||= do {	1396	my $tex = $self->{texture} ||= do {
		1397	$self->{layout}->set_foreground (@{$self->{fg}});
1210	$self->{layout}->set_font ($self->{font}) if $self->{font};	1398	$self->{layout}->set_font ($self->{font}) if $self->{font};
1211	$self->{layout}->set_width ($self->{w});	1399	$self->{layout}->set_width ($self->{w});
1212	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);	1400	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
		1401
1213	new_from_layout CFClient::Texture $self->{layout}	1402	my $tex = new_from_layout CFClient::Texture $self->{layout};
		1403
		1404	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}
		1405	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
		1406	: ($self->{w} - $tex->{w}) * 0.5);
		1407
		1408	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
		1409	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
		1410	: ($self->{h} - $tex->{h}) * 0.5);
		1411
		1412	$tex
1214	};	1413	};
1215		1414
1216	glEnable GL_BLEND;
1217	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1218	glEnable GL_TEXTURE_2D;	1415	glEnable GL_TEXTURE_2D;
1219	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1416	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1220		1417
		1418	if ($tex->{format} == GL_ALPHA) {
1221	glColor @{$self->{fg}};	1419	glColor @{$self->{fg}};
1222
1223	$self->{ox} = int (
1224	$self->{align} < 0 ? $self->{padding}
1225	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1226	: ($self->{w} - $tex->{w}) * 0.5
1227	);
1228
1229	$self->{oy} = int (
1230	$self->{valign} < 0 ? $self->{padding}
1231	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1232	: ($self->{h} - $tex->{h}) * 0.5
1233	);
1234
1235	$tex->draw_quad ($self->{ox}, $self->{oy});	1420	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});
		1421	} else {
		1422	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
		1423	}
1236		1424
1237	glDisable GL_TEXTURE_2D;	1425	glDisable GL_TEXTURE_2D;
1238	glDisable GL_BLEND;
1239	}	1426	}
1240		1427
1241	#############################################################################	1428	#############################################################################
1242		1429
1243	package CFClient::UI::EntryBase;	1430	package CFClient::UI::EntryBase;
…		…
1248		1435
1249	sub new {	1436	sub new {
1250	my $class = shift;	1437	my $class = shift;
1251		1438
1252	$class->SUPER::new (	1439	$class->SUPER::new (
1253	fg => [1, 1, 1],	1440	fg => [1, 1, 1],
1254	bg => [0, 0, 0, 0.2],	1441	bg => [0, 0, 0, 0.2],
1255	active_bg => [1, 1, 1, 0.5],	1442	active_bg => [1, 1, 1, 0.5],
1256	active_fg => [0, 0, 0],	1443	active_fg => [0, 0, 0],
1257	can_hover => 1,	1444	can_hover => 1,
1258	can_focus => 1,	1445	can_focus => 1,
1259	valign => 0,	1446	valign => 0,
1260	can_events => 1,	1447	can_events => 1,
1261	@_	1448	@_
1262	)	1449	)
1263	}	1450	}
1264		1451
…		…
1278	$self->{layout}->set_text ("$text ");	1465	$self->{layout}->set_text ("$text ");
1279		1466
1280	$self->emit (changed => $self->{text});	1467	$self->emit (changed => $self->{text});
1281	}	1468	}
1282		1469
1283	sub get_text {
1284	$_[0]{text}
1285	}
1286
1287	sub size_request {
1288	my ($self) = @_;
1289
1290	my ($w, $h) = $self->SUPER::size_request;
1291
1292	($w + 1, $h) # add 1 for cursor
1293	}
1294
1295	sub size_allocate {
1296	my ($self, $w, $h) = @_;
1297
1298	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1299	}
1300
1301	sub set_text {	1470	sub set_text {
1302	my ($self, $text) = @_;	1471	my ($self, $text) = @_;
1303		1472
1304	$self->{cursor} = length $text;	1473	$self->{cursor} = length $text;
1305	$self->_set_text ($text);	1474	$self->_set_text ($text);
1306	$self->update;	1475	$self->update;
		1476	$self->check_size;
		1477	}
		1478
		1479	sub get_text {
		1480	$_[0]{text}
		1481	}
		1482
		1483	sub size_request {
		1484	my ($self) = @_;
		1485
		1486	my ($w, $h) = $self->SUPER::size_request;
		1487
		1488	($w + 1, $h) # add 1 for cursor
		1489	}
		1490
		1491	sub size_allocate {
		1492	my ($self, $w, $h) = @_;
		1493
		1494	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1307	}	1495	}
1308		1496
1309	sub key_down {	1497	sub key_down {
1310	my ($self, $ev) = @_;	1498	my ($self, $ev) = @_;
1311		1499
…		…
1313	my $sym = $ev->{sym};	1501	my $sym = $ev->{sym};
1314	my $uni = $ev->{unicode};	1502	my $uni = $ev->{unicode};
1315		1503
1316	my $text = $self->get_text;	1504	my $text = $self->get_text;
1317		1505
1318	if ($sym == 8) {	1506	if ($uni == 8) {
1319	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1507	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1320	} elsif ($sym == 127) {	1508	} elsif ($uni == 127) {
1321	substr $text, $self->{cursor}, 1, "";	1509	substr $text, $self->{cursor}, 1, "";
1322	} elsif ($sym == CFClient::SDLK_LEFT) {	1510	} elsif ($sym == CFClient::SDLK_LEFT) {
1323	--$self->{cursor} if $self->{cursor};	1511	--$self->{cursor} if $self->{cursor};
1324	} elsif ($sym == CFClient::SDLK_RIGHT) {	1512	} elsif ($sym == CFClient::SDLK_RIGHT) {
1325	++$self->{cursor} if $self->{cursor} < length $self->{text};	1513	++$self->{cursor} if $self->{cursor} < length $self->{text};
1326	} elsif ($sym == CFClient::SDLK_HOME) {	1514	} elsif ($sym == CFClient::SDLK_HOME) {
1327	$self->{cursor} = 0;	1515	$self->{cursor} = 0;
1328	} elsif ($sym == CFClient::SDLK_END) {	1516	} elsif ($sym == CFClient::SDLK_END) {
1329	$self->{cursor} = length $text;	1517	$self->{cursor} = length $text;
1330	} elsif ($sym == 27) {	1518	} elsif ($uni == 27) {
1331	$self->emit ('escape');	1519	$self->emit ('escape');
1332	} elsif ($uni) {	1520	} elsif ($uni) {
1333	substr $text, $self->{cursor}++, 0, chr $uni;	1521	substr $text, $self->{cursor}++, 0, chr $uni;
1334	}	1522	}
1335		1523
1336	$self->_set_text ($text);	1524	$self->_set_text ($text);
1337	$self->update;	1525	$self->update;
		1526	$self->check_size;
1338	}	1527	}
1339		1528
1340	sub focus_in {	1529	sub focus_in {
1341	my ($self) = @_;	1530	my ($self) = @_;
1342		1531
…		…
1418	my ($self, $ev) = @_;	1607	my ($self, $ev) = @_;
1419		1608
1420	my $sym = $ev->{sym};	1609	my $sym = $ev->{sym};
1421		1610
1422	if ($sym == 13) {	1611	if ($sym == 13) {
		1612	unshift @{$self->{history}},
		1613	my $txt = $self->get_text;
		1614	$self->{history_pointer} = -1;
		1615	$self->{history_saveback} = '';
1423	$self->emit (activate => $self->get_text);	1616	$self->emit (activate => $txt);
1424	$self->update;	1617	$self->update;
		1618
		1619	} elsif ($sym == CFClient::SDLK_UP) {
		1620	if ($self->{history_pointer} < 0) {
		1621	$self->{history_saveback} = $self->get_text;
		1622	}
		1623	if (@{$self->{history} || []} > 0) {
		1624	$self->{history_pointer}++;
		1625	if ($self->{history_pointer} >= @{$self->{history} || []}) {
		1626	$self->{history_pointer} = @{$self->{history} || []} - 1;
		1627	}
		1628	$self->set_text ($self->{history}->[$self->{history_pointer}]);
		1629	}
		1630
		1631	} elsif ($sym == CFClient::SDLK_DOWN) {
		1632	$self->{history_pointer}--;
		1633	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
		1634
		1635	if ($self->{history_pointer} >= 0) {
		1636	$self->set_text ($self->{history}->[$self->{history_pointer}]);
		1637	} else {
		1638	$self->set_text ($self->{history_saveback});
		1639	}
1425		1640
1426	} else {	1641	} else {
1427	$self->SUPER::key_down ($ev);	1642	$self->SUPER::key_down ($ev);
1428	}	1643	}
1429		1644
…		…
1443		1658
1444	sub new {	1659	sub new {
1445	my $class = shift;	1660	my $class = shift;
1446		1661
1447	$class->SUPER::new (	1662	$class->SUPER::new (
1448	padding => 4,	1663	padding => 4,
1449	fg => [1, 1, 1],	1664	fg => [1, 1, 1],
1450	bg => [1, 1, 1, 0.2],	1665	bg => [1, 1, 1, 0.2],
1451	active_fg => [0, 0, 1],	1666	active_fg => [0, 0, 1],
1452	can_hover => 1,	1667	can_hover => 1,
1453	align => 0,	1668	align => 0,
1454	valign => 0,	1669	valign => 0,
1455	can_events => 1,	1670	can_events => 1,
1456	@_	1671	@_
1457	)	1672	)
1458	}	1673	}
1459		1674
…		…
1473		1688
1474	if ($GRAB == $self) {	1689	if ($GRAB == $self) {
1475	$self->{fg} = $self->{active_fg};	1690	$self->{fg} = $self->{active_fg};
1476	}	1691	}
1477		1692
1478	glEnable GL_BLEND;
1479	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1480	glEnable GL_TEXTURE_2D;	1693	glEnable GL_TEXTURE_2D;
1481	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1694	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1482	glColor 0, 0, 0, 1;	1695	glColor 0, 0, 0, 1;
1483		1696
1484	$tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});	1697	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1485		1698
1486	glDisable GL_TEXTURE_2D;	1699	glDisable GL_TEXTURE_2D;
1487	glDisable GL_BLEND;
1488		1700
1489	$self->SUPER::_draw;	1701	$self->SUPER::_draw;
1490	}	1702	}
1491		1703
1492	#############################################################################	1704	#############################################################################
…		…
1539		1751
1540	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1752	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1541		1753
1542	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1754	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1543		1755
1544	glEnable GL_BLEND;	1756	my $tex = $self->{state} ? $tex[1] : $tex[0];
		1757
1545	glEnable GL_TEXTURE_2D;	1758	glEnable GL_TEXTURE_2D;
1546	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1547
1548	my $tex = $self->{state} ? $tex[1] : $tex[0];
1549
1550	$tex->draw_quad (0, 0, $s, $s);	1759	$tex->draw_quad_alpha (0, 0, $s, $s);
1551
1552	glDisable GL_TEXTURE_2D;	1760	glDisable GL_TEXTURE_2D;
1553	glDisable GL_BLEND;
1554	}	1761	}
1555		1762
1556	#############################################################################	1763	#############################################################################
1557		1764
1558	package CFClient::UI::Image;	1765	package CFClient::UI::Image;
…		…
1601	glTranslate 0, -$self->{w}, 0;	1808	glTranslate 0, -$self->{w}, 0;
1602		1809
1603	($w, $h) = ($h, $w);	1810	($w, $h) = ($h, $w);
1604	}	1811	}
1605		1812
1606	glEnable GL_BLEND;
1607	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1608	glEnable GL_TEXTURE_2D;	1813	glEnable GL_TEXTURE_2D;
1609	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1814	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1610		1815
1611	$tex->draw_quad (0, 0, $w, $h);	1816	$tex->draw_quad_alpha (0, 0, $w, $h);
1612		1817
1613	glDisable GL_BLEND;
1614	glDisable GL_TEXTURE_2D;	1818	glDisable GL_TEXTURE_2D;
1615	}	1819	}
1616		1820
1617	#############################################################################	1821	#############################################################################
1618		1822
…		…
1666	}	1870	}
1667		1871
1668	sub set_max {	1872	sub set_max {
1669	my ($self, $max) = @_;	1873	my ($self, $max) = @_;
1670		1874
		1875	return if $self->{max_val} == $max;
		1876
1671	$self->{max_val} = $max;	1877	$self->{max_val} = $max;
		1878	$self->update;
1672	}	1879	}
1673		1880
1674	sub set_value {	1881	sub set_value {
1675	my ($self, $val, $max) = @_;	1882	my ($self, $val, $max) = @_;
1676		1883
1677	$self->set_max ($max)	1884	$self->set_max ($max)
1678	if defined $max;	1885	if defined $max;
1679		1886
1680	$max = $self->{max_val};	1887	return if $self->{val} == $val;
		1888
1681	$self->{val} = $val;	1889	$self->{val} = $val;
1682
1683	$self->update;	1890	$self->update;
1684	}	1891	}
1685		1892
1686	sub _draw {	1893	sub _draw {
1687	my ($self) = @_;	1894	my ($self) = @_;
…		…
1750		1957
1751	sub new {	1958	sub new {
1752	my ($class, %arg) = @_;	1959	my ($class, %arg) = @_;
1753		1960
1754	my $self = $class->SUPER::new (	1961	my $self = $class->SUPER::new (
1755	tooltip => $arg{type},	1962	tooltip => $arg{type},
		1963	can_hover => 1,
		1964	can_events => 1,
1756	%arg,	1965	%arg,
1757	);	1966	);
1758		1967
1759	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999", can_events => 1, can_hover => 1);	1968	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1760	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_events => 1, can_hover => 1);	1969	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1761	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999", can_events => 1, can_hover => 1);	1970	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1762		1971
1763	$self	1972	$self
1764	}	1973	}
1765		1974
1766	sub set_fontsize {	1975	sub set_fontsize {
…		…
1768		1977
1769	$self->{value}->set_fontsize ($fsize);	1978	$self->{value}->set_fontsize ($fsize);
1770	$self->{max} ->set_fontsize ($fsize);	1979	$self->{max} ->set_fontsize ($fsize);
1771	}	1980	}
1772		1981
		1982	sub set_max {
		1983	my ($self, $max) = @_;
		1984
		1985	$self->{gauge}->set_max ($max);
		1986	$self->{max}->set_text ($max);
		1987	}
		1988
1773	sub set_value {	1989	sub set_value {
1774	my ($self, $val, $max) = @_;	1990	my ($self, $val, $max) = @_;
1775		1991
1776	$self->set_max ($max)	1992	$self->set_max ($max)
1777	if defined $max;	1993	if defined $max;
1778		1994
1779	$self->{gauge}->set_value ($val, $max);	1995	$self->{gauge}->set_value ($val, $max);
1780	$self->{value}->set_text ($val);	1996	$self->{value}->set_text ($val);
1781	}
1782
1783	sub set_max {
1784	my ($self, $max) = @_;
1785
1786	$self->{gauge}->set_max ($max);
1787	$self->{max}->set_text ($max);
1788	}	1997	}
1789		1998
1790	#############################################################################	1999	#############################################################################
1791		2000
1792	package CFClient::UI::Slider;	2001	package CFClient::UI::Slider;
…		…
1802	qw(s1_slider.png s1_slider_bg.png);	2011	qw(s1_slider.png s1_slider_bg.png);
1803		2012
1804	sub new {	2013	sub new {
1805	my $class = shift;	2014	my $class = shift;
1806		2015
1807	# range [value, low, high, page]	2016	# range [value, low, high, page, unit]
1808		2017
1809	# TODO: 0-width page	2018	# TODO: 0-width page
1810	# TODO: req_w/h are wrong with vertical	2019	# TODO: req_w/h are wrong with vertical
1811	# TODO: calculations are off	2020	# TODO: calculations are off
1812	my $self = $class->SUPER::new (	2021	my $self = $class->SUPER::new (
1813	fg => [1, 1, 1],	2022	fg => [1, 1, 1],
1814	active_fg => [0, 0, 0],	2023	active_fg => [0, 0, 0],
1815	range => [0, 0, 100, 10],	2024	range => [0, 0, 100, 10],
1816	req_w => 20,	2025	req_w => $::WIDTH / 80,
1817	req_h => 20,	2026	req_h => $::WIDTH / 80,
1818	vertical => 0,	2027	vertical => 0,
1819	can_hover => 1,	2028	can_hover => 1,
1820	inner_pad => 5,	2029	inner_pad => .05,
1821	@_	2030	@_
1822	);	2031	);
1823		2032
		2033	$self->set_value ($self->{range}[0]);
		2034	$self->update;
		2035
1824	$self	2036	$self
		2037	}
		2038
		2039	sub set_value {
		2040	my ($self, $value) = @_;
		2041
		2042	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
		2043
		2044	$hi = $lo + 1 if $hi <= $lo;
		2045
		2046	$value = $lo if $value < $lo;
		2047	$value = $hi if $value > $hi;
		2048
		2049	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
		2050	if $unit;
		2051
		2052	$page = $hi - $lo if $page > $hi - $lo;
		2053
		2054	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
		2055
		2056	if ($value != $old_value) {
		2057	$self->emit (changed => $value);
		2058	$self->update;
		2059	}
1825	}	2060	}
1826		2061
1827	sub size_request {	2062	sub size_request {
1828	my ($self) = @_;	2063	my ($self) = @_;
1829		2064
…		…
1842		2077
1843	sub mouse_motion {	2078	sub mouse_motion {
1844	my ($self, $ev, $x, $y) = @_;	2079	my ($self, $ev, $x, $y) = @_;
1845		2080
1846	if ($GRAB == $self) {	2081	if ($GRAB == $self) {
		2082	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
		2083
		2084	my (undef, $lo, $hi, $page) = @{$self->{range}};
		2085
		2086	$x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};
		2087
		2088	$self->set_value ($x * ($hi - $lo) + $lo);
		2089	}
		2090	}
		2091
		2092	sub update {
		2093	my ($self) = @_;
		2094
		2095	$CFClient::UI::ROOT->on_post_alloc ($self => sub {
		2096	$self->set_value ($self->{range}[0]);
		2097
1847	my ($value, $lo, $hi, $page) = @{$self->{range}};	2098	my ($value, $lo, $hi, $page) = @{$self->{range}};
1848		2099
1849	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2100	my $inner_w = 1 - 2 * $self->{inner_pad};
1850		2101
1851	my $inner_pad_px = $self->_calc_inner_pad_px ($w);	2102	$self->{scale} = ($inner_w / ($hi - $lo)) || 1;
1852	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1853		2103
1854	$x -= $inner_pad_px; # substract the padding	2104	$page = $self->{scale} * $page || 10 / ($self->{w} || 1);
1855	$x = $x * ($hi - $lo) / $inner_w + $lo;	2105	$value = $self->{scale} * ($value - $lo);
1856	$x = $lo if $x < $lo;
1857	$x = $hi - $page if $x > $hi - $page;
1858	$self->{range}[0] = $x;
1859		2106
1860	$self->emit (changed => $x);	2107	$value = $self->{inner_pad} + ($value - $page * 0.5);
1861	$self->update;	2108
		2109	$value = 0 if $value < 0;
		2110	$page = 1 - $value if $value + $page > 1;
		2111
		2112	$self->{knob_x} = $value;
		2113	$self->{knob_w} = $page;
1862	}	2114	});
1863	}
1864		2115
1865	# the inner_* stuff is for generating a padding for the slider handle,	2116	$self->SUPER::update;
1866	# so that the handle doesn't leave the texture. This calculation isn't 100%
1867	# correct propably, but it does the job for now
1868	sub _calc_inner_pad_px {
1869	my ($self, $w) = @_;
1870	($w / 100) * $self->{inner_pad} # % to pixels
1871	}	2117	}
1872		2118
1873	sub _draw {	2119	sub _draw {
1874	my ($self) = @_;	2120	my ($self) = @_;
1875		2121
1876	$self->SUPER::_draw ();	2122	$self->SUPER::_draw ();
1877		2123
1878	my ($w, $h) = @$self{qw(w h)};	2124	glScale $self->{w}, $self->{h};
1879		2125
1880	if ($self->{vertical}) {	2126	if ($self->{vertical}) {
1881	# draw a vertical slider like a rotated horizontal slider	2127	# draw a vertical slider like a rotated horizontal slider
1882		2128
1883	glRotate 90, 0, 0, 1;	2129	glRotate 90, 0, 0, 1;
1884	glTranslate 0, -$self->{w}, 0;	2130	glTranslate 0, 1, 0;
1885
1886	($w, $h) = ($h, $w);
1887	}	2131	}
1888		2132
1889	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	2133	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1890	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	2134	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1891		2135
1892	my ($value, $lo, $hi, $page) = @{$self->{range}};
1893
1894	$hi = $value + 1 if $lo == $hi;
1895
1896	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1897	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1898
1899	$page = int $page * $inner_w / ($hi - $lo);
1900	$value = int +($value - $lo) * $inner_w / ($hi - $lo);
1901
1902	$w -= $page;
1903	$page &= ~1;
1904	glTranslate $page * 0.5, 0, 0;
1905	$page ||= 2;
1906
1907	my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1908	my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1909
1910	glEnable GL_BLEND;
1911	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1912	glEnable GL_TEXTURE_2D;	2136	glEnable GL_TEXTURE_2D;
1913	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2137	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1914		2138
1915	# draw background	2139	# draw background
1916	$tex[1]->draw_quad (0, 0, $w, $h);	2140	$tex[1]->draw_quad_alpha (0, 0, 1, 1);
1917		2141
1918	# draw handle	2142	# draw handle
1919	$tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);	2143	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
1920		2144
1921	glDisable GL_BLEND;
1922	glDisable GL_TEXTURE_2D;	2145	glDisable GL_TEXTURE_2D;
1923	}	2146	}
1924		2147
1925	#############################################################################	2148	#############################################################################
1926		2149
…		…
1932		2155
1933	sub new {	2156	sub new {
1934	my $class = shift;	2157	my $class = shift;
1935		2158
1936	my $self = $class->SUPER::new (	2159	my $self = $class->SUPER::new (
1937	fontsize => 1,	2160	fontsize => 1,
		2161	can_events => 0,
1938	#font => default_font	2162	#font => default_font
1939	@_,	2163	@_,
1940		2164
1941	layout => (new CFClient::Layout),	2165	layout => (new CFClient::Layout 1),
1942	par => [],	2166	par => [],
1943	height => 0,	2167	height => 0,
1944	children => [	2168	children => [
1945	(new CFClient::UI::Empty expand => 1),	2169	(new CFClient::UI::Empty expand => 1),
1946	(new CFClient::UI::Slider vertical => 1),	2170	(new CFClient::UI::Slider vertical => 1),
1947	],	2171	],
1948	);	2172	);
1949		2173
1950	$self->{children}[1]->connect (changed => sub {	2174	$self->{children}[1]->connect (changed => sub { $self->update });
1951	$self->update;
1952	});
1953		2175
1954	$self	2176	$self
1955	}	2177	}
1956		2178
1957	sub set_fontsize {	2179	sub set_fontsize {
…		…
1965	my ($self, $text) = @_;	2187	my ($self, $text) = @_;
1966		2188
1967	my $layout = $self->{layout};	2189	my $layout = $self->{layout};
1968		2190
1969	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2191	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
1970	$layout->set_width ($self->{w});	2192	$layout->set_width ($self->{children}[0]{w});
1971	$layout->set_text ($text);	2193	$layout->set_markup ($text);
1972		2194
1973	($layout->size)[1]	2195	($layout->size)[1]
1974	}	2196	}
1975		2197
1976	sub reflow {	2198	sub reflow {
…		…
2014		2236
2015	return unless $self->{h} > 0;	2237	return unless $self->{h} > 0;
2016		2238
2017	delete $self->{texture};	2239	delete $self->{texture};
2018		2240
2019	$ROOT->on_refresh ($self, sub {	2241	$ROOT->on_post_alloc ($self, sub {
2020	if (delete $self->{need_reflow}) {	2242	if (delete $self->{need_reflow}) {
2021	my $height = 0;	2243	my $height = 0;
2022		2244
2023	$height += $_->[0] = $self->text_height ($_->[2])	2245	$height += $_->[0] = $self->text_height ($_->[2])
2024	for @{$self->{par}};	2246	for @{$self->{par}};
…		…
2028	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2250	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2029		2251
2030	delete $self->{texture};	2252	delete $self->{texture};
2031	}	2253	}
2032		2254
2033	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	2255	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2034	glClearColor 0, 0, 0, 1;	2256	glClearColor 0, 0, 0, 0;
2035	glClear GL_COLOR_BUFFER_BIT;	2257	glClear GL_COLOR_BUFFER_BIT;
2036		2258
2037	glEnable GL_BLEND;
2038	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2039	glEnable GL_TEXTURE_2D;	2259	glEnable GL_TEXTURE_2D;
2040	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2260	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2041		2261
2042	my $top = int $self->{children}[1]{range}[0];	2262	my $top = int $self->{children}[1]{range}[0];
2043		2263
…		…
2052		2272
2053	for my $par (@{$self->{par}}) {	2273	for my $par (@{$self->{par}}) {
2054	my $h = $par->[0];	2274	my $h = $par->[0];
2055		2275
2056	if ($y0 < $y + $h && $y < $y1) {	2276	if ($y0 < $y + $h && $y < $y1) {
		2277	$layout->set_foreground (@{ $par->[1] });
2057	$layout->set_text ($par->[2]);	2278	$layout->set_markup ($par->[2]);
2058		2279
2059	glColor @{ $par->[1] };
2060	my ($W, $H) = $layout->size;	2280	my ($W, $H) = $layout->size;
2061	CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);	2281	CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);
2062	}	2282	}
2063		2283
2064	$y += $h;	2284	$y += $h;
2065	}	2285	}
2066		2286
2067	glDisable GL_TEXTURE_2D;	2287	glDisable GL_TEXTURE_2D;
2068	glDisable GL_BLEND;
2069	};	2288	};
2070	});	2289	});
2071	}	2290	}
2072		2291
2073	sub _draw {	2292	sub _draw {
2074	my ($self) = @_;	2293	my ($self) = @_;
2075		2294
2076	if ($self->{texture}) {
2077	glEnable GL_TEXTURE_2D;	2295	glEnable GL_TEXTURE_2D;
2078	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2296	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2079	$self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});	2297	glColor 1, 1, 1, 1;
		2298	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2080	glDisable GL_TEXTURE_2D;	2299	glDisable GL_TEXTURE_2D;
2081	}
2082		2300
2083	$self->{children}[1]->draw;	2301	$self->{children}[1]->draw;
2084		2302
2085	}	2303	}
2086		2304
…		…
2134		2352
2135	sub new {	2353	sub new {
2136	my $class = shift;	2354	my $class = shift;
2137		2355
2138	my $self = $class->SUPER::new (	2356	my $self = $class->SUPER::new (
2139	state => 0,	2357	state => 0,
2140	connect_activate => \&toggle_flopper,	2358	connect_activate => \&toggle_flopper,
2141	can_events => 1,
2142	@_	2359	@_
2143	);	2360	);
2144		2361
2145	if ($self->{state}) {	2362	if ($self->{state}) {
2146	$self->{state} = 0;	2363	$self->{state} = 0;
…		…
2181	@_,	2398	@_,
2182	can_events => 0,	2399	can_events => 0,
2183	)	2400	)
2184	}	2401	}
2185		2402
2186	sub set_text {	2403	sub set_tooltip_from {
2187	my ($self, $text) = @_;	2404	my ($self, $widget) = @_;
2188		2405
2189	$self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];	2406	$self->add (new CFClient::UI::Label
2190	$self->{label}->set_text ($text);	2407	markup => $widget->{tooltip},
2191	$self->add ($self->{label});	2408	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
		2409	fontsize => 0.8,
		2410	fg => [0, 0, 0, 1],
		2411	font => ($widget->{tooltip_font} || $::FONT_PROP),
		2412	);
2192	}	2413	}
2193		2414
2194	sub size_request {	2415	sub size_request {
2195	my ($self) = @_;	2416	my ($self) = @_;
2196		2417
2197	$self->child->set_max_size ($::WIDTH * 0.2);
2198
2199	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	2418	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2200		2419
2201	($w + 4, $h + 4)	2420	($w + 4, $h + 4)
2202	}	2421	}
2203		2422
		2423	sub size_allocate {
		2424	my ($self, $w, $h) = @_;
		2425
		2426	$self->SUPER::size_allocate ($w - 4, $h - 4);
		2427	}
		2428
2204	sub _draw {	2429	sub _draw {
2205	my ($self) = @_;	2430	my ($self) = @_;
2206		2431
2207	glPushMatrix;
2208	glTranslate 0.375, 0.375;	2432	glTranslate 0.375, 0.375;
2209		2433
2210	my ($w, $h) = @$self{qw(w h)};	2434	my ($w, $h) = @$self{qw(w h)};
2211		2435
2212	glColor 1, 0.8, 0.4;	2436	glColor 1, 0.8, 0.4;
…		…
2223	glVertex 0 , $h;	2447	glVertex 0 , $h;
2224	glVertex $w, $h;	2448	glVertex $w, $h;
2225	glVertex $w, 0;	2449	glVertex $w, 0;
2226	glEnd;	2450	glEnd;
2227		2451
2228	glPopMatrix;	2452	glTranslate 2 - 0.375, 2 - 0.375;
2229
2230	glTranslate 2, 2;
2231	$self->SUPER::_draw;	2453	$self->SUPER::_draw;
2232	}	2454	}
2233		2455
2234	#############################################################################	2456	#############################################################################
2235		2457
		2458	package CFClient::UI::Face;
		2459
		2460	our @ISA = CFClient::UI::Base::;
		2461
		2462	use CFClient::OpenGL;
		2463
		2464	sub new {
		2465	my $class = shift;
		2466
		2467	$class->SUPER::new (
		2468	aspect => 1,
		2469	@_,
		2470	)
		2471	}
		2472
		2473	sub size_request {
		2474	(32, 8)
		2475	}
		2476
		2477	sub _draw {
		2478	my ($self) = @_;
		2479
		2480	return unless $::CONN;#d# manage and cache textures differently
		2481	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
		2482
		2483	# TODO animation
		2484	if ($tex) {
		2485	glEnable GL_TEXTURE_2D;
		2486	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2487	glColor 1, 1, 1, 1;
		2488	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
		2489	glDisable GL_TEXTURE_2D;
		2490	}
		2491	}
		2492
		2493	#############################################################################
		2494
		2495	package CFClient::UI::InventoryItem;
		2496
		2497	our @ISA = CFClient::UI::HBox::;
		2498
		2499	sub new {
		2500	my $class = shift;
		2501
		2502	my %args = @_;
		2503
		2504	my $item = delete $args{item};
		2505
		2506	my $desc = $item->{nrof} < 2
		2507	? $item->{name}
		2508	: "$item->{nrof} $item->{name_pl}";
		2509
		2510	$item->{flags} & Crossfire::Protocol::F_OPEN
		2511	and $desc .= " (open)";
		2512	$item->{flags} & Crossfire::Protocol::F_APPLIED
		2513	and $desc .= " (applied)";
		2514	$item->{flags} & Crossfire::Protocol::F_UNPAID
		2515	and $desc .= " (unpaid)";
		2516	$item->{flags} & Crossfire::Protocol::F_MAGIC
		2517	and $desc .= " (magic)";
		2518	$item->{flags} & Crossfire::Protocol::F_CURSED
		2519	and $desc .= " (cursed)";
		2520	$item->{flags} & Crossfire::Protocol::F_DAMNED
		2521	and $desc .= " (damned)";
		2522	$item->{flags} & Crossfire::Protocol::F_LOCKED
		2523	and $desc .= " *";
		2524
		2525	my $self = $class->SUPER::new (
		2526	can_hover => 1,
		2527	can_events => 1,
		2528	tooltip => (CFClient::UI::Label->escape ($desc)
		2529	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
		2530	connect_button_down => sub {
		2531	my ($self, $ev, $x, $y) = @_;
		2532
		2533	# todo: maybe put examine on 1? but should just be a tooltip :(
		2534	if ($ev->{button} == 1) {
		2535	$::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
		2536	} elsif ($ev->{button} == 2) {
		2537	$::CONN->send ("apply $item->{tag}");
		2538	} elsif ($ev->{button} == 3) {
		2539	my @menu_items = (
		2540	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
		2541	["mark", sub { $::CONN->send ("mark $item->{tag}") }],
		2542	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
		2543	["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
		2544	[
		2545	$item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
		2546	sub { $::CONN->send ("lock ". () ."$item->{tag}") },
		2547	],
		2548	);
		2549
		2550	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
		2551	}
		2552
		2553	1
		2554	},
		2555	%args
		2556	);
		2557
		2558	$self->add (new CFClient::UI::Face
		2559	can_events => 0,
		2560	face => $item->{face},
		2561	anim => $item->{anim},
		2562	animspeed => $item->{animspeed},
		2563	);
		2564
		2565	$self->add (new CFClient::UI::Label
		2566	can_events => 0,
		2567	text => $desc,
		2568	);
		2569
		2570	$self
		2571	}
		2572
		2573	#############################################################################
		2574
		2575	package CFClient::UI::Inventory;
		2576
		2577	our @ISA = CFClient::UI::ScrolledWindow::;
		2578
		2579	sub new {
		2580	my $class = shift;
		2581
		2582	my $self = $class->SUPER::new (
		2583	scrolled => (new CFClient::UI::VBox),
		2584	@_,
		2585	);
		2586
		2587	$self
		2588	}
		2589
		2590	sub set_items {
		2591	my ($self, $items) = @_;
		2592
		2593	$self->{scrolled}->clear;
		2594	return unless $items;
		2595
		2596	my @items = sort {
		2597	($a->{type} <=> $b->{type})
		2598	or ($a->{name} cmp $b->{name})
		2599	} @$items;
		2600
		2601	$self->{real_items} = \@items;
		2602
		2603	for my $item (@items) {
		2604	my $desc = $item->{nrof} < 2
		2605	? $item->{name}
		2606	: "$item->{nrof} $item->{name_pl}";
		2607
		2608	$item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
		2609	}
		2610
		2611	$self->{scrolled}->add (@items);
		2612
		2613	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
		2614	}
		2615
		2616	sub size_request {
		2617	my ($self) = @_;
		2618	($self->{req_w}, $self->{req_h});
		2619	}
		2620
		2621	#############################################################################
		2622
		2623	package CFClient::UI::Menu;
		2624
		2625	our @ISA = CFClient::UI::FancyFrame::;
		2626
		2627	use CFClient::OpenGL;
		2628
		2629	sub new {
		2630	my $class = shift;
		2631
		2632	my $self = $class->SUPER::new (
		2633	items => [],
		2634	z => 100,
		2635	@_,
		2636	);
		2637
		2638	$self->add ($self->{vbox} = new CFClient::UI::VBox);
		2639
		2640	for my $item (@{ $self->{items} }) {
		2641	my ($widget, $cb) = @$item;
		2642
		2643	# handle various types of items, only text for now
		2644	if (!ref $widget) {
		2645	$widget = new CFClient::UI::Label
		2646	can_hover => 1,
		2647	can_events => 1,
		2648	text => $widget;
		2649	}
		2650
		2651	$self->{item}{$widget} = $item;
		2652
		2653	$self->{vbox}->add ($widget);
		2654	}
		2655
		2656	$self
		2657	}
		2658
		2659	# popup given the event (must be a mouse button down event currently)
		2660	sub popup {
		2661	my ($self, $ev) = @_;
		2662
		2663	$self->emit ("popdown");
		2664
		2665	# maybe save $GRAB? must be careful about events...
		2666	$GRAB = $self;
		2667	$self->{button} = $ev->{button};
		2668
		2669	$self->show;
		2670	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
		2671	}
		2672
		2673	sub mouse_motion {
		2674	my ($self, $ev, $x, $y) = @_;
		2675
		2676	# TODO: should use vbox->find_widget or so
		2677	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
		2678	$self->{hover} = $self->{item}{$HOVER};
		2679	}
		2680
		2681	sub button_up {
		2682	my ($self, $ev, $x, $y) = @_;
		2683
		2684	if ($ev->{button} == $self->{button}) {
		2685	undef $GRAB;
		2686	$self->hide;
		2687
		2688	$self->emit ("popdown");
		2689	$self->{hover}[1]->() if $self->{hover};
		2690	}
		2691	}
		2692
		2693	#############################################################################
		2694
		2695	package CFClient::UI::Statusbox;
		2696
		2697	our @ISA = CFClient::UI::VBox::;
		2698
		2699	sub reorder {
		2700	my ($self) = @_;
		2701	my $NOW = time;
		2702
		2703	while (my ($k, $v) = each %{ $self->{item} }) {
		2704	delete $self->{item}{$k} if $v->{timeout} < $NOW;
		2705	}
		2706
		2707	my @widgets;
		2708
		2709	my @items = sort {
		2710	$a->{pri} <=> $b->{pri}
		2711	or $b->{id} <=> $a->{id}
		2712	} values %{ $self->{item} };
		2713
		2714	my $count = 10 + 1;
		2715	for my $item (@items) {
		2716	last unless --$count;
		2717
		2718	push @widgets, $item->{label} ||= do {
		2719	# TODO: doesn't handle markup well (read as: at all)
		2720	my $short = $item->{count} > 1
		2721	? "<b>$item->{count} ×</b> $item->{text}"
		2722	: $item->{text};
		2723
		2724	for ($short) {
		2725	s/^\s+//;
		2726	s/\s+/ /g;
		2727	my $len = int 40 / $item->{fontsize};
		2728	substr $_, $len, length, "…" if $len < length;
		2729	}
		2730
		2731	new CFClient::UI::Label
		2732	markup => $short,
		2733	tooltip => $item->{tooltip},
		2734	tooltip_font => $::FONT_PROP,
		2735	tooltip_width => 0.67,
		2736	fontsize => $item->{fontsize},
		2737	fg => $item->{fg},
		2738	can_events => 1,
		2739	can_hover => 1
		2740	};
		2741	}
		2742
		2743	$self->clear;
		2744	$self->SUPER::add (reverse @widgets);
		2745	}
		2746
		2747	sub add {
		2748	my ($self, $text, %arg) = @_;
		2749
		2750	$text =~ s/^\s+//;
		2751	$text =~ s/\s+$//;
		2752
		2753	my $timeout = time + ((delete $arg{timeout}) || 60);
		2754
		2755	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
		2756
		2757	if (my $item = $self->{item}{$group}) {
		2758	if ($item->{text} eq $text) {
		2759	$item->{count}++;
		2760	} else {
		2761	$item->{count} = 1;
		2762	$item->{text} = $item->{tooltip} = $text;
		2763	}
		2764	$item->{id} = ++$self->{id};
		2765	$item->{timeout} = $timeout;
		2766	delete $item->{label};
		2767	} else {
		2768	$self->{item}{$group} = {
		2769	id => ++$self->{id},
		2770	text => $text,
		2771	timeout => $timeout,
		2772	tooltip => $text,
		2773	fontsize => 0.8,
		2774	fg => [0.8, 0.8, 0.8, 0.8],
		2775	pri => 0,
		2776	count => 1,
		2777	%arg,
		2778	};
		2779	}
		2780
		2781	$self->reorder;
		2782	}
		2783
		2784	#############################################################################
		2785
2236	package CFClient::UI::Root;	2786	package CFClient::UI::Root;
2237		2787
2238	our @ISA = CFClient::UI::Container::;	2788	our @ISA = CFClient::UI::Container::;
2239		2789
2240	use CFClient::OpenGL;	2790	use CFClient::OpenGL;
2241		2791
2242	sub check_size {	2792	sub new {
2243	my ($self) = @_;	2793	my $class = shift;
2244		2794
2245	$self->configure (0, 0, $::WIDTH, $::HEIGHT);	2795	$class->SUPER::new (
2246	}	2796	@_,
2247		2797	)
2248	sub size_request {
2249	($::WIDTH, $::HEIGHT)
2250	}	2798	}
2251		2799
2252	sub configure {	2800	sub configure {
2253	my ($self, $x, $y, $w, $h) = @_;	2801	my ($self, $x, $y, $w, $h) = @_;
2254		2802
2255	$self->SUPER::configure ($x, $y, $w, $h);	2803	$self->{w} = $w;
		2804	$self->{h} = $h;
		2805	}
2256		2806
		2807	sub check_size {
		2808	my ($self) = @_;
		2809
		2810	$self->size_allocate ($self->{w}, $self->{h})
		2811	if $self->{w};
		2812	}
		2813
		2814	sub size_request {
		2815	my ($self) = @_;
		2816
		2817	($self->{w}, $self->{h})
		2818	}
		2819
		2820	sub size_allocate {
		2821	my ($self, $w, $h) = @_;
		2822
		2823	my $old_w = $self->{old_w}; $self->{old_w} = $w;
		2824	my $old_h = $self->{old_h}; $self->{old_h} = $h;
		2825
		2826	CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
		2827	if $old_w && $old_h && ($old_w != $w || $old_h != $h);
		2828
2257	for my $child (@{$self->{children}}) {	2829	for my $child ($self->children) {
2258	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	2830	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2259		2831
		2832	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
		2833	if exists $child->{req_x};
		2834
		2835	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
		2836	if exists $child->{req_y};
		2837
2260	$X = List::Util::max 0, List::Util::min $w - $W, $X;	2838	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2261	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;	2839	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
		2840
2262	$child->configure ($X, $Y, $W,$H);	2841	$child->configure ($X, $Y, $W, $H);
2263	}	2842	}
2264	}	2843	}
2265		2844
2266	sub _topleft {	2845	sub coord2local {
2267	my ($self, $x, $y) = @_;	2846	my ($self, $x, $y) = @_;
2268		2847
2269	($x, $y)	2848	($x, $y)
2270	}	2849	}
2271		2850
		2851	sub coord2global {
		2852	my ($self, $x, $y) = @_;
		2853
		2854	($x, $y)
		2855	}
		2856
2272	sub update {	2857	sub update {
2273	my ($self) = @_;	2858	my ($self) = @_;
2274		2859
2275	$self->check_size;	2860	$self->check_size;
2276	::refresh ();	2861	$::WANT_REFRESH++;
2277	}	2862	}
2278		2863
2279	sub add {	2864	sub add {
2280	my ($self, $child) = @_;	2865	my ($self, @children) = @_;
2281		2866
		2867	for my $child (@children) {
		2868	$child->{toplevel} = 1;
		2869
2282	# integerize window positions	2870	# integerise window positions
2283	$child->{x} = int $child->{x};	2871	$child->{x} = int $child->{x};
2284	$child->{y} = int $child->{y};	2872	$child->{y} = int $child->{y};
		2873	}
2285		2874
2286	$self->SUPER::add ($child);	2875	$self->SUPER::add (@children);
2287	}	2876	}
2288		2877
2289	sub on_refresh {	2878	sub on_refresh {
2290	my ($self, $id, $cb) = @_;	2879	my ($self, $id, $cb) = @_;
2291		2880
2292	$self->{refresh_hook}{$id} = $cb;	2881	$self->{refresh_hook}{$id} = $cb;
2293	}	2882	}
2294		2883
		2884	sub on_post_alloc {
		2885	my ($self, $id, $cb) = @_;
		2886
		2887	$self->{post_alloc_hook}{$id} = $cb;
		2888	}
		2889
2295	sub draw {	2890	sub draw {
2296	my ($self) = @_;	2891	my ($self) = @_;
2297		2892
2298	while (my $rcb = delete $self->{refresh_hook}) {	2893	while ($self->{refresh_hook}) {
2299	$_->() for values %$rcb;	2894	$_->()
		2895	for values %{delete $self->{refresh_hook}};
		2896	}
		2897
		2898	if ($self->{check_size}) {
		2899	my @queue = ([], []);
		2900
		2901	for (;;) {
		2902	if ($self->{check_size}) {
		2903	# heuristic: check containers last
		2904	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
		2905	for values %{delete $self->{check_size}}
		2906	}
		2907
		2908	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
		2909
		2910	my ($w, $h) = $widget->{user_w} && $widget->{user_h}
		2911	? @$widget{qw(user_w user_h)}
		2912	: $widget->size_request;
		2913
		2914	if (delete $widget->{force_alloc}
		2915	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
		2916	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
		2917
		2918	$widget->{req_w} = $w;
		2919	$widget->{req_h} = $h;
		2920
		2921	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
		2922
		2923	$widget->{parent}->check_size
		2924	if $widget->{parent};
		2925	}
		2926	}
		2927	}
		2928
		2929	while ($self->{size_alloc}) {
		2930	for (values %{delete $self->{size_alloc}}) {
		2931	my ($widget, $w, $h) = @$_;
		2932
		2933	$w = 0 if $w < 0;
		2934	$h = 0 if $h < 0;
		2935
		2936	$widget->{w} = $w;
		2937	$widget->{h} = $h;
		2938	$widget->size_allocate ($w, $h);
		2939	$widget->emit (size_allocate => $w, $h);
		2940	}
		2941	}
		2942
		2943	while ($self->{post_alloc_hook}) {
		2944	$_->()
		2945	for values %{delete $self->{post_alloc_hook}};
2300	}	2946	}
2301		2947
2302	glViewport 0, 0, $::WIDTH, $::HEIGHT;	2948	glViewport 0, 0, $::WIDTH, $::HEIGHT;
2303	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	2949	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2304	glClear GL_COLOR_BUFFER_BIT;	2950	glClear GL_COLOR_BUFFER_BIT;

Diff Legend

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