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.195 by root, Thu May 11 23:54:31 2006 UTC vs.
Revision 1.240 by root, Fri May 26 18:28:23 2006 UTC

…		…
5		5
6	use Scalar::Util ();	6	use Scalar::Util ();
7	use List::Util ();	7	use List::Util ();
8		8
9	use CFClient;	9	use CFClient;
		10	use CFClient::Texture;
10		11
11	our ($FOCUS, $HOVER, $GRAB); # various widgets	12	our ($FOCUS, $HOVER, $GRAB); # various widgets
12		13
13	our $ROOT;	14	our $ROOT;
14	our $TOOLTIP;	15	our $TOOLTIP;
15	our $BUTTON_STATE;	16	our $BUTTON_STATE;
		17
		18	our %WIDGET; # all widgets, weak-referenced
16		19
17	sub check_tooltip {	20	sub check_tooltip {
18	if (!$GRAB) {	21	if (!$GRAB) {
19	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	22	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
20	if (length $widget->{tooltip}) {	23	if (length $widget->{tooltip}) {
…		…
24		27
25	my $tip = $widget->{tooltip};	28	my $tip = $widget->{tooltip};
26		29
27	$tip = $tip->($widget) if CODE:: eq ref $tip;	30	$tip = $tip->($widget) if CODE:: eq ref $tip;
28		31
29	$TOOLTIP->set_markup ($widget->{tooltip}, $widget->{tooltip_font});	32	$TOOLTIP->set_tooltip_from ($widget);
30
31	$TOOLTIP->show;	33	$TOOLTIP->show;
32		34
33	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	35	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
34		36
35	if ($x + $TOOLTIP->{w} > $::WIDTH) {
36	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);	37	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
37	}	38	if $x + $TOOLTIP->{w} > $::WIDTH;
38		39
39	$TOOLTIP->move ($x, $y);	40	$TOOLTIP->move ($x, $y);
		41	$TOOLTIP->check_size;
		42	$TOOLTIP->update;
40	}	43	}
41		44
42	return;	45	return;
43	}	46	}
44	}	47	}
…		…
48	delete $TOOLTIP->{owner};	51	delete $TOOLTIP->{owner};
49	}	52	}
50		53
51	# class methods for events	54	# class methods for events
52	sub feed_sdl_key_down_event {	55	sub feed_sdl_key_down_event {
53	$FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])	56	$FOCUS->emit (key_down => $_[0])
54	if $FOCUS;	57	if $FOCUS;
55	}	58	}
56		59
57	sub feed_sdl_key_up_event {	60	sub feed_sdl_key_up_event {
58	$FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])	61	$FOCUS->emit (key_up => $_[0])
59	if $FOCUS;	62	if $FOCUS;
60	}	63	}
61		64
62	sub feed_sdl_button_down_event {	65	sub feed_sdl_button_down_event {
63	my ($ev) = @_;	66	my ($ev) = @_;
…		…
72	check_tooltip;	75	check_tooltip;
73	}	76	}
74		77
75	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	78	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
76		79
77	if ($GRAB) {	80	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
78	($x, $y) = $GRAB->coord2local ($x, $y);	81	if $GRAB;
79	$GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
80	}
81	}	82	}
82		83
83	sub feed_sdl_button_up_event {	84	sub feed_sdl_button_up_event {
84	my ($ev) = @_;	85	my ($ev) = @_;
85	my ($x, $y) = ($ev->{x}, $ev->{y});	86	my ($x, $y) = ($ev->{x}, $ev->{y});
86		87
87	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	88	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
88		89
89	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	90	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
90		91
91	if ($GRAB) {	92	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
92	($x, $y) = $GRAB->coord2local ($x, $y);	93	if $GRAB;
93	$GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
94	}
95		94
96	if (!$BUTTON_STATE) {	95	if (!$BUTTON_STATE) {
97	my $grab = $GRAB; undef $GRAB;	96	my $grab = $GRAB; undef $GRAB;
98	$grab->update if $grab;	97	$grab->update if $grab;
99	$GRAB->update if $GRAB;	98	$GRAB->update if $GRAB;
…		…
115	$HOVER->update if $HOVER && $HOVER->{can_hover};	114	$HOVER->update if $HOVER && $HOVER->{can_hover};
116		115
117	check_tooltip;	116	check_tooltip;
118	}	117	}
119		118
120	if ($HOVER) {
121	($x, $y) = $HOVER->coord2local ($x, $y);
122	$HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);	119	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
123	}	120	if $HOVER;
124	}	121	}
125		122
126	# convert position array to integers	123	# convert position array to integers
127	sub harmonize {	124	sub harmonize {
128	my ($vals) = @_;	125	my ($vals) = @_;
…		…
132	for (@$vals) {	129	for (@$vals) {
133	my $i = int $_ + $rem;	130	my $i = int $_ + $rem;
134	$rem += $_ - $i;	131	$rem += $_ - $i;
135	$_ = $i;	132	$_ = $i;
136	}	133	}
		134	}
		135
		136	sub full_refresh {
		137	# make a copy, otherwise for complains about freed values.
		138	my @widgets = values %WIDGET;
		139
		140	$_->update
		141	for @widgets;
		142	}
		143
		144	sub reconfigure_widgets {
		145	# make a copy, otherwise C<for> complains about freed values.
		146	my @widgets = values %WIDGET;
		147
		148	$_->reconfigure
		149	for @widgets;
		150	}
		151
		152	# call when resolution changes etc.
		153	sub rescale_widgets {
		154	my ($sx, $sy) = @_;
		155
		156	for my $widget (values %WIDGET) {
		157	if ($widget->{is_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
		169	reconfigure_widgets;
137	}	170	}
138		171
139	#############################################################################	172	#############################################################################
140		173
141	package CFClient::UI::Base;	174	package CFClient::UI::Base;
…		…
159	if (/^connect_(.*)$/) {	192	if (/^connect_(.*)$/) {
160	$self->connect ($1 => delete $self->{$_});	193	$self->connect ($1 => delete $self->{$_});
161	}	194	}
162	}	195	}
163		196
		197	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
		198
164	$self	199	$self
165	}	200	}
166		201
167	sub destroy {	202	sub destroy {
168	my ($self) = @_;	203	my ($self) = @_;
…		…
171	%$self = ();	206	%$self = ();
172	}	207	}
173		208
174	sub show {	209	sub show {
175	my ($self) = @_;	210	my ($self) = @_;
176
177	return if $self->{parent};	211	return if $self->{parent};
178		212
179	$CFClient::UI::ROOT->add ($self);	213	$CFClient::UI::ROOT->add ($self);
180	}	214	}
181		215
182	sub hide {	216	sub show_centered {
183	my ($self) = @_;	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	);
		227	}
		228
		229	sub set_invisible {
		230	my ($self) = @_;
		231
		232	# broken show/hide model
		233
		234	delete $self->{visible};
184		235
185	undef $GRAB if $GRAB == $self;	236	undef $GRAB if $GRAB == $self;
186	undef $HOVER if $HOVER == $self;	237	undef $HOVER if $HOVER == $self;
		238
		239	CFClient::UI::check_tooltip
		240	if $CFClient::UI::TOOLTIP->{owner} == $self;
		241
		242	$self->focus_out;
		243	}
		244
		245	sub hide {
		246	my ($self) = @_;
		247
		248	$self->set_invisible;
187		249
188	$self->{parent}->remove ($self)	250	$self->{parent}->remove ($self)
189	if $self->{parent};	251	if $self->{parent};
190	}	252	}
191		253
…		…
241		303
242	sub size_allocate {	304	sub size_allocate {
243	# nothing to be done	305	# nothing to be done
244	}	306	}
245		307
		308	sub reconfigure {
		309	my ($self) = @_;
		310
		311	$self->check_size (1);
		312	$self->update;
		313	}
		314
246	sub children {	315	sub children {
247	}
248
249	# call when resolution changes etc.
250	sub reconfigure {
251	my ($self) = @_;
252
253	$_->reconfigure
254	for $self->children;
255
256	$self->check_size;
257	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $self->{w}, $self->{h}];
258	$self->update;
259	}	316	}
260		317
261	sub set_max_size {	318	sub set_max_size {
262	my ($self, $w, $h) = @_;	319	my ($self, $w, $h) = @_;
263		320
264	delete $self->{max_w}; $self->{max_w} = $w if $w;	321	delete $self->{max_w}; $self->{max_w} = $w if $w;
265	delete $self->{max_h}; $self->{max_h} = $h if $h;	322	delete $self->{max_h}; $self->{max_h} = $h if $h;
		323	}
		324
		325	sub set_tooltip {
		326	my ($self, $tooltip) = @_;
		327
		328	$tooltip =~ s/^\s+//;
		329	$tooltip =~ s/\s+$//;
		330
		331	return if $self->{tooltip} eq $tooltip;
		332
		333	$self->{tooltip} = $tooltip;
		334
		335	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
		336	delete $CFClient::UI::TOOLTIP->{owner};
		337	CFClient::UI::check_tooltip;
		338	}
266	}	339	}
267		340
268	# translate global coordinates to local coordinate system	341	# translate global coordinates to local coordinate system
269	sub coord2local {	342	sub coord2local {
270	my ($self, $x, $y) = @_;	343	my ($self, $x, $y) = @_;
…		…
285	return if $FOCUS == $self;	358	return if $FOCUS == $self;
286	return unless $self->{can_focus};	359	return unless $self->{can_focus};
287		360
288	my $focus = $FOCUS; $FOCUS = $self;	361	my $focus = $FOCUS; $FOCUS = $self;
289		362
290	$self->emit (focus_in => $focus);	363	$self->_emit (focus_in => $focus);
291		364
292	$focus->update if $focus;	365	$focus->update if $focus;
293	$FOCUS->update;	366	$FOCUS->update;
294	}	367	}
295		368
…		…
298		371
299	return unless $FOCUS == $self;	372	return unless $FOCUS == $self;
300		373
301	my $focus = $FOCUS; undef $FOCUS;	374	my $focus = $FOCUS; undef $FOCUS;
302		375
303	$self->emit (focus_out => $focus);	376	$self->_emit (focus_out => $focus);
304		377
305	$focus->update if $focus; #?	378	$focus->update if $focus; #?
		379
		380	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
		381	unless $FOCUS;
306	}	382	}
307		383
308	sub mouse_motion { }	384	sub mouse_motion { }
309	sub button_up { }	385	sub button_up { }
310	sub key_down { }	386	sub key_down { }
311	sub key_up { }	387	sub key_up { }
312		388
313	sub button_down {	389	sub button_down {
314	my ($self, $ev, $x, $y) = @_;	390	my ($self, $ev, $x, $y) = @_;
315		391
316	$self->focus_in;	392	$self->focus_in;
…		…
350	if ($ENV{PCLIENT_DEBUG}) {	426	if ($ENV{PCLIENT_DEBUG}) {
351	glPushMatrix;	427	glPushMatrix;
352	glColor 1, 1, 0, 1;	428	glColor 1, 1, 0, 1;
353	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	429	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
354	glBegin GL_LINE_LOOP;	430	glBegin GL_LINE_LOOP;
355	glVertex 0 , 0;	431	glVertex 0 , 0;
356	glVertex $self->{w}, 0;	432	glVertex $self->{w} - 1, 0;
357	glVertex $self->{w}, $self->{h};	433	glVertex $self->{w} - 1, $self->{h} - 1;
358	glVertex 0 , $self->{h};	434	glVertex 0 , $self->{h} - 1;
359	glEnd;	435	glEnd;
360	glPopMatrix;	436	glPopMatrix;
361	CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	437	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
362	}	438	}
363	}	439	}
364		440
365	sub _draw {	441	sub _draw {
366	my ($self) = @_;	442	my ($self) = @_;
…		…
383	sub set_parent {	459	sub set_parent {
384	my ($self, $parent) = @_;	460	my ($self, $parent) = @_;
385		461
386	Scalar::Util::weaken ($self->{parent} = $parent);	462	Scalar::Util::weaken ($self->{parent} = $parent);
387		463
		464	$self->{root} = $parent->{root};
		465	$self->{visible} = $parent->{visible};
		466
		467	# TODO: req_w _does_change after ->reconfigure
388	$self->check_size	468	$self->check_size
389	unless exists $self->{req_w};	469	unless exists $self->{req_w};
		470
		471	$self->show;
390	}	472	}
391		473
392	sub check_size {	474	sub check_size {
393	my ($self) = @_;	475	my ($self, $forced) = @_;
394		476
		477	$self->{force_alloc} = 1 if $forced;
395	$CFClient::UI::ROOT->{check_size}{$self} = $self;	478	$CFClient::UI::ROOT->{check_size}{$self} = $self;
396	}	479	}
397		480
398	sub update {	481	sub update {
399	my ($self) = @_;	482	my ($self) = @_;
…		…
406	my ($self, $signal, $cb) = @_;	489	my ($self, $signal, $cb) = @_;
407		490
408	push @{ $self->{signal_cb}{$signal} }, $cb;	491	push @{ $self->{signal_cb}{$signal} }, $cb;
409	}	492	}
410		493
		494	sub _emit {
		495	my ($self, $signal, @args) = @_;
		496
		497	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
		498	}
		499
411	sub emit {	500	sub emit {
412	my ($self, $signal, @args) = @_;	501	my ($self, $signal, @args) = @_;
413		502
414	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}	503	$self->_emit ($signal, @args)
		504	|| $self->$signal (@args);
415	}	505	}
416		506
417	sub DESTROY {	507	sub DESTROY {
418	my ($self) = @_;	508	my ($self) = @_;
419		509
		510	delete $WIDGET{$self+0};
420	#$self->deactivate;	511	#$self->deactivate;
421	}	512	}
422		513
423	#############################################################################	514	#############################################################################
424		515
…		…
433	my $class = shift;	524	my $class = shift;
434		525
435	# range [value, low, high, page]	526	# range [value, low, high, page]
436		527
437	$class->SUPER::new (	528	$class->SUPER::new (
438	bg => [0, 0, 0, 0.2],	529	#bg => [0, 0, 0, 0.2],
439	active_bg => [1, 1, 1, 0.5],	530	#active_bg => [1, 1, 1, 0.5],
440	@_	531	@_
441	)	532	)
442	}	533	}
443		534
444	sub _draw {	535	sub _draw {
445	my ($self) = @_;	536	my ($self) = @_;
446		537
		538	my $color = $FOCUS == $self && $self->{active_bg}
		539	? $self->{active_bg}
		540	: $self->{bg};
		541
		542	if ($color && (@$color < 4 || $color->[3])) {
447	my ($w, $h) = @$self{qw(w h)};	543	my ($w, $h) = @$self{qw(w h)};
448		544
449	glEnable GL_BLEND;	545	glEnable GL_BLEND;
450	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	546	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
451	glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };	547	glColor @$color;
452		548
453	glBegin GL_QUADS;	549	glBegin GL_QUADS;
454	glVertex 0 , 0;	550	glVertex 0 , 0;
455	glVertex 0 , $h;	551	glVertex 0 , $h;
456	glVertex $w, $h;	552	glVertex $w, $h;
457	glVertex $w, 0;	553	glVertex $w, 0;
458	glEnd;	554	glEnd;
459		555
460	glDisable GL_BLEND;	556	glDisable GL_BLEND;
		557	}
461	}	558	}
462		559
463	#############################################################################	560	#############################################################################
464		561
465	package CFClient::UI::Empty;	562	package CFClient::UI::Empty;
…		…
509	$self->{children} = [	606	$self->{children} = [
510	sort { $a->{z} <=> $b->{z} }	607	sort { $a->{z} <=> $b->{z} }
511	@{$self->{children}}, @widgets	608	@{$self->{children}}, @widgets
512	];	609	];
513		610
514	$self->check_size;	611	$self->check_size (1);
515	$self->update;	612	$self->update;
516	}	613	}
517		614
518	sub children {	615	sub children {
519	@{ $_[0]{children} }	616	@{ $_[0]{children} }
…		…
525	delete $child->{parent};	622	delete $child->{parent};
526	$child->hide;	623	$child->hide;
527		624
528	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	625	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
529		626
530	$self->check_size;	627	$self->check_size (1);
531	$self->update;	628	$self->update;
532	}	629	}
533		630
534	sub clear {	631	sub clear {
535	my ($self) = @_;	632	my ($self) = @_;
…		…
626	}	723	}
627		724
628	sub update {	725	sub update {
629	my ($self) = @_;	726	my ($self) = @_;
630		727
631	$ROOT->on_refresh ($self => sub { $self->render_child });	728	$ROOT->on_post_alloc ($self => sub { $self->render_child });
632	$self->SUPER::update;	729	$self->SUPER::update;
633	}	730	}
634		731
635	sub size_allocate {	732	sub size_allocate {
636	my ($self, $w, $h) = @_;	733	my ($self, $w, $h) = @_;
…		…
649	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	746	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
650	glClearColor 0, 0, 0, 0;	747	glClearColor 0, 0, 0, 0;
651	glClear GL_COLOR_BUFFER_BIT;	748	glClear GL_COLOR_BUFFER_BIT;
652		749
653	$self->_render;	750	$self->_render;
654	# glColorMask 1, 1, 1, 0;
655	# glEnable GL_BLEND;
656	# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
657	# glRasterPos 0, 0;
658	# glCopyPixels 0, 0, $self->{w}, $self->{h};
659	# glDisable GL_BLEND;
660	# glColorMask 1, 1, 1, 1;
661	};	751	};
662	}	752	}
663		753
664	sub _draw {	754	sub _draw {
665	my ($self) = @_;	755	my ($self) = @_;
…		…
669	my $tex = $self->{texture}	759	my $tex = $self->{texture}
670	or return;	760	or return;
671		761
672	glEnable GL_TEXTURE_2D;	762	glEnable GL_TEXTURE_2D;
673	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	763	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
674	glColor 0, 0, 0, 1;	764	glColor 1, 1, 1, 1;
675		765
676	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	766	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
677		767
678	glDisable GL_TEXTURE_2D;	768	glDisable GL_TEXTURE_2D;
679	}	769	}
…		…
682		772
683	package CFClient::UI::ViewPort;	773	package CFClient::UI::ViewPort;
684		774
685	our @ISA = CFClient::UI::Window::;	775	our @ISA = CFClient::UI::Window::;
686		776
		777	sub new {
		778	my $class = shift;
		779
		780	$class->SUPER::new (
		781	scroll_x => 0,
		782	scroll_y => 1,
		783	@_,
		784	)
		785	}
		786
687	sub size_request {	787	sub size_request {
688	my ($self) = @_;	788	my ($self) = @_;
689		789
690	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	790	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
691	$self->child->configure (0, 0, @$self{qw(child_w child_h)});
692		791
693	@$self{qw(child_w child_h)}	792	@$self{qw(child_w child_h)}
694	}	793	}
695		794
696	sub size_allocate {	795	sub size_allocate {
697	my ($self, $w, $h) = @_;	796	my ($self, $w, $h) = @_;
698		797
		798	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
		799	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
		800
		801	$self->child->configure (0, 0, $w, $h);
699	$self->update;	802	$self->update;
700	}	803	}
701		804
702	sub set_offset {	805	sub set_offset {
703	my ($self, $x, $y) = @_;	806	my ($self, $x, $y) = @_;
…		…
757		860
758	my $slider = new CFClient::UI::Slider	861	my $slider = new CFClient::UI::Slider
759	vertical => 1,	862	vertical => 1,
760	range => [0, 0, 1, 0.01], # HACK fix	863	range => [0, 0, 1, 0.01], # HACK fix
761	connect_changed => sub {	864	connect_changed => sub {
762	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));	865	$self->{vp}->set_offset (0, $_[1]);
763	},	866	},
764	;	867	;
765		868
766	$self = $class->SUPER::new (	869	$self = $class->SUPER::new (
767	vp => (new CFClient::UI::ViewPort),	870	vp => (new CFClient::UI::ViewPort expand => 1),
768	slider => $slider,	871	slider => $slider,
769	@_,	872	@_,
770	);	873	);
771		874
772	$self->{vp}->add ($self->{scrolled});	875	$self->{vp}->add ($self->{scrolled});
…		…
774	$self->add ($self->{slider});	877	$self->add ($self->{slider});
775		878
776	$self	879	$self
777	}	880	}
778		881
		882	sub update {
		883	my ($self) = @_;
		884
		885	$self->SUPER::update;
		886
		887	# todo: overwrite size_allocate of child
		888	my $child = $self->{vp}->child;
		889	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
		890	}
		891
		892	sub size_allocate {
		893	my ($self, $w, $h) = @_;
		894
		895	$self->SUPER::size_allocate ($w, $h);
		896
		897	my $child = $self->{vp}->child;
		898	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
		899	}
		900
779	#TODO# update range on size_allocate depeneing on child	901	#TODO# update range on size_allocate depending on child
780	# update viewport offset on scroll	902	# update viewport offset on scroll
781		903
782	#############################################################################	904	#############################################################################
783		905
784	package CFClient::UI::Frame;	906	package CFClient::UI::Frame;
…		…
788	use CFClient::OpenGL;	910	use CFClient::OpenGL;
789		911
790	sub new {	912	sub new {
791	my $class = shift;	913	my $class = shift;
792		914
793	my $self = $class->SUPER::new (	915	$class->SUPER::new (
794	bg => [1, 1, 1, 1],	916	bg => undef,
795	border_bg => [1, 1, 1, 1],
796	border => 0.8,
797	@_	917	@_,
798	);	918	)
799
800	$self
801	}	919	}
802		920
803	sub _draw {	921	sub _draw {
804	my ($self) = @_;	922	my ($self) = @_;
805		923
806	my ($w, $h) = ($self->{w}, $self->{h});	924	if ($self->{bg}) {
		925	my ($w, $h) = @$self{qw(w h)};
807		926
808	glEnable GL_BLEND;	927	glEnable GL_BLEND;
809	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	928	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
810	glEnable GL_TEXTURE_2D;	929	glColor @{ $self->{bg} };
811	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
812		930
813	# glBegin GL_QUADS;	931	glBegin GL_QUADS;
814	# glColor 0, 0, 0, 0;
815	# glVertex 0 , 0;	932	glVertex 0 , 0;
816	# glVertex 0 , $h;	933	glVertex 0 , $h;
817	# glVertex $w, $h;	934	glVertex $w, $h;
818	# glVertex $w, 0;	935	glVertex $w, 0;
819	# glEnd;	936	glEnd;
820		937
821
822	$self->child->draw;
823	glDisable GL_BLEND;	938	glDisable GL_BLEND;
824	glDisable GL_TEXTURE_2D;	939	}
		940
		941	$self->SUPER::_draw;
825	}	942	}
826		943
827	#############################################################################	944	#############################################################################
828		945
829	package CFClient::UI::FancyFrame;	946	package CFClient::UI::FancyFrame;
…		…
840	my $class = shift;	957	my $class = shift;
841		958
842	# TODO: user_x, user_y, overwrite moveto?	959	# TODO: user_x, user_y, overwrite moveto?
843		960
844	my $self = $class->SUPER::new (	961	my $self = $class->SUPER::new (
845	bg => [1, 1, 1, 1],	962	bg => [1, 1, 1, 1],
846	border_bg => [1, 1, 1, 1],	963	border_bg => [1, 1, 1, 1],
847	border => 0.6,	964	border => 0.6,
		965	is_toplevel => 1,
848	can_events => 1,	966	can_events => 1,
849	@_	967	@_
850	);	968	);
851		969
852	$self->{title} &&= new CFClient::UI::Label	970	$self->{title} &&= new CFClient::UI::Label
853	align => 0,	971	align => 0,
…		…
877	my ($self, $w, $h) = @_;	995	my ($self, $w, $h) = @_;
878		996
879	$h -= List::Util::max 0, $self->border * 2;	997	$h -= List::Util::max 0, $self->border * 2;
880	$w -= List::Util::max 0, $self->border * 2;	998	$w -= List::Util::max 0, $self->border * 2;
881		999
882	$self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)	1000	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
883	if $self->{title};	1001	if $self->{title};
884		1002
885	$self->child->configure ($self->border, $self->border, $w, $h);	1003	$self->child->configure ($self->border, $self->border, $w, $h);
886	}	1004	}
887		1005
…		…
945	my ($self) = @_;	1063	my ($self) = @_;
946		1064
947	my ($w, $h ) = ($self->{w}, $self->{h});	1065	my ($w, $h ) = ($self->{w}, $self->{h});
948	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1066	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
949		1067
950	glEnable GL_BLEND;
951	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
952	glEnable GL_TEXTURE_2D;	1068	glEnable GL_TEXTURE_2D;
953	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1069	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
954		1070
955	my $border = $self->border;	1071	my $border = $self->border;
956		1072
957	glColor @{ $self->{border_bg} };	1073	glColor @{ $self->{border_bg} };
958	$tex[1]->draw_quad (0, 0, $w, $border);	1074	$tex[1]->draw_quad_alpha (0, 0, $w, $border);
959	$tex[3]->draw_quad (0, $border, $border, $ch);	1075	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);
960	$tex[2]->draw_quad ($w - $border, $border, $border, $ch);	1076	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
961	$tex[4]->draw_quad (0, $h - $border, $w, $border);	1077	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
962		1078
963	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1079	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
964	my $bg = $tex[0];	1080	my $bg = $tex[0];
965		1081
966	# TODO: repeat texture not scale	1082	# TODO: repeat texture not scale
…		…
970	glColor @{ $self->{bg} };	1086	glColor @{ $self->{bg} };
971		1087
972	$bg->{s} = $rep_x;	1088	$bg->{s} = $rep_x;
973	$bg->{t} = $rep_y;	1089	$bg->{t} = $rep_y;
974	$bg->{wrap_mode} = 1;	1090	$bg->{wrap_mode} = 1;
975	$bg->draw_quad ($border, $border, $cw, $ch);	1091	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
		1092	}
976		1093
977	glDisable GL_TEXTURE_2D;	1094	glDisable GL_TEXTURE_2D;
978	glDisable GL_BLEND;
979	}
980		1095
981	$self->{title}->draw if $self->{title};	1096	$self->{title}->draw if $self->{title};
982		1097
983	$self->child->draw;	1098	$self->child->draw;
984	}	1099	}
…		…
996	sub new {	1111	sub new {
997	my $class = shift;	1112	my $class = shift;
998		1113
999	$class->SUPER::new (	1114	$class->SUPER::new (
1000	col_expand => [],	1115	col_expand => [],
1001	@_	1116	@_,
1002	)	1117	)
		1118	}
		1119
		1120	sub children {
		1121	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1003	}	1122	}
1004		1123
1005	sub add {	1124	sub add {
1006	my ($self, $x, $y, $child) = @_;	1125	my ($self, $x, $y, $child) = @_;
1007		1126
1008	$child->set_parent ($self);	1127	$child->set_parent ($self);
1009	$self->{children}[$y][$x] = $child;	1128	$self->{children}[$y][$x] = $child;
1010		1129
1011	$child->check_size;	1130	$self->check_size (1);
1012	}	1131	}
1013		1132
1014	sub children {
1015	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1016	}
1017
1018	# TODO: move to container class maybe? send childs a signal on removal?	1133	# TODO: move to container class maybe? send children a signal on removal?
1019	sub clear {	1134	sub clear {
1020	my ($self) = @_;	1135	my ($self) = @_;
1021		1136
1022	my @children = $self->children;	1137	my @children = $self->children;
1023	delete $self->{children};	1138	delete $self->{children};
…		…
1025	for (@children) {	1140	for (@children) {
1026	delete $_->{parent};	1141	delete $_->{parent};
1027	$_->hide;	1142	$_->hide;
1028	}	1143	}
1029		1144
		1145	$self->check_size (1);
1030	$self->update;	1146	$self->update;
1031	}	1147	}
1032		1148
1033	sub get_wh {	1149	sub get_wh {
1034	my ($self) = @_;	1150	my ($self) = @_;
…		…
1066	sub size_allocate {	1182	sub size_allocate {
1067	my ($self, $w, $h) = @_;	1183	my ($self, $w, $h) = @_;
1068		1184
1069	my ($ws, $hs) = $self->get_wh;	1185	my ($ws, $hs) = $self->get_wh;
1070		1186
1071	my $req_w = sum @$ws;	1187	my $req_w = (sum @$ws) || 1;
1072	my $req_h = sum @$hs;	1188	my $req_h = (sum @$hs) || 1;
1073		1189
1074	# TODO: nicer code && do row_expand	1190	# TODO: nicer code && do row_expand
1075	my @col_expand = @{$self->{col_expand}};	1191	my @col_expand = @{$self->{col_expand}};
1076	@col_expand = (1) x @$ws unless @col_expand;	1192	@col_expand = (1) x @$ws unless @col_expand;
1077	my $col_expand = (sum @col_expand) || 1;	1193	my $col_expand = (sum @col_expand) || 1;
…		…
1251		1367
1252	#############################################################################	1368	#############################################################################
1253		1369
1254	package CFClient::UI::Label;	1370	package CFClient::UI::Label;
1255		1371
1256	our @ISA = CFClient::UI::Base::;	1372	our @ISA = CFClient::UI::DrawBG::;
1257		1373
1258	use CFClient::OpenGL;	1374	use CFClient::OpenGL;
1259		1375
1260	sub new {	1376	sub new {
1261	my ($class, %arg) = @_;	1377	my ($class, %arg) = @_;
1262		1378
1263	my $self = $class->SUPER::new (	1379	my $self = $class->SUPER::new (
1264	fg => [1, 1, 1],	1380	fg => [1, 1, 1],
		1381	#bg => none
		1382	#active_bg => none
1265	#font => default_font	1383	#font => default_font
1266	#text => initial text	1384	#text => initial text
1267	#markup => initial narkup	1385	#markup => initial narkup
		1386	#max_w => maximum pixel width
		1387	ellipsise => 3, # end
1268	layout => (new CFClient::Layout),	1388	layout => (new CFClient::Layout),
1269	fontsize => 1,	1389	fontsize => 1,
1270	align => -1,	1390	align => -1,
1271	valign => -1,	1391	valign => -1,
1272	padding => 2,	1392	padding => 2,
…		…
1287	}	1407	}
1288		1408
1289	$self	1409	$self
1290	}	1410	}
1291		1411
1292	sub escape {	1412	sub escape($) {
1293	local $_ = $_[1];	1413	local $_ = $_[0];
1294		1414
1295	s/&/&amp;/g;	1415	s/&/&amp;/g;
1296	s/>/&gt;/g;	1416	s/>/&gt;/g;
1297	s/</&lt;/g;	1417	s/</&lt;/g;
1298		1418
1299	$_[1]	1419	$_
1300	}	1420	}
1301		1421
1302	sub update {	1422	sub update {
1303	my ($self) = @_;	1423	my ($self) = @_;
1304		1424
…		…
1337	sub size_request {	1457	sub size_request {
1338	my ($self) = @_;	1458	my ($self) = @_;
1339		1459
1340	$self->{layout}->set_font ($self->{font}) if $self->{font};	1460	$self->{layout}->set_font ($self->{font}) if $self->{font};
1341	$self->{layout}->set_width ($self->{max_w} || -1);	1461	$self->{layout}->set_width ($self->{max_w} || -1);
		1462	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1463	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1342	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1464	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1343		1465
1344	my ($w, $h) = $self->{layout}->size;	1466	my ($w, $h) = $self->{layout}->size;
1345		1467
1346	if (exists $self->{template}) {	1468	if (exists $self->{template}) {
…		…
1376	}	1498	}
1377		1499
1378	sub _draw {	1500	sub _draw {
1379	my ($self) = @_;	1501	my ($self) = @_;
1380		1502
		1503	$self->SUPER::_draw; # draw background, if applicable
		1504
1381	my $tex = $self->{texture} ||= do {	1505	my $tex = $self->{texture} ||= do {
1382	$self->{layout}->set_foreground (@{$self->{fg}});	1506	$self->{layout}->set_foreground (@{$self->{fg}});
1383	$self->{layout}->set_font ($self->{font}) if $self->{font};	1507	$self->{layout}->set_font ($self->{font}) if $self->{font};
1384	$self->{layout}->set_width ($self->{w});	1508	$self->{layout}->set_width ($self->{w});
		1509	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1510	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1385	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);	1511	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1386		1512
1387	my $tex = new_from_layout CFClient::Texture $self->{layout};	1513	my $tex = new_from_layout CFClient::Texture $self->{layout};
1388		1514
1389	$self->{ox} = int $self->{align} < 0 ? $self->{padding}	1515	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1390	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1516	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1391	: ($self->{w} - $tex->{w}) * 0.5;	1517	: ($self->{w} - $tex->{w}) * 0.5);
1392		1518
1393	$self->{oy} = int $self->{valign} < 0 ? $self->{padding}	1519	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1394	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1520	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1395	: ($self->{h} - $tex->{h}) * 0.5;	1521	: ($self->{h} - $tex->{h}) * 0.5);
1396		1522
1397	$tex	1523	$tex
1398	};	1524	};
1399		1525
1400	glEnable GL_TEXTURE_2D;	1526	glEnable GL_TEXTURE_2D;
…		…
1428	active_fg => [0, 0, 0],	1554	active_fg => [0, 0, 0],
1429	can_hover => 1,	1555	can_hover => 1,
1430	can_focus => 1,	1556	can_focus => 1,
1431	valign => 0,	1557	valign => 0,
1432	can_events => 1,	1558	can_events => 1,
		1559	#text => ...
1433	@_	1560	@_
1434	)	1561	)
1435	}	1562	}
1436		1563
1437	sub _set_text {	1564	sub _set_text {
…		…
1447	$self->{text} = $text;	1574	$self->{text} = $text;
1448		1575
1449	$text =~ s/./*/g if $self->{hidden};	1576	$text =~ s/./*/g if $self->{hidden};
1450	$self->{layout}->set_text ("$text ");	1577	$self->{layout}->set_text ("$text ");
1451		1578
1452	$self->emit (changed => $self->{text});	1579	$self->_emit (changed => $self->{text});
1453	}	1580	}
1454		1581
1455	sub set_text {	1582	sub set_text {
1456	my ($self, $text) = @_;	1583	my ($self, $text) = @_;
1457		1584
1458	$self->{cursor} = length $text;	1585	$self->{cursor} = length $text;
1459	$self->_set_text ($text);	1586	$self->_set_text ($text);
		1587	$self->update;
1460	$self->check_size;	1588	$self->check_size;
1461	$self->update;
1462	}	1589	}
1463		1590
1464	sub get_text {	1591	sub get_text {
1465	$_[0]{text}	1592	$_[0]{text}
1466	}	1593	}
…		…
1469	my ($self) = @_;	1596	my ($self) = @_;
1470		1597
1471	my ($w, $h) = $self->SUPER::size_request;	1598	my ($w, $h) = $self->SUPER::size_request;
1472		1599
1473	($w + 1, $h) # add 1 for cursor	1600	($w + 1, $h) # add 1 for cursor
1474	}
1475
1476	sub size_allocate {
1477	my ($self, $w, $h) = @_;
1478
1479	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1480	}	1601	}
1481		1602
1482	sub key_down {	1603	sub key_down {
1483	my ($self, $ev) = @_;	1604	my ($self, $ev) = @_;
1484		1605
…		…
1486	my $sym = $ev->{sym};	1607	my $sym = $ev->{sym};
1487	my $uni = $ev->{unicode};	1608	my $uni = $ev->{unicode};
1488		1609
1489	my $text = $self->get_text;	1610	my $text = $self->get_text;
1490		1611
1491	if ($sym == 8) {	1612	if ($uni == 8) {
1492	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1613	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1493	} elsif ($sym == 127) {	1614	} elsif ($uni == 127) {
1494	substr $text, $self->{cursor}, 1, "";	1615	substr $text, $self->{cursor}, 1, "";
1495	} elsif ($sym == CFClient::SDLK_LEFT) {	1616	} elsif ($sym == CFClient::SDLK_LEFT) {
1496	--$self->{cursor} if $self->{cursor};	1617	--$self->{cursor} if $self->{cursor};
1497	} elsif ($sym == CFClient::SDLK_RIGHT) {	1618	} elsif ($sym == CFClient::SDLK_RIGHT) {
1498	++$self->{cursor} if $self->{cursor} < length $self->{text};	1619	++$self->{cursor} if $self->{cursor} < length $self->{text};
1499	} elsif ($sym == CFClient::SDLK_HOME) {	1620	} elsif ($sym == CFClient::SDLK_HOME) {
1500	$self->{cursor} = 0;	1621	$self->{cursor} = 0;
1501	} elsif ($sym == CFClient::SDLK_END) {	1622	} elsif ($sym == CFClient::SDLK_END) {
1502	$self->{cursor} = length $text;	1623	$self->{cursor} = length $text;
1503	} elsif ($sym == 27) {	1624	} elsif ($uni == 27) {
1504	$self->emit ('escape');	1625	$self->_emit ('escape');
1505	} elsif ($uni) {	1626	} elsif ($uni) {
1506	substr $text, $self->{cursor}++, 0, chr $uni;	1627	substr $text, $self->{cursor}++, 0, chr $uni;
1507	}	1628	}
1508		1629
1509	$self->_set_text ($text);	1630	$self->_set_text ($text);
1510	$self->update;	1631	$self->update;
		1632	$self->check_size;
1511	}	1633	}
1512		1634
1513	sub focus_in {	1635	sub focus_in {
1514	my ($self) = @_;	1636	my ($self) = @_;
1515		1637
…		…
1595	if ($sym == 13) {	1717	if ($sym == 13) {
1596	unshift @{$self->{history}},	1718	unshift @{$self->{history}},
1597	my $txt = $self->get_text;	1719	my $txt = $self->get_text;
1598	$self->{history_pointer} = -1;	1720	$self->{history_pointer} = -1;
1599	$self->{history_saveback} = '';	1721	$self->{history_saveback} = '';
1600	$self->emit (activate => $txt);	1722	$self->_emit (activate => $txt);
1601	$self->update;	1723	$self->update;
1602		1724
1603	} elsif ($sym == CFClient::SDLK_UP) {	1725	} elsif ($sym == CFClient::SDLK_UP) {
1604	if ($self->{history_pointer} < 0) {	1726	if ($self->{history_pointer} < 0) {
1605	$self->{history_saveback} = $self->get_text;	1727	$self->{history_saveback} = $self->get_text;
…		…
1644	my $class = shift;	1766	my $class = shift;
1645		1767
1646	$class->SUPER::new (	1768	$class->SUPER::new (
1647	padding => 4,	1769	padding => 4,
1648	fg => [1, 1, 1],	1770	fg => [1, 1, 1],
1649	bg => [1, 1, 1, 0.2],
1650	active_fg => [0, 0, 1],	1771	active_fg => [0, 0, 1],
1651	can_hover => 1,	1772	can_hover => 1,
1652	align => 0,	1773	align => 0,
1653	valign => 0,	1774	valign => 0,
1654	can_events => 1,	1775	can_events => 1,
1655	@_	1776	@_
1656	)	1777	)
1657	}	1778	}
1658		1779
		1780	sub activate { }
		1781
1659	sub button_up {	1782	sub button_up {
1660	my ($self, $ev, $x, $y) = @_;	1783	my ($self, $ev, $x, $y) = @_;
1661		1784
		1785	$self->emit ("activate")
1662	if ($x >= 0 && $x < $self->{w}	1786	if $x >= 0 && $x < $self->{w}
1663	&& $y >= 0 && $y < $self->{h}) {	1787	&& $y >= 0 && $y < $self->{h};
1664	$self->emit ("activate");
1665	}
1666	}	1788	}
1667		1789
1668	sub _draw {	1790	sub _draw {
1669	my ($self) = @_;	1791	my ($self) = @_;
1670		1792
…		…
1702		1824
1703	$class->SUPER::new (	1825	$class->SUPER::new (
1704	padding => 2,	1826	padding => 2,
1705	fg => [1, 1, 1],	1827	fg => [1, 1, 1],
1706	active_fg => [1, 1, 0],	1828	active_fg => [1, 1, 0],
		1829	bg => [0, 0, 0, 0.2],
		1830	active_bg => [1, 1, 1, 0.5],
1707	state => 0,	1831	state => 0,
1708	can_hover => 1,	1832	can_hover => 1,
1709	@_	1833	@_
1710	)	1834	)
1711	}	1835	}
…		…
1720	my ($self, $ev, $x, $y) = @_;	1844	my ($self, $ev, $x, $y) = @_;
1721		1845
1722	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1846	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1723	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1847	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1724	$self->{state} = !$self->{state};	1848	$self->{state} = !$self->{state};
1725	$self->emit (changed => $self->{state});	1849	$self->_emit (changed => $self->{state});
1726	}	1850	}
1727	}	1851	}
1728		1852
1729	sub _draw {	1853	sub _draw {
1730	my ($self) = @_;	1854	my ($self) = @_;
…		…
1735		1859
1736	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1860	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1737		1861
1738	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1862	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1739		1863
		1864	my $tex = $self->{state} ? $tex[1] : $tex[0];
		1865
1740	glEnable GL_TEXTURE_2D;	1866	glEnable GL_TEXTURE_2D;
1741
1742	my $tex = $self->{state} ? $tex[1] : $tex[0];
1743
1744	$tex->draw_quad_alpha (0, 0, $s, $s);	1867	$tex->draw_quad_alpha (0, 0, $s, $s);
1745
1746	glDisable GL_TEXTURE_2D;	1868	glDisable GL_TEXTURE_2D;
1747	}	1869	}
1748		1870
1749	#############################################################################	1871	#############################################################################
1750		1872
…		…
1997	qw(s1_slider.png s1_slider_bg.png);	2119	qw(s1_slider.png s1_slider_bg.png);
1998		2120
1999	sub new {	2121	sub new {
2000	my $class = shift;	2122	my $class = shift;
2001		2123
2002	# range [value, low, high, page]	2124	# range [value, low, high, page, unit]
2003		2125
2004	# TODO: 0-width page	2126	# TODO: 0-width page
2005	# TODO: req_w/h are wrong with vertical	2127	# TODO: req_w/h are wrong with vertical
2006	# TODO: calculations are off	2128	# TODO: calculations are off
2007	my $self = $class->SUPER::new (	2129	my $self = $class->SUPER::new (
2008	fg => [1, 1, 1],	2130	fg => [1, 1, 1],
2009	active_fg => [0, 0, 0],	2131	active_fg => [0, 0, 0],
		2132	bg => [0, 0, 0, 0.2],
		2133	active_bg => [1, 1, 1, 0.5],
2010	range => [0, 0, 100, 10],	2134	range => [0, 0, 100, 10, 0],
2011	req_w => $::WIDTH / 80,	2135	req_w => $::WIDTH / 80,
2012	req_h => $::WIDTH / 80,	2136	req_h => $::WIDTH / 80,
2013	vertical => 0,	2137	vertical => 0,
2014	can_hover => 1,	2138	can_hover => 1,
2015	inner_pad => 5,	2139	inner_pad => 0.02,
2016	@_	2140	@_
2017	);	2141	);
2018		2142
		2143	$self->set_value ($self->{range}[0]);
		2144	$self->update;
		2145
2019	$self	2146	$self
		2147	}
		2148
		2149	sub set_range {
		2150	my ($self, $range) = @_;
		2151
		2152	($range, $self->{range}) = ($self->{range}, $range);
		2153
		2154	$self->update
		2155	if "@$range" ne "@{$self->{range}}";
		2156	}
		2157
		2158	sub set_value {
		2159	my ($self, $value) = @_;
		2160
		2161	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
		2162
		2163	$hi = $lo + 1 if $hi <= $lo;
		2164
		2165	$page = $hi - $lo if $page > $hi - $lo;
		2166
		2167	$value = $lo if $value < $lo;
		2168	$value = $hi - $page if $value > $hi - $page;
		2169
		2170	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
		2171	if $unit;
		2172
		2173	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
		2174
		2175	if ($value != $old_value) {
		2176	$self->_emit (changed => $value);
		2177	$self->update;
		2178	}
2020	}	2179	}
2021		2180
2022	sub size_request {	2181	sub size_request {
2023	my ($self) = @_;	2182	my ($self) = @_;
2024		2183
…		…
2030		2189
2031	sub button_down {	2190	sub button_down {
2032	my ($self, $ev, $x, $y) = @_;	2191	my ($self, $ev, $x, $y) = @_;
2033		2192
2034	$self->SUPER::button_down ($ev, $x, $y);	2193	$self->SUPER::button_down ($ev, $x, $y);
		2194
		2195	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
		2196
2035	$self->mouse_motion ($ev, $x, $y);	2197	$self->mouse_motion ($ev, $x, $y);
2036	}	2198	}
2037		2199
2038	sub mouse_motion {	2200	sub mouse_motion {
2039	my ($self, $ev, $x, $y) = @_;	2201	my ($self, $ev, $x, $y) = @_;
2040		2202
2041	if ($GRAB == $self) {	2203	if ($GRAB == $self) {
		2204	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
		2205
		2206	my (undef, $lo, $hi, $page) = @{$self->{range}};
		2207
		2208	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
		2209
		2210	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2211	}
		2212	}
		2213
		2214	sub update {
		2215	my ($self) = @_;
		2216
		2217	$CFClient::UI::ROOT->on_post_alloc ($self => sub {
		2218	$self->set_value ($self->{range}[0]);
		2219
2042	my ($value, $lo, $hi, $page) = @{$self->{range}};	2220	my ($value, $lo, $hi, $page) = @{$self->{range}};
		2221	my $range = ($hi - $page - $lo) || 1e-100;
2043		2222
2044	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2223	my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2045		2224
2046	my $inner_pad_px = $self->_calc_inner_pad_px ($w);	2225	$self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2047	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right	2226	$self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2048		2227
2049	$x -= $inner_pad_px; # substract the padding	2228	$value = ($value - $lo) / $range;
2050	$x = $x * ($hi - $lo) / $inner_w + $lo;	2229	$value = $value * $self->{scale} + $self->{offset};
2051	$x = $lo if $x < $lo;
2052	$x = $hi - $page if $x > $hi - $page;
2053	$self->{range}[0] = $x;
2054		2230
2055	$self->emit (changed => $x);	2231	$self->{knob_x} = $value - $knob_w * 0.5;
2056	$self->update;	2232	$self->{knob_w} = $knob_w;
2057	}	2233	});
2058	}
2059		2234
2060	# the inner_* stuff is for generating a padding for the slider handle,	2235	$self->SUPER::update;
2061	# so that the handle doesn't leave the texture. This calculation isn't 100%
2062	# correct propably, but it does the job for now
2063	sub _calc_inner_pad_px {
2064	my ($self, $w) = @_;
2065	($w / 100) * $self->{inner_pad} # % to pixels
2066	}	2236	}
2067		2237
2068	sub _draw {	2238	sub _draw {
2069	my ($self) = @_;	2239	my ($self) = @_;
2070		2240
2071	$self->SUPER::_draw ();	2241	$self->SUPER::_draw ();
2072		2242
2073	my ($w, $h) = @$self{qw(w h)};	2243	glScale $self->{w}, $self->{h};
2074		2244
2075	if ($self->{vertical}) {	2245	if ($self->{vertical}) {
2076	# draw a vertical slider like a rotated horizontal slider	2246	# draw a vertical slider like a rotated horizontal slider
2077		2247
		2248	glTranslate 1, 0, 0;
2078	glRotate 90, 0, 0, 1;	2249	glRotate 90, 0, 0, 1;
2079	glTranslate 0, -$self->{w}, 0;
2080
2081	($w, $h) = ($h, $w);
2082	}	2250	}
2083		2251
2084	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	2252	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2085	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	2253	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2086		2254
2087	my ($value, $lo, $hi, $page) = @{$self->{range}};
2088
2089	$hi = $value + 1 if $lo == $hi;
2090
2091	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2092	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2093
2094	$page = int $page * $inner_w / ($hi - $lo);
2095	$value = int +($value - $lo) * $inner_w / ($hi - $lo);
2096
2097	$w -= $page;
2098	$page &= ~1;
2099	glTranslate $page * 0.5, 0, 0;
2100	$page ||= 2;
2101
2102	my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2103	my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2104
2105	glEnable GL_TEXTURE_2D;	2255	glEnable GL_TEXTURE_2D;
2106	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2256	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2107		2257
2108	# draw background	2258	# draw background
2109	$tex[1]->draw_quad_alpha (0, 0, $w, $h);	2259	$tex[1]->draw_quad_alpha (0, 0, 1, 1);
2110		2260
2111	# draw handle	2261	# draw handle
2112	$tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h);	2262	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2113		2263
2114	glDisable GL_TEXTURE_2D;	2264	glDisable GL_TEXTURE_2D;
2115	}	2265	}
		2266
		2267	#############################################################################
		2268
		2269	package CFClient::UI::ValSlider;
		2270
		2271	our @ISA = CFClient::UI::HBox::;
		2272
		2273	sub new {
		2274	my ($class, %arg) = @_;
		2275
		2276	my $range = delete $arg{range};
		2277
		2278	my $self = $class->SUPER::new (
		2279	slider => (new CFClient::UI::Slider expand => 1, range => $range),
		2280	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
		2281	to_value => sub { shift },
		2282	from_value => sub { shift },
		2283	%arg,
		2284	);
		2285
		2286	$self->{slider}->connect (changed => sub {
		2287	my ($self, $value) = @_;
		2288	$self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
		2289	$self->{parent}->emit (changed => $value);
		2290	});
		2291
		2292	# $self->{entry}->connect (changed => sub {
		2293	# my ($self, $value) = @_;
		2294	# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
		2295	# $self->{parent}->emit (changed => $value);
		2296	# });
		2297
		2298	$self->add ($self->{slider}, $self->{entry});
		2299
		2300	$self->{slider}->emit (changed => $self->{slider}{range}[0]);
		2301
		2302	$self
		2303	}
		2304
		2305	sub set_range { shift->{slider}->set_range (@_) }
		2306	sub set_value { shift->{slider}->set_value (@_) }
2116		2307
2117	#############################################################################	2308	#############################################################################
2118		2309
2119	package CFClient::UI::TextView;	2310	package CFClient::UI::TextView;
2120		2311
…		…
2150		2341
2151	$self->{fontsize} = $fontsize;	2342	$self->{fontsize} = $fontsize;
2152	$self->reflow;	2343	$self->reflow;
2153	}	2344	}
2154		2345
2155	sub text_height {
2156	my ($self, $text) = @_;
2157
2158	my $layout = $self->{layout};
2159
2160	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2161	$layout->set_width ($self->{children}[0]{w});
2162	$layout->set_markup ($text);
2163
2164	($layout->size)[1]
2165	}
2166
2167	sub reflow {
2168	my ($self) = @_;
2169
2170	$self->{need_reflow}++;
2171	$self->update;
2172	}
2173
2174	sub size_allocate {	2346	sub size_allocate {
2175	my ($self, $w, $h) = @_;	2347	my ($self, $w, $h) = @_;
2176		2348
2177	$self->SUPER::size_allocate ($w, $h);	2349	$self->SUPER::size_allocate ($w, $h);
2178		2350
…		…
2181	$self->{layout}->set_width ($self->{children}[0]{w});	2353	$self->{layout}->set_width ($self->{children}[0]{w});
2182		2354
2183	$self->reflow;	2355	$self->reflow;
2184	}	2356	}
2185		2357
		2358	sub text_size {
		2359	my ($self, $text, $indent) = @_;
		2360
		2361	my $layout = $self->{layout};
		2362
		2363	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2364	$layout->set_width ($self->{children}[0]{w} - $indent);
		2365	$layout->set_markup ($text);
		2366
		2367	$layout->size
		2368	}
		2369
		2370	sub reflow {
		2371	my ($self) = @_;
		2372
		2373	$self->{need_reflow}++;
		2374	$self->update;
		2375	}
		2376
		2377	sub set_offset {
		2378	my ($self, $offset) = @_;
		2379
		2380	# todo: base offset on lines or so, not on pixels
		2381	$self->{children}[1]->set_value ($offset);
		2382	}
		2383
		2384	sub clear {
		2385	my ($self) = @_;
		2386
		2387	$self->{par} = [];
		2388	$self->{height} = 0;
		2389	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
		2390	}
		2391
2186	sub add_paragraph {	2392	sub add_paragraph {
2187	my ($self, $color, $text) = @_;	2393	my ($self, $color, $text, $indent) = @_;
2188		2394
2189	#TODO: intelligently "reformat" paragraph	2395	for my $line (split /\n/, $text) {
2190		2396	my ($w, $h) = $self->text_size ($line);
2191	my $height = $self->text_height ($text);
2192
2193	$self->{height} += $height;	2397	$self->{height} += $h;
		2398	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
		2399	}
2194		2400
2195	push @{$self->{par}}, [$height, $color, $text];
2196
2197	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];	2401	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2198	$self->{children}[1]->update;
2199	}	2402	}
2200		2403
2201	sub update {	2404	sub update {
2202	my ($self) = @_;	2405	my ($self) = @_;
2203		2406
…		…
2205		2408
2206	return unless $self->{h} > 0;	2409	return unless $self->{h} > 0;
2207		2410
2208	delete $self->{texture};	2411	delete $self->{texture};
2209		2412
2210	$ROOT->on_refresh ($self, sub {	2413	$ROOT->on_post_alloc ($self, sub {
		2414	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2415
2211	if (delete $self->{need_reflow}) {	2416	if (delete $self->{need_reflow}) {
2212	my $height = 0;	2417	my $height = 0;
2213		2418
2214	$height += $_->[0] = $self->text_height ($_->[2])	2419	my $layout = $self->{layout};
		2420
		2421	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2422
2215	for @{$self->{par}};	2423	for (@{$self->{par}}) {
		2424	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
		2425	$layout->set_width ($W - $_->[3]);
		2426	$layout->set_markup ($_->[4]);
		2427	my ($w, $h) = $layout->size;
		2428	$_->[0] = $w + $_->[3];
		2429	$_->[1] = $h;
		2430	}
		2431
		2432	$height += $_->[1];
		2433	}
2216		2434
2217	$self->{height} = $height;	2435	$self->{height} = $height;
2218		2436
2219	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2437	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2220		2438
2221	delete $self->{texture};	2439	delete $self->{texture};
2222	}	2440	}
2223		2441
2224	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {	2442	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2225	glClearColor 0, 0, 0, 0;	2443	glClearColor 0.5, 0.5, 0.5, 0;
2226	glClear GL_COLOR_BUFFER_BIT;	2444	glClear GL_COLOR_BUFFER_BIT;
2227		2445
2228	glEnable GL_TEXTURE_2D;
2229	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2230
2231	my $top = int $self->{children}[1]{range}[0];	2446	my $top = int $self->{children}[1]{range}[0];
2232		2447
2233	my $y0 = $top;	2448	my $y0 = $top;
2234	my $y1 = $top + $self->{h};	2449	my $y1 = $top + $H;
2235		2450
2236	my $y = 0;	2451	my $y = 0;
2237		2452
2238	my $layout = $self->{layout};	2453	my $layout = $self->{layout};
2239		2454
2240	$layout->set_font ($self->{font}) if $self->{font};	2455	$layout->set_font ($self->{font}) if $self->{font};
2241		2456
		2457	glEnable GL_BLEND;
		2458	#TODO# not correct in windows where rgba is forced off
		2459	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		2460
2242	for my $par (@{$self->{par}}) {	2461	for my $par (@{$self->{par}}) {
2243	my $h = $par->[0];	2462	my $h = $par->[1];
2244		2463
2245	if ($y0 < $y + $h && $y < $y1) {	2464	if ($y0 < $y + $h && $y < $y1) {
2246	$layout->set_foreground (@{ $par->[1] });	2465	$layout->set_foreground (@{ $par->[2] });
		2466	$layout->set_width ($W - $par->[3]);
2247	$layout->set_markup ($par->[2]);	2467	$layout->set_markup ($par->[4]);
2248		2468
2249	my ($W, $H) = $layout->size;	2469	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2250	CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);	2470
		2471	glRasterPos $par->[3], $y - $y0;
		2472	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2251	}	2473	}
2252		2474
2253	$y += $h;	2475	$y += $h;
2254	}	2476	}
2255		2477
2256	glDisable GL_TEXTURE_2D;	2478	glDisable GL_BLEND;
2257	};	2479	};
2258	});	2480	});
2259	}	2481	}
2260		2482
2261	sub _draw {	2483	sub _draw {
2262	my ($self) = @_;	2484	my ($self) = @_;
2263		2485
2264	glEnable GL_TEXTURE_2D;	2486	glEnable GL_TEXTURE_2D;
2265	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2487	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2266	glColor 1, 1, 1, 1;	2488	glColor 1, 1, 1, 1;
2267	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2489	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2268	glDisable GL_TEXTURE_2D;	2490	glDisable GL_TEXTURE_2D;
2269		2491
2270	$self->{children}[1]->draw;	2492	$self->{children}[1]->draw;
2271		2493
2272	}	2494	}
…		…
2341		2563
2342	# TODO: use animation	2564	# TODO: use animation
2343	if ($self->{state} = !$self->{state}) {	2565	if ($self->{state} = !$self->{state}) {
2344	$CFClient::UI::ROOT->add ($self->{other});	2566	$CFClient::UI::ROOT->add ($self->{other});
2345	$self->{other}->move ($self->coord2global (0, $self->{h}));	2567	$self->{other}->move ($self->coord2global (0, $self->{h}));
2346	$self->emit ("open");	2568	$self->_emit ("open");
2347	} else {	2569	} else {
2348	$CFClient::UI::ROOT->remove ($self->{other});	2570	$CFClient::UI::ROOT->remove ($self->{other});
2349	$self->emit ("close");	2571	$self->_emit ("close");
2350	}	2572	}
2351		2573
2352	$self->emit (changed => $self->{state});	2574	$self->_emit (changed => $self->{state});
2353	}	2575	}
2354		2576
2355	#############################################################################	2577	#############################################################################
2356		2578
2357	package CFClient::UI::Tooltip;	2579	package CFClient::UI::Tooltip;
…		…
2367	@_,	2589	@_,
2368	can_events => 0,	2590	can_events => 0,
2369	)	2591	)
2370	}	2592	}
2371		2593
2372	sub set_markup {	2594	sub set_tooltip_from {
2373	my ($self, $text, $font) = @_;	2595	my ($self, $widget) = @_;
2374		2596
2375	$self->{label} = new CFClient::UI::Label	2597	$self->add (new CFClient::UI::Label
		2598	markup => $widget->{tooltip},
		2599	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2376	fontsize => 0.8,	2600	fontsize => 0.8,
2377	fg => [0, 0, 0],	2601	fg => [0, 0, 0, 1],
		2602	ellipsise => 0,
2378	font => ($font || $::FONT_PROP);	2603	font => ($widget->{tooltip_font} || $::FONT_PROP),
2379		2604	);
2380	$self->{label}->set_max_size ($::WIDTH * 0.3);
2381	$self->{label}->set_markup ($text);
2382	$self->add ($self->{label});
2383	}	2605	}
2384		2606
2385	sub size_request {	2607	sub size_request {
2386	my ($self) = @_;	2608	my ($self) = @_;
2387		2609
…		…
2397	}	2619	}
2398		2620
2399	sub _draw {	2621	sub _draw {
2400	my ($self) = @_;	2622	my ($self) = @_;
2401		2623
2402	glPushMatrix;
2403	glTranslate 0.375, 0.375;	2624	glTranslate 0.375, 0.375;
2404		2625
2405	my ($w, $h) = @$self{qw(w h)};	2626	my ($w, $h) = @$self{qw(w h)};
2406		2627
2407	glColor 1, 0.8, 0.4;	2628	glColor 1, 0.8, 0.4;
…		…
2418	glVertex 0 , $h;	2639	glVertex 0 , $h;
2419	glVertex $w, $h;	2640	glVertex $w, $h;
2420	glVertex $w, 0;	2641	glVertex $w, 0;
2421	glEnd;	2642	glEnd;
2422		2643
2423	glPopMatrix;	2644	glTranslate 2 - 0.375, 2 - 0.375;
2424
2425	glTranslate 2, 2;
2426	$self->SUPER::_draw;	2645	$self->SUPER::_draw;
2427	}	2646	}
2428		2647
2429	#############################################################################	2648	#############################################################################
2430		2649
…		…
2435	use CFClient::OpenGL;	2654	use CFClient::OpenGL;
2436		2655
2437	sub new {	2656	sub new {
2438	my $class = shift;	2657	my $class = shift;
2439		2658
2440	$class->SUPER::new (	2659	my $self = $class->SUPER::new (
2441	aspect => 1,	2660	aspect => 1,
		2661	can_events => 0,
2442	@_,	2662	@_,
2443	)	2663	);
		2664
		2665	if ($self->{anim} && $self->{animspeed}) {
		2666	Scalar::Util::weaken (my $widget = $self);
		2667
		2668	$self->{timer} = Event->timer (
		2669	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
		2670	hard => 1,
		2671	interval => $self->{animspeed},
		2672	cb => sub {
		2673	++$widget->{frame};
		2674	$widget->update;
		2675	},
		2676	);
		2677	}
		2678
		2679	$self
2444	}	2680	}
2445		2681
2446	sub size_request {	2682	sub size_request {
2447	(32, 8)	2683	(32, 8)
2448	}	2684	}
2449		2685
		2686	sub update {
		2687	my ($self) = @_;
		2688
		2689	return unless $self->{visible};
		2690
		2691	$self->SUPER::update;
		2692	}
		2693
2450	sub _draw {	2694	sub _draw {
2451	my ($self) = @_;	2695	my ($self) = @_;
2452		2696
2453	return unless $::CONN;#d# manage and cache textures differently	2697	return unless $::CONN;
		2698
		2699	my $face;
		2700
		2701	if ($self->{frame}) {
		2702	my $anim = $::CONN->{anim}[$self->{anim}];
		2703
		2704	$face = $anim->[ $self->{frame} % @$anim ]
		2705	if $anim && @$anim;
		2706	}
		2707
2454	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	2708	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2455		2709
2456	# TODO animation
2457	if ($tex) {	2710	if ($tex) {
2458	glEnable GL_TEXTURE_2D;	2711	glEnable GL_TEXTURE_2D;
2459	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2712	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2460	glColor 1, 1, 1, 1;	2713	glColor 1, 1, 1, 1;
2461	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2714	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2462	glDisable GL_TEXTURE_2D;	2715	glDisable GL_TEXTURE_2D;
2463	}	2716	}
2464	}	2717	}
2465		2718
		2719	sub DESTROY {
		2720	my ($self) = @_;
		2721
		2722	$self->{timer}->cancel
		2723	if $self->{timer};
		2724
		2725	$self->SUPER::DESTROY;
		2726	}
		2727
2466	#############################################################################	2728	#############################################################################
2467		2729
2468	package CFClient::UI::InventoryItem;	2730	package CFClient::UI::Inventory;
2469		2731
2470	our @ISA = CFClient::UI::HBox::;	2732	our @ISA = CFClient::UI::ScrolledWindow::;
2471		2733
2472	sub new {	2734	sub new {
2473	my $class = shift;	2735	my $class = shift;
2474		2736
2475	my %args = @_;
2476
2477	my $item = delete $args{item};
2478
2479	my $desc = $item->{nrof} < 2
2480	? $item->{name}
2481	: "$item->{nrof} $item->{name_pl}";
2482
2483
2484	my $self = $class->SUPER::new (	2737	my $self = $class->SUPER::new (
2485	can_hover => 1,	2738	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2486	can_events => 1,
2487	tooltip => (CFClient::UI::Label->escape ($desc)
2488	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2489	connect_button_down => sub {
2490	my ($self, $ev, $x, $y) = @_;
2491
2492	# todo: maybe put examine on 1? but should just be a tooltip :(
2493	if ($ev->{button} == 1) {
2494	$::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2495	} elsif ($ev->{button} == 2) {
2496	$::CONN->send ("apply $item->{tag}");
2497	} elsif ($ev->{button} == 3) {
2498	CFClient::UI::Menu->new (
2499	items => [
2500	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2501	[
2502	$item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2503	sub { $::CONN->send ("lock $item->{tag}") },
2504	],
2505	["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2506	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2507	["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2508	],
2509	)->popup ($ev);
2510	}
2511
2512	1
2513	},
2514	%args
2515	);
2516
2517	$self->add (new CFClient::UI::Face
2518	can_events => 0,
2519	face => $item->{face},
2520	anim => $item->{anim},
2521	animspeed => $item->{animspeed},
2522	);
2523
2524	$self->add (new CFClient::UI::Label
2525	can_events => 0,
2526	text => $desc,
2527	);
2528
2529	$self
2530	}
2531
2532	#############################################################################
2533
2534	package CFClient::UI::Inventory;
2535
2536	our @ISA = CFClient::UI::ScrolledWindow::;
2537
2538	sub new {
2539	my $class = shift;
2540
2541	my $self = $class->SUPER::new (
2542	scrolled => (new CFClient::UI::VBox),
2543	@_,	2739	@_,
2544	);	2740	);
2545		2741
2546	$self	2742	$self
2547	}	2743	}
…		…
2550	my ($self, $items) = @_;	2746	my ($self, $items) = @_;
2551		2747
2552	$self->{scrolled}->clear;	2748	$self->{scrolled}->clear;
2553	return unless $items;	2749	return unless $items;
2554		2750
2555	my @items = sort { $a->{type} <=> $b->{type} } @$items;	2751	my @items = sort {
		2752	($a->{type} <=> $b->{type})
		2753	or ($a->{name} cmp $b->{name})
		2754	} @$items;
2556		2755
2557	$self->{real_items} = \@items;	2756	$self->{real_items} = \@items;
2558		2757
		2758	my $row = 0;
2559	for my $item (@items) {	2759	for my $item (@items) {
2560	my $desc = $item->{nrof} < 2	2760	CFClient::Item::update_widgets $item;
2561	? $item->{name}
2562	: "$item->{nrof} $item->{name_pl}";
2563		2761
2564	$self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item);	2762	$self->{scrolled}->add (0, $row, $item->{face_widget});
2565	}	2763	$self->{scrolled}->add (1, $row, $item->{desc_widget});
		2764	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2566		2765
2567	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];	2766	$row++;
		2767	}
2568	}	2768	}
2569		2769
2570	sub size_request {	2770	sub size_request {
2571	my ($self) = @_;	2771	my ($self) = @_;
2572	($self->{req_w}, $self->{req_h});	2772	($self->{req_w}, $self->{req_h});
…		…
2612		2812
2613	# popup given the event (must be a mouse button down event currently)	2813	# popup given the event (must be a mouse button down event currently)
2614	sub popup {	2814	sub popup {
2615	my ($self, $ev) = @_;	2815	my ($self, $ev) = @_;
2616		2816
2617	$self->emit ("popdown");	2817	$self->_emit ("popdown");
2618		2818
2619	# maybe save $GRAB? must be careful about events...	2819	# maybe save $GRAB? must be careful about events...
2620	$GRAB = $self;	2820	$GRAB = $self;
2621	$self->{button} = $ev->{button};	2821	$self->{button} = $ev->{button};
2622		2822
…		…
2637		2837
2638	if ($ev->{button} == $self->{button}) {	2838	if ($ev->{button} == $self->{button}) {
2639	undef $GRAB;	2839	undef $GRAB;
2640	$self->hide;	2840	$self->hide;
2641		2841
2642	$self->emit ("popdown");	2842	$self->_emit ("popdown");
2643	$self->{hover}[1]->() if $self->{hover};	2843	$self->{hover}[1]->() if $self->{hover};
2644	}	2844	}
2645	}	2845	}
2646		2846
2647	#############################################################################	2847	#############################################################################
2648		2848
2649	package CFClient::UI::Statusbox;	2849	package CFClient::UI::Statusbox;
2650		2850
2651	our @ISA = CFClient::UI::VBox::;	2851	our @ISA = CFClient::UI::VBox::;
		2852
		2853	sub new {
		2854	my $class = shift;
		2855
		2856	$class->SUPER::new (
		2857	fontsize => 0.8,
		2858	@_,
		2859	)
		2860	}
2652		2861
2653	sub reorder {	2862	sub reorder {
2654	my ($self) = @_;	2863	my ($self) = @_;
2655	my $NOW = time;	2864	my $NOW = time;
2656		2865
2657	while (my ($k, $v) = each %{ $self->{item} }) {	2866	while (my ($k, $v) = each %{ $self->{item} }) {
2658	delete $self->{item}{$k} if $v->{timeout} < $NOW;	2867	delete $self->{item}{$k} if $v->{timeout} < $NOW;
2659	}	2868	}
2660		2869
2661	my @widgets;	2870	my @widgets;
2662	my @items = sort { $a->{time} <=> $b->{time} } values %{ $self->{item} };	2871
		2872	my @items = sort {
		2873	$a->{pri} <=> $b->{pri}
		2874	or $b->{id} <=> $a->{id}
		2875	} values %{ $self->{item} };
		2876
2663	my $count = 10 + 1;	2877	my $count = 10 + 1;
2664	for my $item (@items) {	2878	for my $item (@items) {
2665	last unless --$count;	2879	last unless --$count;
2666		2880
2667	push @widgets, $item->{label} ||= do {	2881	push @widgets, $item->{label} ||= do {
2668	# TODO: doesn't handle markup well (read as: at all)	2882	# TODO: doesn't handle markup well (read as: at all)
2669	my $short = delete $item->{text};	2883	my $short = $item->{count} > 1
		2884	? "<b>$item->{count} ×</b> $item->{text}"
		2885	: $item->{text};
		2886
2670	for ($short) {	2887	for ($short) {
2671	s/^\s+//;	2888	s/^\s+//;
2672	s/\012.*//s;	2889	s/\s+/ /g;
2673	my $len = int 30 / $item->{fontsize};
2674	substr $_, $len, length, "…" if $len < length;
2675	}	2890	}
2676		2891
2677	new CFClient::UI::Label	2892	new CFClient::UI::Label
2678	markup => $short,	2893	markup => $short,
2679	tooltip => delete $item->{tooltip},	2894	tooltip => $item->{tooltip},
2680	fontsize => delete $item->{fontsize},	2895	tooltip_font => $::FONT_PROP,
2681	color => delete $item->{color},	2896	tooltip_width => 0.67,
		2897	fontsize => $item->{fontsize} || $self->{fontsize},
		2898	max_w => $::WIDTH * 0.44,
		2899	fg => $item->{fg},
2682	can_events => 1,	2900	can_events => 1,
2683	can_hover => 1,	2901	can_hover => 1
2684	};	2902	};
2685	}	2903	}
2686		2904
2687	$self->clear;	2905	$self->clear;
2688	$self->SUPER::add (@widgets);	2906	$self->SUPER::add (reverse @widgets);
2689	}	2907	}
2690		2908
2691	sub add {	2909	sub add {
2692	my ($self, $text, %arg) = @_;	2910	my ($self, $text, %arg) = @_;
2693		2911
2694	my $item = {	2912	$text =~ s/^\s+//;
2695	time => time,	2913	$text =~ s/\s+$//;
		2914
		2915	return unless $text;
		2916
		2917	my $timeout = time + ((delete $arg{timeout}) || 60);
		2918
		2919	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
		2920
		2921	if (my $item = $self->{item}{$group}) {
		2922	if ($item->{text} eq $text) {
		2923	$item->{count}++;
		2924	} else {
		2925	$item->{count} = 1;
		2926	$item->{text} = $item->{tooltip} = $text;
		2927	}
		2928	$item->{id} = ++$self->{id};
		2929	$item->{timeout} = $timeout;
		2930	delete $item->{label};
		2931	} else {
		2932	$self->{item}{$group} = {
		2933	id => ++$self->{id},
2696	text => $text,	2934	text => $text,
2697	timeout => 60,	2935	timeout => $timeout,
2698	tooltip => $text,	2936	tooltip => $text,
2699	fontsize => 0.8,
2700	color => [0.8, 0.8, 0.8, 0.8],	2937	fg => [0.8, 0.8, 0.8, 0.8],
		2938	pri => 0,
		2939	count => 1,
2701	%arg,	2940	%arg,
		2941	};
2702	};	2942	}
2703
2704	$item->{timeout} += time;
2705	$item->{group} ||= $item+0;
2706
2707	$item = $self->{item}{$item->{group}} ||= $item;
2708		2943
2709	$self->reorder;	2944	$self->reorder;
		2945	}
		2946
		2947	sub reconfigure {
		2948	my ($self) = @_;
		2949
		2950	delete $_->{label}
		2951	for values %{ $self->{item} || {} };
		2952
		2953	$self->reorder;
		2954	$self->SUPER::reconfigure;
2710	}	2955	}
2711		2956
2712	#############################################################################	2957	#############################################################################
2713		2958
2714	package CFClient::UI::Root;	2959	package CFClient::UI::Root;
…		…
2746	}	2991	}
2747		2992
2748	sub size_allocate {	2993	sub size_allocate {
2749	my ($self, $w, $h) = @_;	2994	my ($self, $w, $h) = @_;
2750		2995
2751	my $old_w = $self->{old_w};
2752	my $old_h = $self->{old_h};
2753
2754	if ($old_w && $old_h) {
2755	for my $child ($self->children) {
2756	$child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2757	$child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2758	$child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2759	$child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2760	$child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2761	$child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2762	$child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2763	$child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2764	}
2765	}
2766
2767	for my $child ($self->children) {	2996	for my $child ($self->children) {
2768	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	2997	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2769		2998
		2999	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
		3000	if exists $child->{req_x};
		3001
		3002	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
		3003	if exists $child->{req_y};
		3004
2770	$X = List::Util::max 0, List::Util::min $w - $W, $X;	3005	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2771	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;	3006	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
		3007
2772	$child->configure ($X, $Y, $W, $H);	3008	$child->configure ($X, $Y, $W, $H);
2773	}	3009	}
2774
2775	$self->{old_w} = $w;
2776	$self->{old_h} = $h;
2777	}	3010	}
2778		3011
2779	sub coord2local {	3012	sub coord2local {
2780	my ($self, $x, $y) = @_;	3013	my ($self, $x, $y) = @_;
2781		3014
…		…
2794	$self->check_size;	3027	$self->check_size;
2795	$::WANT_REFRESH++;	3028	$::WANT_REFRESH++;
2796	}	3029	}
2797		3030
2798	sub add {	3031	sub add {
2799	my ($self, $child) = @_;	3032	my ($self, @children) = @_;
2800		3033
		3034	for (my @widgets = @children; my $w = pop @widgets; ) {
		3035	push @widgets, $w->children;
		3036	$w->{root} = $self;
		3037	$w->{visible} = 1;
		3038	}
		3039
		3040	for my $child (@children) {
		3041	$child->{is_toplevel} = 1;
		3042
2801	# integerise window positions	3043	# integerise window positions
2802	$child->{x} = int $child->{x};	3044	$child->{x} = int $child->{x};
2803	$child->{y} = int $child->{y};	3045	$child->{y} = int $child->{y};
		3046	}
2804		3047
2805	$self->SUPER::add ($child);	3048	$self->SUPER::add (@children);
		3049	}
		3050
		3051	sub remove {
		3052	my ($self, @children) = @_;
		3053
		3054	$self->SUPER::remove (@children);
		3055
		3056	while (@children) {
		3057	my $w = pop @children;
		3058	push @children, $w->children;
		3059	$w->set_invisible;
		3060	}
2806	}	3061	}
2807		3062
2808	sub on_refresh {	3063	sub on_refresh {
2809	my ($self, $id, $cb) = @_;	3064	my ($self, $id, $cb) = @_;
2810		3065
2811	$self->{refresh_hook}{$id} = $cb;	3066	$self->{refresh_hook}{$id} = $cb;
2812	}	3067	}
2813		3068
		3069	sub on_post_alloc {
		3070	my ($self, $id, $cb) = @_;
		3071
		3072	$self->{post_alloc_hook}{$id} = $cb;
		3073	}
		3074
2814	sub draw {	3075	sub draw {
2815	my ($self) = @_;	3076	my ($self) = @_;
		3077
		3078	while ($self->{refresh_hook}) {
		3079	$_->()
		3080	for values %{delete $self->{refresh_hook}};
		3081	}
2816		3082
2817	if ($self->{check_size}) {	3083	if ($self->{check_size}) {
2818	my @queue = ([], []);	3084	my @queue = ([], []);
2819		3085
2820	for (;;) {	3086	for (;;) {
…		…
2828		3094
2829	my ($w, $h) = $widget->{user_w} && $widget->{user_h}	3095	my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2830	? @$widget{qw(user_w user_h)}	3096	? @$widget{qw(user_w user_h)}
2831	: $widget->size_request;	3097	: $widget->size_request;
2832		3098
		3099	if (delete $widget->{force_alloc}
2833	if ($w != $widget->{req_w} || $h != $widget->{req_h}) {	3100	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2834	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#	3101	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2835		3102
2836	$widget->{req_w} = $w;	3103	$widget->{req_w} = $w;
2837	$widget->{req_h} = $h;	3104	$widget->{req_h} = $h;
2838		3105
2839	$self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}];	3106	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
2840		3107
2841	$widget->{parent}->check_size	3108	$widget->{parent}->check_size
2842	if $widget->{parent};	3109	if $widget->{parent};
2843	}	3110	}
2844	}	3111	}
…		…
2851	$w = 0 if $w < 0;	3118	$w = 0 if $w < 0;
2852	$h = 0 if $h < 0;	3119	$h = 0 if $h < 0;
2853		3120
2854	$widget->{w} = $w;	3121	$widget->{w} = $w;
2855	$widget->{h} = $h;	3122	$widget->{h} = $h;
2856	$widget->size_allocate ($w, $h);
2857	$widget->emit (size_allocate => $w, $h);	3123	$widget->emit (size_allocate => $w, $h);
2858	}	3124	}
2859	}	3125	}
2860		3126
2861	while ($self->{refresh_hook}) {	3127	while ($self->{post_alloc_hook}) {
2862	$_->()	3128	$_->()
2863	for values %{delete $self->{refresh_hook}};	3129	for values %{delete $self->{post_alloc_hook}};
2864	}	3130	}
2865		3131
2866	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3132	glViewport 0, 0, $::WIDTH, $::HEIGHT;
2867	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3133	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2868	glClear GL_COLOR_BUFFER_BIT;	3134	glClear GL_COLOR_BUFFER_BIT;
2869		3135
2870	glMatrixMode GL_PROJECTION;	3136	glMatrixMode GL_PROJECTION;
2871	glLoadIdentity;	3137	glLoadIdentity;
2872	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;	3138	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2873	glMatrixMode GL_MODELVIEW;	3139	glMatrixMode GL_MODELVIEW;
2874	glLoadIdentity;	3140	glLoadIdentity;
2875		3141
2876	$self->_draw;	3142	$self->_draw;
2877	}	3143	}
…		…
2879	#############################################################################	3145	#############################################################################
2880		3146
2881	package CFClient::UI;	3147	package CFClient::UI;
2882		3148
2883	$ROOT = new CFClient::UI::Root;	3149	$ROOT = new CFClient::UI::Root;
2884	$TOOLTIP = new CFClient::UI::Tooltip;	3150	$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2885		3151
2886	1	3152	1
2887		3153

Diff Legend

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