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.197 by root, Fri May 12 01:47:04 2006 UTC vs.
Revision 1.247 by root, Sun May 28 01:16:04 2006 UTC

…		…
5		5
6	use Scalar::Util ();	6	use Scalar::Util ();
7	use List::Util ();	7	use List::Util ();
8		8
9	use CFClient;	9	use CFClient;
		10	use CFClient::Texture;
10		11
11	our ($FOCUS, $HOVER, $GRAB); # various widgets	12	our ($FOCUS, $HOVER, $GRAB); # various widgets
12		13
		14	our $LAYOUT;
13	our $ROOT;	15	our $ROOT;
14	our $TOOLTIP;	16	our $TOOLTIP;
15	our $BUTTON_STATE;	17	our $BUTTON_STATE;
		18
		19	our %WIDGET; # all widgets, weak-referenced
		20
		21	sub get_layout {
		22	for (grep { $_->{name} } values %WIDGET) {
		23	$LAYOUT->{$_->{name}} = {
		24	x => $_->{x} / $::WIDTH,
		25	y => $_->{y} / $::HEIGHT,
		26	w => $_->{w} / $::WIDTH,
		27	h => $_->{h} / $::HEIGHT
		28	};
		29	}
		30
		31	return $LAYOUT;
		32	}
		33
		34	sub set_layout {
		35	my ($layout) = @_;
		36	$LAYOUT = $layout;
		37	}
16		38
17	sub check_tooltip {	39	sub check_tooltip {
18	if (!$GRAB) {	40	if (!$GRAB) {
19	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	41	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
20	if (length $widget->{tooltip}) {	42	if (length $widget->{tooltip}) {
…		…
29	$TOOLTIP->set_tooltip_from ($widget);	51	$TOOLTIP->set_tooltip_from ($widget);
30	$TOOLTIP->show;	52	$TOOLTIP->show;
31		53
32	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	54	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33		55
34	if ($x + $TOOLTIP->{w} > $::WIDTH) {
35	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);	56	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
36	}	57	if $x + $TOOLTIP->{w} > $::WIDTH;
37		58
38	$TOOLTIP->move ($x, $y);	59	$TOOLTIP->move ($x, $y);
39	$TOOLTIP->check_size;	60	$TOOLTIP->check_size;
40	$TOOLTIP->update;	61	$TOOLTIP->update;
41	}	62	}
…		…
49	delete $TOOLTIP->{owner};	70	delete $TOOLTIP->{owner};
50	}	71	}
51		72
52	# class methods for events	73	# class methods for events
53	sub feed_sdl_key_down_event {	74	sub feed_sdl_key_down_event {
54	$FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])	75	$FOCUS->emit (key_down => $_[0])
55	if $FOCUS;	76	if $FOCUS;
56	}	77	}
57		78
58	sub feed_sdl_key_up_event {	79	sub feed_sdl_key_up_event {
59	$FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])	80	$FOCUS->emit (key_up => $_[0])
60	if $FOCUS;	81	if $FOCUS;
61	}	82	}
62		83
63	sub feed_sdl_button_down_event {	84	sub feed_sdl_button_down_event {
64	my ($ev) = @_;	85	my ($ev) = @_;
…		…
73	check_tooltip;	94	check_tooltip;
74	}	95	}
75		96
76	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	97	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
77		98
78	if ($GRAB) {	99	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
79	($x, $y) = $GRAB->coord2local ($x, $y);	100	if $GRAB;
80	$GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
81	}
82	}	101	}
83		102
84	sub feed_sdl_button_up_event {	103	sub feed_sdl_button_up_event {
85	my ($ev) = @_;	104	my ($ev) = @_;
86	my ($x, $y) = ($ev->{x}, $ev->{y});	105	my ($x, $y) = ($ev->{x}, $ev->{y});
87		106
88	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	107	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
89		108
90	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	109	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
91		110
92	if ($GRAB) {	111	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
93	($x, $y) = $GRAB->coord2local ($x, $y);	112	if $GRAB;
94	$GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
95	}
96		113
97	if (!$BUTTON_STATE) {	114	if (!$BUTTON_STATE) {
98	my $grab = $GRAB; undef $GRAB;	115	my $grab = $GRAB; undef $GRAB;
99	$grab->update if $grab;	116	$grab->update if $grab;
100	$GRAB->update if $GRAB;	117	$GRAB->update if $GRAB;
…		…
116	$HOVER->update if $HOVER && $HOVER->{can_hover};	133	$HOVER->update if $HOVER && $HOVER->{can_hover};
117		134
118	check_tooltip;	135	check_tooltip;
119	}	136	}
120		137
121	if ($HOVER) {
122	($x, $y) = $HOVER->coord2local ($x, $y);
123	$HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);	138	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
124	}	139	if $HOVER;
125	}	140	}
126		141
127	# convert position array to integers	142	# convert position array to integers
128	sub harmonize {	143	sub harmonize {
129	my ($vals) = @_;	144	my ($vals) = @_;
…		…
133	for (@$vals) {	148	for (@$vals) {
134	my $i = int $_ + $rem;	149	my $i = int $_ + $rem;
135	$rem += $_ - $i;	150	$rem += $_ - $i;
136	$_ = $i;	151	$_ = $i;
137	}	152	}
		153	}
		154
		155	sub full_refresh {
		156	# make a copy, otherwise for complains about freed values.
		157	my @widgets = values %WIDGET;
		158
		159	$_->update
		160	for @widgets;
		161	}
		162
		163	sub reconfigure_widgets {
		164	# make a copy, otherwise C<for> complains about freed values.
		165	my @widgets = values %WIDGET;
		166
		167	$_->reconfigure
		168	for @widgets;
		169	}
		170
		171	# call when resolution changes etc.
		172	sub rescale_widgets {
		173	my ($sx, $sy) = @_;
		174
		175	for my $widget (values %WIDGET) {
		176	if ($widget->{is_toplevel}) {
		177	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
		178	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
		179	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
		180	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
		181	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
		182	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
		183	}
		184	}
		185
		186	reconfigure_widgets;
138	}	187	}
139		188
140	#############################################################################	189	#############################################################################
141		190
142	package CFClient::UI::Base;	191	package CFClient::UI::Base;
…		…
155	can_events => 1,	204	can_events => 1,
156	@_	205	@_
157	}, $class;	206	}, $class;
158		207
159	for (keys %$self) {	208	for (keys %$self) {
160	if (/^connect_(.*)$/) {	209	if (/^on_(.*)$/) {
161	$self->connect ($1 => delete $self->{$_});	210	$self->connect ($1 => delete $self->{$_});
162	}	211	}
163	}	212	}
164		213
		214	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
		215
		216	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
		217	$self->{req_x} = $layout->{x} * $::WIDTH;
		218	$self->{req_y} = $layout->{y} * $::HEIGHT;
		219	$self->{def_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH;
		220	$self->{def_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT;
		221	}
		222
165	$self	223	$self
		224	}
		225
		226	sub toggle_visibility {
		227	my ($self) = @_;
		228
		229	if ($self->{visible}) {
		230	$self->hide;
		231	} else {
		232	$self->show;
		233	}
166	}	234	}
167		235
168	sub destroy {	236	sub destroy {
169	my ($self) = @_;	237	my ($self) = @_;
170		238
…		…
172	%$self = ();	240	%$self = ();
173	}	241	}
174		242
175	sub show {	243	sub show {
176	my ($self) = @_;	244	my ($self) = @_;
177
178	return if $self->{parent};	245	return if $self->{parent};
179		246
180	$CFClient::UI::ROOT->add ($self);	247	$CFClient::UI::ROOT->add ($self);
181	}	248	}
182		249
183	sub hide {	250	sub center {
184	my ($self) = @_;	251	my ($self) = @_;
		252
		253	$CFClient::UI::ROOT->on_post_alloc (
		254	"center_$self" => sub {
		255	$self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
		256	},
		257	);
		258
		259	$self->update;
		260	}
		261
		262	sub set_visible {
		263	my ($self) = @_;
		264
		265	return if $self->{visible};
		266
		267	$self->{root} = $self->{parent}{root};
		268	$self->{visible} = $self->{parent}{visible} + 1;
		269
		270	$self->emit (visibility_change => 1)
		271	}
		272
		273	sub set_invisible {
		274	my ($self) = @_;
		275
		276	return unless $self->{visible};
		277
		278	# broken show/hide model
		279
		280	delete $self->{root};
		281	delete $self->{visible};
185		282
186	undef $GRAB if $GRAB == $self;	283	undef $GRAB if $GRAB == $self;
187	undef $HOVER if $HOVER == $self;	284	undef $HOVER if $HOVER == $self;
		285
		286	CFClient::UI::check_tooltip
		287	if $CFClient::UI::TOOLTIP->{owner} == $self;
		288
		289	$self->focus_out;
		290
		291	$self->emit (visibility_change => 0);
		292	}
		293
		294	sub hide {
		295	my ($self) = @_;
		296
		297	$self->set_invisible;
188		298
189	$self->{parent}->remove ($self)	299	$self->{parent}->remove ($self)
190	if $self->{parent};	300	if $self->{parent};
191	}	301	}
192		302
…		…
201	}	311	}
202		312
203	sub set_size {	313	sub set_size {
204	my ($self, $w, $h) = @_;	314	my ($self, $w, $h) = @_;
205		315
206	$self->{user_w} = $w;	316	$self->{def_w} = $w;
207	$self->{user_h} = $h;	317	$self->{def_h} = $h;
208		318
209	$self->check_size;	319	$self->check_size;
210	}	320	}
211		321
212	sub size_request {	322	sub size_request {
…		…
242		352
243	sub size_allocate {	353	sub size_allocate {
244	# nothing to be done	354	# nothing to be done
245	}	355	}
246		356
		357	sub reconfigure {
		358	my ($self) = @_;
		359
		360	$self->check_size (1);
		361	$self->update;
		362	}
		363
247	sub children {	364	sub children {
248	}
249
250	# call when resolution changes etc.
251	sub reconfigure {
252	my ($self) = @_;
253
254	$_->reconfigure
255	for $self->children;
256
257	$self->check_size;
258	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $self->{w}, $self->{h}];
259	$self->update;
260	}	365	}
261		366
262	sub set_max_size {	367	sub set_max_size {
263	my ($self, $w, $h) = @_;	368	my ($self, $w, $h) = @_;
264		369
265	delete $self->{max_w}; $self->{max_w} = $w if $w;	370	delete $self->{max_w}; $self->{max_w} = $w if $w;
266	delete $self->{max_h}; $self->{max_h} = $h if $h;	371	delete $self->{max_h}; $self->{max_h} = $h if $h;
		372	}
		373
		374	sub set_tooltip {
		375	my ($self, $tooltip) = @_;
		376
		377	$tooltip =~ s/^\s+//;
		378	$tooltip =~ s/\s+$//;
		379
		380	return if $self->{tooltip} eq $tooltip;
		381
		382	$self->{tooltip} = $tooltip;
		383
		384	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
		385	delete $CFClient::UI::TOOLTIP->{owner};
		386	CFClient::UI::check_tooltip;
		387	}
267	}	388	}
268		389
269	# translate global coordinates to local coordinate system	390	# translate global coordinates to local coordinate system
270	sub coord2local {	391	sub coord2local {
271	my ($self, $x, $y) = @_;	392	my ($self, $x, $y) = @_;
…		…
286	return if $FOCUS == $self;	407	return if $FOCUS == $self;
287	return unless $self->{can_focus};	408	return unless $self->{can_focus};
288		409
289	my $focus = $FOCUS; $FOCUS = $self;	410	my $focus = $FOCUS; $FOCUS = $self;
290		411
291	$self->emit (focus_in => $focus);	412	$self->_emit (focus_in => $focus);
292		413
293	$focus->update if $focus;	414	$focus->update if $focus;
294	$FOCUS->update;	415	$FOCUS->update;
295	}	416	}
296		417
…		…
299		420
300	return unless $FOCUS == $self;	421	return unless $FOCUS == $self;
301		422
302	my $focus = $FOCUS; undef $FOCUS;	423	my $focus = $FOCUS; undef $FOCUS;
303		424
304	$self->emit (focus_out => $focus);	425	$self->_emit (focus_out => $focus);
305		426
306	$focus->update if $focus; #?	427	$focus->update if $focus; #?
		428
		429	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
		430	unless $FOCUS;
307	}	431	}
308		432
309	sub mouse_motion { }	433	sub mouse_motion { }
310	sub button_up { }	434	sub button_up { }
311	sub key_down { }	435	sub key_down { }
312	sub key_up { }	436	sub key_up { }
313		437
314	sub button_down {	438	sub button_down {
315	my ($self, $ev, $x, $y) = @_;	439	my ($self, $ev, $x, $y) = @_;
316		440
317	$self->focus_in;	441	$self->focus_in;
…		…
351	if ($ENV{PCLIENT_DEBUG}) {	475	if ($ENV{PCLIENT_DEBUG}) {
352	glPushMatrix;	476	glPushMatrix;
353	glColor 1, 1, 0, 1;	477	glColor 1, 1, 0, 1;
354	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	478	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
355	glBegin GL_LINE_LOOP;	479	glBegin GL_LINE_LOOP;
356	glVertex 0 , 0;	480	glVertex 0 , 0;
357	glVertex $self->{w}, 0;	481	glVertex $self->{w} - 1, 0;
358	glVertex $self->{w}, $self->{h};	482	glVertex $self->{w} - 1, $self->{h} - 1;
359	glVertex 0 , $self->{h};	483	glVertex 0 , $self->{h} - 1;
360	glEnd;	484	glEnd;
361	glPopMatrix;	485	glPopMatrix;
362	CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	486	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
363	}	487	}
364	}	488	}
365		489
366	sub _draw {	490	sub _draw {
367	my ($self) = @_;	491	my ($self) = @_;
…		…
384	sub set_parent {	508	sub set_parent {
385	my ($self, $parent) = @_;	509	my ($self, $parent) = @_;
386		510
387	Scalar::Util::weaken ($self->{parent} = $parent);	511	Scalar::Util::weaken ($self->{parent} = $parent);
388		512
		513	$self->set_visible; #TODO why breakssssss borked damn if $parent->{visible};
		514
389	$self->check_size	515	$self->check_size;
390	unless exists $self->{req_w};
391	}	516	}
392		517
393	sub check_size {	518	sub check_size {
394	my ($self, $forced) = @_;	519	my ($self, $forced) = @_;
395		520
…		…
408	my ($self, $signal, $cb) = @_;	533	my ($self, $signal, $cb) = @_;
409		534
410	push @{ $self->{signal_cb}{$signal} }, $cb;	535	push @{ $self->{signal_cb}{$signal} }, $cb;
411	}	536	}
412		537
		538	sub _emit {
		539	my ($self, $signal, @args) = @_;
		540
		541	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
		542	}
		543
413	sub emit {	544	sub emit {
414	my ($self, $signal, @args) = @_;	545	my ($self, $signal, @args) = @_;
415		546
416	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}	547	$self->_emit ($signal, @args)
		548	|| $self->$signal (@args);
		549	}
		550
		551	sub visibility_change {
		552	#my ($self, $visible) = @_;
417	}	553	}
418		554
419	sub DESTROY {	555	sub DESTROY {
420	my ($self) = @_;	556	my ($self) = @_;
421		557
		558	delete $WIDGET{$self+0};
422	#$self->deactivate;	559	#$self->deactivate;
423	}	560	}
424		561
425	#############################################################################	562	#############################################################################
426		563
…		…
435	my $class = shift;	572	my $class = shift;
436		573
437	# range [value, low, high, page]	574	# range [value, low, high, page]
438		575
439	$class->SUPER::new (	576	$class->SUPER::new (
440	bg => [0, 0, 0, 0.2],	577	#bg => [0, 0, 0, 0.2],
441	active_bg => [1, 1, 1, 0.5],	578	#active_bg => [1, 1, 1, 0.5],
442	@_	579	@_
443	)	580	)
444	}	581	}
445		582
446	sub _draw {	583	sub _draw {
447	my ($self) = @_;	584	my ($self) = @_;
448		585
		586	my $color = $FOCUS == $self && $self->{active_bg}
		587	? $self->{active_bg}
		588	: $self->{bg};
		589
		590	if ($color && (@$color < 4 || $color->[3])) {
449	my ($w, $h) = @$self{qw(w h)};	591	my ($w, $h) = @$self{qw(w h)};
450		592
451	glEnable GL_BLEND;	593	glEnable GL_BLEND;
452	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	594	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
453	glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };	595	glColor @$color;
454		596
455	glBegin GL_QUADS;	597	glBegin GL_QUADS;
456	glVertex 0 , 0;	598	glVertex 0 , 0;
457	glVertex 0 , $h;	599	glVertex 0 , $h;
458	glVertex $w, $h;	600	glVertex $w, $h;
459	glVertex $w, 0;	601	glVertex $w, 0;
460	glEnd;	602	glEnd;
461		603
462	glDisable GL_BLEND;	604	glDisable GL_BLEND;
		605	}
463	}	606	}
464		607
465	#############################################################################	608	#############################################################################
466		609
467	package CFClient::UI::Empty;	610	package CFClient::UI::Empty;
…		…
527	delete $child->{parent};	670	delete $child->{parent};
528	$child->hide;	671	$child->hide;
529		672
530	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	673	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
531		674
532	$self->check_size;	675	$self->check_size (1);
533	$self->update;	676	$self->update;
534	}	677	}
535		678
536	sub clear {	679	sub clear {
537	my ($self) = @_;	680	my ($self) = @_;
…		…
628	}	771	}
629		772
630	sub update {	773	sub update {
631	my ($self) = @_;	774	my ($self) = @_;
632		775
633	$ROOT->on_refresh ($self => sub { $self->render_child });	776	$ROOT->on_post_alloc ($self => sub { $self->render_child });
634	$self->SUPER::update;	777	$self->SUPER::update;
635	}	778	}
636		779
637	sub size_allocate {	780	sub size_allocate {
638	my ($self, $w, $h) = @_;	781	my ($self, $w, $h) = @_;
…		…
651	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	794	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
652	glClearColor 0, 0, 0, 0;	795	glClearColor 0, 0, 0, 0;
653	glClear GL_COLOR_BUFFER_BIT;	796	glClear GL_COLOR_BUFFER_BIT;
654		797
655	$self->_render;	798	$self->_render;
656	# glColorMask 1, 1, 1, 0;
657	# glEnable GL_BLEND;
658	# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
659	# glRasterPos 0, 0;
660	# glCopyPixels 0, 0, $self->{w}, $self->{h};
661	# glDisable GL_BLEND;
662	# glColorMask 1, 1, 1, 1;
663	};	799	};
664	}	800	}
665		801
666	sub _draw {	802	sub _draw {
667	my ($self) = @_;	803	my ($self) = @_;
…		…
671	my $tex = $self->{texture}	807	my $tex = $self->{texture}
672	or return;	808	or return;
673		809
674	glEnable GL_TEXTURE_2D;	810	glEnable GL_TEXTURE_2D;
675	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	811	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
676	glColor 0, 0, 0, 1;	812	glColor 1, 1, 1, 1;
677		813
678	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	814	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
679		815
680	glDisable GL_TEXTURE_2D;	816	glDisable GL_TEXTURE_2D;
681	}	817	}
…		…
684		820
685	package CFClient::UI::ViewPort;	821	package CFClient::UI::ViewPort;
686		822
687	our @ISA = CFClient::UI::Window::;	823	our @ISA = CFClient::UI::Window::;
688		824
		825	sub new {
		826	my $class = shift;
		827
		828	$class->SUPER::new (
		829	scroll_x => 0,
		830	scroll_y => 1,
		831	@_,
		832	)
		833	}
		834
689	sub size_request {	835	sub size_request {
690	my ($self) = @_;	836	my ($self) = @_;
691		837
692	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	838	my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
693	$self->child->configure (0, 0, @$self{qw(child_w child_h)});
694		839
695	@$self{qw(child_w child_h)}	840	$w = 10 if $self->{scroll_x};
		841	$h = 10 if $self->{scroll_y};
		842
		843	($w, $h)
696	}	844	}
697		845
698	sub size_allocate {	846	sub size_allocate {
699	my ($self, $w, $h) = @_;	847	my ($self, $w, $h) = @_;
700		848
		849	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
		850	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
		851
		852	$self->child->configure (0, 0, $w, $h);
701	$self->update;	853	$self->update;
702	}	854	}
703		855
704	sub set_offset {	856	sub set_offset {
705	my ($self, $x, $y) = @_;	857	my ($self, $x, $y) = @_;
…		…
756	my $class = shift;	908	my $class = shift;
757		909
758	my $self;	910	my $self;
759		911
760	my $slider = new CFClient::UI::Slider	912	my $slider = new CFClient::UI::Slider
761	vertical => 1,	913	vertical => 1,
762	range => [0, 0, 1, 0.01], # HACK fix	914	range => [0, 0, 1, 0.01], # HACK fix
763	connect_changed => sub {	915	on_changed => sub {
764	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));	916	$self->{vp}->set_offset (0, $_[1]);
765	},	917	},
766	;	918	;
767		919
768	$self = $class->SUPER::new (	920	$self = $class->SUPER::new (
769	vp => (new CFClient::UI::ViewPort),	921	vp => (new CFClient::UI::ViewPort expand => 1),
770	slider => $slider,	922	slider => $slider,
771	@_,	923	@_,
772	);	924	);
773		925
774	$self->{vp}->add ($self->{scrolled});	926	$self->{vp}->add ($self->{scrolled});
…		…
776	$self->add ($self->{slider});	928	$self->add ($self->{slider});
777		929
778	$self	930	$self
779	}	931	}
780		932
		933	sub update {
		934	my ($self) = @_;
		935
		936	$self->SUPER::update;
		937
		938	# todo: overwrite size_allocate of child
		939	my $child = $self->{vp}->child;
		940	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
		941	}
		942
		943	sub size_allocate {
		944	my ($self, $w, $h) = @_;
		945
		946	$self->SUPER::size_allocate ($w, $h);
		947
		948	my $child = $self->{vp}->child;
		949	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
		950	}
		951
781	#TODO# update range on size_allocate depeneing on child	952	#TODO# update range on size_allocate depending on child
782	# update viewport offset on scroll	953	# update viewport offset on scroll
783		954
784	#############################################################################	955	#############################################################################
785		956
786	package CFClient::UI::Frame;	957	package CFClient::UI::Frame;
787		958
788	our @ISA = CFClient::UI::Bin::;	959	our @ISA = CFClient::UI::Bin::;
789		960
790	use CFClient::OpenGL;	961	use CFClient::OpenGL;
		962
		963	sub new {
		964	my $class = shift;
		965
		966	$class->SUPER::new (
		967	bg => undef,
		968	@_,
		969	)
		970	}
		971
		972	sub _draw {
		973	my ($self) = @_;
		974
		975	if ($self->{bg}) {
		976	my ($w, $h) = @$self{qw(w h)};
		977
		978	glEnable GL_BLEND;
		979	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		980	glColor @{ $self->{bg} };
		981
		982	glBegin GL_QUADS;
		983	glVertex 0 , 0;
		984	glVertex 0 , $h;
		985	glVertex $w, $h;
		986	glVertex $w, 0;
		987	glEnd;
		988
		989	glDisable GL_BLEND;
		990	}
		991
		992	$self->SUPER::_draw;
		993	}
791		994
792	#############################################################################	995	#############################################################################
793		996
794	package CFClient::UI::FancyFrame;	997	package CFClient::UI::FancyFrame;
795		998
…		…
802	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1005	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
803		1006
804	sub new {	1007	sub new {
805	my $class = shift;	1008	my $class = shift;
806		1009
807	# TODO: user_x, user_y, overwrite moveto?
808
809	my $self = $class->SUPER::new (	1010	my $self = $class->SUPER::new (
810	bg => [1, 1, 1, 1],	1011	bg => [1, 1, 1, 1],
811	border_bg => [1, 1, 1, 1],	1012	border_bg => [1, 1, 1, 1],
812	border => 0.6,	1013	border => 0.6,
		1014	is_toplevel => 1,
813	can_events => 1,	1015	can_events => 1,
814	@_	1016	@_
815	);	1017	);
816		1018
817	$self->{title} &&= new CFClient::UI::Label	1019	$self->{title} &&= new CFClient::UI::Label
818	align => 0,	1020	align => 0,
…		…
842	my ($self, $w, $h) = @_;	1044	my ($self, $w, $h) = @_;
843		1045
844	$h -= List::Util::max 0, $self->border * 2;	1046	$h -= List::Util::max 0, $self->border * 2;
845	$w -= List::Util::max 0, $self->border * 2;	1047	$w -= List::Util::max 0, $self->border * 2;
846		1048
847	$self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)	1049	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
848	if $self->{title};	1050	if $self->{title};
849		1051
850	$self->child->configure ($self->border, $self->border, $w, $h);	1052	$self->child->configure ($self->border, $self->border, $w, $h);
851	}	1053	}
852		1054
…		…
871	my ($ev, $x, $y) = @_;	1073	my ($ev, $x, $y) = @_;
872		1074
873	my $dx = $ev->{x} - $ox;	1075	my $dx = $ev->{x} - $ox;
874	my $dy = $ev->{y} - $oy;	1076	my $dy = $ev->{y} - $oy;
875		1077
		1078	$self->{user_x} = $wx + $dx * $mx;
		1079	$self->{user_y} = $wy + $dy * $my;
876	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1080	$self->{def_w} = $bw + $dx * ($mx ? -1 : 1);
877	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1081	$self->{def_h} = $bh + $dy * ($my ? -1 : 1);
878	$self->move ($wx + $dx * $mx, $wy + $dy * $my);	1082	$self->move ($self->{user_x}, $self->{user_y});
879	$self->check_size;	1083	$self->check_size;
880	};	1084	};
881		1085
882	} elsif ($lr ^ $td) {	1086	} elsif ($lr ^ $td) {
883	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1087	my ($ox, $oy) = ($ev->{x}, $ev->{y});
…		…
886	$self->{motion} = sub {	1090	$self->{motion} = sub {
887	my ($ev, $x, $y) = @_;	1091	my ($ev, $x, $y) = @_;
888		1092
889	($x, $y) = ($ev->{x}, $ev->{y});	1093	($x, $y) = ($ev->{x}, $ev->{y});
890		1094
891	$self->move ($bx + $x - $ox, $by + $y - $oy);	1095	$self->{user_x} = $bx + $x - $ox;
		1096	$self->{user_y} = $by + $y - $oy;
		1097
		1098	$self->move ($self->{user_x}, $self->{user_y});
892	$self->update;	1099	$self->update;
893	};	1100	};
894	}	1101	}
895	}	1102	}
896		1103
…		…
958	sub new {	1165	sub new {
959	my $class = shift;	1166	my $class = shift;
960		1167
961	$class->SUPER::new (	1168	$class->SUPER::new (
962	col_expand => [],	1169	col_expand => [],
963	@_	1170	@_,
964	)	1171	)
		1172	}
		1173
		1174	sub children {
		1175	grep $_, map @$_, grep $_, @{ $_[0]{children} }
965	}	1176	}
966		1177
967	sub add {	1178	sub add {
968	my ($self, $x, $y, $child) = @_;	1179	my ($self, $x, $y, $child) = @_;
969		1180
970	$child->set_parent ($self);	1181	$child->set_parent ($self);
971	$self->{children}[$y][$x] = $child;	1182	$self->{children}[$y][$x] = $child;
972		1183
973	$child->check_size;	1184	$self->check_size (1);
974	}	1185	}
975		1186
976	sub children {
977	grep $_, map @$_, grep $_, @{ $_[0]{children} }
978	}
979
980	# TODO: move to container class maybe? send childs a signal on removal?	1187	# TODO: move to container class maybe? send children a signal on removal?
981	sub clear {	1188	sub clear {
982	my ($self) = @_;	1189	my ($self) = @_;
983		1190
984	my @children = $self->children;	1191	my @children = $self->children;
985	delete $self->{children};	1192	delete $self->{children};
…		…
987	for (@children) {	1194	for (@children) {
988	delete $_->{parent};	1195	delete $_->{parent};
989	$_->hide;	1196	$_->hide;
990	}	1197	}
991		1198
		1199	$self->check_size (1);
992	$self->update;	1200	$self->update;
993	}	1201	}
994		1202
995	sub get_wh {	1203	sub get_wh {
996	my ($self) = @_;	1204	my ($self) = @_;
…		…
1028	sub size_allocate {	1236	sub size_allocate {
1029	my ($self, $w, $h) = @_;	1237	my ($self, $w, $h) = @_;
1030		1238
1031	my ($ws, $hs) = $self->get_wh;	1239	my ($ws, $hs) = $self->get_wh;
1032		1240
1033	my $req_w = sum @$ws;	1241	my $req_w = (sum @$ws) || 1;
1034	my $req_h = sum @$hs;	1242	my $req_h = (sum @$hs) || 1;
1035		1243
1036	# TODO: nicer code && do row_expand	1244	# TODO: nicer code && do row_expand
1037	my @col_expand = @{$self->{col_expand}};	1245	my @col_expand = @{$self->{col_expand}};
1038	@col_expand = (1) x @$ws unless @col_expand;	1246	@col_expand = (1) x @$ws unless @col_expand;
1039	my $col_expand = (sum @col_expand) || 1;	1247	my $col_expand = (sum @col_expand) || 1;
…		…
1093	}	1301	}
1094	}	1302	}
1095		1303
1096	#############################################################################	1304	#############################################################################
1097		1305
1098	package CFClient::UI::HBox;	1306	package CFClient::UI::Box;
1099
1100	# TODO: wrap into common Box base class
1101		1307
1102	our @ISA = CFClient::UI::Container::;	1308	our @ISA = CFClient::UI::Container::;
1103		1309
1104	sub size_request {	1310	sub size_request {
1105	my ($self) = @_;	1311	my ($self) = @_;
1106		1312
1107	my @alloc = map [$_->size_request], @{$self->{children}};	1313	$self->{vertical}
1108		1314	? (
1109	(	1315	(List::Util::max map $_->{req_w}, @{$self->{children}}),
1110	(List::Util::sum map $_->[0], @alloc),	1316	(List::Util::sum map $_->{req_h}, @{$self->{children}}),
1111	(List::Util::max map $_->[1], @alloc),	1317	)
1112	)	1318	: (
		1319	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
		1320	(List::Util::max map $_->{req_h}, @{$self->{children}}),
		1321	)
1113	}	1322	}
1114		1323
1115	sub size_allocate {	1324	sub size_allocate {
1116	my ($self, $w, $h) = @_;	1325	my ($self, $w, $h) = @_;
1117		1326
1118	($h, $w) = ($w, $h);	1327	my $space = $self->{vertical} ? $h : $w;
1119
1120	my $children = $self->{children};	1328	my $children = $self->{children};
1121		1329
1122	my @h = map $_->{req_w}, @$children;	1330	my @req;
1123		1331
1124	my $req_h = List::Util::sum @h;	1332	if ($self->{homogeneous}) {
1125		1333	@req = ($space / (@$children || 1)) x @$children;
1126	if ($req_h > $h) {
1127	# ah well, not enough space
1128	$_ *= $h / $req_h for @h;
1129	} else {	1334	} else {
		1335	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
		1336	my $req = List::Util::sum @req;
		1337
		1338	if ($req > $space) {
		1339	# ah well, not enough space
		1340	$_ *= $space / $req for @req;
		1341	} else {
1130	my $exp = List::Util::sum map $_->{expand}, @$children;	1342	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1131	$exp ||= 1;
1132		1343
		1344	$space = ($space - $req) / $expand; # remaining space to give away
		1345
		1346	$req[$_] += $space * $children->[$_]{expand}
1133	for (0 .. $#$children) {	1347	for 0 .. $#$children;
1134	my $child = $children->[$_];
1135
1136	my $alloc_h = $h[$_];
1137	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1138	$h[$_] = $alloc_h;
1139	}	1348	}
1140	}	1349	}
1141		1350
1142	CFClient::UI::harmonize \@h;	1351	CFClient::UI::harmonize \@req;
1143		1352
1144	my $y = 0;	1353	my $pos = 0;
1145	for (0 .. $#$children) {	1354	for (0 .. $#$children) {
1146	my $child = $children->[$_];
1147	my $h = $h[$_];	1355	my $alloc = $req[$_];
1148	$child->configure ($y, 0, $h, $w);	1356	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1149		1357
1150	$y += $h;	1358	$pos += $alloc;
1151	}	1359	}
1152		1360
1153	1	1361	1
1154	}	1362	}
1155		1363
1156	#############################################################################	1364	#############################################################################
1157		1365
		1366	package CFClient::UI::HBox;
		1367
		1368	our @ISA = CFClient::UI::Box::;
		1369
		1370	sub new {
		1371	my $class = shift;
		1372
		1373	$class->SUPER::new (
		1374	vertical => 0,
		1375	@_,
		1376	)
		1377	}
		1378
		1379	#############################################################################
		1380
1158	package CFClient::UI::VBox;	1381	package CFClient::UI::VBox;
1159		1382
1160	# TODO: wrap into common Box base class
1161
1162	our @ISA = CFClient::UI::Container::;	1383	our @ISA = CFClient::UI::Box::;
1163		1384
1164	sub size_request {	1385	sub new {
1165	my ($self) = @_;	1386	my $class = shift;
1166		1387
1167	my @alloc = map [$_->size_request], @{$self->{children}};	1388	$class->SUPER::new (
1168		1389	vertical => 1,
1169	(	1390	@_,
1170	(List::Util::max map $_->[0], @alloc),
1171	(List::Util::sum map $_->[1], @alloc),
1172	)	1391	)
1173	}	1392	}
1174		1393
1175	sub size_allocate {
1176	my ($self, $w, $h) = @_;
1177
1178	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1179
1180	my $children = $self->{children};
1181
1182	my @h = map $_->{req_h}, @$children;
1183
1184	my $req_h = List::Util::sum @h;
1185
1186	if ($req_h > $h) {
1187	# ah well, not enough space
1188	$_ *= $h / $req_h for @h;
1189	} else {
1190	my $exp = List::Util::sum map $_->{expand}, @$children;
1191	$exp ||= 1;
1192
1193	for (0 .. $#$children) {
1194	my $child = $children->[$_];
1195
1196	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1197	}
1198	}
1199
1200	CFClient::UI::harmonize \@h;
1201
1202	my $y = 0;
1203	for (0 .. $#$children) {
1204	my $child = $children->[$_];
1205	my $h = $h[$_];
1206	$child->configure (0, $y, $w, $h);
1207
1208	$y += $h;
1209	}
1210
1211	1
1212	}
1213
1214	#############################################################################	1394	#############################################################################
1215		1395
1216	package CFClient::UI::Label;	1396	package CFClient::UI::Label;
1217		1397
1218	our @ISA = CFClient::UI::Base::;	1398	our @ISA = CFClient::UI::DrawBG::;
1219		1399
1220	use CFClient::OpenGL;	1400	use CFClient::OpenGL;
1221		1401
1222	sub new {	1402	sub new {
1223	my ($class, %arg) = @_;	1403	my ($class, %arg) = @_;
1224		1404
1225	my $self = $class->SUPER::new (	1405	my $self = $class->SUPER::new (
1226	fg => [1, 1, 1],	1406	fg => [1, 1, 1],
		1407	#bg => none
		1408	#active_bg => none
1227	#font => default_font	1409	#font => default_font
1228	#text => initial text	1410	#text => initial text
1229	#markup => initial narkup	1411	#markup => initial narkup
		1412	#max_w => maximum pixel width
		1413	ellipsise => 3, # end
1230	layout => (new CFClient::Layout),	1414	layout => (new CFClient::Layout),
1231	fontsize => 1,	1415	fontsize => 1,
1232	align => -1,	1416	align => -1,
1233	valign => -1,	1417	valign => -1,
1234	padding => 2,	1418	padding => 2,
…		…
1249	}	1433	}
1250		1434
1251	$self	1435	$self
1252	}	1436	}
1253		1437
1254	sub escape {	1438	sub escape($) {
1255	local $_ = $_[1];	1439	local $_ = $_[0];
1256		1440
1257	s/&/&amp;/g;	1441	s/&/&amp;/g;
1258	s/>/&gt;/g;	1442	s/>/&gt;/g;
1259	s/</&lt;/g;	1443	s/</&lt;/g;
1260		1444
1261	$_[1]	1445	$_
1262	}	1446	}
1263		1447
1264	sub update {	1448	sub update {
1265	my ($self) = @_;	1449	my ($self) = @_;
1266		1450
…		…
1299	sub size_request {	1483	sub size_request {
1300	my ($self) = @_;	1484	my ($self) = @_;
1301		1485
1302	$self->{layout}->set_font ($self->{font}) if $self->{font};	1486	$self->{layout}->set_font ($self->{font}) if $self->{font};
1303	$self->{layout}->set_width ($self->{max_w} || -1);	1487	$self->{layout}->set_width ($self->{max_w} || -1);
		1488	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1489	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1304	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1490	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1305		1491
1306	my ($w, $h) = $self->{layout}->size;	1492	my ($w, $h) = $self->{layout}->size;
1307		1493
1308	if (exists $self->{template}) {	1494	if (exists $self->{template}) {
…		…
1338	}	1524	}
1339		1525
1340	sub _draw {	1526	sub _draw {
1341	my ($self) = @_;	1527	my ($self) = @_;
1342		1528
		1529	$self->SUPER::_draw; # draw background, if applicable
		1530
1343	my $tex = $self->{texture} ||= do {	1531	my $tex = $self->{texture} ||= do {
1344	$self->{layout}->set_foreground (@{$self->{fg}});	1532	$self->{layout}->set_foreground (@{$self->{fg}});
1345	$self->{layout}->set_font ($self->{font}) if $self->{font};	1533	$self->{layout}->set_font ($self->{font}) if $self->{font};
1346	$self->{layout}->set_width ($self->{w});	1534	$self->{layout}->set_width ($self->{w});
		1535	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1536	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1347	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);	1537	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1348		1538
1349	my $tex = new_from_layout CFClient::Texture $self->{layout};	1539	my $tex = new_from_layout CFClient::Texture $self->{layout};
1350		1540
1351	$self->{ox} = int $self->{align} < 0 ? $self->{padding}	1541	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1352	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1542	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1353	: ($self->{w} - $tex->{w}) * 0.5;	1543	: ($self->{w} - $tex->{w}) * 0.5);
1354		1544
1355	$self->{oy} = int $self->{valign} < 0 ? $self->{padding}	1545	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1356	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1546	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1357	: ($self->{h} - $tex->{h}) * 0.5;	1547	: ($self->{h} - $tex->{h}) * 0.5);
1358		1548
1359	$tex	1549	$tex
1360	};	1550	};
1361		1551
1362	glEnable GL_TEXTURE_2D;	1552	glEnable GL_TEXTURE_2D;
…		…
1390	active_fg => [0, 0, 0],	1580	active_fg => [0, 0, 0],
1391	can_hover => 1,	1581	can_hover => 1,
1392	can_focus => 1,	1582	can_focus => 1,
1393	valign => 0,	1583	valign => 0,
1394	can_events => 1,	1584	can_events => 1,
		1585	#text => ...
1395	@_	1586	@_
1396	)	1587	)
1397	}	1588	}
1398		1589
1399	sub _set_text {	1590	sub _set_text {
…		…
1409	$self->{text} = $text;	1600	$self->{text} = $text;
1410		1601
1411	$text =~ s/./*/g if $self->{hidden};	1602	$text =~ s/./*/g if $self->{hidden};
1412	$self->{layout}->set_text ("$text ");	1603	$self->{layout}->set_text ("$text ");
1413		1604
1414	$self->emit (changed => $self->{text});	1605	$self->_emit (changed => $self->{text});
1415	}	1606	}
1416		1607
1417	sub set_text {	1608	sub set_text {
1418	my ($self, $text) = @_;	1609	my ($self, $text) = @_;
1419		1610
1420	$self->{cursor} = length $text;	1611	$self->{cursor} = length $text;
1421	$self->_set_text ($text);	1612	$self->_set_text ($text);
		1613	$self->update;
1422	$self->check_size;	1614	$self->check_size;
1423	$self->update;
1424	}	1615	}
1425		1616
1426	sub get_text {	1617	sub get_text {
1427	$_[0]{text}	1618	$_[0]{text}
1428	}	1619	}
…		…
1431	my ($self) = @_;	1622	my ($self) = @_;
1432		1623
1433	my ($w, $h) = $self->SUPER::size_request;	1624	my ($w, $h) = $self->SUPER::size_request;
1434		1625
1435	($w + 1, $h) # add 1 for cursor	1626	($w + 1, $h) # add 1 for cursor
1436	}
1437
1438	sub size_allocate {
1439	my ($self, $w, $h) = @_;
1440
1441	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1442	}	1627	}
1443		1628
1444	sub key_down {	1629	sub key_down {
1445	my ($self, $ev) = @_;	1630	my ($self, $ev) = @_;
1446		1631
…		…
1448	my $sym = $ev->{sym};	1633	my $sym = $ev->{sym};
1449	my $uni = $ev->{unicode};	1634	my $uni = $ev->{unicode};
1450		1635
1451	my $text = $self->get_text;	1636	my $text = $self->get_text;
1452		1637
1453	if ($sym == 8) {	1638	if ($uni == 8) {
1454	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1639	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1455	} elsif ($sym == 127) {	1640	} elsif ($uni == 127) {
1456	substr $text, $self->{cursor}, 1, "";	1641	substr $text, $self->{cursor}, 1, "";
1457	} elsif ($sym == CFClient::SDLK_LEFT) {	1642	} elsif ($sym == CFClient::SDLK_LEFT) {
1458	--$self->{cursor} if $self->{cursor};	1643	--$self->{cursor} if $self->{cursor};
1459	} elsif ($sym == CFClient::SDLK_RIGHT) {	1644	} elsif ($sym == CFClient::SDLK_RIGHT) {
1460	++$self->{cursor} if $self->{cursor} < length $self->{text};	1645	++$self->{cursor} if $self->{cursor} < length $self->{text};
1461	} elsif ($sym == CFClient::SDLK_HOME) {	1646	} elsif ($sym == CFClient::SDLK_HOME) {
1462	$self->{cursor} = 0;	1647	$self->{cursor} = 0;
1463	} elsif ($sym == CFClient::SDLK_END) {	1648	} elsif ($sym == CFClient::SDLK_END) {
1464	$self->{cursor} = length $text;	1649	$self->{cursor} = length $text;
1465	} elsif ($sym == 27) {	1650	} elsif ($uni == 27) {
1466	$self->emit ('escape');	1651	$self->_emit ('escape');
1467	} elsif ($uni) {	1652	} elsif ($uni) {
1468	substr $text, $self->{cursor}++, 0, chr $uni;	1653	substr $text, $self->{cursor}++, 0, chr $uni;
1469	}	1654	}
1470		1655
1471	$self->_set_text ($text);	1656	$self->_set_text ($text);
1472	$self->update;	1657	$self->update;
		1658	$self->check_size;
1473	}	1659	}
1474		1660
1475	sub focus_in {	1661	sub focus_in {
1476	my ($self) = @_;	1662	my ($self) = @_;
1477		1663
…		…
1557	if ($sym == 13) {	1743	if ($sym == 13) {
1558	unshift @{$self->{history}},	1744	unshift @{$self->{history}},
1559	my $txt = $self->get_text;	1745	my $txt = $self->get_text;
1560	$self->{history_pointer} = -1;	1746	$self->{history_pointer} = -1;
1561	$self->{history_saveback} = '';	1747	$self->{history_saveback} = '';
1562	$self->emit (activate => $txt);	1748	$self->_emit (activate => $txt);
1563	$self->update;	1749	$self->update;
1564		1750
1565	} elsif ($sym == CFClient::SDLK_UP) {	1751	} elsif ($sym == CFClient::SDLK_UP) {
1566	if ($self->{history_pointer} < 0) {	1752	if ($self->{history_pointer} < 0) {
1567	$self->{history_saveback} = $self->get_text;	1753	$self->{history_saveback} = $self->get_text;
…		…
1606	my $class = shift;	1792	my $class = shift;
1607		1793
1608	$class->SUPER::new (	1794	$class->SUPER::new (
1609	padding => 4,	1795	padding => 4,
1610	fg => [1, 1, 1],	1796	fg => [1, 1, 1],
1611	bg => [1, 1, 1, 0.2],
1612	active_fg => [0, 0, 1],	1797	active_fg => [0, 0, 1],
1613	can_hover => 1,	1798	can_hover => 1,
1614	align => 0,	1799	align => 0,
1615	valign => 0,	1800	valign => 0,
1616	can_events => 1,	1801	can_events => 1,
1617	@_	1802	@_
1618	)	1803	)
1619	}	1804	}
1620		1805
		1806	sub activate { }
		1807
1621	sub button_up {	1808	sub button_up {
1622	my ($self, $ev, $x, $y) = @_;	1809	my ($self, $ev, $x, $y) = @_;
1623		1810
		1811	$self->emit ("activate")
1624	if ($x >= 0 && $x < $self->{w}	1812	if $x >= 0 && $x < $self->{w}
1625	&& $y >= 0 && $y < $self->{h}) {	1813	&& $y >= 0 && $y < $self->{h};
1626	$self->emit ("activate");
1627	}
1628	}	1814	}
1629		1815
1630	sub _draw {	1816	sub _draw {
1631	my ($self) = @_;	1817	my ($self) = @_;
1632		1818
…		…
1664		1850
1665	$class->SUPER::new (	1851	$class->SUPER::new (
1666	padding => 2,	1852	padding => 2,
1667	fg => [1, 1, 1],	1853	fg => [1, 1, 1],
1668	active_fg => [1, 1, 0],	1854	active_fg => [1, 1, 0],
		1855	bg => [0, 0, 0, 0.2],
		1856	active_bg => [1, 1, 1, 0.5],
1669	state => 0,	1857	state => 0,
1670	can_hover => 1,	1858	can_hover => 1,
1671	@_	1859	@_
1672	)	1860	)
1673	}	1861	}
…		…
1682	my ($self, $ev, $x, $y) = @_;	1870	my ($self, $ev, $x, $y) = @_;
1683		1871
1684	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1872	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1685	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1873	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1686	$self->{state} = !$self->{state};	1874	$self->{state} = !$self->{state};
1687	$self->emit (changed => $self->{state});	1875	$self->_emit (changed => $self->{state});
1688	}	1876	}
1689	}	1877	}
1690		1878
1691	sub _draw {	1879	sub _draw {
1692	my ($self) = @_;	1880	my ($self) = @_;
…		…
1957	qw(s1_slider.png s1_slider_bg.png);	2145	qw(s1_slider.png s1_slider_bg.png);
1958		2146
1959	sub new {	2147	sub new {
1960	my $class = shift;	2148	my $class = shift;
1961		2149
1962	# range [value, low, high, page]	2150	# range [value, low, high, page, unit]
1963		2151
1964	# TODO: 0-width page	2152	# TODO: 0-width page
1965	# TODO: req_w/h are wrong with vertical	2153	# TODO: req_w/h are wrong with vertical
1966	# TODO: calculations are off	2154	# TODO: calculations are off
1967	my $self = $class->SUPER::new (	2155	my $self = $class->SUPER::new (
1968	fg => [1, 1, 1],	2156	fg => [1, 1, 1],
1969	active_fg => [0, 0, 0],	2157	active_fg => [0, 0, 0],
		2158	bg => [0, 0, 0, 0.2],
		2159	active_bg => [1, 1, 1, 0.5],
1970	range => [0, 0, 100, 10],	2160	range => [0, 0, 100, 10, 0],
1971	req_w => $::WIDTH / 80,	2161	req_w => $::WIDTH / 80,
1972	req_h => $::WIDTH / 80,	2162	req_h => $::WIDTH / 80,
1973	vertical => 0,	2163	vertical => 0,
1974	can_hover => 1,	2164	can_hover => 1,
1975	inner_pad => 5,	2165	inner_pad => 0.02,
1976	@_	2166	@_
1977	);	2167	);
1978		2168
		2169	$self->set_value ($self->{range}[0]);
		2170	$self->update;
		2171
1979	$self	2172	$self
		2173	}
		2174
		2175	sub set_range {
		2176	my ($self, $range) = @_;
		2177
		2178	($range, $self->{range}) = ($self->{range}, $range);
		2179
		2180	$self->update
		2181	if "@$range" ne "@{$self->{range}}";
		2182	}
		2183
		2184	sub set_value {
		2185	my ($self, $value) = @_;
		2186
		2187	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
		2188
		2189	$hi = $lo + 1 if $hi <= $lo;
		2190
		2191	$page = $hi - $lo if $page > $hi - $lo;
		2192
		2193	$value = $lo if $value < $lo;
		2194	$value = $hi - $page if $value > $hi - $page;
		2195
		2196	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
		2197	if $unit;
		2198
		2199	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
		2200
		2201	if ($value != $old_value) {
		2202	$self->_emit (changed => $value);
		2203	$self->update;
		2204	}
1980	}	2205	}
1981		2206
1982	sub size_request {	2207	sub size_request {
1983	my ($self) = @_;	2208	my ($self) = @_;
1984		2209
…		…
1990		2215
1991	sub button_down {	2216	sub button_down {
1992	my ($self, $ev, $x, $y) = @_;	2217	my ($self, $ev, $x, $y) = @_;
1993		2218
1994	$self->SUPER::button_down ($ev, $x, $y);	2219	$self->SUPER::button_down ($ev, $x, $y);
		2220
		2221	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
		2222
1995	$self->mouse_motion ($ev, $x, $y);	2223	$self->mouse_motion ($ev, $x, $y);
1996	}	2224	}
1997		2225
1998	sub mouse_motion {	2226	sub mouse_motion {
1999	my ($self, $ev, $x, $y) = @_;	2227	my ($self, $ev, $x, $y) = @_;
2000		2228
2001	if ($GRAB == $self) {	2229	if ($GRAB == $self) {
		2230	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
		2231
		2232	my (undef, $lo, $hi, $page) = @{$self->{range}};
		2233
		2234	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
		2235
		2236	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2237	}
		2238	}
		2239
		2240	sub update {
		2241	my ($self) = @_;
		2242
		2243	$CFClient::UI::ROOT->on_post_alloc ($self => sub {
		2244	$self->set_value ($self->{range}[0]);
		2245
2002	my ($value, $lo, $hi, $page) = @{$self->{range}};	2246	my ($value, $lo, $hi, $page) = @{$self->{range}};
		2247	my $range = ($hi - $page - $lo) || 1e-100;
2003		2248
2004	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2249	my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2005		2250
2006	my $inner_pad_px = $self->_calc_inner_pad_px ($w);	2251	$self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2007	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right	2252	$self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2008		2253
2009	$x -= $inner_pad_px; # substract the padding	2254	$value = ($value - $lo) / $range;
2010	$x = $x * ($hi - $lo) / $inner_w + $lo;	2255	$value = $value * $self->{scale} + $self->{offset};
2011	$x = $lo if $x < $lo;
2012	$x = $hi - $page if $x > $hi - $page;
2013	$self->{range}[0] = $x;
2014		2256
2015	$self->emit (changed => $x);	2257	$self->{knob_x} = $value - $knob_w * 0.5;
2016	$self->update;	2258	$self->{knob_w} = $knob_w;
2017	}	2259	});
2018	}
2019		2260
2020	# the inner_* stuff is for generating a padding for the slider handle,	2261	$self->SUPER::update;
2021	# so that the handle doesn't leave the texture. This calculation isn't 100%
2022	# correct propably, but it does the job for now
2023	sub _calc_inner_pad_px {
2024	my ($self, $w) = @_;
2025	($w / 100) * $self->{inner_pad} # % to pixels
2026	}	2262	}
2027		2263
2028	sub _draw {	2264	sub _draw {
2029	my ($self) = @_;	2265	my ($self) = @_;
2030		2266
2031	$self->SUPER::_draw ();	2267	$self->SUPER::_draw ();
2032		2268
2033	my ($w, $h) = @$self{qw(w h)};	2269	glScale $self->{w}, $self->{h};
2034		2270
2035	if ($self->{vertical}) {	2271	if ($self->{vertical}) {
2036	# draw a vertical slider like a rotated horizontal slider	2272	# draw a vertical slider like a rotated horizontal slider
2037		2273
		2274	glTranslate 1, 0, 0;
2038	glRotate 90, 0, 0, 1;	2275	glRotate 90, 0, 0, 1;
2039	glTranslate 0, -$self->{w}, 0;
2040
2041	($w, $h) = ($h, $w);
2042	}	2276	}
2043		2277
2044	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	2278	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2045	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	2279	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2046		2280
2047	my ($value, $lo, $hi, $page) = @{$self->{range}};
2048
2049	$hi = $value + 1 if $lo == $hi;
2050
2051	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2052	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2053
2054	$page = int $page * $inner_w / ($hi - $lo);
2055	$value = int +($value - $lo) * $inner_w / ($hi - $lo);
2056
2057	$w -= $page;
2058	$page &= ~1;
2059	glTranslate $page * 0.5, 0, 0;
2060	$page ||= 2;
2061
2062	my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2063	my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2064
2065	glEnable GL_TEXTURE_2D;	2281	glEnable GL_TEXTURE_2D;
2066	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2282	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2067		2283
2068	# draw background	2284	# draw background
2069	$tex[1]->draw_quad_alpha (0, 0, $w, $h);	2285	$tex[1]->draw_quad_alpha (0, 0, 1, 1);
2070		2286
2071	# draw handle	2287	# draw handle
2072	$tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h);	2288	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2073		2289
2074	glDisable GL_TEXTURE_2D;	2290	glDisable GL_TEXTURE_2D;
2075	}	2291	}
		2292
		2293	#############################################################################
		2294
		2295	package CFClient::UI::ValSlider;
		2296
		2297	our @ISA = CFClient::UI::HBox::;
		2298
		2299	sub new {
		2300	my ($class, %arg) = @_;
		2301
		2302	my $range = delete $arg{range};
		2303
		2304	my $self = $class->SUPER::new (
		2305	slider => (new CFClient::UI::Slider expand => 1, range => $range),
		2306	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
		2307	to_value => sub { shift },
		2308	from_value => sub { shift },
		2309	%arg,
		2310	);
		2311
		2312	$self->{slider}->connect (changed => sub {
		2313	my ($self, $value) = @_;
		2314	$self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
		2315	$self->{parent}->emit (changed => $value);
		2316	});
		2317
		2318	# $self->{entry}->connect (changed => sub {
		2319	# my ($self, $value) = @_;
		2320	# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
		2321	# $self->{parent}->emit (changed => $value);
		2322	# });
		2323
		2324	$self->add ($self->{slider}, $self->{entry});
		2325
		2326	$self->{slider}->emit (changed => $self->{slider}{range}[0]);
		2327
		2328	$self
		2329	}
		2330
		2331	sub set_range { shift->{slider}->set_range (@_) }
		2332	sub set_value { shift->{slider}->set_value (@_) }
2076		2333
2077	#############################################################################	2334	#############################################################################
2078		2335
2079	package CFClient::UI::TextView;	2336	package CFClient::UI::TextView;
2080		2337
…		…
2110		2367
2111	$self->{fontsize} = $fontsize;	2368	$self->{fontsize} = $fontsize;
2112	$self->reflow;	2369	$self->reflow;
2113	}	2370	}
2114		2371
2115	sub text_height {
2116	my ($self, $text) = @_;
2117
2118	my $layout = $self->{layout};
2119
2120	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2121	$layout->set_width ($self->{children}[0]{w});
2122	$layout->set_markup ($text);
2123
2124	($layout->size)[1]
2125	}
2126
2127	sub reflow {
2128	my ($self) = @_;
2129
2130	$self->{need_reflow}++;
2131	$self->update;
2132	}
2133
2134	sub size_allocate {	2372	sub size_allocate {
2135	my ($self, $w, $h) = @_;	2373	my ($self, $w, $h) = @_;
2136		2374
2137	$self->SUPER::size_allocate ($w, $h);	2375	$self->SUPER::size_allocate ($w, $h);
2138		2376
…		…
2141	$self->{layout}->set_width ($self->{children}[0]{w});	2379	$self->{layout}->set_width ($self->{children}[0]{w});
2142		2380
2143	$self->reflow;	2381	$self->reflow;
2144	}	2382	}
2145		2383
		2384	sub text_size {
		2385	my ($self, $text, $indent) = @_;
		2386
		2387	my $layout = $self->{layout};
		2388
		2389	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2390	$layout->set_width ($self->{children}[0]{w} - $indent);
		2391	$layout->set_markup ($text);
		2392
		2393	$layout->size
		2394	}
		2395
		2396	sub reflow {
		2397	my ($self) = @_;
		2398
		2399	$self->{need_reflow}++;
		2400	$self->update;
		2401	}
		2402
		2403	sub set_offset {
		2404	my ($self, $offset) = @_;
		2405
		2406	# todo: base offset on lines or so, not on pixels
		2407	$self->{children}[1]->set_value ($offset);
		2408	}
		2409
		2410	sub clear {
		2411	my ($self) = @_;
		2412
		2413	$self->{par} = [];
		2414	$self->{height} = 0;
		2415	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
		2416	}
		2417
2146	sub add_paragraph {	2418	sub add_paragraph {
2147	my ($self, $color, $text) = @_;	2419	my ($self, $color, $text, $indent) = @_;
2148		2420
2149	#TODO: intelligently "reformat" paragraph	2421	for my $line (split /\n/, $text) {
2150		2422	my ($w, $h) = $self->text_size ($line);
2151	my $height = $self->text_height ($text);
2152
2153	$self->{height} += $height;	2423	$self->{height} += $h;
		2424	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
		2425	}
2154		2426
2155	push @{$self->{par}}, [$height, $color, $text];
2156
2157	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];	2427	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2158	$self->{children}[1]->update;
2159	}	2428	}
2160		2429
2161	sub update {	2430	sub update {
2162	my ($self) = @_;	2431	my ($self) = @_;
2163		2432
…		…
2165		2434
2166	return unless $self->{h} > 0;	2435	return unless $self->{h} > 0;
2167		2436
2168	delete $self->{texture};	2437	delete $self->{texture};
2169		2438
2170	$ROOT->on_refresh ($self, sub {	2439	$ROOT->on_post_alloc ($self, sub {
		2440	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2441
2171	if (delete $self->{need_reflow}) {	2442	if (delete $self->{need_reflow}) {
2172	my $height = 0;	2443	my $height = 0;
2173		2444
2174	$height += $_->[0] = $self->text_height ($_->[2])	2445	my $layout = $self->{layout};
		2446
		2447	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2448
2175	for @{$self->{par}};	2449	for (@{$self->{par}}) {
		2450	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
		2451	$layout->set_width ($W - $_->[3]);
		2452	$layout->set_markup ($_->[4]);
		2453	my ($w, $h) = $layout->size;
		2454	$_->[0] = $w + $_->[3];
		2455	$_->[1] = $h;
		2456	}
		2457
		2458	$height += $_->[1];
		2459	}
2176		2460
2177	$self->{height} = $height;	2461	$self->{height} = $height;
2178		2462
2179	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2463	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2180		2464
2181	delete $self->{texture};	2465	delete $self->{texture};
2182	}	2466	}
2183		2467
2184	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {	2468	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2185	glClearColor 0, 0, 0, 0;	2469	glClearColor 0.5, 0.5, 0.5, 0;
2186	glClear GL_COLOR_BUFFER_BIT;	2470	glClear GL_COLOR_BUFFER_BIT;
2187		2471
2188	glEnable GL_TEXTURE_2D;
2189	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2190
2191	my $top = int $self->{children}[1]{range}[0];	2472	my $top = int $self->{children}[1]{range}[0];
2192		2473
2193	my $y0 = $top;	2474	my $y0 = $top;
2194	my $y1 = $top + $self->{h};	2475	my $y1 = $top + $H;
2195		2476
2196	my $y = 0;	2477	my $y = 0;
2197		2478
2198	my $layout = $self->{layout};	2479	my $layout = $self->{layout};
2199		2480
2200	$layout->set_font ($self->{font}) if $self->{font};	2481	$layout->set_font ($self->{font}) if $self->{font};
2201		2482
		2483	glEnable GL_BLEND;
		2484	#TODO# not correct in windows where rgba is forced off
		2485	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		2486
2202	for my $par (@{$self->{par}}) {	2487	for my $par (@{$self->{par}}) {
2203	my $h = $par->[0];	2488	my $h = $par->[1];
2204		2489
2205	if ($y0 < $y + $h && $y < $y1) {	2490	if ($y0 < $y + $h && $y < $y1) {
2206	$layout->set_foreground (@{ $par->[1] });	2491	$layout->set_foreground (@{ $par->[2] });
		2492	$layout->set_width ($W - $par->[3]);
2207	$layout->set_markup ($par->[2]);	2493	$layout->set_markup ($par->[4]);
2208		2494
2209	my ($W, $H) = $layout->size;	2495	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2210	CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);	2496
		2497	glRasterPos $par->[3], $y - $y0;
		2498	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2211	}	2499	}
2212		2500
2213	$y += $h;	2501	$y += $h;
2214	}	2502	}
2215		2503
2216	glDisable GL_TEXTURE_2D;	2504	glDisable GL_BLEND;
2217	};	2505	};
2218	});	2506	});
2219	}	2507	}
2220		2508
2221	sub _draw {	2509	sub _draw {
2222	my ($self) = @_;	2510	my ($self) = @_;
2223		2511
2224	glEnable GL_TEXTURE_2D;	2512	glEnable GL_TEXTURE_2D;
2225	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2513	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2226	glColor 1, 1, 1, 1;	2514	glColor 1, 1, 1, 1;
2227	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2515	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2228	glDisable GL_TEXTURE_2D;	2516	glDisable GL_TEXTURE_2D;
2229		2517
2230	$self->{children}[1]->draw;	2518	$self->{children}[1]->draw;
2231		2519
2232	}	2520	}
…		…
2281		2569
2282	sub new {	2570	sub new {
2283	my $class = shift;	2571	my $class = shift;
2284		2572
2285	my $self = $class->SUPER::new (	2573	my $self = $class->SUPER::new (
2286	state => 0,	2574	state => 0,
2287	connect_activate => \&toggle_flopper,	2575	on_activate => \&toggle_flopper,
2288	@_	2576	@_
2289	);	2577	);
2290		2578
2291	if ($self->{state}) {
2292	$self->{state} = 0;
2293	$self->toggle_flopper;
2294	}
2295
2296	$self	2579	$self
2297	}	2580	}
2298		2581
2299	sub toggle_flopper {	2582	sub toggle_flopper {
2300	my ($self) = @_;	2583	my ($self) = @_;
2301		2584
2302	# TODO: use animation	2585	$self->{other}->toggle_visibility;
2303	if ($self->{state} = !$self->{state}) {
2304	$CFClient::UI::ROOT->add ($self->{other});
2305	$self->{other}->move ($self->coord2global (0, $self->{h}));
2306	$self->emit ("open");
2307	} else {
2308	$CFClient::UI::ROOT->remove ($self->{other});
2309	$self->emit ("close");
2310	}
2311
2312	$self->emit (changed => $self->{state});
2313	}	2586	}
2314		2587
2315	#############################################################################	2588	#############################################################################
2316		2589
2317	package CFClient::UI::Tooltip;	2590	package CFClient::UI::Tooltip;
…		…
2331		2604
2332	sub set_tooltip_from {	2605	sub set_tooltip_from {
2333	my ($self, $widget) = @_;	2606	my ($self, $widget) = @_;
2334		2607
2335	$self->add (new CFClient::UI::Label	2608	$self->add (new CFClient::UI::Label
2336	markup => $widget->{tooltip},	2609	markup => $widget->{tooltip},
2337	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2610	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2338	fontsize => 0.8,	2611	fontsize => 0.8,
2339	fg => [0, 0, 0, 1],	2612	fg => [0, 0, 0, 1],
		2613	ellipsise => 0,
2340	font => ($widget->{tooltip_font} || $::FONT_PROP),	2614	font => ($widget->{tooltip_font} || $::FONT_PROP),
2341	);	2615	);
2342	}	2616	}
2343		2617
2344	sub size_request {	2618	sub size_request {
2345	my ($self) = @_;	2619	my ($self) = @_;
…		…
2391	use CFClient::OpenGL;	2665	use CFClient::OpenGL;
2392		2666
2393	sub new {	2667	sub new {
2394	my $class = shift;	2668	my $class = shift;
2395		2669
2396	$class->SUPER::new (	2670	my $self = $class->SUPER::new (
2397	aspect => 1,	2671	aspect => 1,
		2672	can_events => 0,
2398	@_,	2673	@_,
2399	)	2674	);
		2675
		2676	if ($self->{anim} && $self->{animspeed}) {
		2677	Scalar::Util::weaken (my $widget = $self);
		2678
		2679	$self->{timer} = Event->timer (
		2680	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
		2681	hard => 1,
		2682	interval => $self->{animspeed},
		2683	cb => sub {
		2684	++$widget->{frame};
		2685	$widget->update;
		2686	},
		2687	);
		2688	}
		2689
		2690	$self
2400	}	2691	}
2401		2692
2402	sub size_request {	2693	sub size_request {
2403	(32, 8)	2694	(32, 8)
2404	}	2695	}
2405		2696
		2697	sub update {
		2698	my ($self) = @_;
		2699
		2700	return unless $self->{visible};
		2701
		2702	$self->SUPER::update;
		2703	}
		2704
2406	sub _draw {	2705	sub _draw {
2407	my ($self) = @_;	2706	my ($self) = @_;
2408		2707
2409	return unless $::CONN;#d# manage and cache textures differently	2708	return unless $::CONN;
		2709
		2710	my $face;
		2711
		2712	if ($self->{frame}) {
		2713	my $anim = $::CONN->{anim}[$self->{anim}];
		2714
		2715	$face = $anim->[ $self->{frame} % @$anim ]
		2716	if $anim && @$anim;
		2717	}
		2718
2410	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	2719	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2411		2720
2412	# TODO animation
2413	if ($tex) {	2721	if ($tex) {
2414	glEnable GL_TEXTURE_2D;	2722	glEnable GL_TEXTURE_2D;
2415	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2723	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2416	glColor 1, 1, 1, 1;	2724	glColor 1, 1, 1, 1;
2417	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2725	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2418	glDisable GL_TEXTURE_2D;	2726	glDisable GL_TEXTURE_2D;
2419	}	2727	}
2420	}	2728	}
2421		2729
2422	#############################################################################	2730	sub DESTROY {
		2731	my ($self) = @_;
2423		2732
		2733	$self->{timer}->cancel
		2734	if $self->{timer};
		2735
		2736	$self->SUPER::DESTROY;
		2737	}
		2738
		2739	#############################################################################
		2740
2424	package CFClient::UI::InventoryItem;	2741	package CFClient::UI::Inventory;
2425		2742
2426	our @ISA = CFClient::UI::HBox::;	2743	our @ISA = CFClient::UI::ScrolledWindow::;
2427		2744
2428	sub new {	2745	sub new {
2429	my $class = shift;	2746	my $class = shift;
2430		2747
2431	my %args = @_;
2432
2433	my $item = delete $args{item};
2434
2435	my $desc = $item->{nrof} < 2
2436	? $item->{name}
2437	: "$item->{nrof} $item->{name_pl}";
2438
2439
2440	my $self = $class->SUPER::new (	2748	my $self = $class->SUPER::new (
2441	can_hover => 1,	2749	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2442	can_events => 1,
2443	tooltip => (CFClient::UI::Label->escape ($desc)
2444	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2445	connect_button_down => sub {
2446	my ($self, $ev, $x, $y) = @_;
2447
2448	# todo: maybe put examine on 1? but should just be a tooltip :(
2449	if ($ev->{button} == 1) {
2450	$::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2451	} elsif ($ev->{button} == 2) {
2452	$::CONN->send ("apply $item->{tag}");
2453	} elsif ($ev->{button} == 3) {
2454	CFClient::UI::Menu->new (
2455	items => [
2456	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2457	[
2458	$item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2459	sub { $::CONN->send ("lock $item->{tag}") },
2460	],
2461	["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2462	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2463	["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2464	],
2465	)->popup ($ev);
2466	}
2467
2468	1
2469	},
2470	%args
2471	);
2472
2473	$self->add (new CFClient::UI::Face
2474	can_events => 0,
2475	face => $item->{face},
2476	anim => $item->{anim},
2477	animspeed => $item->{animspeed},
2478	);
2479
2480	$self->add (new CFClient::UI::Label
2481	can_events => 0,
2482	text => $desc,
2483	);
2484
2485	$self
2486	}
2487
2488	#############################################################################
2489
2490	package CFClient::UI::Inventory;
2491
2492	our @ISA = CFClient::UI::ScrolledWindow::;
2493
2494	sub new {
2495	my $class = shift;
2496
2497	my $self = $class->SUPER::new (
2498	scrolled => (new CFClient::UI::VBox),
2499	@_,	2750	@_,
2500	);	2751	);
2501		2752
2502	$self	2753	$self
2503	}	2754	}
…		…
2506	my ($self, $items) = @_;	2757	my ($self, $items) = @_;
2507		2758
2508	$self->{scrolled}->clear;	2759	$self->{scrolled}->clear;
2509	return unless $items;	2760	return unless $items;
2510		2761
2511	my @items = sort { $a->{type} <=> $b->{type} } @$items;	2762	my @items = sort {
		2763	($a->{type} <=> $b->{type})
		2764	or ($a->{name} cmp $b->{name})
		2765	} @$items;
2512		2766
2513	$self->{real_items} = \@items;	2767	$self->{real_items} = \@items;
2514		2768
		2769	my $row = 0;
2515	for my $item (@items) {	2770	for my $item (@items) {
2516	my $desc = $item->{nrof} < 2	2771	CFClient::Item::update_widgets $item;
2517	? $item->{name}
2518	: "$item->{nrof} $item->{name_pl}";
2519		2772
2520	$self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item);	2773	$self->{scrolled}->add (0, $row, $item->{face_widget});
2521	}	2774	$self->{scrolled}->add (1, $row, $item->{desc_widget});
		2775	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2522		2776
2523	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];	2777	$row++;
2524	}	2778	}
2525
2526	sub size_request {
2527	my ($self) = @_;
2528	($self->{req_w}, $self->{req_h});
2529	}	2779	}
2530		2780
2531	#############################################################################	2781	#############################################################################
2532		2782
2533	package CFClient::UI::Menu;	2783	package CFClient::UI::Menu;
…		…
2568		2818
2569	# popup given the event (must be a mouse button down event currently)	2819	# popup given the event (must be a mouse button down event currently)
2570	sub popup {	2820	sub popup {
2571	my ($self, $ev) = @_;	2821	my ($self, $ev) = @_;
2572		2822
2573	$self->emit ("popdown");	2823	$self->_emit ("popdown");
2574		2824
2575	# maybe save $GRAB? must be careful about events...	2825	# maybe save $GRAB? must be careful about events...
2576	$GRAB = $self;	2826	$GRAB = $self;
2577	$self->{button} = $ev->{button};	2827	$self->{button} = $ev->{button};
2578		2828
…		…
2593		2843
2594	if ($ev->{button} == $self->{button}) {	2844	if ($ev->{button} == $self->{button}) {
2595	undef $GRAB;	2845	undef $GRAB;
2596	$self->hide;	2846	$self->hide;
2597		2847
2598	$self->emit ("popdown");	2848	$self->_emit ("popdown");
2599	$self->{hover}[1]->() if $self->{hover};	2849	$self->{hover}[1]->() if $self->{hover};
2600	}	2850	}
2601	}	2851	}
2602		2852
2603	#############################################################################	2853	#############################################################################
2604		2854
2605	package CFClient::UI::Statusbox;	2855	package CFClient::UI::Statusbox;
2606		2856
2607	our @ISA = CFClient::UI::VBox::;	2857	our @ISA = CFClient::UI::VBox::;
		2858
		2859	sub new {
		2860	my $class = shift;
		2861
		2862	$class->SUPER::new (
		2863	fontsize => 0.8,
		2864	@_,
		2865	)
		2866	}
2608		2867
2609	sub reorder {	2868	sub reorder {
2610	my ($self) = @_;	2869	my ($self) = @_;
2611	my $NOW = time;	2870	my $NOW = time;
2612		2871
…		…
2631	? "<b>$item->{count} ×</b> $item->{text}"	2890	? "<b>$item->{count} ×</b> $item->{text}"
2632	: $item->{text};	2891	: $item->{text};
2633		2892
2634	for ($short) {	2893	for ($short) {
2635	s/^\s+//;	2894	s/^\s+//;
2636	s/\012.*/…/s;	2895	s/\s+/ /g;
2637	my $len = int 30 / $item->{fontsize};
2638	substr $_, $len, length, "…" if $len < length;
2639	}	2896	}
2640		2897
2641	new CFClient::UI::Label	2898	new CFClient::UI::Label
2642	markup => $short,	2899	markup => $short,
2643	tooltip => $item->{tooltip},	2900	tooltip => $item->{tooltip},
2644	tooltip_font => $::FONT_PROP,	2901	tooltip_font => $::FONT_PROP,
2645	tooltip_width => 0.67,	2902	tooltip_width => 0.67,
2646	fontsize => $item->{fontsize},	2903	fontsize => $item->{fontsize} || $self->{fontsize},
		2904	max_w => $::WIDTH * 0.44,
2647	color => $item->{color},	2905	fg => $item->{fg},
2648	can_events => 1,	2906	can_events => 1,
2649	can_hover => 1	2907	can_hover => 1
2650	};	2908	};
2651	}	2909	}
2652		2910
…		…
2654	$self->SUPER::add (reverse @widgets);	2912	$self->SUPER::add (reverse @widgets);
2655	}	2913	}
2656		2914
2657	sub add {	2915	sub add {
2658	my ($self, $text, %arg) = @_;	2916	my ($self, $text, %arg) = @_;
		2917
		2918	$text =~ s/^\s+//;
		2919	$text =~ s/\s+$//;
		2920
		2921	return unless $text;
2659		2922
2660	my $timeout = time + ((delete $arg{timeout}) || 60);	2923	my $timeout = time + ((delete $arg{timeout}) || 60);
2661		2924
2662	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	2925	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2663		2926
…		…
2666	$item->{count}++;	2929	$item->{count}++;
2667	} else {	2930	} else {
2668	$item->{count} = 1;	2931	$item->{count} = 1;
2669	$item->{text} = $item->{tooltip} = $text;	2932	$item->{text} = $item->{tooltip} = $text;
2670	}	2933	}
		2934	$item->{id} = ++$self->{id};
2671	$item->{timeout} = $timeout;	2935	$item->{timeout} = $timeout;
2672	delete $item->{label};	2936	delete $item->{label};
2673	} else {	2937	} else {
2674	$self->{item}{$group} = {	2938	$self->{item}{$group} = {
2675	id => ++$self->{id},	2939	id => ++$self->{id},
2676	text => $text,	2940	text => $text,
2677	timeout => $timeout,	2941	timeout => $timeout,
2678	tooltip => $text,	2942	tooltip => $text,
2679	fontsize => 0.8,
2680	color => [0.8, 0.8, 0.8, 0.8],	2943	fg => [0.8, 0.8, 0.8, 0.8],
2681	pri => 0,	2944	pri => 0,
2682	count => 1,	2945	count => 1,
2683	%arg,	2946	%arg,
2684	};	2947	};
2685	}	2948	}
2686		2949
2687	$self->reorder;	2950	$self->reorder;
2688	}	2951	}
2689		2952
		2953	sub reconfigure {
		2954	my ($self) = @_;
		2955
		2956	delete $_->{label}
		2957	for values %{ $self->{item} || {} };
		2958
		2959	$self->reorder;
		2960	$self->SUPER::reconfigure;
		2961	}
		2962
2690	#############################################################################	2963	#############################################################################
2691		2964
2692	package CFClient::UI::Root;	2965	package CFClient::UI::Root;
2693		2966
2694	our @ISA = CFClient::UI::Container::;	2967	our @ISA = CFClient::UI::Container::;
…		…
2697		2970
2698	sub new {	2971	sub new {
2699	my $class = shift;	2972	my $class = shift;
2700		2973
2701	$class->SUPER::new (	2974	$class->SUPER::new (
		2975	visible => 1,
2702	@_,	2976	@_,
2703	)	2977	)
2704	}	2978	}
2705		2979
2706	sub configure {	2980	sub configure {
…		…
2724	}	2998	}
2725		2999
2726	sub size_allocate {	3000	sub size_allocate {
2727	my ($self, $w, $h) = @_;	3001	my ($self, $w, $h) = @_;
2728		3002
2729	my $old_w = $self->{old_w};
2730	my $old_h = $self->{old_h};
2731
2732	if ($old_w && $old_h) {
2733	for my $child ($self->children) {
2734	$child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2735	$child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2736	$child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2737	$child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2738	$child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2739	$child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2740	$child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2741	$child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2742	}
2743	}
2744
2745	for my $child ($self->children) {	3003	for my $child ($self->children) {
2746	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3004	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2747		3005
		3006	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
		3007	if exists $child->{req_x};
		3008
		3009	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
		3010	if exists $child->{req_y};
		3011
		3012	delete @$child{qw(req_x req_y)};
		3013
2748	$X = List::Util::max 0, List::Util::min $w - $W, $X;	3014	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2749	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;	3015	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
		3016
2750	$child->configure ($X, $Y, $W, $H);	3017	$child->configure ($X, $Y, $W, $H);
2751	}	3018	}
2752
2753	$self->{old_w} = $w;
2754	$self->{old_h} = $h;
2755	}	3019	}
2756		3020
2757	sub coord2local {	3021	sub coord2local {
2758	my ($self, $x, $y) = @_;	3022	my ($self, $x, $y) = @_;
2759		3023
…		…
2772	$self->check_size;	3036	$self->check_size;
2773	$::WANT_REFRESH++;	3037	$::WANT_REFRESH++;
2774	}	3038	}
2775		3039
2776	sub add {	3040	sub add {
2777	my ($self, $child) = @_;	3041	my ($self, @children) = @_;
2778		3042
		3043	for my $child (@children) {
		3044	$child->{is_toplevel} = 1;
		3045
2779	# integerise window positions	3046	# integerise window positions
2780	$child->{x} = int $child->{x};	3047	$child->{x} = int $child->{x};
2781	$child->{y} = int $child->{y};	3048	$child->{y} = int $child->{y};
		3049	}
2782		3050
2783	$self->SUPER::add ($child);	3051	$self->SUPER::add (@children);
		3052
		3053	for (my @widgets = @children; my $w = pop @widgets; ) {
		3054	push @widgets, $w->children;
		3055	$w->set_visible;
		3056	}
		3057
		3058	}
		3059
		3060	sub remove {
		3061	my ($self, @children) = @_;
		3062
		3063	$self->SUPER::remove (@children);
		3064
		3065	while (@children) {
		3066	my $w = pop @children;
		3067	push @children, $w->children;
		3068	$w->set_invisible;
		3069	}
2784	}	3070	}
2785		3071
2786	sub on_refresh {	3072	sub on_refresh {
2787	my ($self, $id, $cb) = @_;	3073	my ($self, $id, $cb) = @_;
2788		3074
2789	$self->{refresh_hook}{$id} = $cb;	3075	$self->{refresh_hook}{$id} = $cb;
2790	}	3076	}
2791		3077
		3078	sub on_post_alloc {
		3079	my ($self, $id, $cb) = @_;
		3080
		3081	$self->{post_alloc_hook}{$id} = $cb;
		3082	}
		3083
2792	sub draw {	3084	sub draw {
2793	my ($self) = @_;	3085	my ($self) = @_;
2794		3086
		3087	while ($self->{refresh_hook}) {
		3088	$_->()
		3089	for values %{delete $self->{refresh_hook}};
		3090	}
		3091
2795	if ($self->{check_size}) {	3092	if ($self->{check_size}) {
2796	my @queue = ([], []);	3093	my @queue;
2797		3094
2798	for (;;) {	3095	for (;;) {
2799	if ($self->{check_size}) {	3096	if ($self->{check_size}) {
2800	# heuristic: check containers last	3097	#TODO use array-of-depth approach
2801	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_	3098
		3099	@queue = sort { $a->{visible} <=> $b->{visible} }
2802	for values %{delete $self->{check_size}}	3100	@queue, values %{delete $self->{check_size}};
2803	}	3101	}
2804		3102
2805	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;	3103	my $widget = pop @queue || last;
2806		3104
		3105	defined $widget->{visible} or last; # do not resize invisible widgets
		3106
2807	my ($w, $h) = $widget->{user_w} && $widget->{user_h}	3107	my ($w, $h) = $widget->{def_w} && $widget->{def_h}
2808	? @$widget{qw(user_w user_h)}	3108	? @$widget{qw(def_w def_h)}
2809	: $widget->size_request;	3109	: $widget->size_request;
2810		3110
2811	if (delete $widget->{force_alloc}	3111	if (delete $widget->{force_alloc}
2812	or $w != $widget->{req_w} or $h != $widget->{req_h}) {	3112	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2813	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#	3113	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
…		…
2830	$w = 0 if $w < 0;	3130	$w = 0 if $w < 0;
2831	$h = 0 if $h < 0;	3131	$h = 0 if $h < 0;
2832		3132
2833	$widget->{w} = $w;	3133	$widget->{w} = $w;
2834	$widget->{h} = $h;	3134	$widget->{h} = $h;
2835	$widget->size_allocate ($w, $h);
2836	$widget->emit (size_allocate => $w, $h);	3135	$widget->emit (size_allocate => $w, $h);
2837	}	3136	}
2838	}	3137	}
2839		3138
2840	while ($self->{refresh_hook}) {	3139	while ($self->{post_alloc_hook}) {
2841	$_->()	3140	$_->()
2842	for values %{delete $self->{refresh_hook}};	3141	for values %{delete $self->{post_alloc_hook}};
2843	}	3142	}
2844		3143
2845	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3144	glViewport 0, 0, $::WIDTH, $::HEIGHT;
2846	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3145	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2847	glClear GL_COLOR_BUFFER_BIT;	3146	glClear GL_COLOR_BUFFER_BIT;
2848		3147
2849	glMatrixMode GL_PROJECTION;	3148	glMatrixMode GL_PROJECTION;
2850	glLoadIdentity;	3149	glLoadIdentity;
2851	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;	3150	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2852	glMatrixMode GL_MODELVIEW;	3151	glMatrixMode GL_MODELVIEW;
2853	glLoadIdentity;	3152	glLoadIdentity;
2854		3153
2855	$self->_draw;	3154	$self->_draw;
2856	}	3155	}
…		…
2858	#############################################################################	3157	#############################################################################
2859		3158
2860	package CFClient::UI;	3159	package CFClient::UI;
2861		3160
2862	$ROOT = new CFClient::UI::Root;	3161	$ROOT = new CFClient::UI::Root;
2863	$TOOLTIP = new CFClient::UI::Tooltip;	3162	$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2864		3163
2865	1	3164	1
2866		3165

Diff Legend

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