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.234 by root, Thu May 25 16:24:44 2006 UTC

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

Diff Legend

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