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

Diff Legend

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