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

Diff Legend

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