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.193 by root, Wed May 10 21:12:26 2006 UTC vs.
Revision 1.235 by root, Thu May 25 16:35:42 2006 UTC

1	package CFClient::UI;	1	package CFClient::UI;
2		2
		3	use utf8;
3	use strict;	4	use strict;
4		5
5	use Scalar::Util ();	6	use Scalar::Util ();
6	use List::Util ();	7	use List::Util ();
7		8
…		…
10	our ($FOCUS, $HOVER, $GRAB); # various widgets	11	our ($FOCUS, $HOVER, $GRAB); # various widgets
11		12
12	our $ROOT;	13	our $ROOT;
13	our $TOOLTIP;	14	our $TOOLTIP;
14	our $BUTTON_STATE;	15	our $BUTTON_STATE;
		16
		17	our %WIDGET; # all widgets, weak-referenced
15		18
16	sub check_tooltip {	19	sub check_tooltip {
17	if (!$GRAB) {	20	if (!$GRAB) {
18	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	21	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19	if (length $widget->{tooltip}) {	22	if (length $widget->{tooltip}) {
…		…
23		26
24	my $tip = $widget->{tooltip};	27	my $tip = $widget->{tooltip};
25		28
26	$tip = $tip->($widget) if CODE:: eq ref $tip;	29	$tip = $tip->($widget) if CODE:: eq ref $tip;
27		30
28	$TOOLTIP->set_markup ($widget->{tooltip});	31	$TOOLTIP->set_tooltip_from ($widget);
29
30	$TOOLTIP->show;	32	$TOOLTIP->show;
31		33
32	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	34	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33		35
34	if ($x + $TOOLTIP->{w} > $::WIDTH) {
35	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);	36	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
36	}	37	if $x + $TOOLTIP->{w} > $::WIDTH;
37		38
38	$TOOLTIP->move ($x, $y);	39	$TOOLTIP->move ($x, $y);
		40	$TOOLTIP->check_size;
		41	$TOOLTIP->update;
39	}	42	}
40		43
41	return;	44	return;
42	}	45	}
43	}	46	}
…		…
47	delete $TOOLTIP->{owner};	50	delete $TOOLTIP->{owner};
48	}	51	}
49		52
50	# class methods for events	53	# class methods for events
51	sub feed_sdl_key_down_event {	54	sub feed_sdl_key_down_event {
52	$FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])	55	$FOCUS->emit (key_down => $_[0])
53	if $FOCUS;	56	if $FOCUS;
54	}	57	}
55		58
56	sub feed_sdl_key_up_event {	59	sub feed_sdl_key_up_event {
57	$FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])	60	$FOCUS->emit (key_up => $_[0])
58	if $FOCUS;	61	if $FOCUS;
59	}	62	}
60		63
61	sub feed_sdl_button_down_event {	64	sub feed_sdl_button_down_event {
62	my ($ev) = @_;	65	my ($ev) = @_;
…		…
71	check_tooltip;	74	check_tooltip;
72	}	75	}
73		76
74	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	77	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
75		78
76	if ($GRAB) {	79	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
77	($x, $y) = $GRAB->coord2local ($x, $y);	80	if $GRAB;
78	$GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
79	}
80	}	81	}
81		82
82	sub feed_sdl_button_up_event {	83	sub feed_sdl_button_up_event {
83	my ($ev) = @_;	84	my ($ev) = @_;
84	my ($x, $y) = ($ev->{x}, $ev->{y});	85	my ($x, $y) = ($ev->{x}, $ev->{y});
85		86
86	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	87	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
87		88
88	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	89	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
89		90
90	if ($GRAB) {	91	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
91	($x, $y) = $GRAB->coord2local ($x, $y);	92	if $GRAB;
92	$GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
93	}
94		93
95	if (!$BUTTON_STATE) {	94	if (!$BUTTON_STATE) {
96	my $grab = $GRAB; undef $GRAB;	95	my $grab = $GRAB; undef $GRAB;
97	$grab->update if $grab;	96	$grab->update if $grab;
98	$GRAB->update if $GRAB;	97	$GRAB->update if $GRAB;
…		…
114	$HOVER->update if $HOVER && $HOVER->{can_hover};	113	$HOVER->update if $HOVER && $HOVER->{can_hover};
115		114
116	check_tooltip;	115	check_tooltip;
117	}	116	}
118		117
119	if ($HOVER) {
120	($x, $y) = $HOVER->coord2local ($x, $y);
121	$HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);	118	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
122	}	119	if $HOVER;
123	}	120	}
124		121
125	# convert position array to integers	122	# convert position array to integers
126	sub harmonize {	123	sub harmonize {
127	my ($vals) = @_;	124	my ($vals) = @_;
…		…
131	for (@$vals) {	128	for (@$vals) {
132	my $i = int $_ + $rem;	129	my $i = int $_ + $rem;
133	$rem += $_ - $i;	130	$rem += $_ - $i;
134	$_ = $i;	131	$_ = $i;
135	}	132	}
		133	}
		134
		135	sub full_refresh {
		136	# make a copy, otherwise for complains about freed values.
		137	my @widgets = values %WIDGET;
		138
		139	$_->update
		140	for @widgets;
		141	}
		142
		143	sub reconfigure_widgets {
		144	# make a copy, otherwise C<for> complains about freed values.
		145	my @widgets = values %WIDGET;
		146
		147	$_->reconfigure
		148	for @widgets;
		149	}
		150
		151	# call when resolution changes etc.
		152	sub rescale_widgets {
		153	my ($sx, $sy) = @_;
		154
		155	for my $widget (values %WIDGET) {
		156	if ($widget->{is_toplevel}) {
		157	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
		158	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
		159	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
		160	$widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
		161	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
		162	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
		163	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
		164	$widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
		165	}
		166	}
		167
		168	reconfigure_widgets;
136	}	169	}
137		170
138	#############################################################################	171	#############################################################################
139		172
140	package CFClient::UI::Base;	173	package CFClient::UI::Base;
…		…
158	if (/^connect_(.*)$/) {	191	if (/^connect_(.*)$/) {
159	$self->connect ($1 => delete $self->{$_});	192	$self->connect ($1 => delete $self->{$_});
160	}	193	}
161	}	194	}
162		195
		196	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
		197
163	$self	198	$self
164	}	199	}
165		200
166	sub destroy {	201	sub destroy {
167	my ($self) = @_;	202	my ($self) = @_;
…		…
170	%$self = ();	205	%$self = ();
171	}	206	}
172		207
173	sub show {	208	sub show {
174	my ($self) = @_;	209	my ($self) = @_;
175
176	return if $self->{parent};	210	return if $self->{parent};
177		211
178	$CFClient::UI::ROOT->add ($self);	212	$CFClient::UI::ROOT->add ($self);
179	}	213	}
180		214
181	sub hide {	215	sub show_centered {
182	my ($self) = @_;	216	my ($self) = @_;
		217	return if $self->{parent};
		218
		219	$self->show;
		220
		221	$CFClient::UI::ROOT->on_post_alloc (
		222	"centered $self" => sub {
		223	$self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
		224	},
		225	);
		226	}
		227
		228	sub set_invisible {
		229	my ($self) = @_;
		230
		231	# broken show/hide model
		232
		233	delete $self->{visible};
183		234
184	undef $GRAB if $GRAB == $self;	235	undef $GRAB if $GRAB == $self;
185	undef $HOVER if $HOVER == $self;	236	undef $HOVER if $HOVER == $self;
		237
		238	CFClient::UI::check_tooltip
		239	if $CFClient::UI::TOOLTIP->{owner} == $self;
		240
		241	$self->focus_out;
		242	}
		243
		244	sub hide {
		245	my ($self) = @_;
		246
		247	$self->set_invisible;
186		248
187	$self->{parent}->remove ($self)	249	$self->{parent}->remove ($self)
188	if $self->{parent};	250	if $self->{parent};
189	}	251	}
190		252
…		…
240		302
241	sub size_allocate {	303	sub size_allocate {
242	# nothing to be done	304	# nothing to be done
243	}	305	}
244		306
		307	sub reconfigure {
		308	my ($self) = @_;
		309
		310	$self->check_size (1);
		311	$self->update;
		312	}
		313
245	sub children {	314	sub children {
246	}
247
248	# call when resolution changes etc.
249	sub reconfigure {
250	my ($self) = @_;
251
252	$_->reconfigure
253	for $self->children;
254
255	$self->check_size;
256	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $self->{w}, $self->{h}];
257	$self->update;
258	}	315	}
259		316
260	sub set_max_size {	317	sub set_max_size {
261	my ($self, $w, $h) = @_;	318	my ($self, $w, $h) = @_;
262		319
263	delete $self->{max_w}; $self->{max_w} = $w if $w;	320	delete $self->{max_w}; $self->{max_w} = $w if $w;
264	delete $self->{max_h}; $self->{max_h} = $h if $h;	321	delete $self->{max_h}; $self->{max_h} = $h if $h;
		322	}
		323
		324	sub set_tooltip {
		325	my ($self, $tooltip) = @_;
		326
		327	$tooltip =~ s/^\s+//;
		328	$tooltip =~ s/\s+$//;
		329
		330	return if $self->{tooltip} eq $tooltip;
		331
		332	$self->{tooltip} = $tooltip;
		333
		334	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
		335	delete $CFClient::UI::TOOLTIP->{owner};
		336	CFClient::UI::check_tooltip;
		337	}
265	}	338	}
266		339
267	# translate global coordinates to local coordinate system	340	# translate global coordinates to local coordinate system
268	sub coord2local {	341	sub coord2local {
269	my ($self, $x, $y) = @_;	342	my ($self, $x, $y) = @_;
…		…
284	return if $FOCUS == $self;	357	return if $FOCUS == $self;
285	return unless $self->{can_focus};	358	return unless $self->{can_focus};
286		359
287	my $focus = $FOCUS; $FOCUS = $self;	360	my $focus = $FOCUS; $FOCUS = $self;
288		361
289	$self->emit (focus_in => $focus);	362	$self->_emit (focus_in => $focus);
290		363
291	$focus->update if $focus;	364	$focus->update if $focus;
292	$FOCUS->update;	365	$FOCUS->update;
293	}	366	}
294		367
…		…
297		370
298	return unless $FOCUS == $self;	371	return unless $FOCUS == $self;
299		372
300	my $focus = $FOCUS; undef $FOCUS;	373	my $focus = $FOCUS; undef $FOCUS;
301		374
302	$self->emit (focus_out => $focus);	375	$self->_emit (focus_out => $focus);
303		376
304	$focus->update if $focus; #?	377	$focus->update if $focus; #?
		378
		379	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
		380	unless $FOCUS;
305	}	381	}
306		382
307	sub mouse_motion { }	383	sub mouse_motion { }
308	sub button_up { }	384	sub button_up { }
309	sub key_down { }	385	sub key_down { }
310	sub key_up { }	386	sub key_up { }
311		387
312	sub button_down {	388	sub button_down {
313	my ($self, $ev, $x, $y) = @_;	389	my ($self, $ev, $x, $y) = @_;
314		390
315	$self->focus_in;	391	$self->focus_in;
…		…
349	if ($ENV{PCLIENT_DEBUG}) {	425	if ($ENV{PCLIENT_DEBUG}) {
350	glPushMatrix;	426	glPushMatrix;
351	glColor 1, 1, 0, 1;	427	glColor 1, 1, 0, 1;
352	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	428	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
353	glBegin GL_LINE_LOOP;	429	glBegin GL_LINE_LOOP;
354	glVertex 0 , 0;	430	glVertex 0 , 0;
355	glVertex $self->{w}, 0;	431	glVertex $self->{w} - 1, 0;
356	glVertex $self->{w}, $self->{h};	432	glVertex $self->{w} - 1, $self->{h} - 1;
357	glVertex 0 , $self->{h};	433	glVertex 0 , $self->{h} - 1;
358	glEnd;	434	glEnd;
359	glPopMatrix;	435	glPopMatrix;
360	CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	436	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
361	}	437	}
362	}	438	}
363		439
364	sub _draw {	440	sub _draw {
365	my ($self) = @_;	441	my ($self) = @_;
…		…
382	sub set_parent {	458	sub set_parent {
383	my ($self, $parent) = @_;	459	my ($self, $parent) = @_;
384		460
385	Scalar::Util::weaken ($self->{parent} = $parent);	461	Scalar::Util::weaken ($self->{parent} = $parent);
386		462
		463	# TODO: req_w _does_change after ->reconfigure
387	$self->check_size	464	$self->check_size
388	unless exists $self->{req_w};	465	unless exists $self->{req_w};
		466
		467	$self->show;
389	}	468	}
390		469
391	sub check_size {	470	sub check_size {
392	my ($self) = @_;	471	my ($self, $forced) = @_;
393		472
		473	$self->{force_alloc} = 1 if $forced;
394	$CFClient::UI::ROOT->{check_size}{$self} = $self;	474	$CFClient::UI::ROOT->{check_size}{$self} = $self;
395	}	475	}
396		476
397	sub update {	477	sub update {
398	my ($self) = @_;	478	my ($self) = @_;
…		…
405	my ($self, $signal, $cb) = @_;	485	my ($self, $signal, $cb) = @_;
406		486
407	push @{ $self->{signal_cb}{$signal} }, $cb;	487	push @{ $self->{signal_cb}{$signal} }, $cb;
408	}	488	}
409		489
		490	sub _emit {
		491	my ($self, $signal, @args) = @_;
		492
		493	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
		494	}
		495
410	sub emit {	496	sub emit {
411	my ($self, $signal, @args) = @_;	497	my ($self, $signal, @args) = @_;
412		498
413	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}	499	$self->_emit ($signal, @args)
		500	|| $self->$signal (@args);
414	}	501	}
415		502
416	sub DESTROY {	503	sub DESTROY {
417	my ($self) = @_;	504	my ($self) = @_;
418		505
		506	delete $WIDGET{$self+0};
419	#$self->deactivate;	507	#$self->deactivate;
420	}	508	}
421		509
422	#############################################################################	510	#############################################################################
423		511
…		…
432	my $class = shift;	520	my $class = shift;
433		521
434	# range [value, low, high, page]	522	# range [value, low, high, page]
435		523
436	$class->SUPER::new (	524	$class->SUPER::new (
437	bg => [0, 0, 0, 0.2],	525	#bg => [0, 0, 0, 0.2],
438	active_bg => [1, 1, 1, 0.5],	526	#active_bg => [1, 1, 1, 0.5],
439	@_	527	@_
440	)	528	)
441	}	529	}
442		530
443	sub _draw {	531	sub _draw {
444	my ($self) = @_;	532	my ($self) = @_;
445		533
		534	my $color = $FOCUS == $self && $self->{active_bg}
		535	? $self->{active_bg}
		536	: $self->{bg};
		537
		538	if ($color && (@$color < 4 || $color->[3])) {
446	my ($w, $h) = @$self{qw(w h)};	539	my ($w, $h) = @$self{qw(w h)};
447		540
448	glEnable GL_BLEND;	541	glEnable GL_BLEND;
449	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	542	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
450	glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };	543	glColor @$color;
451		544
452	glBegin GL_QUADS;	545	glBegin GL_QUADS;
453	glVertex 0 , 0;	546	glVertex 0 , 0;
454	glVertex 0 , $h;	547	glVertex 0 , $h;
455	glVertex $w, $h;	548	glVertex $w, $h;
456	glVertex $w, 0;	549	glVertex $w, 0;
457	glEnd;	550	glEnd;
458		551
459	glDisable GL_BLEND;	552	glDisable GL_BLEND;
		553	}
460	}	554	}
461		555
462	#############################################################################	556	#############################################################################
463		557
464	package CFClient::UI::Empty;	558	package CFClient::UI::Empty;
…		…
508	$self->{children} = [	602	$self->{children} = [
509	sort { $a->{z} <=> $b->{z} }	603	sort { $a->{z} <=> $b->{z} }
510	@{$self->{children}}, @widgets	604	@{$self->{children}}, @widgets
511	];	605	];
512		606
513	$self->check_size;	607	$self->check_size (1);
514	$self->update;	608	$self->update;
515	}	609	}
516		610
517	sub children {	611	sub children {
518	@{ $_[0]{children} }	612	@{ $_[0]{children} }
…		…
625	}	719	}
626		720
627	sub update {	721	sub update {
628	my ($self) = @_;	722	my ($self) = @_;
629		723
630	$ROOT->on_refresh ($self => sub { $self->render_child });	724	$ROOT->on_post_alloc ($self => sub { $self->render_child });
631	$self->SUPER::update;	725	$self->SUPER::update;
632	}	726	}
633		727
634	sub size_allocate {	728	sub size_allocate {
635	my ($self, $w, $h) = @_;	729	my ($self, $w, $h) = @_;
…		…
648	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	742	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
649	glClearColor 0, 0, 0, 0;	743	glClearColor 0, 0, 0, 0;
650	glClear GL_COLOR_BUFFER_BIT;	744	glClear GL_COLOR_BUFFER_BIT;
651		745
652	$self->_render;	746	$self->_render;
653	# glColorMask 1, 1, 1, 0;
654	# glEnable GL_BLEND;
655	# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
656	# glRasterPos 0, 0;
657	# glCopyPixels 0, 0, $self->{w}, $self->{h};
658	# glDisable GL_BLEND;
659	# glColorMask 1, 1, 1, 1;
660	};	747	};
661	}	748	}
662		749
663	sub _draw {	750	sub _draw {
664	my ($self) = @_;	751	my ($self) = @_;
…		…
666	my ($w, $h) = ($self->w, $self->h);	753	my ($w, $h) = ($self->w, $self->h);
667		754
668	my $tex = $self->{texture}	755	my $tex = $self->{texture}
669	or return;	756	or return;
670		757
671	glEnable GL_BLEND;
672	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
673	glEnable GL_TEXTURE_2D;	758	glEnable GL_TEXTURE_2D;
674	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	759	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
675	glColor 0, 0, 0, 1;	760	glColor 1, 1, 1, 1;
676		761
677	$tex->draw_quad (0, 0, $w, $h);	762	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
678		763
679	glDisable GL_BLEND;
680	glDisable GL_TEXTURE_2D;	764	glDisable GL_TEXTURE_2D;
681	}	765	}
682		766
683	#############################################################################	767	#############################################################################
684		768
685	package CFClient::UI::ViewPort;	769	package CFClient::UI::ViewPort;
686		770
687	our @ISA = CFClient::UI::Window::;	771	our @ISA = CFClient::UI::Window::;
688		772
		773	sub new {
		774	my $class = shift;
		775
		776	$class->SUPER::new (
		777	scroll_x => 0,
		778	scroll_y => 1,
		779	@_,
		780	)
		781	}
		782
689	sub size_request {	783	sub size_request {
690	my ($self) = @_;	784	my ($self) = @_;
691		785
692	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	786	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
693	$self->child->configure (0, 0, @$self{qw(child_w child_h)});
694		787
695	@$self{qw(child_w child_h)}	788	@$self{qw(child_w child_h)}
696	}	789	}
697		790
698	sub size_allocate {	791	sub size_allocate {
699	my ($self, $w, $h) = @_;	792	my ($self, $w, $h) = @_;
700		793
		794	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
		795	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
		796
		797	$self->child->configure (0, 0, $w, $h);
701	$self->update;	798	$self->update;
702	}	799	}
703		800
704	sub set_offset {	801	sub set_offset {
705	my ($self, $x, $y) = @_;	802	my ($self, $x, $y) = @_;
…		…
759		856
760	my $slider = new CFClient::UI::Slider	857	my $slider = new CFClient::UI::Slider
761	vertical => 1,	858	vertical => 1,
762	range => [0, 0, 1, 0.01], # HACK fix	859	range => [0, 0, 1, 0.01], # HACK fix
763	connect_changed => sub {	860	connect_changed => sub {
764	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));	861	$self->{vp}->set_offset (0, $_[1]);
765	},	862	},
766	;	863	;
767		864
768	$self = $class->SUPER::new (	865	$self = $class->SUPER::new (
769	vp => (new CFClient::UI::ViewPort),	866	vp => (new CFClient::UI::ViewPort expand => 1),
770	slider => $slider,	867	slider => $slider,
771	@_,	868	@_,
772	);	869	);
773		870
774	$self->{vp}->add ($self->{scrolled});	871	$self->{vp}->add ($self->{scrolled});
…		…
776	$self->add ($self->{slider});	873	$self->add ($self->{slider});
777		874
778	$self	875	$self
779	}	876	}
780		877
		878	sub size_allocate {
		879	my ($self, $w, $h) = @_;
		880
		881	$self->SUPER::size_allocate ($w, $h);
		882
		883	my $child = $self->{vp}->child;
		884	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
		885	}
		886
781	#TODO# update range on size_allocate depeneing on child	887	#TODO# update range on size_allocate depending on child
782	# update viewport offset on scroll	888	# update viewport offset on scroll
783		889
784	#############################################################################	890	#############################################################################
785		891
786	package CFClient::UI::Frame;	892	package CFClient::UI::Frame;
…		…
790	use CFClient::OpenGL;	896	use CFClient::OpenGL;
791		897
792	sub new {	898	sub new {
793	my $class = shift;	899	my $class = shift;
794		900
795	my $self = $class->SUPER::new (	901	$class->SUPER::new (
796	bg => [1, 1, 1, 1],	902	bg => undef,
797	border_bg => [1, 1, 1, 1],
798	border => 0.8,
799	@_	903	@_,
800	);	904	)
801
802	$self
803	}	905	}
804		906
805	sub _draw {	907	sub _draw {
806	my ($self) = @_;	908	my ($self) = @_;
807		909
808	my ($w, $h) = ($self->{w}, $self->{h});	910	if ($self->{bg}) {
		911	my ($w, $h) = @$self{qw(w h)};
809		912
810	glEnable GL_BLEND;	913	glEnable GL_BLEND;
811	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	914	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
812	glEnable GL_TEXTURE_2D;	915	glColor @{ $self->{bg} };
813	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
814		916
815	# glBegin GL_QUADS;	917	glBegin GL_QUADS;
816	# glColor 0, 0, 0, 0;
817	# glVertex 0 , 0;	918	glVertex 0 , 0;
818	# glVertex 0 , $h;	919	glVertex 0 , $h;
819	# glVertex $w, $h;	920	glVertex $w, $h;
820	# glVertex $w, 0;	921	glVertex $w, 0;
821	# glEnd;	922	glEnd;
822		923
823
824	$self->child->draw;
825	glDisable GL_BLEND;	924	glDisable GL_BLEND;
826	glDisable GL_TEXTURE_2D;	925	}
		926
		927	$self->SUPER::_draw;
827	}	928	}
828		929
829	#############################################################################	930	#############################################################################
830		931
831	package CFClient::UI::FancyFrame;	932	package CFClient::UI::FancyFrame;
…		…
842	my $class = shift;	943	my $class = shift;
843		944
844	# TODO: user_x, user_y, overwrite moveto?	945	# TODO: user_x, user_y, overwrite moveto?
845		946
846	my $self = $class->SUPER::new (	947	my $self = $class->SUPER::new (
847	bg => [1, 1, 1, 1],	948	bg => [1, 1, 1, 1],
848	border_bg => [1, 1, 1, 1],	949	border_bg => [1, 1, 1, 1],
849	border => 0.6,	950	border => 0.6,
		951	is_toplevel => 1,
850	can_events => 1,	952	can_events => 1,
851	@_	953	@_
852	);	954	);
853		955
854	$self->{title} &&= new CFClient::UI::Label	956	$self->{title} &&= new CFClient::UI::Label
855	align => 0,	957	align => 0,
…		…
879	my ($self, $w, $h) = @_;	981	my ($self, $w, $h) = @_;
880		982
881	$h -= List::Util::max 0, $self->border * 2;	983	$h -= List::Util::max 0, $self->border * 2;
882	$w -= List::Util::max 0, $self->border * 2;	984	$w -= List::Util::max 0, $self->border * 2;
883		985
884	$self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)	986	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
885	if $self->{title};	987	if $self->{title};
886		988
887	$self->child->configure ($self->border, $self->border, $w, $h);	989	$self->child->configure ($self->border, $self->border, $w, $h);
888	}	990	}
889		991
…		…
947	my ($self) = @_;	1049	my ($self) = @_;
948		1050
949	my ($w, $h ) = ($self->{w}, $self->{h});	1051	my ($w, $h ) = ($self->{w}, $self->{h});
950	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1052	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
951		1053
952	glEnable GL_BLEND;
953	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
954	glEnable GL_TEXTURE_2D;	1054	glEnable GL_TEXTURE_2D;
955	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1055	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
956		1056
957	my $border = $self->border;	1057	my $border = $self->border;
958		1058
959	glColor @{ $self->{border_bg} };	1059	glColor @{ $self->{border_bg} };
960	$tex[1]->draw_quad (0, 0, $w, $border);	1060	$tex[1]->draw_quad_alpha (0, 0, $w, $border);
961	$tex[3]->draw_quad (0, $border, $border, $ch);	1061	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);
962	$tex[2]->draw_quad ($w - $border, $border, $border, $ch);	1062	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
963	$tex[4]->draw_quad (0, $h - $border, $w, $border);	1063	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
964		1064
965	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1065	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
966	my $bg = $tex[0];	1066	my $bg = $tex[0];
967		1067
968	# TODO: repeat texture not scale	1068	# TODO: repeat texture not scale
…		…
972	glColor @{ $self->{bg} };	1072	glColor @{ $self->{bg} };
973		1073
974	$bg->{s} = $rep_x;	1074	$bg->{s} = $rep_x;
975	$bg->{t} = $rep_y;	1075	$bg->{t} = $rep_y;
976	$bg->{wrap_mode} = 1;	1076	$bg->{wrap_mode} = 1;
977	$bg->draw_quad ($border, $border, $cw, $ch);	1077	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
		1078	}
978		1079
979	glDisable GL_TEXTURE_2D;	1080	glDisable GL_TEXTURE_2D;
980	glDisable GL_BLEND;
981	}
982		1081
983	$self->{title}->draw if $self->{title};	1082	$self->{title}->draw if $self->{title};
984		1083
985	$self->child->draw;	1084	$self->child->draw;
986	}	1085	}
…		…
998	sub new {	1097	sub new {
999	my $class = shift;	1098	my $class = shift;
1000		1099
1001	$class->SUPER::new (	1100	$class->SUPER::new (
1002	col_expand => [],	1101	col_expand => [],
1003	@_	1102	@_,
1004	)	1103	)
1005	}	1104	}
1006		1105
1007	sub add {	1106	sub add {
1008	my ($self, $x, $y, $child) = @_;	1107	my ($self, $x, $y, $child) = @_;
…		…
1253		1352
1254	#############################################################################	1353	#############################################################################
1255		1354
1256	package CFClient::UI::Label;	1355	package CFClient::UI::Label;
1257		1356
1258	our @ISA = CFClient::UI::Base::;	1357	our @ISA = CFClient::UI::DrawBG::;
1259		1358
1260	use CFClient::OpenGL;	1359	use CFClient::OpenGL;
1261		1360
1262	sub new {	1361	sub new {
1263	my ($class, %arg) = @_;	1362	my ($class, %arg) = @_;
1264		1363
1265	my $self = $class->SUPER::new (	1364	my $self = $class->SUPER::new (
1266	fg => [1, 1, 1],	1365	fg => [1, 1, 1],
		1366	#bg => none
		1367	#active_bg => none
1267	#font => default_font	1368	#font => default_font
		1369	#text => initial text
		1370	#markup => initial narkup
		1371	#max_w => maximum pixel width
		1372	ellipsise => 3, # end
		1373	layout => (new CFClient::Layout),
1268	fontsize => 1,	1374	fontsize => 1,
1269	text => "",
1270	align => -1,	1375	align => -1,
1271	valign => -1,	1376	valign => -1,
1272	padding => 2,	1377	padding => 2,
1273	layout => new CFClient::Layout,
1274	can_events => 0,	1378	can_events => 0,
1275	%arg	1379	%arg
1276	);	1380	);
1277		1381
1278	if (exists $self->{template}) {	1382	if (exists $self->{template}) {
1279	my $layout = new CFClient::Layout;	1383	my $layout = new CFClient::Layout;
1280	$layout->set_text (delete $self->{template});	1384	$layout->set_text (delete $self->{template});
1281	$self->{template} = $layout;	1385	$self->{template} = $layout;
1282	}	1386	}
1283		1387
1284	$self->set_text (delete $self->{text}) if exists $self->{text};	1388	if (exists $self->{markup}) {
1285	$self->set_markup (delete $self->{markup}) if exists $self->{markup};	1389	$self->set_markup (delete $self->{markup});
		1390	} else {
		1391	$self->set_text (delete $self->{text});
		1392	}
1286		1393
1287	$self	1394	$self
1288	}	1395	}
1289		1396
1290	sub escape {	1397	sub escape($) {
1291	local $_ = $_[1];	1398	local $_ = $_[0];
1292		1399
1293	s/&/&amp;/g;	1400	s/&/&amp;/g;
1294	s/>/&gt;/g;	1401	s/>/&gt;/g;
1295	s/</&lt;/g;	1402	s/</&lt;/g;
1296		1403
1297	$_[1]	1404	$_
1298	}	1405	}
1299		1406
1300	sub update {	1407	sub update {
1301	my ($self) = @_;	1408	my ($self) = @_;
1302		1409
…		…
1308	my ($self, $text) = @_;	1415	my ($self, $text) = @_;
1309		1416
1310	return if $self->{text} eq "T$text";	1417	return if $self->{text} eq "T$text";
1311	$self->{text} = "T$text";	1418	$self->{text} = "T$text";
1312		1419
		1420	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1313	$self->{layout}->set_text ($text);	1421	$self->{layout}->set_text ($text);
1314		1422
1315	$self->update;	1423	$self->update;
1316	$self->check_size;	1424	$self->check_size;
1317	}	1425	}
…		…
1320	my ($self, $markup) = @_;	1428	my ($self, $markup) = @_;
1321		1429
1322	return if $self->{text} eq "M$markup";	1430	return if $self->{text} eq "M$markup";
1323	$self->{text} = "M$markup";	1431	$self->{text} = "M$markup";
1324		1432
		1433	my $rgba = $markup =~ /span.*(?:foreground|background)/;
		1434
		1435	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1325	$self->{layout}->set_markup ($markup);	1436	$self->{layout}->set_markup ($markup);
1326		1437
1327	$self->update;	1438	$self->update;
1328	$self->check_size;	1439	$self->check_size;
1329	}	1440	}
…		…
1331	sub size_request {	1442	sub size_request {
1332	my ($self) = @_;	1443	my ($self) = @_;
1333		1444
1334	$self->{layout}->set_font ($self->{font}) if $self->{font};	1445	$self->{layout}->set_font ($self->{font}) if $self->{font};
1335	$self->{layout}->set_width ($self->{max_w} || -1);	1446	$self->{layout}->set_width ($self->{max_w} || -1);
		1447	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1448	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1336	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1449	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1337		1450
1338	my ($w, $h) = $self->{layout}->size;	1451	my ($w, $h) = $self->{layout}->size;
1339		1452
1340	if (exists $self->{template}) {	1453	if (exists $self->{template}) {
…		…
1370	}	1483	}
1371		1484
1372	sub _draw {	1485	sub _draw {
1373	my ($self) = @_;	1486	my ($self) = @_;
1374		1487
		1488	$self->SUPER::_draw; # draw background, if applicable
		1489
1375	my $tex = $self->{texture} ||= do {	1490	my $tex = $self->{texture} ||= do {
		1491	$self->{layout}->set_foreground (@{$self->{fg}});
1376	$self->{layout}->set_font ($self->{font}) if $self->{font};	1492	$self->{layout}->set_font ($self->{font}) if $self->{font};
1377	$self->{layout}->set_width ($self->{w});	1493	$self->{layout}->set_width ($self->{w});
		1494	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1495	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1378	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);	1496	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
		1497
1379	new_from_layout CFClient::Texture $self->{layout}	1498	my $tex = new_from_layout CFClient::Texture $self->{layout};
		1499
		1500	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}
		1501	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
		1502	: ($self->{w} - $tex->{w}) * 0.5);
		1503
		1504	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
		1505	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
		1506	: ($self->{h} - $tex->{h}) * 0.5);
		1507
		1508	$tex
1380	};	1509	};
1381		1510
1382	glEnable GL_BLEND;
1383	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1384	glEnable GL_TEXTURE_2D;	1511	glEnable GL_TEXTURE_2D;
1385	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1512	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1386		1513
		1514	if ($tex->{format} == GL_ALPHA) {
1387	glColor @{$self->{fg}};	1515	glColor @{$self->{fg}};
1388
1389	$self->{ox} = int (
1390	$self->{align} < 0 ? $self->{padding}
1391	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1392	: ($self->{w} - $tex->{w}) * 0.5
1393	);
1394
1395	$self->{oy} = int (
1396	$self->{valign} < 0 ? $self->{padding}
1397	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1398	: ($self->{h} - $tex->{h}) * 0.5
1399	);
1400
1401	$tex->draw_quad ($self->{ox}, $self->{oy});	1516	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});
		1517	} else {
		1518	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
		1519	}
1402		1520
1403	glDisable GL_TEXTURE_2D;	1521	glDisable GL_TEXTURE_2D;
1404	glDisable GL_BLEND;
1405	}	1522	}
1406		1523
1407	#############################################################################	1524	#############################################################################
1408		1525
1409	package CFClient::UI::EntryBase;	1526	package CFClient::UI::EntryBase;
…		…
1422	active_fg => [0, 0, 0],	1539	active_fg => [0, 0, 0],
1423	can_hover => 1,	1540	can_hover => 1,
1424	can_focus => 1,	1541	can_focus => 1,
1425	valign => 0,	1542	valign => 0,
1426	can_events => 1,	1543	can_events => 1,
		1544	#text => ...
1427	@_	1545	@_
1428	)	1546	)
1429	}	1547	}
1430		1548
1431	sub _set_text {	1549	sub _set_text {
…		…
1441	$self->{text} = $text;	1559	$self->{text} = $text;
1442		1560
1443	$text =~ s/./*/g if $self->{hidden};	1561	$text =~ s/./*/g if $self->{hidden};
1444	$self->{layout}->set_text ("$text ");	1562	$self->{layout}->set_text ("$text ");
1445		1563
1446	$self->emit (changed => $self->{text});	1564	$self->_emit (changed => $self->{text});
1447	}
1448
1449	sub get_text {
1450	$_[0]{text}
1451	}
1452
1453	sub size_request {
1454	my ($self) = @_;
1455
1456	my ($w, $h) = $self->SUPER::size_request;
1457
1458	($w + 1, $h) # add 1 for cursor
1459	}
1460
1461	sub size_allocate {
1462	my ($self, $w, $h) = @_;
1463
1464	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1465	}	1565	}
1466		1566
1467	sub set_text {	1567	sub set_text {
1468	my ($self, $text) = @_;	1568	my ($self, $text) = @_;
1469		1569
1470	$self->{cursor} = length $text;	1570	$self->{cursor} = length $text;
1471	$self->_set_text ($text);	1571	$self->_set_text ($text);
1472	$self->update;	1572	$self->update;
		1573	$self->check_size;
		1574	}
		1575
		1576	sub get_text {
		1577	$_[0]{text}
		1578	}
		1579
		1580	sub size_request {
		1581	my ($self) = @_;
		1582
		1583	my ($w, $h) = $self->SUPER::size_request;
		1584
		1585	($w + 1, $h) # add 1 for cursor
1473	}	1586	}
1474		1587
1475	sub key_down {	1588	sub key_down {
1476	my ($self, $ev) = @_;	1589	my ($self, $ev) = @_;
1477		1590
…		…
1479	my $sym = $ev->{sym};	1592	my $sym = $ev->{sym};
1480	my $uni = $ev->{unicode};	1593	my $uni = $ev->{unicode};
1481		1594
1482	my $text = $self->get_text;	1595	my $text = $self->get_text;
1483		1596
1484	if ($sym == 8) {	1597	if ($uni == 8) {
1485	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1598	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1486	} elsif ($sym == 127) {	1599	} elsif ($uni == 127) {
1487	substr $text, $self->{cursor}, 1, "";	1600	substr $text, $self->{cursor}, 1, "";
1488	} elsif ($sym == CFClient::SDLK_LEFT) {	1601	} elsif ($sym == CFClient::SDLK_LEFT) {
1489	--$self->{cursor} if $self->{cursor};	1602	--$self->{cursor} if $self->{cursor};
1490	} elsif ($sym == CFClient::SDLK_RIGHT) {	1603	} elsif ($sym == CFClient::SDLK_RIGHT) {
1491	++$self->{cursor} if $self->{cursor} < length $self->{text};	1604	++$self->{cursor} if $self->{cursor} < length $self->{text};
1492	} elsif ($sym == CFClient::SDLK_HOME) {	1605	} elsif ($sym == CFClient::SDLK_HOME) {
1493	$self->{cursor} = 0;	1606	$self->{cursor} = 0;
1494	} elsif ($sym == CFClient::SDLK_END) {	1607	} elsif ($sym == CFClient::SDLK_END) {
1495	$self->{cursor} = length $text;	1608	$self->{cursor} = length $text;
1496	} elsif ($sym == 27) {	1609	} elsif ($uni == 27) {
1497	$self->emit ('escape');	1610	$self->_emit ('escape');
1498	} elsif ($uni) {	1611	} elsif ($uni) {
1499	substr $text, $self->{cursor}++, 0, chr $uni;	1612	substr $text, $self->{cursor}++, 0, chr $uni;
1500	}	1613	}
1501		1614
1502	$self->_set_text ($text);	1615	$self->_set_text ($text);
1503	$self->update;	1616	$self->update;
		1617	$self->check_size;
1504	}	1618	}
1505		1619
1506	sub focus_in {	1620	sub focus_in {
1507	my ($self) = @_;	1621	my ($self) = @_;
1508		1622
…		…
1588	if ($sym == 13) {	1702	if ($sym == 13) {
1589	unshift @{$self->{history}},	1703	unshift @{$self->{history}},
1590	my $txt = $self->get_text;	1704	my $txt = $self->get_text;
1591	$self->{history_pointer} = -1;	1705	$self->{history_pointer} = -1;
1592	$self->{history_saveback} = '';	1706	$self->{history_saveback} = '';
1593	$self->emit (activate => $txt);	1707	$self->_emit (activate => $txt);
1594	$self->update;	1708	$self->update;
1595		1709
1596	} elsif ($sym == CFClient::SDLK_UP) {	1710	} elsif ($sym == CFClient::SDLK_UP) {
1597	if ($self->{history_pointer} < 0) {	1711	if ($self->{history_pointer} < 0) {
1598	$self->{history_saveback} = $self->get_text;	1712	$self->{history_saveback} = $self->get_text;
…		…
1637	my $class = shift;	1751	my $class = shift;
1638		1752
1639	$class->SUPER::new (	1753	$class->SUPER::new (
1640	padding => 4,	1754	padding => 4,
1641	fg => [1, 1, 1],	1755	fg => [1, 1, 1],
1642	bg => [1, 1, 1, 0.2],
1643	active_fg => [0, 0, 1],	1756	active_fg => [0, 0, 1],
1644	can_hover => 1,	1757	can_hover => 1,
1645	align => 0,	1758	align => 0,
1646	valign => 0,	1759	valign => 0,
1647	can_events => 1,	1760	can_events => 1,
1648	@_	1761	@_
1649	)	1762	)
1650	}	1763	}
1651		1764
		1765	sub activate { }
		1766
1652	sub button_up {	1767	sub button_up {
1653	my ($self, $ev, $x, $y) = @_;	1768	my ($self, $ev, $x, $y) = @_;
1654		1769
		1770	$self->emit ("activate")
1655	if ($x >= 0 && $x < $self->{w}	1771	if $x >= 0 && $x < $self->{w}
1656	&& $y >= 0 && $y < $self->{h}) {	1772	&& $y >= 0 && $y < $self->{h};
1657	$self->emit ("activate");
1658	}
1659	}	1773	}
1660		1774
1661	sub _draw {	1775	sub _draw {
1662	my ($self) = @_;	1776	my ($self) = @_;
1663		1777
…		…
1665		1779
1666	if ($GRAB == $self) {	1780	if ($GRAB == $self) {
1667	$self->{fg} = $self->{active_fg};	1781	$self->{fg} = $self->{active_fg};
1668	}	1782	}
1669		1783
1670	glEnable GL_BLEND;
1671	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1672	glEnable GL_TEXTURE_2D;	1784	glEnable GL_TEXTURE_2D;
1673	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1785	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1674	glColor 0, 0, 0, 1;	1786	glColor 0, 0, 0, 1;
1675		1787
1676	$tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});	1788	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1677		1789
1678	glDisable GL_TEXTURE_2D;	1790	glDisable GL_TEXTURE_2D;
1679	glDisable GL_BLEND;
1680		1791
1681	$self->SUPER::_draw;	1792	$self->SUPER::_draw;
1682	}	1793	}
1683		1794
1684	#############################################################################	1795	#############################################################################
…		…
1698		1809
1699	$class->SUPER::new (	1810	$class->SUPER::new (
1700	padding => 2,	1811	padding => 2,
1701	fg => [1, 1, 1],	1812	fg => [1, 1, 1],
1702	active_fg => [1, 1, 0],	1813	active_fg => [1, 1, 0],
		1814	bg => [0, 0, 0, 0.2],
		1815	active_bg => [1, 1, 1, 0.5],
1703	state => 0,	1816	state => 0,
1704	can_hover => 1,	1817	can_hover => 1,
1705	@_	1818	@_
1706	)	1819	)
1707	}	1820	}
…		…
1716	my ($self, $ev, $x, $y) = @_;	1829	my ($self, $ev, $x, $y) = @_;
1717		1830
1718	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1831	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1719	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1832	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1720	$self->{state} = !$self->{state};	1833	$self->{state} = !$self->{state};
1721	$self->emit (changed => $self->{state});	1834	$self->_emit (changed => $self->{state});
1722	}	1835	}
1723	}	1836	}
1724		1837
1725	sub _draw {	1838	sub _draw {
1726	my ($self) = @_;	1839	my ($self) = @_;
…		…
1731		1844
1732	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1845	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1733		1846
1734	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1847	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1735		1848
1736	glEnable GL_BLEND;	1849	my $tex = $self->{state} ? $tex[1] : $tex[0];
		1850
1737	glEnable GL_TEXTURE_2D;	1851	glEnable GL_TEXTURE_2D;
1738	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1739
1740	my $tex = $self->{state} ? $tex[1] : $tex[0];
1741
1742	$tex->draw_quad (0, 0, $s, $s);	1852	$tex->draw_quad_alpha (0, 0, $s, $s);
1743
1744	glDisable GL_TEXTURE_2D;	1853	glDisable GL_TEXTURE_2D;
1745	glDisable GL_BLEND;
1746	}	1854	}
1747		1855
1748	#############################################################################	1856	#############################################################################
1749		1857
1750	package CFClient::UI::Image;	1858	package CFClient::UI::Image;
…		…
1793	glTranslate 0, -$self->{w}, 0;	1901	glTranslate 0, -$self->{w}, 0;
1794		1902
1795	($w, $h) = ($h, $w);	1903	($w, $h) = ($h, $w);
1796	}	1904	}
1797		1905
1798	glEnable GL_BLEND;
1799	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1800	glEnable GL_TEXTURE_2D;	1906	glEnable GL_TEXTURE_2D;
1801	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1907	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1802		1908
1803	$tex->draw_quad (0, 0, $w, $h);	1909	$tex->draw_quad_alpha (0, 0, $w, $h);
1804		1910
1805	glDisable GL_BLEND;
1806	glDisable GL_TEXTURE_2D;	1911	glDisable GL_TEXTURE_2D;
1807	}	1912	}
1808		1913
1809	#############################################################################	1914	#############################################################################
1810		1915
…		…
1999	qw(s1_slider.png s1_slider_bg.png);	2104	qw(s1_slider.png s1_slider_bg.png);
2000		2105
2001	sub new {	2106	sub new {
2002	my $class = shift;	2107	my $class = shift;
2003		2108
2004	# range [value, low, high, page]	2109	# range [value, low, high, page, unit]
2005		2110
2006	# TODO: 0-width page	2111	# TODO: 0-width page
2007	# TODO: req_w/h are wrong with vertical	2112	# TODO: req_w/h are wrong with vertical
2008	# TODO: calculations are off	2113	# TODO: calculations are off
2009	my $self = $class->SUPER::new (	2114	my $self = $class->SUPER::new (
2010	fg => [1, 1, 1],	2115	fg => [1, 1, 1],
2011	active_fg => [0, 0, 0],	2116	active_fg => [0, 0, 0],
		2117	bg => [0, 0, 0, 0.2],
		2118	active_bg => [1, 1, 1, 0.5],
2012	range => [0, 0, 100, 10],	2119	range => [0, 0, 100, 10, 0],
2013	req_w => $::WIDTH / 80,	2120	req_w => $::WIDTH / 80,
2014	req_h => $::WIDTH / 80,	2121	req_h => $::WIDTH / 80,
2015	vertical => 0,	2122	vertical => 0,
2016	can_hover => 1,	2123	can_hover => 1,
2017	inner_pad => 5,	2124	inner_pad => 0.02,
2018	@_	2125	@_
2019	);	2126	);
2020		2127
		2128	$self->set_value ($self->{range}[0]);
		2129	$self->update;
		2130
2021	$self	2131	$self
		2132	}
		2133
		2134	sub set_range {
		2135	my ($self, $range) = @_;
		2136
		2137	$self->{range} = $range;
		2138
		2139	$self->update;
		2140	}
		2141
		2142	sub set_value {
		2143	my ($self, $value) = @_;
		2144
		2145	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
		2146
		2147	$hi = $lo + 1 if $hi <= $lo;
		2148
		2149	$page = $hi - $lo if $page > $hi - $lo;
		2150
		2151	$value = $lo if $value < $lo;
		2152	$value = $hi - $page if $value > $hi - $page;
		2153
		2154	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
		2155	if $unit;
		2156
		2157	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
		2158
		2159	if ($value != $old_value) {
		2160	$self->_emit (changed => $value);
		2161	$self->update;
		2162	}
2022	}	2163	}
2023		2164
2024	sub size_request {	2165	sub size_request {
2025	my ($self) = @_;	2166	my ($self) = @_;
2026		2167
…		…
2032		2173
2033	sub button_down {	2174	sub button_down {
2034	my ($self, $ev, $x, $y) = @_;	2175	my ($self, $ev, $x, $y) = @_;
2035		2176
2036	$self->SUPER::button_down ($ev, $x, $y);	2177	$self->SUPER::button_down ($ev, $x, $y);
		2178
		2179	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
		2180
2037	$self->mouse_motion ($ev, $x, $y);	2181	$self->mouse_motion ($ev, $x, $y);
2038	}	2182	}
2039		2183
2040	sub mouse_motion {	2184	sub mouse_motion {
2041	my ($self, $ev, $x, $y) = @_;	2185	my ($self, $ev, $x, $y) = @_;
2042		2186
2043	if ($GRAB == $self) {	2187	if ($GRAB == $self) {
		2188	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
		2189
		2190	my (undef, $lo, $hi, $page) = @{$self->{range}};
		2191
		2192	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
		2193
		2194	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2195	}
		2196	}
		2197
		2198	sub update {
		2199	my ($self) = @_;
		2200
		2201	$CFClient::UI::ROOT->on_post_alloc ($self => sub {
		2202	$self->set_value ($self->{range}[0]);
		2203
2044	my ($value, $lo, $hi, $page) = @{$self->{range}};	2204	my ($value, $lo, $hi, $page) = @{$self->{range}};
		2205	my $range = ($hi - $page - $lo) || 1e-100;
2045		2206
2046	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2207	my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2047		2208
2048	my $inner_pad_px = $self->_calc_inner_pad_px ($w);	2209	$self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2049	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right	2210	$self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2050		2211
2051	$x -= $inner_pad_px; # substract the padding	2212	$value = ($value - $lo) / $range;
2052	$x = $x * ($hi - $lo) / $inner_w + $lo;	2213	$value = $value * $self->{scale} + $self->{offset};
2053	$x = $lo if $x < $lo;
2054	$x = $hi - $page if $x > $hi - $page;
2055	$self->{range}[0] = $x;
2056		2214
2057	$self->emit (changed => $x);	2215	$self->{knob_x} = $value - $knob_w * 0.5;
2058	$self->update;	2216	$self->{knob_w} = $knob_w;
2059	}	2217	});
2060	}
2061		2218
2062	# the inner_* stuff is for generating a padding for the slider handle,	2219	$self->SUPER::update;
2063	# so that the handle doesn't leave the texture. This calculation isn't 100%
2064	# correct propably, but it does the job for now
2065	sub _calc_inner_pad_px {
2066	my ($self, $w) = @_;
2067	($w / 100) * $self->{inner_pad} # % to pixels
2068	}	2220	}
2069		2221
2070	sub _draw {	2222	sub _draw {
2071	my ($self) = @_;	2223	my ($self) = @_;
2072		2224
2073	$self->SUPER::_draw ();	2225	$self->SUPER::_draw ();
2074		2226
2075	my ($w, $h) = @$self{qw(w h)};	2227	glScale $self->{w}, $self->{h};
2076		2228
2077	if ($self->{vertical}) {	2229	if ($self->{vertical}) {
2078	# draw a vertical slider like a rotated horizontal slider	2230	# draw a vertical slider like a rotated horizontal slider
2079		2231
		2232	glTranslate 1, 0, 0;
2080	glRotate 90, 0, 0, 1;	2233	glRotate 90, 0, 0, 1;
2081	glTranslate 0, -$self->{w}, 0;
2082
2083	($w, $h) = ($h, $w);
2084	}	2234	}
2085		2235
2086	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	2236	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2087	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	2237	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2088		2238
2089	my ($value, $lo, $hi, $page) = @{$self->{range}};
2090
2091	$hi = $value + 1 if $lo == $hi;
2092
2093	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2094	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2095
2096	$page = int $page * $inner_w / ($hi - $lo);
2097	$value = int +($value - $lo) * $inner_w / ($hi - $lo);
2098
2099	$w -= $page;
2100	$page &= ~1;
2101	glTranslate $page * 0.5, 0, 0;
2102	$page ||= 2;
2103
2104	my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2105	my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2106
2107	glEnable GL_BLEND;
2108	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2109	glEnable GL_TEXTURE_2D;	2239	glEnable GL_TEXTURE_2D;
2110	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2240	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2111		2241
2112	# draw background	2242	# draw background
2113	$tex[1]->draw_quad (0, 0, $w, $h);	2243	$tex[1]->draw_quad_alpha (0, 0, 1, 1);
2114		2244
2115	# draw handle	2245	# draw handle
2116	$tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);	2246	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2117		2247
2118	glDisable GL_BLEND;
2119	glDisable GL_TEXTURE_2D;	2248	glDisable GL_TEXTURE_2D;
2120	}	2249	}
		2250
		2251	#############################################################################
		2252
		2253	package CFClient::UI::ValSlider;
		2254
		2255	our @ISA = CFClient::UI::HBox::;
		2256
		2257	sub new {
		2258	my ($class, %arg) = @_;
		2259
		2260	my $range = delete $arg{range};
		2261
		2262	my $self = $class->SUPER::new (
		2263	slider => (new CFClient::UI::Slider expand => 1, range => $range),
		2264	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
		2265	to_value => sub { shift },
		2266	from_value => sub { shift },
		2267	%arg,
		2268	);
		2269
		2270	$self->{slider}->connect (changed => sub {
		2271	my ($self, $value) = @_;
		2272	$self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
		2273	$self->{parent}->emit (changed => $value);
		2274	});
		2275
		2276	# $self->{entry}->connect (changed => sub {
		2277	# my ($self, $value) = @_;
		2278	# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
		2279	# $self->{parent}->emit (changed => $value);
		2280	# });
		2281
		2282	$self->add ($self->{slider}, $self->{entry});
		2283
		2284	$self->{slider}->emit (changed => $self->{slider}{range}[0]);
		2285
		2286	$self
		2287	}
		2288
		2289	sub set_range { shift->{slider}->set_range (@_) }
		2290	sub set_value { shift->{slider}->set_value (@_) }
2121		2291
2122	#############################################################################	2292	#############################################################################
2123		2293
2124	package CFClient::UI::TextView;	2294	package CFClient::UI::TextView;
2125		2295
…		…
2134	fontsize => 1,	2304	fontsize => 1,
2135	can_events => 0,	2305	can_events => 0,
2136	#font => default_font	2306	#font => default_font
2137	@_,	2307	@_,
2138		2308
2139	layout => (new CFClient::Layout),	2309	layout => (new CFClient::Layout 1),
2140	par => [],	2310	par => [],
2141	height => 0,	2311	height => 0,
2142	children => [	2312	children => [
2143	(new CFClient::UI::Empty expand => 1),	2313	(new CFClient::UI::Empty expand => 1),
2144	(new CFClient::UI::Slider vertical => 1),	2314	(new CFClient::UI::Slider vertical => 1),
…		…
2155		2325
2156	$self->{fontsize} = $fontsize;	2326	$self->{fontsize} = $fontsize;
2157	$self->reflow;	2327	$self->reflow;
2158	}	2328	}
2159		2329
2160	sub text_height {
2161	my ($self, $text) = @_;
2162
2163	my $layout = $self->{layout};
2164
2165	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2166	$layout->set_width ($self->{children}[0]{w});
2167	$layout->set_text ($text);
2168
2169	($layout->size)[1]
2170	}
2171
2172	sub reflow {
2173	my ($self) = @_;
2174
2175	$self->{need_reflow}++;
2176	$self->update;
2177	}
2178
2179	sub size_allocate {	2330	sub size_allocate {
2180	my ($self, $w, $h) = @_;	2331	my ($self, $w, $h) = @_;
2181		2332
2182	$self->SUPER::size_allocate ($w, $h);	2333	$self->SUPER::size_allocate ($w, $h);
2183		2334
…		…
2186	$self->{layout}->set_width ($self->{children}[0]{w});	2337	$self->{layout}->set_width ($self->{children}[0]{w});
2187		2338
2188	$self->reflow;	2339	$self->reflow;
2189	}	2340	}
2190		2341
		2342	sub text_size {
		2343	my ($self, $text, $indent) = @_;
		2344
		2345	my $layout = $self->{layout};
		2346
		2347	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2348	$layout->set_width ($self->{children}[0]{w} - $indent);
		2349	$layout->set_markup ($text);
		2350
		2351	$layout->size
		2352	}
		2353
		2354	sub reflow {
		2355	my ($self) = @_;
		2356
		2357	$self->{need_reflow}++;
		2358	$self->update;
		2359	}
		2360
		2361	sub set_offset {
		2362	my ($self, $offset) = @_;
		2363
		2364	# todo: base offset on lines or so, not on pixels
		2365	$self->{children}[1]->set_value ($offset);
		2366	}
		2367
		2368	sub clear {
		2369	my ($self) = @_;
		2370
		2371	$self->{par} = [];
		2372	$self->{height} = 0;
		2373	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
		2374	}
		2375
2191	sub add_paragraph {	2376	sub add_paragraph {
2192	my ($self, $color, $text) = @_;	2377	my ($self, $color, $text, $indent) = @_;
2193		2378
2194	#TODO: intelligently "reformat" paragraph	2379	for my $line (split /\n/, $text) {
2195		2380	my ($w, $h) = $self->text_size ($line);
2196	my $height = $self->text_height ($text);
2197
2198	$self->{height} += $height;	2381	$self->{height} += $h;
		2382	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
		2383	}
2199		2384
2200	push @{$self->{par}}, [$height, $color, $text];
2201
2202	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];	2385	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2203	$self->{children}[1]->update;
2204	}	2386	}
2205		2387
2206	sub update {	2388	sub update {
2207	my ($self) = @_;	2389	my ($self) = @_;
2208		2390
…		…
2210		2392
2211	return unless $self->{h} > 0;	2393	return unless $self->{h} > 0;
2212		2394
2213	delete $self->{texture};	2395	delete $self->{texture};
2214		2396
2215	$ROOT->on_refresh ($self, sub {	2397	$ROOT->on_post_alloc ($self, sub {
		2398	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2399
2216	if (delete $self->{need_reflow}) {	2400	if (delete $self->{need_reflow}) {
2217	my $height = 0;	2401	my $height = 0;
2218		2402
2219	$height += $_->[0] = $self->text_height ($_->[2])	2403	my $layout = $self->{layout};
		2404
		2405	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2406
2220	for @{$self->{par}};	2407	for (@{$self->{par}}) {
		2408	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
		2409	$layout->set_width ($W - $_->[3]);
		2410	$layout->set_markup ($_->[4]);
		2411	my ($w, $h) = $layout->size;
		2412	$_->[0] = $w + $_->[3];
		2413	$_->[1] = $h;
		2414	}
		2415
		2416	$height += $_->[1];
		2417	}
2221		2418
2222	$self->{height} = $height;	2419	$self->{height} = $height;
2223		2420
2224	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2421	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2225		2422
2226	delete $self->{texture};	2423	delete $self->{texture};
2227	}	2424	}
2228		2425
2229	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {	2426	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2230	glClearColor 0, 0, 0, 0;	2427	glClearColor 0.5, 0.5, 0.5, 0;
2231	glClear GL_COLOR_BUFFER_BIT;	2428	glClear GL_COLOR_BUFFER_BIT;
2232		2429
		2430	my $top = int $self->{children}[1]{range}[0];
		2431
		2432	my $y0 = $top;
		2433	my $y1 = $top + $H;
		2434
		2435	my $y = 0;
		2436
		2437	my $layout = $self->{layout};
		2438
		2439	$layout->set_font ($self->{font}) if $self->{font};
		2440
2233	glEnable GL_BLEND;	2441	glEnable GL_BLEND;
		2442	#TODO# not correct in windows where rgba is forced off
2234	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	2443	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2235	glEnable GL_TEXTURE_2D;
2236	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2237
2238	my $top = int $self->{children}[1]{range}[0];
2239
2240	my $y0 = $top;
2241	my $y1 = $top + $self->{h};
2242
2243	my $y = 0;
2244
2245	my $layout = $self->{layout};
2246
2247	$layout->set_font ($self->{font}) if $self->{font};
2248		2444
2249	for my $par (@{$self->{par}}) {	2445	for my $par (@{$self->{par}}) {
2250	my $h = $par->[0];	2446	my $h = $par->[1];
2251		2447
2252	if ($y0 < $y + $h && $y < $y1) {	2448	if ($y0 < $y + $h && $y < $y1) {
		2449	$layout->set_foreground (@{ $par->[2] });
		2450	$layout->set_width ($W - $par->[3]);
2253	$layout->set_text ($par->[2]);	2451	$layout->set_markup ($par->[4]);
2254		2452
2255	glColor @{ $par->[1] };	2453	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2256	my ($W, $H) = $layout->size;	2454
2257	CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);	2455	glRasterPos $par->[3], $y - $y0;
		2456	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2258	}	2457	}
2259		2458
2260	$y += $h;	2459	$y += $h;
2261	}	2460	}
2262		2461
2263	glDisable GL_TEXTURE_2D;
2264	glDisable GL_BLEND;	2462	glDisable GL_BLEND;
2265	};	2463	};
2266	});	2464	});
2267	}	2465	}
2268		2466
2269	sub _draw {	2467	sub _draw {
2270	my ($self) = @_;	2468	my ($self) = @_;
2271		2469
2272	glEnable GL_BLEND;
2273	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2274	glEnable GL_TEXTURE_2D;	2470	glEnable GL_TEXTURE_2D;
2275	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2471	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2276	glColor 1, 1, 1, 1;	2472	glColor 1, 1, 1, 1;
2277	$self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2473	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2278	glDisable GL_TEXTURE_2D;	2474	glDisable GL_TEXTURE_2D;
2279	glDisable GL_BLEND;
2280		2475
2281	$self->{children}[1]->draw;	2476	$self->{children}[1]->draw;
2282		2477
2283	}	2478	}
2284		2479
…		…
2352		2547
2353	# TODO: use animation	2548	# TODO: use animation
2354	if ($self->{state} = !$self->{state}) {	2549	if ($self->{state} = !$self->{state}) {
2355	$CFClient::UI::ROOT->add ($self->{other});	2550	$CFClient::UI::ROOT->add ($self->{other});
2356	$self->{other}->move ($self->coord2global (0, $self->{h}));	2551	$self->{other}->move ($self->coord2global (0, $self->{h}));
2357	$self->emit ("open");	2552	$self->_emit ("open");
2358	} else {	2553	} else {
2359	$CFClient::UI::ROOT->remove ($self->{other});	2554	$CFClient::UI::ROOT->remove ($self->{other});
2360	$self->emit ("close");	2555	$self->_emit ("close");
2361	}	2556	}
2362		2557
2363	$self->emit (changed => $self->{state});	2558	$self->_emit (changed => $self->{state});
2364	}	2559	}
2365		2560
2366	#############################################################################	2561	#############################################################################
2367		2562
2368	package CFClient::UI::Tooltip;	2563	package CFClient::UI::Tooltip;
…		…
2378	@_,	2573	@_,
2379	can_events => 0,	2574	can_events => 0,
2380	)	2575	)
2381	}	2576	}
2382		2577
2383	sub set_markup {	2578	sub set_tooltip_from {
2384	my ($self, $text) = @_;	2579	my ($self, $widget) = @_;
2385		2580
2386	$self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];	2581	$self->add (new CFClient::UI::Label
2387	$self->{label}->set_markup ($text);	2582	markup => $widget->{tooltip},
2388	$self->add ($self->{label});	2583	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
		2584	fontsize => 0.8,
		2585	fg => [0, 0, 0, 1],
		2586	ellipsise => 0,
		2587	font => ($widget->{tooltip_font} || $::FONT_PROP),
		2588	);
2389	}	2589	}
2390		2590
2391	sub size_request {	2591	sub size_request {
2392	my ($self) = @_;	2592	my ($self) = @_;
2393
2394	$self->child->set_max_size ($::WIDTH * 0.3);
2395		2593
2396	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	2594	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2397		2595
2398	($w + 4, $h + 4)	2596	($w + 4, $h + 4)
2399	}	2597	}
…		…
2405	}	2603	}
2406		2604
2407	sub _draw {	2605	sub _draw {
2408	my ($self) = @_;	2606	my ($self) = @_;
2409		2607
2410	glPushMatrix;
2411	glTranslate 0.375, 0.375;	2608	glTranslate 0.375, 0.375;
2412		2609
2413	my ($w, $h) = @$self{qw(w h)};	2610	my ($w, $h) = @$self{qw(w h)};
2414		2611
2415	glColor 1, 0.8, 0.4;	2612	glColor 1, 0.8, 0.4;
…		…
2426	glVertex 0 , $h;	2623	glVertex 0 , $h;
2427	glVertex $w, $h;	2624	glVertex $w, $h;
2428	glVertex $w, 0;	2625	glVertex $w, 0;
2429	glEnd;	2626	glEnd;
2430		2627
2431	glPopMatrix;	2628	glTranslate 2 - 0.375, 2 - 0.375;
2432
2433	glTranslate 2, 2;
2434	$self->SUPER::_draw;	2629	$self->SUPER::_draw;
2435	}	2630	}
2436		2631
2437	#############################################################################	2632	#############################################################################
2438		2633
…		…
2443	use CFClient::OpenGL;	2638	use CFClient::OpenGL;
2444		2639
2445	sub new {	2640	sub new {
2446	my $class = shift;	2641	my $class = shift;
2447		2642
2448	$class->SUPER::new (	2643	my $self = $class->SUPER::new (
2449	aspect => 1,	2644	aspect => 1,
		2645	can_events => 0,
2450	@_,	2646	@_,
2451	)	2647	);
		2648
		2649	if ($self->{anim} && $self->{animspeed}) {
		2650	Scalar::Util::weaken (my $widget = $self);
		2651
		2652	$self->{timer} = Event->timer (
		2653	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
		2654	hard => 1,
		2655	interval => $self->{animspeed},
		2656	cb => sub {
		2657	++$widget->{frame};
		2658	$widget->update;
		2659	},
		2660	);
		2661	}
		2662
		2663	$self
2452	}	2664	}
2453		2665
2454	sub size_request {	2666	sub size_request {
2455	(32, 8)	2667	(32, 8)
2456	}	2668	}
2457		2669
		2670	sub update {
		2671	my ($self) = @_;
		2672
		2673	return unless $self->{visible};
		2674
		2675	$self->SUPER::update;
		2676	}
		2677
2458	sub _draw {	2678	sub _draw {
2459	my ($self) = @_;	2679	my ($self) = @_;
2460		2680
2461	return unless $::CONN;#d# manage and cache textures differently	2681	return unless $::CONN;
		2682
		2683	my $face;
		2684
		2685	if ($self->{frame}) {
		2686	my $anim = $::CONN->{anim}[$self->{anim}];
		2687
		2688	$face = $anim->[ $self->{frame} % @$anim ]
		2689	if $anim && @$anim;
		2690	}
		2691
2462	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	2692	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2463		2693
2464	# TODO animation
2465	if ($tex) {	2694	if ($tex) {
2466	glEnable GL_BLEND;
2467	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2468	glEnable GL_TEXTURE_2D;	2695	glEnable GL_TEXTURE_2D;
2469	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2696	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2470	glColor 1, 1, 1, 1;	2697	glColor 1, 1, 1, 1;
2471	$tex->draw_quad (0, 0, $self->{w}, $self->{h});	2698	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2472	glDisable GL_TEXTURE_2D;	2699	glDisable GL_TEXTURE_2D;
2473	glDisable GL_BLEND;
2474	}	2700	}
		2701	}
		2702
		2703	sub DESTROY {
		2704	my ($self) = @_;
		2705
		2706	$self->{timer}->cancel
		2707	if $self->{timer};
		2708
		2709	$self->SUPER::DESTROY;
2475	}	2710	}
2476		2711
2477	#############################################################################	2712	#############################################################################
2478		2713
2479	package CFClient::UI::InventoryItem;	2714	package CFClient::UI::Inventory;
2480		2715
2481	our @ISA = CFClient::UI::HBox::;	2716	our @ISA = CFClient::UI::ScrolledWindow::;
2482		2717
2483	sub new {	2718	sub new {
2484	my $class = shift;	2719	my $class = shift;
2485		2720
2486	my %args = @_;
2487
2488	my $item = delete $args{item};
2489
2490	my $desc = $item->{nrof} < 2
2491	? $item->{name}
2492	: "$item->{nrof} $item->{name_pl}";
2493
2494
2495	my $self = $class->SUPER::new (	2721	my $self = $class->SUPER::new (
2496	can_hover => 1,	2722	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2497	can_events => 1,
2498	tooltip => (CFClient::UI::Label->escape ($desc)
2499	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2500	connect_button_down => sub {
2501	my ($self, $ev, $x, $y) = @_;
2502
2503	# todo: maybe put examine on 1? but should just be a tooltip :(
2504	if ($ev->{button} == 1) {
2505	$::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2506	} elsif ($ev->{button} == 2) {
2507	$::CONN->send ("apply $item->{tag}");
2508	} elsif ($ev->{button} == 3) {
2509	CFClient::UI::Menu->new (
2510	items => [
2511	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2512	[
2513	$item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2514	sub { $::CONN->send ("lock $item->{tag}") },
2515	],
2516	["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2517	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2518	["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2519	],
2520	)->popup ($ev);
2521	}
2522
2523	1
2524	},
2525	%args
2526	);
2527
2528	$self->add (new CFClient::UI::Face
2529	can_events => 0,
2530	face => $item->{face},
2531	anim => $item->{anim},
2532	animspeed => $item->{animspeed},
2533	);
2534
2535	$self->add (new CFClient::UI::Label
2536	can_events => 0,
2537	text => $desc,
2538	);
2539
2540	$self
2541	}
2542
2543	#############################################################################
2544
2545	package CFClient::UI::Inventory;
2546
2547	our @ISA = CFClient::UI::ScrolledWindow::;
2548
2549	sub new {
2550	my $class = shift;
2551
2552	my $self = $class->SUPER::new (
2553	scrolled => (new CFClient::UI::VBox),
2554	@_,	2723	@_,
2555	);	2724	);
2556		2725
2557	$self	2726	$self
2558	}	2727	}
…		…
2561	my ($self, $items) = @_;	2730	my ($self, $items) = @_;
2562		2731
2563	$self->{scrolled}->clear;	2732	$self->{scrolled}->clear;
2564	return unless $items;	2733	return unless $items;
2565		2734
2566	my @items = sort { $a->{type} <=> $b->{type} } @$items;	2735	my @items = sort {
		2736	($a->{type} <=> $b->{type})
		2737	or ($a->{name} cmp $b->{name})
		2738	} @$items;
2567		2739
2568	$self->{real_items} = \@items;	2740	$self->{real_items} = \@items;
2569		2741
		2742	my $row = 0;
2570	for my $item (@items) {	2743	for my $item (@items) {
2571	my $desc = $item->{nrof} < 2	2744	CFClient::Item::update_widgets $item;
2572	? $item->{name}
2573	: "$item->{nrof} $item->{name_pl}";
2574		2745
2575	$self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item);	2746	$self->{scrolled}->add (0, $row, $item->{face_widget});
		2747	$self->{scrolled}->add (1, $row, $item->{desc_widget});
		2748	$self->{scrolled}->add (2, $row, $item->{weight_widget});
		2749
		2750	$row++;
2576	}	2751	}
2577		2752
2578	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];	2753	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2579	}	2754	}
2580		2755
…		…
2623		2798
2624	# popup given the event (must be a mouse button down event currently)	2799	# popup given the event (must be a mouse button down event currently)
2625	sub popup {	2800	sub popup {
2626	my ($self, $ev) = @_;	2801	my ($self, $ev) = @_;
2627		2802
2628	$self->emit ("popdown");	2803	$self->_emit ("popdown");
2629		2804
2630	# maybe save $GRAB? must be careful about events...	2805	# maybe save $GRAB? must be careful about events...
2631	$GRAB = $self;	2806	$GRAB = $self;
2632	$self->{button} = $ev->{button};	2807	$self->{button} = $ev->{button};
2633		2808
…		…
2648		2823
2649	if ($ev->{button} == $self->{button}) {	2824	if ($ev->{button} == $self->{button}) {
2650	undef $GRAB;	2825	undef $GRAB;
2651	$self->hide;	2826	$self->hide;
2652		2827
2653	$self->emit ("popdown");	2828	$self->_emit ("popdown");
2654	$self->{hover}[1]->() if $self->{hover};	2829	$self->{hover}[1]->() if $self->{hover};
2655	}	2830	}
		2831	}
		2832
		2833	#############################################################################
		2834
		2835	package CFClient::UI::Statusbox;
		2836
		2837	our @ISA = CFClient::UI::VBox::;
		2838
		2839	sub new {
		2840	my $class = shift;
		2841
		2842	$class->SUPER::new (
		2843	fontsize => 0.8,
		2844	@_,
		2845	)
		2846	}
		2847
		2848	sub reorder {
		2849	my ($self) = @_;
		2850	my $NOW = time;
		2851
		2852	while (my ($k, $v) = each %{ $self->{item} }) {
		2853	delete $self->{item}{$k} if $v->{timeout} < $NOW;
		2854	}
		2855
		2856	my @widgets;
		2857
		2858	my @items = sort {
		2859	$a->{pri} <=> $b->{pri}
		2860	or $b->{id} <=> $a->{id}
		2861	} values %{ $self->{item} };
		2862
		2863	my $count = 10 + 1;
		2864	for my $item (@items) {
		2865	last unless --$count;
		2866
		2867	push @widgets, $item->{label} ||= do {
		2868	# TODO: doesn't handle markup well (read as: at all)
		2869	my $short = $item->{count} > 1
		2870	? "<b>$item->{count} ×</b> $item->{text}"
		2871	: $item->{text};
		2872
		2873	for ($short) {
		2874	s/^\s+//;
		2875	s/\s+/ /g;
		2876	}
		2877
		2878	new CFClient::UI::Label
		2879	markup => $short,
		2880	tooltip => $item->{tooltip},
		2881	tooltip_font => $::FONT_PROP,
		2882	tooltip_width => 0.67,
		2883	fontsize => $item->{fontsize} || $self->{fontsize},
		2884	max_w => $::WIDTH * 0.44,
		2885	fg => $item->{fg},
		2886	can_events => 1,
		2887	can_hover => 1
		2888	};
		2889	}
		2890
		2891	$self->clear;
		2892	$self->SUPER::add (reverse @widgets);
		2893	}
		2894
		2895	sub add {
		2896	my ($self, $text, %arg) = @_;
		2897
		2898	$text =~ s/^\s+//;
		2899	$text =~ s/\s+$//;
		2900
		2901	return unless $text;
		2902
		2903	my $timeout = time + ((delete $arg{timeout}) || 60);
		2904
		2905	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
		2906
		2907	if (my $item = $self->{item}{$group}) {
		2908	if ($item->{text} eq $text) {
		2909	$item->{count}++;
		2910	} else {
		2911	$item->{count} = 1;
		2912	$item->{text} = $item->{tooltip} = $text;
		2913	}
		2914	$item->{id} = ++$self->{id};
		2915	$item->{timeout} = $timeout;
		2916	delete $item->{label};
		2917	} else {
		2918	$self->{item}{$group} = {
		2919	id => ++$self->{id},
		2920	text => $text,
		2921	timeout => $timeout,
		2922	tooltip => $text,
		2923	fg => [0.8, 0.8, 0.8, 0.8],
		2924	pri => 0,
		2925	count => 1,
		2926	%arg,
		2927	};
		2928	}
		2929
		2930	$self->reorder;
		2931	}
		2932
		2933	sub reconfigure {
		2934	my ($self) = @_;
		2935
		2936	delete $_->{label}
		2937	for values %{ $self->{item} || {} };
		2938
		2939	$self->reorder;
		2940	$self->SUPER::reconfigure;
2656	}	2941	}
2657		2942
2658	#############################################################################	2943	#############################################################################
2659		2944
2660	package CFClient::UI::Root;	2945	package CFClient::UI::Root;
…		…
2692	}	2977	}
2693		2978
2694	sub size_allocate {	2979	sub size_allocate {
2695	my ($self, $w, $h) = @_;	2980	my ($self, $w, $h) = @_;
2696		2981
2697	my $old_w = $self->{old_w};
2698	my $old_h = $self->{old_h};
2699
2700	if ($old_w && $old_h) {
2701	for my $child ($self->children) {
2702	$child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2703	$child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2704	$child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2705	$child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2706	$child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2707	$child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2708	$child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2709	$child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2710	}
2711	}
2712
2713	for my $child ($self->children) {	2982	for my $child ($self->children) {
2714	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	2983	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2715		2984
		2985	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
		2986	if exists $child->{req_x};
		2987
		2988	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
		2989	if exists $child->{req_y};
		2990
2716	$X = List::Util::max 0, List::Util::min $w - $W, $X;	2991	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2717	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;	2992	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
		2993
2718	$child->configure ($X, $Y, $W, $H);	2994	$child->configure ($X, $Y, $W, $H);
2719	}	2995	}
2720
2721	$self->{old_w} = $w;
2722	$self->{old_h} = $h;
2723	}	2996	}
2724		2997
2725	sub coord2local {	2998	sub coord2local {
2726	my ($self, $x, $y) = @_;	2999	my ($self, $x, $y) = @_;
2727		3000
…		…
2740	$self->check_size;	3013	$self->check_size;
2741	$::WANT_REFRESH++;	3014	$::WANT_REFRESH++;
2742	}	3015	}
2743		3016
2744	sub add {	3017	sub add {
2745	my ($self, $child) = @_;	3018	my ($self, @children) = @_;
2746		3019
		3020	for (my @widgets = @children; my $w = pop @widgets; ) {
		3021	push @widgets, $w->children;
		3022	$w->{root} = $self;
		3023	$w->{visible} = 1;
		3024	}
		3025
		3026	for my $child (@children) {
		3027	$child->{is_toplevel} = 1;
		3028
2747	# integerise window positions	3029	# integerise window positions
2748	$child->{x} = int $child->{x};	3030	$child->{x} = int $child->{x};
2749	$child->{y} = int $child->{y};	3031	$child->{y} = int $child->{y};
		3032	}
2750		3033
2751	$self->SUPER::add ($child);	3034	$self->SUPER::add (@children);
		3035	}
		3036
		3037	sub remove {
		3038	my ($self, @children) = @_;
		3039
		3040	$self->SUPER::remove (@children);
		3041
		3042	while (@children) {
		3043	my $w = pop @children;
		3044	push @children, $w->children;
		3045	$w->set_invisible;
		3046	}
2752	}	3047	}
2753		3048
2754	sub on_refresh {	3049	sub on_refresh {
2755	my ($self, $id, $cb) = @_;	3050	my ($self, $id, $cb) = @_;
2756		3051
2757	$self->{refresh_hook}{$id} = $cb;	3052	$self->{refresh_hook}{$id} = $cb;
2758	}	3053	}
2759		3054
		3055	sub on_post_alloc {
		3056	my ($self, $id, $cb) = @_;
		3057
		3058	$self->{post_alloc_hook}{$id} = $cb;
		3059	}
		3060
2760	sub draw {	3061	sub draw {
2761	my ($self) = @_;	3062	my ($self) = @_;
		3063
		3064	while ($self->{refresh_hook}) {
		3065	$_->()
		3066	for values %{delete $self->{refresh_hook}};
		3067	}
2762		3068
2763	if ($self->{check_size}) {	3069	if ($self->{check_size}) {
2764	my @queue = ([], []);	3070	my @queue = ([], []);
2765		3071
2766	for (;;) {	3072	for (;;) {
…		…
2774		3080
2775	my ($w, $h) = $widget->{user_w} && $widget->{user_h}	3081	my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2776	? @$widget{qw(user_w user_h)}	3082	? @$widget{qw(user_w user_h)}
2777	: $widget->size_request;	3083	: $widget->size_request;
2778		3084
		3085	if (delete $widget->{force_alloc}
2779	if ($w != $widget->{req_w} || $h != $widget->{req_h}) {	3086	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2780	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#	3087	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2781		3088
2782	$widget->{req_w} = $w;	3089	$widget->{req_w} = $w;
2783	$widget->{req_h} = $h;	3090	$widget->{req_h} = $h;
2784		3091
2785	$self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}];	3092	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
2786		3093
2787	$widget->{parent}->check_size	3094	$widget->{parent}->check_size
2788	if $widget->{parent};	3095	if $widget->{parent};
2789	}	3096	}
2790	}	3097	}
…		…
2797	$w = 0 if $w < 0;	3104	$w = 0 if $w < 0;
2798	$h = 0 if $h < 0;	3105	$h = 0 if $h < 0;
2799		3106
2800	$widget->{w} = $w;	3107	$widget->{w} = $w;
2801	$widget->{h} = $h;	3108	$widget->{h} = $h;
2802	$widget->size_allocate ($w, $h);
2803	$widget->emit (size_allocate => $w, $h);	3109	$widget->emit (size_allocate => $w, $h);
2804	}	3110	}
2805	}	3111	}
2806		3112
2807	while ($self->{refresh_hook}) {	3113	while ($self->{post_alloc_hook}) {
2808	$_->()	3114	$_->()
2809	for values %{delete $self->{refresh_hook}};	3115	for values %{delete $self->{post_alloc_hook}};
2810	}	3116	}
2811		3117
2812	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3118	glViewport 0, 0, $::WIDTH, $::HEIGHT;
2813	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3119	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2814	glClear GL_COLOR_BUFFER_BIT;	3120	glClear GL_COLOR_BUFFER_BIT;
2815		3121
2816	glMatrixMode GL_PROJECTION;	3122	glMatrixMode GL_PROJECTION;
2817	glLoadIdentity;	3123	glLoadIdentity;
2818	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;	3124	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2819	glMatrixMode GL_MODELVIEW;	3125	glMatrixMode GL_MODELVIEW;
2820	glLoadIdentity;	3126	glLoadIdentity;
2821		3127
2822	$self->_draw;	3128	$self->_draw;
2823	}	3129	}
…		…
2825	#############################################################################	3131	#############################################################################
2826		3132
2827	package CFClient::UI;	3133	package CFClient::UI;
2828		3134
2829	$ROOT = new CFClient::UI::Root;	3135	$ROOT = new CFClient::UI::Root;
2830	$TOOLTIP = new CFClient::UI::Tooltip;	3136	$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2831		3137
2832	1	3138	1
2833		3139

Diff Legend

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