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.238 by root, Thu May 25 21:48:22 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	$self->{root} = $parent->{root};
		464	$self->{visible} = $parent->{visible};
		465
		466	# TODO: req_w _does_change after ->reconfigure
388	$self->check_size	467	$self->check_size
389	unless exists $self->{req_w};	468	unless exists $self->{req_w};
		469
		470	$self->show;
390	}	471	}
391		472
392	sub check_size {	473	sub check_size {
393	my ($self) = @_;	474	my ($self, $forced) = @_;
394		475
		476	$self->{force_alloc} = 1 if $forced;
395	$CFClient::UI::ROOT->{check_size}{$self} = $self;	477	$CFClient::UI::ROOT->{check_size}{$self} = $self;
396	}	478	}
397		479
398	sub update {	480	sub update {
399	my ($self) = @_;	481	my ($self) = @_;
…		…
406	my ($self, $signal, $cb) = @_;	488	my ($self, $signal, $cb) = @_;
407		489
408	push @{ $self->{signal_cb}{$signal} }, $cb;	490	push @{ $self->{signal_cb}{$signal} }, $cb;
409	}	491	}
410		492
		493	sub _emit {
		494	my ($self, $signal, @args) = @_;
		495
		496	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
		497	}
		498
411	sub emit {	499	sub emit {
412	my ($self, $signal, @args) = @_;	500	my ($self, $signal, @args) = @_;
413		501
414	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}	502	$self->_emit ($signal, @args)
		503	|| $self->$signal (@args);
415	}	504	}
416		505
417	sub DESTROY {	506	sub DESTROY {
418	my ($self) = @_;	507	my ($self) = @_;
419		508
		509	delete $WIDGET{$self+0};
420	#$self->deactivate;	510	#$self->deactivate;
421	}	511	}
422		512
423	#############################################################################	513	#############################################################################
424		514
…		…
433	my $class = shift;	523	my $class = shift;
434		524
435	# range [value, low, high, page]	525	# range [value, low, high, page]
436		526
437	$class->SUPER::new (	527	$class->SUPER::new (
438	bg => [0, 0, 0, 0.2],	528	#bg => [0, 0, 0, 0.2],
439	active_bg => [1, 1, 1, 0.5],	529	#active_bg => [1, 1, 1, 0.5],
440	@_	530	@_
441	)	531	)
442	}	532	}
443		533
444	sub _draw {	534	sub _draw {
445	my ($self) = @_;	535	my ($self) = @_;
446		536
		537	my $color = $FOCUS == $self && $self->{active_bg}
		538	? $self->{active_bg}
		539	: $self->{bg};
		540
		541	if ($color && (@$color < 4 || $color->[3])) {
447	my ($w, $h) = @$self{qw(w h)};	542	my ($w, $h) = @$self{qw(w h)};
448		543
449	glEnable GL_BLEND;	544	glEnable GL_BLEND;
450	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	545	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
451	glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };	546	glColor @$color;
452		547
453	glBegin GL_QUADS;	548	glBegin GL_QUADS;
454	glVertex 0 , 0;	549	glVertex 0 , 0;
455	glVertex 0 , $h;	550	glVertex 0 , $h;
456	glVertex $w, $h;	551	glVertex $w, $h;
457	glVertex $w, 0;	552	glVertex $w, 0;
458	glEnd;	553	glEnd;
459		554
460	glDisable GL_BLEND;	555	glDisable GL_BLEND;
		556	}
461	}	557	}
462		558
463	#############################################################################	559	#############################################################################
464		560
465	package CFClient::UI::Empty;	561	package CFClient::UI::Empty;
…		…
509	$self->{children} = [	605	$self->{children} = [
510	sort { $a->{z} <=> $b->{z} }	606	sort { $a->{z} <=> $b->{z} }
511	@{$self->{children}}, @widgets	607	@{$self->{children}}, @widgets
512	];	608	];
513		609
514	$self->check_size;	610	$self->check_size (1);
515	$self->update;	611	$self->update;
516	}	612	}
517		613
518	sub children {	614	sub children {
519	@{ $_[0]{children} }	615	@{ $_[0]{children} }
…		…
525	delete $child->{parent};	621	delete $child->{parent};
526	$child->hide;	622	$child->hide;
527		623
528	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	624	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
529		625
530	$self->check_size;	626	$self->check_size (1);
531	$self->update;	627	$self->update;
532	}	628	}
533		629
534	sub clear {	630	sub clear {
535	my ($self) = @_;	631	my ($self) = @_;
…		…
626	}	722	}
627		723
628	sub update {	724	sub update {
629	my ($self) = @_;	725	my ($self) = @_;
630		726
631	$ROOT->on_refresh ($self => sub { $self->render_child });	727	$ROOT->on_post_alloc ($self => sub { $self->render_child });
632	$self->SUPER::update;	728	$self->SUPER::update;
633	}	729	}
634		730
635	sub size_allocate {	731	sub size_allocate {
636	my ($self, $w, $h) = @_;	732	my ($self, $w, $h) = @_;
…		…
649	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	745	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
650	glClearColor 0, 0, 0, 0;	746	glClearColor 0, 0, 0, 0;
651	glClear GL_COLOR_BUFFER_BIT;	747	glClear GL_COLOR_BUFFER_BIT;
652		748
653	$self->_render;	749	$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	};	750	};
662	}	751	}
663		752
664	sub _draw {	753	sub _draw {
665	my ($self) = @_;	754	my ($self) = @_;
…		…
669	my $tex = $self->{texture}	758	my $tex = $self->{texture}
670	or return;	759	or return;
671		760
672	glEnable GL_TEXTURE_2D;	761	glEnable GL_TEXTURE_2D;
673	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	762	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
674	glColor 0, 0, 0, 1;	763	glColor 1, 1, 1, 1;
675		764
676	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	765	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
677		766
678	glDisable GL_TEXTURE_2D;	767	glDisable GL_TEXTURE_2D;
679	}	768	}
…		…
682		771
683	package CFClient::UI::ViewPort;	772	package CFClient::UI::ViewPort;
684		773
685	our @ISA = CFClient::UI::Window::;	774	our @ISA = CFClient::UI::Window::;
686		775
		776	sub new {
		777	my $class = shift;
		778
		779	$class->SUPER::new (
		780	scroll_x => 0,
		781	scroll_y => 1,
		782	@_,
		783	)
		784	}
		785
687	sub size_request {	786	sub size_request {
688	my ($self) = @_;	787	my ($self) = @_;
689		788
690	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	789	@$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		790
693	@$self{qw(child_w child_h)}	791	@$self{qw(child_w child_h)}
694	}	792	}
695		793
696	sub size_allocate {	794	sub size_allocate {
697	my ($self, $w, $h) = @_;	795	my ($self, $w, $h) = @_;
698		796
		797	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
		798	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
		799
		800	$self->child->configure (0, 0, $w, $h);
699	$self->update;	801	$self->update;
700	}	802	}
701		803
702	sub set_offset {	804	sub set_offset {
703	my ($self, $x, $y) = @_;	805	my ($self, $x, $y) = @_;
…		…
757		859
758	my $slider = new CFClient::UI::Slider	860	my $slider = new CFClient::UI::Slider
759	vertical => 1,	861	vertical => 1,
760	range => [0, 0, 1, 0.01], # HACK fix	862	range => [0, 0, 1, 0.01], # HACK fix
761	connect_changed => sub {	863	connect_changed => sub {
762	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));	864	$self->{vp}->set_offset (0, $_[1]);
763	},	865	},
764	;	866	;
765		867
766	$self = $class->SUPER::new (	868	$self = $class->SUPER::new (
767	vp => (new CFClient::UI::ViewPort),	869	vp => (new CFClient::UI::ViewPort expand => 1),
768	slider => $slider,	870	slider => $slider,
769	@_,	871	@_,
770	);	872	);
771		873
772	$self->{vp}->add ($self->{scrolled});	874	$self->{vp}->add ($self->{scrolled});
…		…
774	$self->add ($self->{slider});	876	$self->add ($self->{slider});
775		877
776	$self	878	$self
777	}	879	}
778		880
		881	sub size_allocate {
		882	my ($self, $w, $h) = @_;
		883
		884	$self->SUPER::size_allocate ($w, $h);
		885
		886	my $child = $self->{vp}->child;
		887	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
		888	}
		889
779	#TODO# update range on size_allocate depeneing on child	890	#TODO# update range on size_allocate depending on child
780	# update viewport offset on scroll	891	# update viewport offset on scroll
781		892
782	#############################################################################	893	#############################################################################
783		894
784	package CFClient::UI::Frame;	895	package CFClient::UI::Frame;
…		…
788	use CFClient::OpenGL;	899	use CFClient::OpenGL;
789		900
790	sub new {	901	sub new {
791	my $class = shift;	902	my $class = shift;
792		903
793	my $self = $class->SUPER::new (	904	$class->SUPER::new (
794	bg => [1, 1, 1, 1],	905	bg => undef,
795	border_bg => [1, 1, 1, 1],
796	border => 0.8,
797	@_	906	@_,
798	);	907	)
799
800	$self
801	}	908	}
802		909
803	sub _draw {	910	sub _draw {
804	my ($self) = @_;	911	my ($self) = @_;
805		912
806	my ($w, $h) = ($self->{w}, $self->{h});	913	if ($self->{bg}) {
		914	my ($w, $h) = @$self{qw(w h)};
807		915
808	glEnable GL_BLEND;	916	glEnable GL_BLEND;
809	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	917	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
810	glEnable GL_TEXTURE_2D;	918	glColor @{ $self->{bg} };
811	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
812		919
813	# glBegin GL_QUADS;	920	glBegin GL_QUADS;
814	# glColor 0, 0, 0, 0;
815	# glVertex 0 , 0;	921	glVertex 0 , 0;
816	# glVertex 0 , $h;	922	glVertex 0 , $h;
817	# glVertex $w, $h;	923	glVertex $w, $h;
818	# glVertex $w, 0;	924	glVertex $w, 0;
819	# glEnd;	925	glEnd;
820		926
821
822	$self->child->draw;
823	glDisable GL_BLEND;	927	glDisable GL_BLEND;
824	glDisable GL_TEXTURE_2D;	928	}
		929
		930	$self->SUPER::_draw;
825	}	931	}
826		932
827	#############################################################################	933	#############################################################################
828		934
829	package CFClient::UI::FancyFrame;	935	package CFClient::UI::FancyFrame;
…		…
840	my $class = shift;	946	my $class = shift;
841		947
842	# TODO: user_x, user_y, overwrite moveto?	948	# TODO: user_x, user_y, overwrite moveto?
843		949
844	my $self = $class->SUPER::new (	950	my $self = $class->SUPER::new (
845	bg => [1, 1, 1, 1],	951	bg => [1, 1, 1, 1],
846	border_bg => [1, 1, 1, 1],	952	border_bg => [1, 1, 1, 1],
847	border => 0.6,	953	border => 0.6,
		954	is_toplevel => 1,
848	can_events => 1,	955	can_events => 1,
849	@_	956	@_
850	);	957	);
851		958
852	$self->{title} &&= new CFClient::UI::Label	959	$self->{title} &&= new CFClient::UI::Label
853	align => 0,	960	align => 0,
…		…
877	my ($self, $w, $h) = @_;	984	my ($self, $w, $h) = @_;
878		985
879	$h -= List::Util::max 0, $self->border * 2;	986	$h -= List::Util::max 0, $self->border * 2;
880	$w -= List::Util::max 0, $self->border * 2;	987	$w -= List::Util::max 0, $self->border * 2;
881		988
882	$self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)	989	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
883	if $self->{title};	990	if $self->{title};
884		991
885	$self->child->configure ($self->border, $self->border, $w, $h);	992	$self->child->configure ($self->border, $self->border, $w, $h);
886	}	993	}
887		994
…		…
945	my ($self) = @_;	1052	my ($self) = @_;
946		1053
947	my ($w, $h ) = ($self->{w}, $self->{h});	1054	my ($w, $h ) = ($self->{w}, $self->{h});
948	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1055	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
949		1056
950	glEnable GL_BLEND;
951	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
952	glEnable GL_TEXTURE_2D;	1057	glEnable GL_TEXTURE_2D;
953	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1058	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
954		1059
955	my $border = $self->border;	1060	my $border = $self->border;
956		1061
957	glColor @{ $self->{border_bg} };	1062	glColor @{ $self->{border_bg} };
958	$tex[1]->draw_quad (0, 0, $w, $border);	1063	$tex[1]->draw_quad_alpha (0, 0, $w, $border);
959	$tex[3]->draw_quad (0, $border, $border, $ch);	1064	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);
960	$tex[2]->draw_quad ($w - $border, $border, $border, $ch);	1065	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
961	$tex[4]->draw_quad (0, $h - $border, $w, $border);	1066	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
962		1067
963	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1068	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
964	my $bg = $tex[0];	1069	my $bg = $tex[0];
965		1070
966	# TODO: repeat texture not scale	1071	# TODO: repeat texture not scale
…		…
970	glColor @{ $self->{bg} };	1075	glColor @{ $self->{bg} };
971		1076
972	$bg->{s} = $rep_x;	1077	$bg->{s} = $rep_x;
973	$bg->{t} = $rep_y;	1078	$bg->{t} = $rep_y;
974	$bg->{wrap_mode} = 1;	1079	$bg->{wrap_mode} = 1;
975	$bg->draw_quad ($border, $border, $cw, $ch);	1080	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
		1081	}
976		1082
977	glDisable GL_TEXTURE_2D;	1083	glDisable GL_TEXTURE_2D;
978	glDisable GL_BLEND;
979	}
980		1084
981	$self->{title}->draw if $self->{title};	1085	$self->{title}->draw if $self->{title};
982		1086
983	$self->child->draw;	1087	$self->child->draw;
984	}	1088	}
…		…
996	sub new {	1100	sub new {
997	my $class = shift;	1101	my $class = shift;
998		1102
999	$class->SUPER::new (	1103	$class->SUPER::new (
1000	col_expand => [],	1104	col_expand => [],
1001	@_	1105	@_,
1002	)	1106	)
		1107	}
		1108
		1109	sub children {
		1110	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1003	}	1111	}
1004		1112
1005	sub add {	1113	sub add {
1006	my ($self, $x, $y, $child) = @_;	1114	my ($self, $x, $y, $child) = @_;
1007		1115
1008	$child->set_parent ($self);	1116	$child->set_parent ($self);
1009	$self->{children}[$y][$x] = $child;	1117	$self->{children}[$y][$x] = $child;
1010		1118
1011	$child->check_size;	1119	$self->check_size (1);
1012	}	1120	}
1013		1121
1014	sub children {
1015	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1016	}
1017
1018	# TODO: move to container class maybe? send childs a signal on removal?	1122	# TODO: move to container class maybe? send children a signal on removal?
1019	sub clear {	1123	sub clear {
1020	my ($self) = @_;	1124	my ($self) = @_;
1021		1125
1022	my @children = $self->children;	1126	my @children = $self->children;
1023	delete $self->{children};	1127	delete $self->{children};
…		…
1025	for (@children) {	1129	for (@children) {
1026	delete $_->{parent};	1130	delete $_->{parent};
1027	$_->hide;	1131	$_->hide;
1028	}	1132	}
1029		1133
		1134	$self->check_size (1);
1030	$self->update;	1135	$self->update;
1031	}	1136	}
1032		1137
1033	sub get_wh {	1138	sub get_wh {
1034	my ($self) = @_;	1139	my ($self) = @_;
…		…
1066	sub size_allocate {	1171	sub size_allocate {
1067	my ($self, $w, $h) = @_;	1172	my ($self, $w, $h) = @_;
1068		1173
1069	my ($ws, $hs) = $self->get_wh;	1174	my ($ws, $hs) = $self->get_wh;
1070		1175
1071	my $req_w = sum @$ws;	1176	my $req_w = (sum @$ws) || 1;
1072	my $req_h = sum @$hs;	1177	my $req_h = (sum @$hs) || 1;
1073		1178
1074	# TODO: nicer code && do row_expand	1179	# TODO: nicer code && do row_expand
1075	my @col_expand = @{$self->{col_expand}};	1180	my @col_expand = @{$self->{col_expand}};
1076	@col_expand = (1) x @$ws unless @col_expand;	1181	@col_expand = (1) x @$ws unless @col_expand;
1077	my $col_expand = (sum @col_expand) || 1;	1182	my $col_expand = (sum @col_expand) || 1;
…		…
1251		1356
1252	#############################################################################	1357	#############################################################################
1253		1358
1254	package CFClient::UI::Label;	1359	package CFClient::UI::Label;
1255		1360
1256	our @ISA = CFClient::UI::Base::;	1361	our @ISA = CFClient::UI::DrawBG::;
1257		1362
1258	use CFClient::OpenGL;	1363	use CFClient::OpenGL;
1259		1364
1260	sub new {	1365	sub new {
1261	my ($class, %arg) = @_;	1366	my ($class, %arg) = @_;
1262		1367
1263	my $self = $class->SUPER::new (	1368	my $self = $class->SUPER::new (
1264	fg => [1, 1, 1],	1369	fg => [1, 1, 1],
		1370	#bg => none
		1371	#active_bg => none
1265	#font => default_font	1372	#font => default_font
1266	#text => initial text	1373	#text => initial text
1267	#markup => initial narkup	1374	#markup => initial narkup
		1375	#max_w => maximum pixel width
		1376	ellipsise => 3, # end
1268	layout => (new CFClient::Layout),	1377	layout => (new CFClient::Layout),
1269	fontsize => 1,	1378	fontsize => 1,
1270	align => -1,	1379	align => -1,
1271	valign => -1,	1380	valign => -1,
1272	padding => 2,	1381	padding => 2,
…		…
1287	}	1396	}
1288		1397
1289	$self	1398	$self
1290	}	1399	}
1291		1400
1292	sub escape {	1401	sub escape($) {
1293	local $_ = $_[1];	1402	local $_ = $_[0];
1294		1403
1295	s/&/&amp;/g;	1404	s/&/&amp;/g;
1296	s/>/&gt;/g;	1405	s/>/&gt;/g;
1297	s/</&lt;/g;	1406	s/</&lt;/g;
1298		1407
1299	$_[1]	1408	$_
1300	}	1409	}
1301		1410
1302	sub update {	1411	sub update {
1303	my ($self) = @_;	1412	my ($self) = @_;
1304		1413
…		…
1337	sub size_request {	1446	sub size_request {
1338	my ($self) = @_;	1447	my ($self) = @_;
1339		1448
1340	$self->{layout}->set_font ($self->{font}) if $self->{font};	1449	$self->{layout}->set_font ($self->{font}) if $self->{font};
1341	$self->{layout}->set_width ($self->{max_w} || -1);	1450	$self->{layout}->set_width ($self->{max_w} || -1);
		1451	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1452	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1342	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1453	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1343		1454
1344	my ($w, $h) = $self->{layout}->size;	1455	my ($w, $h) = $self->{layout}->size;
1345		1456
1346	if (exists $self->{template}) {	1457	if (exists $self->{template}) {
…		…
1376	}	1487	}
1377		1488
1378	sub _draw {	1489	sub _draw {
1379	my ($self) = @_;	1490	my ($self) = @_;
1380		1491
		1492	$self->SUPER::_draw; # draw background, if applicable
		1493
1381	my $tex = $self->{texture} ||= do {	1494	my $tex = $self->{texture} ||= do {
1382	$self->{layout}->set_foreground (@{$self->{fg}});	1495	$self->{layout}->set_foreground (@{$self->{fg}});
1383	$self->{layout}->set_font ($self->{font}) if $self->{font};	1496	$self->{layout}->set_font ($self->{font}) if $self->{font};
1384	$self->{layout}->set_width ($self->{w});	1497	$self->{layout}->set_width ($self->{w});
		1498	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1499	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1385	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);	1500	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1386		1501
1387	my $tex = new_from_layout CFClient::Texture $self->{layout};	1502	my $tex = new_from_layout CFClient::Texture $self->{layout};
1388		1503
1389	$self->{ox} = int $self->{align} < 0 ? $self->{padding}	1504	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1390	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1505	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1391	: ($self->{w} - $tex->{w}) * 0.5;	1506	: ($self->{w} - $tex->{w}) * 0.5);
1392		1507
1393	$self->{oy} = int $self->{valign} < 0 ? $self->{padding}	1508	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1394	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1509	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1395	: ($self->{h} - $tex->{h}) * 0.5;	1510	: ($self->{h} - $tex->{h}) * 0.5);
1396		1511
1397	$tex	1512	$tex
1398	};	1513	};
1399		1514
1400	glEnable GL_TEXTURE_2D;	1515	glEnable GL_TEXTURE_2D;
…		…
1428	active_fg => [0, 0, 0],	1543	active_fg => [0, 0, 0],
1429	can_hover => 1,	1544	can_hover => 1,
1430	can_focus => 1,	1545	can_focus => 1,
1431	valign => 0,	1546	valign => 0,
1432	can_events => 1,	1547	can_events => 1,
		1548	#text => ...
1433	@_	1549	@_
1434	)	1550	)
1435	}	1551	}
1436		1552
1437	sub _set_text {	1553	sub _set_text {
…		…
1447	$self->{text} = $text;	1563	$self->{text} = $text;
1448		1564
1449	$text =~ s/./*/g if $self->{hidden};	1565	$text =~ s/./*/g if $self->{hidden};
1450	$self->{layout}->set_text ("$text ");	1566	$self->{layout}->set_text ("$text ");
1451		1567
1452	$self->emit (changed => $self->{text});	1568	$self->_emit (changed => $self->{text});
1453	}	1569	}
1454		1570
1455	sub set_text {	1571	sub set_text {
1456	my ($self, $text) = @_;	1572	my ($self, $text) = @_;
1457		1573
1458	$self->{cursor} = length $text;	1574	$self->{cursor} = length $text;
1459	$self->_set_text ($text);	1575	$self->_set_text ($text);
		1576	$self->update;
1460	$self->check_size;	1577	$self->check_size;
1461	$self->update;
1462	}	1578	}
1463		1579
1464	sub get_text {	1580	sub get_text {
1465	$_[0]{text}	1581	$_[0]{text}
1466	}	1582	}
…		…
1469	my ($self) = @_;	1585	my ($self) = @_;
1470		1586
1471	my ($w, $h) = $self->SUPER::size_request;	1587	my ($w, $h) = $self->SUPER::size_request;
1472		1588
1473	($w + 1, $h) # add 1 for cursor	1589	($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	}	1590	}
1481		1591
1482	sub key_down {	1592	sub key_down {
1483	my ($self, $ev) = @_;	1593	my ($self, $ev) = @_;
1484		1594
…		…
1486	my $sym = $ev->{sym};	1596	my $sym = $ev->{sym};
1487	my $uni = $ev->{unicode};	1597	my $uni = $ev->{unicode};
1488		1598
1489	my $text = $self->get_text;	1599	my $text = $self->get_text;
1490		1600
1491	if ($sym == 8) {	1601	if ($uni == 8) {
1492	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1602	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1493	} elsif ($sym == 127) {	1603	} elsif ($uni == 127) {
1494	substr $text, $self->{cursor}, 1, "";	1604	substr $text, $self->{cursor}, 1, "";
1495	} elsif ($sym == CFClient::SDLK_LEFT) {	1605	} elsif ($sym == CFClient::SDLK_LEFT) {
1496	--$self->{cursor} if $self->{cursor};	1606	--$self->{cursor} if $self->{cursor};
1497	} elsif ($sym == CFClient::SDLK_RIGHT) {	1607	} elsif ($sym == CFClient::SDLK_RIGHT) {
1498	++$self->{cursor} if $self->{cursor} < length $self->{text};	1608	++$self->{cursor} if $self->{cursor} < length $self->{text};
1499	} elsif ($sym == CFClient::SDLK_HOME) {	1609	} elsif ($sym == CFClient::SDLK_HOME) {
1500	$self->{cursor} = 0;	1610	$self->{cursor} = 0;
1501	} elsif ($sym == CFClient::SDLK_END) {	1611	} elsif ($sym == CFClient::SDLK_END) {
1502	$self->{cursor} = length $text;	1612	$self->{cursor} = length $text;
1503	} elsif ($sym == 27) {	1613	} elsif ($uni == 27) {
1504	$self->emit ('escape');	1614	$self->_emit ('escape');
1505	} elsif ($uni) {	1615	} elsif ($uni) {
1506	substr $text, $self->{cursor}++, 0, chr $uni;	1616	substr $text, $self->{cursor}++, 0, chr $uni;
1507	}	1617	}
1508		1618
1509	$self->_set_text ($text);	1619	$self->_set_text ($text);
1510	$self->update;	1620	$self->update;
		1621	$self->check_size;
1511	}	1622	}
1512		1623
1513	sub focus_in {	1624	sub focus_in {
1514	my ($self) = @_;	1625	my ($self) = @_;
1515		1626
…		…
1595	if ($sym == 13) {	1706	if ($sym == 13) {
1596	unshift @{$self->{history}},	1707	unshift @{$self->{history}},
1597	my $txt = $self->get_text;	1708	my $txt = $self->get_text;
1598	$self->{history_pointer} = -1;	1709	$self->{history_pointer} = -1;
1599	$self->{history_saveback} = '';	1710	$self->{history_saveback} = '';
1600	$self->emit (activate => $txt);	1711	$self->_emit (activate => $txt);
1601	$self->update;	1712	$self->update;
1602		1713
1603	} elsif ($sym == CFClient::SDLK_UP) {	1714	} elsif ($sym == CFClient::SDLK_UP) {
1604	if ($self->{history_pointer} < 0) {	1715	if ($self->{history_pointer} < 0) {
1605	$self->{history_saveback} = $self->get_text;	1716	$self->{history_saveback} = $self->get_text;
…		…
1644	my $class = shift;	1755	my $class = shift;
1645		1756
1646	$class->SUPER::new (	1757	$class->SUPER::new (
1647	padding => 4,	1758	padding => 4,
1648	fg => [1, 1, 1],	1759	fg => [1, 1, 1],
1649	bg => [1, 1, 1, 0.2],
1650	active_fg => [0, 0, 1],	1760	active_fg => [0, 0, 1],
1651	can_hover => 1,	1761	can_hover => 1,
1652	align => 0,	1762	align => 0,
1653	valign => 0,	1763	valign => 0,
1654	can_events => 1,	1764	can_events => 1,
1655	@_	1765	@_
1656	)	1766	)
1657	}	1767	}
1658		1768
		1769	sub activate { }
		1770
1659	sub button_up {	1771	sub button_up {
1660	my ($self, $ev, $x, $y) = @_;	1772	my ($self, $ev, $x, $y) = @_;
1661		1773
		1774	$self->emit ("activate")
1662	if ($x >= 0 && $x < $self->{w}	1775	if $x >= 0 && $x < $self->{w}
1663	&& $y >= 0 && $y < $self->{h}) {	1776	&& $y >= 0 && $y < $self->{h};
1664	$self->emit ("activate");
1665	}
1666	}	1777	}
1667		1778
1668	sub _draw {	1779	sub _draw {
1669	my ($self) = @_;	1780	my ($self) = @_;
1670		1781
…		…
1672		1783
1673	if ($GRAB == $self) {	1784	if ($GRAB == $self) {
1674	$self->{fg} = $self->{active_fg};	1785	$self->{fg} = $self->{active_fg};
1675	}	1786	}
1676		1787
1677	glEnable GL_BLEND;
1678	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1679	glEnable GL_TEXTURE_2D;	1788	glEnable GL_TEXTURE_2D;
1680	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1789	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1681	glColor 0, 0, 0, 1;	1790	glColor 0, 0, 0, 1;
1682		1791
1683	$tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});	1792	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1684		1793
1685	glDisable GL_TEXTURE_2D;	1794	glDisable GL_TEXTURE_2D;
1686	glDisable GL_BLEND;
1687		1795
1688	$self->SUPER::_draw;	1796	$self->SUPER::_draw;
1689	}	1797	}
1690		1798
1691	#############################################################################	1799	#############################################################################
…		…
1705		1813
1706	$class->SUPER::new (	1814	$class->SUPER::new (
1707	padding => 2,	1815	padding => 2,
1708	fg => [1, 1, 1],	1816	fg => [1, 1, 1],
1709	active_fg => [1, 1, 0],	1817	active_fg => [1, 1, 0],
		1818	bg => [0, 0, 0, 0.2],
		1819	active_bg => [1, 1, 1, 0.5],
1710	state => 0,	1820	state => 0,
1711	can_hover => 1,	1821	can_hover => 1,
1712	@_	1822	@_
1713	)	1823	)
1714	}	1824	}
…		…
1723	my ($self, $ev, $x, $y) = @_;	1833	my ($self, $ev, $x, $y) = @_;
1724		1834
1725	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1835	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1726	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1836	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1727	$self->{state} = !$self->{state};	1837	$self->{state} = !$self->{state};
1728	$self->emit (changed => $self->{state});	1838	$self->_emit (changed => $self->{state});
1729	}	1839	}
1730	}	1840	}
1731		1841
1732	sub _draw {	1842	sub _draw {
1733	my ($self) = @_;	1843	my ($self) = @_;
…		…
1738		1848
1739	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1849	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1740		1850
1741	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1851	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1742		1852
1743	glEnable GL_BLEND;	1853	my $tex = $self->{state} ? $tex[1] : $tex[0];
		1854
1744	glEnable GL_TEXTURE_2D;	1855	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);	1856	$tex->draw_quad_alpha (0, 0, $s, $s);
1750
1751	glDisable GL_TEXTURE_2D;	1857	glDisable GL_TEXTURE_2D;
1752	glDisable GL_BLEND;
1753	}	1858	}
1754		1859
1755	#############################################################################	1860	#############################################################################
1756		1861
1757	package CFClient::UI::Image;	1862	package CFClient::UI::Image;
…		…
1800	glTranslate 0, -$self->{w}, 0;	1905	glTranslate 0, -$self->{w}, 0;
1801		1906
1802	($w, $h) = ($h, $w);	1907	($w, $h) = ($h, $w);
1803	}	1908	}
1804		1909
1805	glEnable GL_BLEND;
1806	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1807	glEnable GL_TEXTURE_2D;	1910	glEnable GL_TEXTURE_2D;
1808	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1911	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1809		1912
1810	$tex->draw_quad (0, 0, $w, $h);	1913	$tex->draw_quad_alpha (0, 0, $w, $h);
1811		1914
1812	glDisable GL_BLEND;
1813	glDisable GL_TEXTURE_2D;	1915	glDisable GL_TEXTURE_2D;
1814	}	1916	}
1815		1917
1816	#############################################################################	1918	#############################################################################
1817		1919
…		…
2006	qw(s1_slider.png s1_slider_bg.png);	2108	qw(s1_slider.png s1_slider_bg.png);
2007		2109
2008	sub new {	2110	sub new {
2009	my $class = shift;	2111	my $class = shift;
2010		2112
2011	# range [value, low, high, page]	2113	# range [value, low, high, page, unit]
2012		2114
2013	# TODO: 0-width page	2115	# TODO: 0-width page
2014	# TODO: req_w/h are wrong with vertical	2116	# TODO: req_w/h are wrong with vertical
2015	# TODO: calculations are off	2117	# TODO: calculations are off
2016	my $self = $class->SUPER::new (	2118	my $self = $class->SUPER::new (
2017	fg => [1, 1, 1],	2119	fg => [1, 1, 1],
2018	active_fg => [0, 0, 0],	2120	active_fg => [0, 0, 0],
		2121	bg => [0, 0, 0, 0.2],
		2122	active_bg => [1, 1, 1, 0.5],
2019	range => [0, 0, 100, 10],	2123	range => [0, 0, 100, 10, 0],
2020	req_w => $::WIDTH / 80,	2124	req_w => $::WIDTH / 80,
2021	req_h => $::WIDTH / 80,	2125	req_h => $::WIDTH / 80,
2022	vertical => 0,	2126	vertical => 0,
2023	can_hover => 1,	2127	can_hover => 1,
2024	inner_pad => 5,	2128	inner_pad => 0.02,
2025	@_	2129	@_
2026	);	2130	);
2027		2131
		2132	$self->set_value ($self->{range}[0]);
		2133	$self->update;
		2134
2028	$self	2135	$self
		2136	}
		2137
		2138	sub set_range {
		2139	my ($self, $range) = @_;
		2140
		2141	$self->{range} = $range;
		2142
		2143	$self->update;
		2144	}
		2145
		2146	sub set_value {
		2147	my ($self, $value) = @_;
		2148
		2149	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
		2150
		2151	$hi = $lo + 1 if $hi <= $lo;
		2152
		2153	$page = $hi - $lo if $page > $hi - $lo;
		2154
		2155	$value = $lo if $value < $lo;
		2156	$value = $hi - $page if $value > $hi - $page;
		2157
		2158	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
		2159	if $unit;
		2160
		2161	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
		2162
		2163	if ($value != $old_value) {
		2164	$self->_emit (changed => $value);
		2165	$self->update;
		2166	}
2029	}	2167	}
2030		2168
2031	sub size_request {	2169	sub size_request {
2032	my ($self) = @_;	2170	my ($self) = @_;
2033		2171
…		…
2039		2177
2040	sub button_down {	2178	sub button_down {
2041	my ($self, $ev, $x, $y) = @_;	2179	my ($self, $ev, $x, $y) = @_;
2042		2180
2043	$self->SUPER::button_down ($ev, $x, $y);	2181	$self->SUPER::button_down ($ev, $x, $y);
		2182
		2183	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
		2184
2044	$self->mouse_motion ($ev, $x, $y);	2185	$self->mouse_motion ($ev, $x, $y);
2045	}	2186	}
2046		2187
2047	sub mouse_motion {	2188	sub mouse_motion {
2048	my ($self, $ev, $x, $y) = @_;	2189	my ($self, $ev, $x, $y) = @_;
2049		2190
2050	if ($GRAB == $self) {	2191	if ($GRAB == $self) {
		2192	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
		2193
		2194	my (undef, $lo, $hi, $page) = @{$self->{range}};
		2195
		2196	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
		2197
		2198	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2199	}
		2200	}
		2201
		2202	sub update {
		2203	my ($self) = @_;
		2204
		2205	$CFClient::UI::ROOT->on_post_alloc ($self => sub {
		2206	$self->set_value ($self->{range}[0]);
		2207
2051	my ($value, $lo, $hi, $page) = @{$self->{range}};	2208	my ($value, $lo, $hi, $page) = @{$self->{range}};
		2209	my $range = ($hi - $page - $lo) || 1e-100;
2052		2210
2053	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2211	my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2054		2212
2055	my $inner_pad_px = $self->_calc_inner_pad_px ($w);	2213	$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	2214	$self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2057		2215
2058	$x -= $inner_pad_px; # substract the padding	2216	$value = ($value - $lo) / $range;
2059	$x = $x * ($hi - $lo) / $inner_w + $lo;	2217	$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		2218
2064	$self->emit (changed => $x);	2219	$self->{knob_x} = $value - $knob_w * 0.5;
2065	$self->update;	2220	$self->{knob_w} = $knob_w;
2066	}	2221	});
2067	}
2068		2222
2069	# the inner_* stuff is for generating a padding for the slider handle,	2223	$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	}	2224	}
2076		2225
2077	sub _draw {	2226	sub _draw {
2078	my ($self) = @_;	2227	my ($self) = @_;
2079		2228
2080	$self->SUPER::_draw ();	2229	$self->SUPER::_draw ();
2081		2230
2082	my ($w, $h) = @$self{qw(w h)};	2231	glScale $self->{w}, $self->{h};
2083		2232
2084	if ($self->{vertical}) {	2233	if ($self->{vertical}) {
2085	# draw a vertical slider like a rotated horizontal slider	2234	# draw a vertical slider like a rotated horizontal slider
2086		2235
		2236	glTranslate 1, 0, 0;
2087	glRotate 90, 0, 0, 1;	2237	glRotate 90, 0, 0, 1;
2088	glTranslate 0, -$self->{w}, 0;
2089
2090	($w, $h) = ($h, $w);
2091	}	2238	}
2092		2239
2093	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	2240	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2094	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	2241	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2095		2242
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;	2243	glEnable GL_TEXTURE_2D;
2117	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2244	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2118		2245
2119	# draw background	2246	# draw background
2120	$tex[1]->draw_quad (0, 0, $w, $h);	2247	$tex[1]->draw_quad_alpha (0, 0, 1, 1);
2121		2248
2122	# draw handle	2249	# draw handle
2123	$tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);	2250	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2124		2251
2125	glDisable GL_BLEND;
2126	glDisable GL_TEXTURE_2D;	2252	glDisable GL_TEXTURE_2D;
2127	}	2253	}
		2254
		2255	#############################################################################
		2256
		2257	package CFClient::UI::ValSlider;
		2258
		2259	our @ISA = CFClient::UI::HBox::;
		2260
		2261	sub new {
		2262	my ($class, %arg) = @_;
		2263
		2264	my $range = delete $arg{range};
		2265
		2266	my $self = $class->SUPER::new (
		2267	slider => (new CFClient::UI::Slider expand => 1, range => $range),
		2268	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
		2269	to_value => sub { shift },
		2270	from_value => sub { shift },
		2271	%arg,
		2272	);
		2273
		2274	$self->{slider}->connect (changed => sub {
		2275	my ($self, $value) = @_;
		2276	$self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
		2277	$self->{parent}->emit (changed => $value);
		2278	});
		2279
		2280	# $self->{entry}->connect (changed => sub {
		2281	# my ($self, $value) = @_;
		2282	# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
		2283	# $self->{parent}->emit (changed => $value);
		2284	# });
		2285
		2286	$self->add ($self->{slider}, $self->{entry});
		2287
		2288	$self->{slider}->emit (changed => $self->{slider}{range}[0]);
		2289
		2290	$self
		2291	}
		2292
		2293	sub set_range { shift->{slider}->set_range (@_) }
		2294	sub set_value { shift->{slider}->set_value (@_) }
2128		2295
2129	#############################################################################	2296	#############################################################################
2130		2297
2131	package CFClient::UI::TextView;	2298	package CFClient::UI::TextView;
2132		2299
…		…
2141	fontsize => 1,	2308	fontsize => 1,
2142	can_events => 0,	2309	can_events => 0,
2143	#font => default_font	2310	#font => default_font
2144	@_,	2311	@_,
2145		2312
2146	layout => (new CFClient::Layout),	2313	layout => (new CFClient::Layout 1),
2147	par => [],	2314	par => [],
2148	height => 0,	2315	height => 0,
2149	children => [	2316	children => [
2150	(new CFClient::UI::Empty expand => 1),	2317	(new CFClient::UI::Empty expand => 1),
2151	(new CFClient::UI::Slider vertical => 1),	2318	(new CFClient::UI::Slider vertical => 1),
…		…
2162		2329
2163	$self->{fontsize} = $fontsize;	2330	$self->{fontsize} = $fontsize;
2164	$self->reflow;	2331	$self->reflow;
2165	}	2332	}
2166		2333
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 {	2334	sub size_allocate {
2187	my ($self, $w, $h) = @_;	2335	my ($self, $w, $h) = @_;
2188		2336
2189	$self->SUPER::size_allocate ($w, $h);	2337	$self->SUPER::size_allocate ($w, $h);
2190		2338
…		…
2193	$self->{layout}->set_width ($self->{children}[0]{w});	2341	$self->{layout}->set_width ($self->{children}[0]{w});
2194		2342
2195	$self->reflow;	2343	$self->reflow;
2196	}	2344	}
2197		2345
		2346	sub text_size {
		2347	my ($self, $text, $indent) = @_;
		2348
		2349	my $layout = $self->{layout};
		2350
		2351	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2352	$layout->set_width ($self->{children}[0]{w} - $indent);
		2353	$layout->set_markup ($text);
		2354
		2355	$layout->size
		2356	}
		2357
		2358	sub reflow {
		2359	my ($self) = @_;
		2360
		2361	$self->{need_reflow}++;
		2362	$self->update;
		2363	}
		2364
		2365	sub set_offset {
		2366	my ($self, $offset) = @_;
		2367
		2368	# todo: base offset on lines or so, not on pixels
		2369	$self->{children}[1]->set_value ($offset);
		2370	}
		2371
		2372	sub clear {
		2373	my ($self) = @_;
		2374
		2375	$self->{par} = [];
		2376	$self->{height} = 0;
		2377	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
		2378	}
		2379
2198	sub add_paragraph {	2380	sub add_paragraph {
2199	my ($self, $color, $text) = @_;	2381	my ($self, $color, $text, $indent) = @_;
2200		2382
2201	#TODO: intelligently "reformat" paragraph	2383	for my $line (split /\n/, $text) {
2202		2384	my ($w, $h) = $self->text_size ($line);
2203	my $height = $self->text_height ($text);
2204
2205	$self->{height} += $height;	2385	$self->{height} += $h;
		2386	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
		2387	}
2206		2388
2207	push @{$self->{par}}, [$height, $color, $text];
2208
2209	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];	2389	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2210	$self->{children}[1]->update;
2211	}	2390	}
2212		2391
2213	sub update {	2392	sub update {
2214	my ($self) = @_;	2393	my ($self) = @_;
2215		2394
…		…
2217		2396
2218	return unless $self->{h} > 0;	2397	return unless $self->{h} > 0;
2219		2398
2220	delete $self->{texture};	2399	delete $self->{texture};
2221		2400
2222	$ROOT->on_refresh ($self, sub {	2401	$ROOT->on_post_alloc ($self, sub {
		2402	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2403
2223	if (delete $self->{need_reflow}) {	2404	if (delete $self->{need_reflow}) {
2224	my $height = 0;	2405	my $height = 0;
2225		2406
2226	$height += $_->[0] = $self->text_height ($_->[2])	2407	my $layout = $self->{layout};
		2408
		2409	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2410
2227	for @{$self->{par}};	2411	for (@{$self->{par}}) {
		2412	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
		2413	$layout->set_width ($W - $_->[3]);
		2414	$layout->set_markup ($_->[4]);
		2415	my ($w, $h) = $layout->size;
		2416	$_->[0] = $w + $_->[3];
		2417	$_->[1] = $h;
		2418	}
		2419
		2420	$height += $_->[1];
		2421	}
2228		2422
2229	$self->{height} = $height;	2423	$self->{height} = $height;
2230		2424
2231	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2425	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2232		2426
2233	delete $self->{texture};	2427	delete $self->{texture};
2234	}	2428	}
2235		2429
2236	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {	2430	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2237	glClearColor 0, 0, 0, 0;	2431	glClearColor 0.5, 0.5, 0.5, 0;
2238	glClear GL_COLOR_BUFFER_BIT;	2432	glClear GL_COLOR_BUFFER_BIT;
2239		2433
		2434	my $top = int $self->{children}[1]{range}[0];
		2435
		2436	my $y0 = $top;
		2437	my $y1 = $top + $H;
		2438
		2439	my $y = 0;
		2440
		2441	my $layout = $self->{layout};
		2442
		2443	$layout->set_font ($self->{font}) if $self->{font};
		2444
2240	glEnable GL_BLEND;	2445	glEnable GL_BLEND;
		2446	#TODO# not correct in windows where rgba is forced off
2241	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	2447	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		2448
2256	for my $par (@{$self->{par}}) {	2449	for my $par (@{$self->{par}}) {
2257	my $h = $par->[0];	2450	my $h = $par->[1];
2258		2451
2259	if ($y0 < $y + $h && $y < $y1) {	2452	if ($y0 < $y + $h && $y < $y1) {
		2453	$layout->set_foreground (@{ $par->[2] });
		2454	$layout->set_width ($W - $par->[3]);
2260	$layout->set_text ($par->[2]);	2455	$layout->set_markup ($par->[4]);
2261		2456
2262	glColor @{ $par->[1] };	2457	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2263	my ($W, $H) = $layout->size;	2458
2264	CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);	2459	glRasterPos $par->[3], $y - $y0;
		2460	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2265	}	2461	}
2266		2462
2267	$y += $h;	2463	$y += $h;
2268	}	2464	}
2269		2465
2270	glDisable GL_TEXTURE_2D;
2271	glDisable GL_BLEND;	2466	glDisable GL_BLEND;
2272	};	2467	};
2273	});	2468	});
2274	}	2469	}
2275		2470
2276	sub _draw {	2471	sub _draw {
2277	my ($self) = @_;	2472	my ($self) = @_;
2278		2473
2279	glEnable GL_BLEND;
2280	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2281	glEnable GL_TEXTURE_2D;	2474	glEnable GL_TEXTURE_2D;
2282	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2475	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2283	glColor 1, 1, 1, 1;	2476	glColor 1, 1, 1, 1;
2284	$self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2477	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2285	glDisable GL_TEXTURE_2D;	2478	glDisable GL_TEXTURE_2D;
2286	glDisable GL_BLEND;
2287		2479
2288	$self->{children}[1]->draw;	2480	$self->{children}[1]->draw;
2289		2481
2290	}	2482	}
2291		2483
…		…
2359		2551
2360	# TODO: use animation	2552	# TODO: use animation
2361	if ($self->{state} = !$self->{state}) {	2553	if ($self->{state} = !$self->{state}) {
2362	$CFClient::UI::ROOT->add ($self->{other});	2554	$CFClient::UI::ROOT->add ($self->{other});
2363	$self->{other}->move ($self->coord2global (0, $self->{h}));	2555	$self->{other}->move ($self->coord2global (0, $self->{h}));
2364	$self->emit ("open");	2556	$self->_emit ("open");
2365	} else {	2557	} else {
2366	$CFClient::UI::ROOT->remove ($self->{other});	2558	$CFClient::UI::ROOT->remove ($self->{other});
2367	$self->emit ("close");	2559	$self->_emit ("close");
2368	}	2560	}
2369		2561
2370	$self->emit (changed => $self->{state});	2562	$self->_emit (changed => $self->{state});
2371	}	2563	}
2372		2564
2373	#############################################################################	2565	#############################################################################
2374		2566
2375	package CFClient::UI::Tooltip;	2567	package CFClient::UI::Tooltip;
…		…
2385	@_,	2577	@_,
2386	can_events => 0,	2578	can_events => 0,
2387	)	2579	)
2388	}	2580	}
2389		2581
2390	sub set_markup {	2582	sub set_tooltip_from {
2391	my ($self, $text) = @_;	2583	my ($self, $widget) = @_;
2392		2584
2393	$self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];	2585	$self->add (new CFClient::UI::Label
2394	$self->{label}->set_markup ($text);	2586	markup => $widget->{tooltip},
2395	$self->add ($self->{label});	2587	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
		2588	fontsize => 0.8,
		2589	fg => [0, 0, 0, 1],
		2590	ellipsise => 0,
		2591	font => ($widget->{tooltip_font} || $::FONT_PROP),
		2592	);
2396	}	2593	}
2397		2594
2398	sub size_request {	2595	sub size_request {
2399	my ($self) = @_;	2596	my ($self) = @_;
2400
2401	$self->child->set_max_size ($::WIDTH * 0.3);
2402		2597
2403	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	2598	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2404		2599
2405	($w + 4, $h + 4)	2600	($w + 4, $h + 4)
2406	}	2601	}
…		…
2412	}	2607	}
2413		2608
2414	sub _draw {	2609	sub _draw {
2415	my ($self) = @_;	2610	my ($self) = @_;
2416		2611
2417	glPushMatrix;
2418	glTranslate 0.375, 0.375;	2612	glTranslate 0.375, 0.375;
2419		2613
2420	my ($w, $h) = @$self{qw(w h)};	2614	my ($w, $h) = @$self{qw(w h)};
2421		2615
2422	glColor 1, 0.8, 0.4;	2616	glColor 1, 0.8, 0.4;
…		…
2433	glVertex 0 , $h;	2627	glVertex 0 , $h;
2434	glVertex $w, $h;	2628	glVertex $w, $h;
2435	glVertex $w, 0;	2629	glVertex $w, 0;
2436	glEnd;	2630	glEnd;
2437		2631
2438	glPopMatrix;	2632	glTranslate 2 - 0.375, 2 - 0.375;
2439
2440	glTranslate 2, 2;
2441	$self->SUPER::_draw;	2633	$self->SUPER::_draw;
2442	}	2634	}
2443		2635
2444	#############################################################################	2636	#############################################################################
2445		2637
…		…
2450	use CFClient::OpenGL;	2642	use CFClient::OpenGL;
2451		2643
2452	sub new {	2644	sub new {
2453	my $class = shift;	2645	my $class = shift;
2454		2646
2455	$class->SUPER::new (	2647	my $self = $class->SUPER::new (
2456	aspect => 1,	2648	aspect => 1,
		2649	can_events => 0,
2457	@_,	2650	@_,
2458	)	2651	);
		2652
		2653	if ($self->{anim} && $self->{animspeed}) {
		2654	Scalar::Util::weaken (my $widget = $self);
		2655
		2656	$self->{timer} = Event->timer (
		2657	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
		2658	hard => 1,
		2659	interval => $self->{animspeed},
		2660	cb => sub {
		2661	++$widget->{frame};
		2662	$widget->update;
		2663	},
		2664	);
		2665	}
		2666
		2667	$self
2459	}	2668	}
2460		2669
2461	sub size_request {	2670	sub size_request {
2462	(32, 8)	2671	(32, 8)
2463	}	2672	}
2464		2673
		2674	sub update {
		2675	my ($self) = @_;
		2676
		2677	return unless $self->{visible};
		2678
		2679	$self->SUPER::update;
		2680	}
		2681
2465	sub _draw {	2682	sub _draw {
2466	my ($self) = @_;	2683	my ($self) = @_;
2467		2684
2468	return unless $::CONN;#d# manage and cache textures differently	2685	return unless $::CONN;
		2686
		2687	my $face;
		2688
		2689	if ($self->{frame}) {
		2690	my $anim = $::CONN->{anim}[$self->{anim}];
		2691
		2692	$face = $anim->[ $self->{frame} % @$anim ]
		2693	if $anim && @$anim;
		2694	}
		2695
2469	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	2696	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2470		2697
2471	# TODO animation
2472	if ($tex) {	2698	if ($tex) {
2473	glEnable GL_BLEND;
2474	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2475	glEnable GL_TEXTURE_2D;	2699	glEnable GL_TEXTURE_2D;
2476	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2700	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2477	glColor 1, 1, 1, 1;	2701	glColor 1, 1, 1, 1;
2478	$tex->draw_quad (0, 0, $self->{w}, $self->{h});	2702	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2479	glDisable GL_TEXTURE_2D;	2703	glDisable GL_TEXTURE_2D;
2480	glDisable GL_BLEND;
2481	}	2704	}
		2705	}
		2706
		2707	sub DESTROY {
		2708	my ($self) = @_;
		2709
		2710	$self->{timer}->cancel
		2711	if $self->{timer};
		2712
		2713	$self->SUPER::DESTROY;
2482	}	2714	}
2483		2715
2484	#############################################################################	2716	#############################################################################
2485		2717
2486	package CFClient::UI::InventoryItem;	2718	package CFClient::UI::Inventory;
2487		2719
2488	our @ISA = CFClient::UI::HBox::;	2720	our @ISA = CFClient::UI::ScrolledWindow::;
2489		2721
2490	sub new {	2722	sub new {
2491	my $class = shift;	2723	my $class = shift;
2492		2724
2493	my %args = @_;
2494
2495	my $item = delete $args{item};
2496
2497	my $desc = $item->{nrof} < 2
2498	? $item->{name}
2499	: "$item->{nrof} $item->{name_pl}";
2500
2501
2502	my $self = $class->SUPER::new (	2725	my $self = $class->SUPER::new (
2503	can_hover => 1,	2726	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2504	can_events => 1,
2505	tooltip => (CFClient::UI::Label->escape ($desc)
2506	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2507	connect_button_down => sub {
2508	my ($self, $ev, $x, $y) = @_;
2509
2510	# todo: maybe put examine on 1? but should just be a tooltip :(
2511	if ($ev->{button} == 1) {
2512	$::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2513	} elsif ($ev->{button} == 2) {
2514	$::CONN->send ("apply $item->{tag}");
2515	} elsif ($ev->{button} == 3) {
2516	CFClient::UI::Menu->new (
2517	items => [
2518	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2519	[
2520	$item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2521	sub { $::CONN->send ("lock $item->{tag}") },
2522	],
2523	["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2524	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2525	["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2526	],
2527	)->popup ($ev);
2528	}
2529
2530	1
2531	},
2532	%args
2533	);
2534
2535	$self->add (new CFClient::UI::Face
2536	can_events => 0,
2537	face => $item->{face},
2538	anim => $item->{anim},
2539	animspeed => $item->{animspeed},
2540	);
2541
2542	$self->add (new CFClient::UI::Label
2543	can_events => 0,
2544	text => $desc,
2545	);
2546
2547	$self
2548	}
2549
2550	#############################################################################
2551
2552	package CFClient::UI::Inventory;
2553
2554	our @ISA = CFClient::UI::ScrolledWindow::;
2555
2556	sub new {
2557	my $class = shift;
2558
2559	my $self = $class->SUPER::new (
2560	scrolled => (new CFClient::UI::VBox),
2561	@_,	2727	@_,
2562	);	2728	);
2563		2729
2564	$self	2730	$self
2565	}	2731	}
…		…
2568	my ($self, $items) = @_;	2734	my ($self, $items) = @_;
2569		2735
2570	$self->{scrolled}->clear;	2736	$self->{scrolled}->clear;
2571	return unless $items;	2737	return unless $items;
2572		2738
2573	my @items = sort { $a->{type} <=> $b->{type} } @$items;	2739	my @items = sort {
		2740	($a->{type} <=> $b->{type})
		2741	or ($a->{name} cmp $b->{name})
		2742	} @$items;
2574		2743
2575	$self->{real_items} = \@items;	2744	$self->{real_items} = \@items;
2576		2745
		2746	my $row = 0;
2577	for my $item (@items) {	2747	for my $item (@items) {
2578	my $desc = $item->{nrof} < 2	2748	CFClient::Item::update_widgets $item;
2579	? $item->{name}
2580	: "$item->{nrof} $item->{name_pl}";
2581		2749
2582	$self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item);	2750	$self->{scrolled}->add (0, $row, $item->{face_widget});
		2751	$self->{scrolled}->add (1, $row, $item->{desc_widget});
		2752	$self->{scrolled}->add (2, $row, $item->{weight_widget});
		2753
		2754	$row++;
2583	}	2755	}
2584		2756
2585	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];	2757	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2586	}	2758	}
2587		2759
…		…
2630		2802
2631	# popup given the event (must be a mouse button down event currently)	2803	# popup given the event (must be a mouse button down event currently)
2632	sub popup {	2804	sub popup {
2633	my ($self, $ev) = @_;	2805	my ($self, $ev) = @_;
2634		2806
2635	$self->emit ("popdown");	2807	$self->_emit ("popdown");
2636		2808
2637	# maybe save $GRAB? must be careful about events...	2809	# maybe save $GRAB? must be careful about events...
2638	$GRAB = $self;	2810	$GRAB = $self;
2639	$self->{button} = $ev->{button};	2811	$self->{button} = $ev->{button};
2640		2812
…		…
2655		2827
2656	if ($ev->{button} == $self->{button}) {	2828	if ($ev->{button} == $self->{button}) {
2657	undef $GRAB;	2829	undef $GRAB;
2658	$self->hide;	2830	$self->hide;
2659		2831
2660	$self->emit ("popdown");	2832	$self->_emit ("popdown");
2661	$self->{hover}[1]->() if $self->{hover};	2833	$self->{hover}[1]->() if $self->{hover};
2662	}	2834	}
2663	}	2835	}
2664		2836
2665	#############################################################################	2837	#############################################################################
2666		2838
2667	package CFClient::UI::Statusbox;	2839	package CFClient::UI::Statusbox;
2668		2840
2669	our @ISA = CFClient::UI::VBox::;	2841	our @ISA = CFClient::UI::VBox::;
		2842
		2843	sub new {
		2844	my $class = shift;
		2845
		2846	$class->SUPER::new (
		2847	fontsize => 0.8,
		2848	@_,
		2849	)
		2850	}
2670		2851
2671	sub reorder {	2852	sub reorder {
2672	my ($self) = @_;	2853	my ($self) = @_;
2673	my $NOW = time;	2854	my $NOW = time;
2674		2855
2675	while (my ($k, $v) = each %{ $self->{item} }) {	2856	while (my ($k, $v) = each %{ $self->{item} }) {
2676	delete $self->{item}{$k} if $v->{timeout} < $NOW;	2857	delete $self->{item}{$k} if $v->{timeout} < $NOW;
2677	}	2858	}
2678		2859
2679	my @widgets;	2860	my @widgets;
2680	my @items = sort { $a->{time} <=> $b->{time} } values %{ $self->{item} };	2861
		2862	my @items = sort {
		2863	$a->{pri} <=> $b->{pri}
		2864	or $b->{id} <=> $a->{id}
		2865	} values %{ $self->{item} };
		2866
2681	my $count = 10 + 1;	2867	my $count = 10 + 1;
2682	for my $item (@items) {	2868	for my $item (@items) {
2683	last unless --$count;	2869	last unless --$count;
2684		2870
2685	push @widgets, $item->{label} ||= do {	2871	push @widgets, $item->{label} ||= do {
2686	# TODO: doesn't handle markup well (read as: at all)	2872	# TODO: doesn't handle markup well (read as: at all)
2687	my $short = delete $item->{text};	2873	my $short = $item->{count} > 1
		2874	? "<b>$item->{count} ×</b> $item->{text}"
		2875	: $item->{text};
		2876
2688	for ($short) {	2877	for ($short) {
2689	s/^\s+//;	2878	s/^\s+//;
2690	s/\012.*//s;	2879	s/\s+/ /g;
2691	my $len = int 30 / $item->{fontsize};
2692	substr $_, $len, length, "…" if $len < length;
2693	}	2880	}
2694		2881
2695	new CFClient::UI::Label	2882	new CFClient::UI::Label
2696	markup => $short,	2883	markup => $short,
2697	tooltip => delete $item->{tooltip},	2884	tooltip => $item->{tooltip},
2698	fontsize => delete $item->{fontsize},	2885	tooltip_font => $::FONT_PROP,
2699	color => delete $item->{color},	2886	tooltip_width => 0.67,
		2887	fontsize => $item->{fontsize} || $self->{fontsize},
		2888	max_w => $::WIDTH * 0.44,
		2889	fg => $item->{fg},
2700	can_events => 1,	2890	can_events => 1,
2701	can_hover => 1,	2891	can_hover => 1
2702	};	2892	};
2703	}	2893	}
2704		2894
2705	$self->clear;	2895	$self->clear;
2706	$self->SUPER::add (@widgets);	2896	$self->SUPER::add (reverse @widgets);
2707	}	2897	}
2708		2898
2709	sub add {	2899	sub add {
2710	my ($self, $text, %arg) = @_;	2900	my ($self, $text, %arg) = @_;
2711		2901
2712	my $item = {	2902	$text =~ s/^\s+//;
2713	time => time,	2903	$text =~ s/\s+$//;
		2904
		2905	return unless $text;
		2906
		2907	my $timeout = time + ((delete $arg{timeout}) || 60);
		2908
		2909	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
		2910
		2911	if (my $item = $self->{item}{$group}) {
		2912	if ($item->{text} eq $text) {
		2913	$item->{count}++;
		2914	} else {
		2915	$item->{count} = 1;
		2916	$item->{text} = $item->{tooltip} = $text;
		2917	}
		2918	$item->{id} = ++$self->{id};
		2919	$item->{timeout} = $timeout;
		2920	delete $item->{label};
		2921	} else {
		2922	$self->{item}{$group} = {
		2923	id => ++$self->{id},
2714	text => $text,	2924	text => $text,
2715	timeout => 60,	2925	timeout => $timeout,
2716	tooltip => $text,	2926	tooltip => $text,
2717	fontsize => 0.8,
2718	color => [0.8, 0.8, 0.8, 0.8],	2927	fg => [0.8, 0.8, 0.8, 0.8],
		2928	pri => 0,
		2929	count => 1,
2719	%arg,	2930	%arg,
		2931	};
2720	};	2932	}
2721
2722	$item->{timeout} += time;
2723	$item->{group} ||= $item+0;
2724
2725	$item = $self->{item}{$item->{group}} ||= $item;
2726		2933
2727	$self->reorder;	2934	$self->reorder;
		2935	}
		2936
		2937	sub reconfigure {
		2938	my ($self) = @_;
		2939
		2940	delete $_->{label}
		2941	for values %{ $self->{item} || {} };
		2942
		2943	$self->reorder;
		2944	$self->SUPER::reconfigure;
2728	}	2945	}
2729		2946
2730	#############################################################################	2947	#############################################################################
2731		2948
2732	package CFClient::UI::Root;	2949	package CFClient::UI::Root;
…		…
2764	}	2981	}
2765		2982
2766	sub size_allocate {	2983	sub size_allocate {
2767	my ($self, $w, $h) = @_;	2984	my ($self, $w, $h) = @_;
2768		2985
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) {	2986	for my $child ($self->children) {
2786	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	2987	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2787		2988
		2989	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
		2990	if exists $child->{req_x};
		2991
		2992	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
		2993	if exists $child->{req_y};
		2994
2788	$X = List::Util::max 0, List::Util::min $w - $W, $X;	2995	$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;	2996	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
		2997
2790	$child->configure ($X, $Y, $W, $H);	2998	$child->configure ($X, $Y, $W, $H);
2791	}	2999	}
2792
2793	$self->{old_w} = $w;
2794	$self->{old_h} = $h;
2795	}	3000	}
2796		3001
2797	sub coord2local {	3002	sub coord2local {
2798	my ($self, $x, $y) = @_;	3003	my ($self, $x, $y) = @_;
2799		3004
…		…
2812	$self->check_size;	3017	$self->check_size;
2813	$::WANT_REFRESH++;	3018	$::WANT_REFRESH++;
2814	}	3019	}
2815		3020
2816	sub add {	3021	sub add {
2817	my ($self, $child) = @_;	3022	my ($self, @children) = @_;
2818		3023
		3024	for (my @widgets = @children; my $w = pop @widgets; ) {
		3025	push @widgets, $w->children;
		3026	$w->{root} = $self;
		3027	$w->{visible} = 1;
		3028	}
		3029
		3030	for my $child (@children) {
		3031	$child->{is_toplevel} = 1;
		3032
2819	# integerise window positions	3033	# integerise window positions
2820	$child->{x} = int $child->{x};	3034	$child->{x} = int $child->{x};
2821	$child->{y} = int $child->{y};	3035	$child->{y} = int $child->{y};
		3036	}
2822		3037
2823	$self->SUPER::add ($child);	3038	$self->SUPER::add (@children);
		3039	}
		3040
		3041	sub remove {
		3042	my ($self, @children) = @_;
		3043
		3044	$self->SUPER::remove (@children);
		3045
		3046	while (@children) {
		3047	my $w = pop @children;
		3048	push @children, $w->children;
		3049	$w->set_invisible;
		3050	}
2824	}	3051	}
2825		3052
2826	sub on_refresh {	3053	sub on_refresh {
2827	my ($self, $id, $cb) = @_;	3054	my ($self, $id, $cb) = @_;
2828		3055
2829	$self->{refresh_hook}{$id} = $cb;	3056	$self->{refresh_hook}{$id} = $cb;
2830	}	3057	}
2831		3058
		3059	sub on_post_alloc {
		3060	my ($self, $id, $cb) = @_;
		3061
		3062	$self->{post_alloc_hook}{$id} = $cb;
		3063	}
		3064
2832	sub draw {	3065	sub draw {
2833	my ($self) = @_;	3066	my ($self) = @_;
		3067
		3068	while ($self->{refresh_hook}) {
		3069	$_->()
		3070	for values %{delete $self->{refresh_hook}};
		3071	}
2834		3072
2835	if ($self->{check_size}) {	3073	if ($self->{check_size}) {
2836	my @queue = ([], []);	3074	my @queue = ([], []);
2837		3075
2838	for (;;) {	3076	for (;;) {
…		…
2846		3084
2847	my ($w, $h) = $widget->{user_w} && $widget->{user_h}	3085	my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2848	? @$widget{qw(user_w user_h)}	3086	? @$widget{qw(user_w user_h)}
2849	: $widget->size_request;	3087	: $widget->size_request;
2850		3088
		3089	if (delete $widget->{force_alloc}
2851	if ($w != $widget->{req_w} || $h != $widget->{req_h}) {	3090	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2852	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#	3091	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2853		3092
2854	$widget->{req_w} = $w;	3093	$widget->{req_w} = $w;
2855	$widget->{req_h} = $h;	3094	$widget->{req_h} = $h;
2856		3095
2857	$self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}];	3096	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
2858		3097
2859	$widget->{parent}->check_size	3098	$widget->{parent}->check_size
2860	if $widget->{parent};	3099	if $widget->{parent};
2861	}	3100	}
2862	}	3101	}
…		…
2869	$w = 0 if $w < 0;	3108	$w = 0 if $w < 0;
2870	$h = 0 if $h < 0;	3109	$h = 0 if $h < 0;
2871		3110
2872	$widget->{w} = $w;	3111	$widget->{w} = $w;
2873	$widget->{h} = $h;	3112	$widget->{h} = $h;
2874	$widget->size_allocate ($w, $h);
2875	$widget->emit (size_allocate => $w, $h);	3113	$widget->emit (size_allocate => $w, $h);
2876	}	3114	}
2877	}	3115	}
2878		3116
2879	while ($self->{refresh_hook}) {	3117	while ($self->{post_alloc_hook}) {
2880	$_->()	3118	$_->()
2881	for values %{delete $self->{refresh_hook}};	3119	for values %{delete $self->{post_alloc_hook}};
2882	}	3120	}
2883		3121
2884	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3122	glViewport 0, 0, $::WIDTH, $::HEIGHT;
2885	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3123	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2886	glClear GL_COLOR_BUFFER_BIT;	3124	glClear GL_COLOR_BUFFER_BIT;
2887		3125
2888	glMatrixMode GL_PROJECTION;	3126	glMatrixMode GL_PROJECTION;
2889	glLoadIdentity;	3127	glLoadIdentity;
2890	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;	3128	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2891	glMatrixMode GL_MODELVIEW;	3129	glMatrixMode GL_MODELVIEW;
2892	glLoadIdentity;	3130	glLoadIdentity;
2893		3131
2894	$self->_draw;	3132	$self->_draw;
2895	}	3133	}
…		…
2897	#############################################################################	3135	#############################################################################
2898		3136
2899	package CFClient::UI;	3137	package CFClient::UI;
2900		3138
2901	$ROOT = new CFClient::UI::Root;	3139	$ROOT = new CFClient::UI::Root;
2902	$TOOLTIP = new CFClient::UI::Tooltip;	3140	$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2903		3141
2904	1	3142	1
2905		3143

Diff Legend

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