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.211 by elmex, Wed May 17 10:33:03 2006 UTC vs.
Revision 1.252 by root, Sun May 28 23:21:28 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;
16		18
17	our %WIDGET; # all widgets, weak-referenced	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	}
18		38
19	sub check_tooltip {	39	sub check_tooltip {
20	if (!$GRAB) {	40	if (!$GRAB) {
21	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	41	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22	if (length $widget->{tooltip}) {	42	if (length $widget->{tooltip}) {
…		…
27	my $tip = $widget->{tooltip};	47	my $tip = $widget->{tooltip};
28		48
29	$tip = $tip->($widget) if CODE:: eq ref $tip;	49	$tip = $tip->($widget) if CODE:: eq ref $tip;
30		50
31	$TOOLTIP->set_tooltip_from ($widget);	51	$TOOLTIP->set_tooltip_from ($widget);
32	$TOOLTIP->show;
33		52
34	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	53	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35		54
36	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)	55	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
37	if $x + $TOOLTIP->{w} > $::WIDTH;	56	if $x + $TOOLTIP->{w} > $::WIDTH;
38		57
39	$TOOLTIP->move ($x, $y);	58	$TOOLTIP->move ($x, $y);
40	$TOOLTIP->check_size;
41	$TOOLTIP->update;	59	$TOOLTIP->show;
42	}	60	}
43		61
44	return;	62	return;
45	}	63	}
46	}	64	}
…		…
50	delete $TOOLTIP->{owner};	68	delete $TOOLTIP->{owner};
51	}	69	}
52		70
53	# class methods for events	71	# class methods for events
54	sub feed_sdl_key_down_event {	72	sub feed_sdl_key_down_event {
55	$FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])	73	$FOCUS->emit (key_down => $_[0])
56	if $FOCUS;	74	if $FOCUS;
57	}	75	}
58		76
59	sub feed_sdl_key_up_event {	77	sub feed_sdl_key_up_event {
60	$FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])	78	$FOCUS->emit (key_up => $_[0])
61	if $FOCUS;	79	if $FOCUS;
62	}	80	}
63		81
64	sub feed_sdl_button_down_event {	82	sub feed_sdl_button_down_event {
65	my ($ev) = @_;	83	my ($ev) = @_;
…		…
74	check_tooltip;	92	check_tooltip;
75	}	93	}
76		94
77	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	95	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
78		96
79	if ($GRAB) {	97	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
80	($x, $y) = $GRAB->coord2local ($x, $y);	98	if $GRAB;
81	$GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
82	}
83	}	99	}
84		100
85	sub feed_sdl_button_up_event {	101	sub feed_sdl_button_up_event {
86	my ($ev) = @_;	102	my ($ev) = @_;
87	my ($x, $y) = ($ev->{x}, $ev->{y});	103	my ($x, $y) = ($ev->{x}, $ev->{y});
88		104
89	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	105	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
90		106
91	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	107	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
92		108
93	if ($GRAB) {	109	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
94	($x, $y) = $GRAB->coord2local ($x, $y);	110	if $GRAB;
95	$GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
96	}
97		111
98	if (!$BUTTON_STATE) {	112	if (!$BUTTON_STATE) {
99	my $grab = $GRAB; undef $GRAB;	113	my $grab = $GRAB; undef $GRAB;
100	$grab->update if $grab;	114	$grab->update if $grab;
101	$GRAB->update if $GRAB;	115	$GRAB->update if $GRAB;
…		…
117	$HOVER->update if $HOVER && $HOVER->{can_hover};	131	$HOVER->update if $HOVER && $HOVER->{can_hover};
118		132
119	check_tooltip;	133	check_tooltip;
120	}	134	}
121		135
122	if ($HOVER) {
123	($x, $y) = $HOVER->coord2local ($x, $y);
124	$HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);	136	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
125	}	137	if $HOVER;
126	}	138	}
127		139
128	# convert position array to integers	140	# convert position array to integers
129	sub harmonize {	141	sub harmonize {
130	my ($vals) = @_;	142	my ($vals) = @_;
…		…
136	$rem += $_ - $i;	148	$rem += $_ - $i;
137	$_ = $i;	149	$_ = $i;
138	}	150	}
139	}	151	}
140		152
		153	sub full_refresh {
		154	# make a copy, otherwise for complains about freed values.
		155	my @widgets = values %WIDGET;
		156
		157	$_->update
		158	for @widgets;
		159	}
		160
		161	sub reconfigure_widgets {
		162	# make a copy, otherwise C<for> complains about freed values.
		163	my @widgets = values %WIDGET;
		164
		165	$_->reconfigure
		166	for @widgets;
		167	}
		168
141	# call when resolution changes etc.	169	# call when resolution changes etc.
142	sub rescale_widgets {	170	sub rescale_widgets {
143	my ($sx, $sy) = @_;	171	my ($sx, $sy) = @_;
144		172
145	for my $widget (values %WIDGET) {	173	for my $widget (values %WIDGET) {
146	if ($widget->{toplevel}) {	174	if ($widget->{is_toplevel}) {
147	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};	175	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
148	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};	176	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
149	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};	177	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
150	$widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
151	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};	178	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
152	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};	179	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
153	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};	180	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
154	$widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
155	}	181	}
156
157	$widget->reconfigure;
158	}	182	}
		183
		184	reconfigure_widgets;
159	}	185	}
160		186
161	#############################################################################	187	#############################################################################
162		188
163	package CFClient::UI::Base;	189	package CFClient::UI::Base;
…		…
176	can_events => 1,	202	can_events => 1,
177	@_	203	@_
178	}, $class;	204	}, $class;
179		205
180	for (keys %$self) {	206	for (keys %$self) {
181	if (/^connect_(.*)$/) {	207	if (/^on_(.*)$/) {
182	$self->connect ($1 => delete $self->{$_});	208	$self->connect ($1 => delete $self->{$_});
183	}	209	}
184	}	210	}
185		211
186	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	212	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
187		213
		214	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
		215	$self->{req_x} = $layout->{x} * $::WIDTH;
		216	$self->{req_y} = $layout->{y} * $::HEIGHT;
		217	$self->{def_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH;
		218	$self->{def_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT;
		219	}
		220
188	$self	221	$self
189	}	222	}
190		223
191	sub destroy {	224	sub destroy {
192	my ($self) = @_;	225	my ($self) = @_;
…		…
201	return if $self->{parent};	234	return if $self->{parent};
202		235
203	$CFClient::UI::ROOT->add ($self);	236	$CFClient::UI::ROOT->add ($self);
204	}	237	}
205		238
206	sub hide {	239	sub center {
207	my ($self) = @_;	240	my ($self) = @_;
		241
		242	$CFClient::UI::ROOT->on_post_alloc (
		243	"center_$self" => sub {
		244	$self->move (($self->{parent}{w} - $self->{w}) * 0.5, ($self->{parent}{h} - $self->{h}) * 0.5);
		245	},
		246	);
		247
		248	$self->update;
		249	}
		250
		251	sub set_visible {
		252	my ($self) = @_;
		253
		254	return if $self->{visible};
		255
		256	$self->{root} = $self->{parent}{root};
		257	$self->{visible} = $self->{parent}{visible} + 1;
		258
		259	$self->emit (visibility_change => 1);
		260
		261	$self->realloc if !exists $self->{req_w};
		262
		263	$_->set_visible for $self->children;
		264	}
		265
		266	sub set_invisible {
		267	my ($self) = @_;
		268
		269	return unless $self->{visible};
		270
		271	$_->set_invisible for $self->children;
		272
		273	delete $self->{root};
		274	delete $self->{visible};
208		275
209	undef $GRAB if $GRAB == $self;	276	undef $GRAB if $GRAB == $self;
210	undef $HOVER if $HOVER == $self;	277	undef $HOVER if $HOVER == $self;
		278
		279	CFClient::UI::check_tooltip
		280	if $TOOLTIP->{owner} == $self;
		281
		282	$self->focus_out;
		283
		284	$self->emit (visibility_change => 0);
		285	}
		286
		287	sub set_visibility {
		288	my ($self, $visible) = @_;
		289
		290	return if $self->{visible} == $visible;
		291
		292	$visible ? $self->hide
		293	: $self->show;
		294	}
		295
		296	sub toggle_visibility {
		297	my ($self) = @_;
		298
		299	$self->{visible}
		300	? $self->hide
		301	: $self->show;
		302	}
		303
		304	sub hide {
		305	my ($self) = @_;
		306
		307	$self->set_invisible;
211		308
212	$self->{parent}->remove ($self)	309	$self->{parent}->remove ($self)
213	if $self->{parent};	310	if $self->{parent};
214	}	311	}
215		312
…		…
224	}	321	}
225		322
226	sub set_size {	323	sub set_size {
227	my ($self, $w, $h) = @_;	324	my ($self, $w, $h) = @_;
228		325
229	$self->{user_w} = $w;	326	$self->{def_w} = $w;
230	$self->{user_h} = $h;	327	$self->{def_h} = $h;
231		328
232	$self->check_size;	329	$self->realloc;
233	}	330	}
234		331
235	sub size_request {	332	sub size_request {
236	require Carp;	333	require Carp;
237	Carp::confess "size_request is abstract";	334	Carp::confess "size_request is abstract";
…		…
257	$self->{y} = $y;	354	$self->{y} = $y;
258	$self->update;	355	$self->update;
259	}	356	}
260		357
261	if ($self->{w} != $w || $self->{h} != $h) {	358	if ($self->{w} != $w || $self->{h} != $h) {
		359	return unless $self->{visible};
		360
262	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];	361	$self->{root}->{size_alloc}{$self+0} = [$self, $w, $h];
263	}	362	}
264	}	363	}
265		364
266	sub size_allocate {	365	sub size_allocate {
267	# nothing to be done	366	# nothing to be done
268	}	367	}
269		368
270	sub reconfigure {
271	my ($self) = @_;
272
273	$self->check_size (1);
274	$self->update;
275	}
276
277	sub children {	369	sub children {
278	}	370	}
279		371
280	sub set_max_size {	372	sub set_max_size {
281	my ($self, $w, $h) = @_;	373	my ($self, $w, $h) = @_;
…		…
284	delete $self->{max_h}; $self->{max_h} = $h if $h;	376	delete $self->{max_h}; $self->{max_h} = $h if $h;
285	}	377	}
286		378
287	sub set_tooltip {	379	sub set_tooltip {
288	my ($self, $tooltip) = @_;	380	my ($self, $tooltip) = @_;
		381
		382	$tooltip =~ s/^\s+//;
		383	$tooltip =~ s/\s+$//;
		384
		385	return if $self->{tooltip} eq $tooltip;
289		386
290	$self->{tooltip} = $tooltip;	387	$self->{tooltip} = $tooltip;
291		388
292	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	389	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
293	delete $CFClient::UI::TOOLTIP->{owner};	390	delete $CFClient::UI::TOOLTIP->{owner};
…		…
315	return if $FOCUS == $self;	412	return if $FOCUS == $self;
316	return unless $self->{can_focus};	413	return unless $self->{can_focus};
317		414
318	my $focus = $FOCUS; $FOCUS = $self;	415	my $focus = $FOCUS; $FOCUS = $self;
319		416
320	$self->emit (focus_in => $focus);	417	$self->_emit (focus_in => $focus);
321		418
322	$focus->update if $focus;	419	$focus->update if $focus;
323	$FOCUS->update;	420	$FOCUS->update;
324	}	421	}
325		422
…		…
328		425
329	return unless $FOCUS == $self;	426	return unless $FOCUS == $self;
330		427
331	my $focus = $FOCUS; undef $FOCUS;	428	my $focus = $FOCUS; undef $FOCUS;
332		429
333	$self->emit (focus_out => $focus);	430	$self->_emit (focus_out => $focus);
334		431
335	$focus->update if $focus; #?	432	$focus->update if $focus; #?
		433
		434	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
		435	unless $FOCUS;
336	}	436	}
337		437
338	sub mouse_motion { }	438	sub mouse_motion { }
339	sub button_up { }	439	sub button_up { }
340	sub key_down { }	440	sub key_down { }
341	sub key_up { }	441	sub key_up { }
342		442
343	sub button_down {	443	sub button_down {
344	my ($self, $ev, $x, $y) = @_;	444	my ($self, $ev, $x, $y) = @_;
345		445
346	$self->focus_in;	446	$self->focus_in;
…		…
349	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	449	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
350	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	450	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
351	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }	451	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
352	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }	452	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
353	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }	453	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
		454
		455	sub find_widget {
		456	my ($self, $x, $y) = @_;
		457
		458	return () unless $self->{can_events};
		459
		460	return $self
		461	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
		462	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
		463
		464	()
		465	}
		466
		467	sub set_parent {
		468	my ($self, $parent) = @_;
		469
		470	Scalar::Util::weaken ($self->{parent} = $parent);
		471
		472	$self->set_visible if $parent->{visible};
		473	}
		474
		475	sub connect {
		476	my ($self, $signal, $cb) = @_;
		477
		478	push @{ $self->{signal_cb}{$signal} }, $cb;
		479	}
		480
		481	sub _emit {
		482	my ($self, $signal, @args) = @_;
		483
		484	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
		485	}
		486
		487	sub emit {
		488	my ($self, $signal, @args) = @_;
		489
		490	$self->_emit ($signal, @args)
		491	|| $self->$signal (@args);
		492	}
		493
		494	sub visibility_change {
		495	#my ($self, $visible) = @_;
		496	}
		497
		498	sub realloc {
		499	my ($self) = @_;
		500
		501	if ($self->{visible}) {
		502	return if $self->{root}{realloc}{$self};
		503
		504	$self->{root}{realloc}{$self} = $self;
		505	$self->{root}->update;
		506	} else {
		507	delete $self->{req_w};
		508	}
		509	}
		510
		511	sub update {
		512	my ($self) = @_;
		513
		514	$self->{parent}->update
		515	if $self->{parent};
		516	}
354		517
355	sub draw {	518	sub draw {
356	my ($self) = @_;	519	my ($self) = @_;
357		520
358	return unless $self->{h} && $self->{w};	521	return unless $self->{h} && $self->{w};
…		…
380	if ($ENV{PCLIENT_DEBUG}) {	543	if ($ENV{PCLIENT_DEBUG}) {
381	glPushMatrix;	544	glPushMatrix;
382	glColor 1, 1, 0, 1;	545	glColor 1, 1, 0, 1;
383	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	546	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
384	glBegin GL_LINE_LOOP;	547	glBegin GL_LINE_LOOP;
385	glVertex 0 , 0;	548	glVertex 0 , 0;
386	glVertex $self->{w}, 0;	549	glVertex $self->{w} - 1, 0;
387	glVertex $self->{w}, $self->{h};	550	glVertex $self->{w} - 1, $self->{h} - 1;
388	glVertex 0 , $self->{h};	551	glVertex 0 , $self->{h} - 1;
389	glEnd;	552	glEnd;
390	glPopMatrix;	553	glPopMatrix;
391	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	554	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
392	}	555	}
393	}	556	}
394		557
395	sub _draw {	558	sub _draw {
396	my ($self) = @_;	559	my ($self) = @_;
397		560
398	warn "no draw defined for $self\n";	561	warn "no draw defined for $self\n";
399	}
400
401	sub find_widget {
402	my ($self, $x, $y) = @_;
403
404	return () unless $self->{can_events};
405
406	return $self
407	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
408	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
409
410	()
411	}
412
413	sub set_parent {
414	my ($self, $parent) = @_;
415
416	Scalar::Util::weaken ($self->{parent} = $parent);
417
418	# TODO: req_w _does_change after ->reconfigure
419	$self->check_size
420	unless exists $self->{req_w};
421	}
422
423	sub check_size {
424	my ($self, $forced) = @_;
425
426	$self->{force_alloc} = 1 if $forced;
427	$CFClient::UI::ROOT->{check_size}{$self} = $self;
428	}
429
430	sub update {
431	my ($self) = @_;
432
433	$self->{parent}->update
434	if $self->{parent};
435	}
436
437	sub connect {
438	my ($self, $signal, $cb) = @_;
439
440	push @{ $self->{signal_cb}{$signal} }, $cb;
441	}
442
443	sub emit {
444	my ($self, $signal, @args) = @_;
445
446	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
447	}	562	}
448		563
449	sub DESTROY {	564	sub DESTROY {
450	my ($self) = @_;	565	my ($self) = @_;
451		566
…		…
548	$self->{children} = [	663	$self->{children} = [
549	sort { $a->{z} <=> $b->{z} }	664	sort { $a->{z} <=> $b->{z} }
550	@{$self->{children}}, @widgets	665	@{$self->{children}}, @widgets
551	];	666	];
552		667
553	$self->check_size (1);	668	$self->realloc;
554	$self->update;
555	}	669	}
556		670
557	sub children {	671	sub children {
558	@{ $_[0]{children} }	672	@{ $_[0]{children} }
559	}	673	}
…		…
564	delete $child->{parent};	678	delete $child->{parent};
565	$child->hide;	679	$child->hide;
566		680
567	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	681	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
568		682
569	$self->check_size;	683	$self->realloc;
570	$self->update;
571	}	684	}
572		685
573	sub clear {	686	sub clear {
574	my ($self) = @_;	687	my ($self) = @_;
575		688
…		…
579	for (@$children) {	692	for (@$children) {
580	delete $_->{parent};	693	delete $_->{parent};
581	$_->hide;	694	$_->hide;
582	}	695	}
583		696
584	$self->check_size;	697	$self->realloc;
585	$self->update;
586	}	698	}
587		699
588	sub find_widget {	700	sub find_widget {
589	my ($self, $x, $y) = @_;	701	my ($self, $x, $y) = @_;
590		702
…		…
643	sub size_request {	755	sub size_request {
644	$_[0]{children}[0]->size_request	756	$_[0]{children}[0]->size_request
645	}	757	}
646		758
647	sub size_allocate {	759	sub size_allocate {
648	my ($self, $w, $h) = @_;	760	my ($self, $w, $h, $changed) = @_;
649		761
650	$self->{children}[0]->configure (0, 0, $w, $h);	762	$self->{children}[0]->configure (0, 0, $w, $h);
651	}	763	}
652		764
653	#############################################################################	765	#############################################################################
…		…
670	$ROOT->on_post_alloc ($self => sub { $self->render_child });	782	$ROOT->on_post_alloc ($self => sub { $self->render_child });
671	$self->SUPER::update;	783	$self->SUPER::update;
672	}	784	}
673		785
674	sub size_allocate {	786	sub size_allocate {
675	my ($self, $w, $h) = @_;	787	my ($self, $w, $h, $changed) = @_;
676		788
677	$self->SUPER::size_allocate ($w, $h);	789	$self->SUPER::size_allocate ($w, $h, $changed);
678	$self->update;	790	$self->update
		791	if $changed;
679	}	792	}
680		793
681	sub _render {	794	sub _render {
682	$_[0]{children}[0]->draw;	795	$_[0]{children}[0]->draw;
683	}	796	}
…		…
688	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	801	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
689	glClearColor 0, 0, 0, 0;	802	glClearColor 0, 0, 0, 0;
690	glClear GL_COLOR_BUFFER_BIT;	803	glClear GL_COLOR_BUFFER_BIT;
691		804
692	$self->_render;	805	$self->_render;
693	# glColorMask 1, 1, 1, 0;
694	# glEnable GL_BLEND;
695	# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
696	# glRasterPos 0, 0;
697	# glCopyPixels 0, 0, $self->{w}, $self->{h};
698	# glDisable GL_BLEND;
699	# glColorMask 1, 1, 1, 1;
700	};	806	};
701	}	807	}
702		808
703	sub _draw {	809	sub _draw {
704	my ($self) = @_;	810	my ($self) = @_;
…		…
708	my $tex = $self->{texture}	814	my $tex = $self->{texture}
709	or return;	815	or return;
710		816
711	glEnable GL_TEXTURE_2D;	817	glEnable GL_TEXTURE_2D;
712	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	818	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
713	glColor 0, 0, 0, 1;	819	glColor 1, 1, 1, 1;
714		820
715	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	821	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
716		822
717	glDisable GL_TEXTURE_2D;	823	glDisable GL_TEXTURE_2D;
718	}	824	}
…		…
721		827
722	package CFClient::UI::ViewPort;	828	package CFClient::UI::ViewPort;
723		829
724	our @ISA = CFClient::UI::Window::;	830	our @ISA = CFClient::UI::Window::;
725		831
		832	sub new {
		833	my $class = shift;
		834
		835	$class->SUPER::new (
		836	scroll_x => 0,
		837	scroll_y => 1,
		838	@_,
		839	)
		840	}
		841
726	sub size_request {	842	sub size_request {
727	my ($self) = @_;	843	my ($self) = @_;
728		844
729	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	845	my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
730	$self->child->configure (0, 0, @$self{qw(child_w child_h)});
731		846
732	@$self{qw(child_w child_h)}	847	$w = 10 if $self->{scroll_x};
		848	$h = 10 if $self->{scroll_y};
		849
		850	($w, $h)
733	}	851	}
734		852
735	sub size_allocate {	853	sub size_allocate {
736	my ($self, $w, $h) = @_;	854	my ($self, $w, $h, $changed) = @_;
737		855
		856	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
		857	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
		858
		859	$self->child->configure (0, 0, $w, $h);
738	$self->update;	860	$self->update;
739	}	861	}
740		862
741	sub set_offset {	863	sub set_offset {
742	my ($self, $x, $y) = @_;	864	my ($self, $x, $y) = @_;
…		…
793	my $class = shift;	915	my $class = shift;
794		916
795	my $self;	917	my $self;
796		918
797	my $slider = new CFClient::UI::Slider	919	my $slider = new CFClient::UI::Slider
798	vertical => 1,	920	vertical => 1,
799	range => [0, 0, 1, 0.01], # HACK fix	921	range => [0, 0, 1, 0.01], # HACK fix
800	connect_changed => sub {	922	on_changed => sub {
801	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));	923	$self->{vp}->set_offset (0, $_[1]);
802	},	924	},
803	;	925	;
804		926
805	$self = $class->SUPER::new (	927	$self = $class->SUPER::new (
806	vp => (new CFClient::UI::ViewPort),	928	vp => (new CFClient::UI::ViewPort expand => 1),
807	slider => $slider,	929	slider => $slider,
808	@_,	930	@_,
809	);	931	);
810		932
811	$self->{vp}->add ($self->{scrolled});	933	$self->{vp}->add ($self->{scrolled});
812	$self->add ($self->{vp});	934	$self->add ($self->{vp});
813	$self->add ($self->{slider});	935	$self->add ($self->{slider});
814		936
815	$self	937	$self
		938	}
		939
		940	sub update {
		941	my ($self) = @_;
		942
		943	$self->SUPER::update;
		944
		945	# todo: overwrite size_allocate of child
		946	my $child = $self->{vp}->child;
		947	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
		948	}
		949
		950	sub size_allocate {
		951	my ($self, $w, $h, $changed) = @_;
		952
		953	$self->SUPER::size_allocate ($w, $h, $changed);
		954
		955	my $child = $self->{vp}->child;
		956	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
816	}	957	}
817		958
818	#TODO# update range on size_allocate depending on child	959	#TODO# update range on size_allocate depending on child
819	# update viewport offset on scroll	960	# update viewport offset on scroll
820		961
…		…
871	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1012	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
872		1013
873	sub new {	1014	sub new {
874	my $class = shift;	1015	my $class = shift;
875		1016
876	# TODO: user_x, user_y, overwrite moveto?
877
878	my $self = $class->SUPER::new (	1017	my $self = $class->SUPER::new (
879	bg => [1, 1, 1, 1],	1018	bg => [1, 1, 1, 1],
880	border_bg => [1, 1, 1, 1],	1019	border_bg => [1, 1, 1, 1],
881	border => 0.6,	1020	border => 0.6,
882	toplevel => 1,	1021	is_toplevel => 1,
883	can_events => 1,	1022	can_events => 1,
884	@_	1023	@_
885	);	1024	);
886		1025
887	$self->{title} &&= new CFClient::UI::Label	1026	$self->{title} &&= new CFClient::UI::Label
888	align => 0,	1027	align => 0,
…		…
907	$h + $self->border * 2,	1046	$h + $self->border * 2,
908	)	1047	)
909	}	1048	}
910		1049
911	sub size_allocate {	1050	sub size_allocate {
912	my ($self, $w, $h) = @_;	1051	my ($self, $w, $h, $changed) = @_;
		1052
		1053	return unless $changed;
913		1054
914	$h -= List::Util::max 0, $self->border * 2;	1055	$h -= List::Util::max 0, $self->border * 2;
915	$w -= List::Util::max 0, $self->border * 2;	1056	$w -= List::Util::max 0, $self->border * 2;
916		1057
917	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)	1058	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
…		…
941	my ($ev, $x, $y) = @_;	1082	my ($ev, $x, $y) = @_;
942		1083
943	my $dx = $ev->{x} - $ox;	1084	my $dx = $ev->{x} - $ox;
944	my $dy = $ev->{y} - $oy;	1085	my $dy = $ev->{y} - $oy;
945		1086
		1087	$self->{user_x} = $wx + $dx * $mx;
		1088	$self->{user_y} = $wy + $dy * $my;
946	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1089	$self->{def_w} = $bw + $dx * ($mx ? -1 : 1);
947	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1090	$self->{def_h} = $bh + $dy * ($my ? -1 : 1);
948	$self->move ($wx + $dx * $mx, $wy + $dy * $my);	1091	$self->move ($self->{user_x}, $self->{user_y});
949	$self->check_size;	1092	$self->realloc;
950	};	1093	};
951		1094
952	} elsif ($lr ^ $td) {	1095	} elsif ($lr ^ $td) {
953	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1096	my ($ox, $oy) = ($ev->{x}, $ev->{y});
954	my ($bx, $by) = ($self->{x}, $self->{y});	1097	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
956	$self->{motion} = sub {	1099	$self->{motion} = sub {
957	my ($ev, $x, $y) = @_;	1100	my ($ev, $x, $y) = @_;
958		1101
959	($x, $y) = ($ev->{x}, $ev->{y});	1102	($x, $y) = ($ev->{x}, $ev->{y});
960		1103
961	$self->move ($bx + $x - $ox, $by + $y - $oy);	1104	$self->{user_x} = $bx + $x - $ox;
		1105	$self->{user_y} = $by + $y - $oy;
		1106
		1107	$self->move ($self->{user_x}, $self->{user_y});
962	$self->update;	1108	$self->realloc;
963	};	1109	};
964	}	1110	}
965	}	1111	}
966		1112
967	sub button_up {	1113	sub button_up {
…		…
1028	sub new {	1174	sub new {
1029	my $class = shift;	1175	my $class = shift;
1030		1176
1031	$class->SUPER::new (	1177	$class->SUPER::new (
1032	col_expand => [],	1178	col_expand => [],
1033	@_	1179	@_,
1034	)	1180	)
		1181	}
		1182
		1183	sub children {
		1184	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1035	}	1185	}
1036		1186
1037	sub add {	1187	sub add {
1038	my ($self, $x, $y, $child) = @_;	1188	my ($self, $x, $y, $child) = @_;
1039		1189
1040	$child->set_parent ($self);	1190	$child->set_parent ($self);
1041	$self->{children}[$y][$x] = $child;	1191	$self->{children}[$y][$x] = $child;
1042		1192
1043	$child->check_size;	1193	$self->realloc;
1044	}	1194	}
1045		1195
1046	sub children {
1047	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1048	}
1049
1050	# TODO: move to container class maybe? send childs a signal on removal?	1196	# TODO: move to container class maybe? send children a signal on removal?
1051	sub clear {	1197	sub clear {
1052	my ($self) = @_;	1198	my ($self) = @_;
1053		1199
1054	my @children = $self->children;	1200	my @children = $self->children;
1055	delete $self->{children};	1201	delete $self->{children};
…		…
1057	for (@children) {	1203	for (@children) {
1058	delete $_->{parent};	1204	delete $_->{parent};
1059	$_->hide;	1205	$_->hide;
1060	}	1206	}
1061		1207
1062	$self->update;	1208	$self->realloc;
1063	}	1209	}
1064		1210
1065	sub get_wh {	1211	sub get_wh {
1066	my ($self) = @_;	1212	my ($self) = @_;
1067		1213
…		…
1094	(sum @$hs),	1240	(sum @$hs),
1095	)	1241	)
1096	}	1242	}
1097		1243
1098	sub size_allocate {	1244	sub size_allocate {
1099	my ($self, $w, $h) = @_;	1245	my ($self, $w, $h, $changed) = @_;
1100		1246
1101	my ($ws, $hs) = $self->get_wh;	1247	my ($ws, $hs) = $self->get_wh;
1102		1248
1103	my $req_w = sum @$ws;	1249	my $req_w = (sum @$ws) || 1;
1104	my $req_h = sum @$hs;	1250	my $req_h = (sum @$hs) || 1;
1105		1251
1106	# TODO: nicer code && do row_expand	1252	# TODO: nicer code && do row_expand
1107	my @col_expand = @{$self->{col_expand}};	1253	my @col_expand = @{$self->{col_expand}};
1108	@col_expand = (1) x @$ws unless @col_expand;	1254	@col_expand = (1) x @$ws unless @col_expand;
1109	my $col_expand = (sum @col_expand) || 1;	1255	my $col_expand = (sum @col_expand) || 1;
…		…
1163	}	1309	}
1164	}	1310	}
1165		1311
1166	#############################################################################	1312	#############################################################################
1167		1313
		1314	package CFClient::UI::Box;
		1315
		1316	our @ISA = CFClient::UI::Container::;
		1317
		1318	sub size_request {
		1319	my ($self) = @_;
		1320
		1321	$self->{vertical}
		1322	? (
		1323	(List::Util::max map $_->{req_w}, @{$self->{children}}),
		1324	(List::Util::sum map $_->{req_h}, @{$self->{children}}),
		1325	)
		1326	: (
		1327	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
		1328	(List::Util::max map $_->{req_h}, @{$self->{children}}),
		1329	)
		1330	}
		1331
		1332	sub size_allocate {
		1333	my ($self, $w, $h, $changed) = @_;
		1334
		1335	my $space = $self->{vertical} ? $h : $w;
		1336	my $children = $self->{children};
		1337
		1338	my @req;
		1339
		1340	if ($self->{homogeneous}) {
		1341	@req = ($space / (@$children || 1)) x @$children;
		1342	} else {
		1343	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
		1344	my $req = List::Util::sum @req;
		1345
		1346	if ($req > $space) {
		1347	# ah well, not enough space
		1348	$_ *= $space / $req for @req;
		1349	} else {
		1350	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
		1351
		1352	$space = ($space - $req) / $expand; # remaining space to give away
		1353
		1354	$req[$_] += $space * $children->[$_]{expand}
		1355	for 0 .. $#$children;
		1356	}
		1357	}
		1358
		1359	CFClient::UI::harmonize \@req;
		1360
		1361	my $pos = 0;
		1362	for (0 .. $#$children) {
		1363	my $alloc = $req[$_];
		1364	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
		1365
		1366	$pos += $alloc;
		1367	}
		1368
		1369	1
		1370	}
		1371
		1372	#############################################################################
		1373
1168	package CFClient::UI::HBox;	1374	package CFClient::UI::HBox;
1169		1375
1170	# TODO: wrap into common Box base class
1171
1172	our @ISA = CFClient::UI::Container::;	1376	our @ISA = CFClient::UI::Box::;
1173		1377
1174	sub size_request {	1378	sub new {
1175	my ($self) = @_;	1379	my $class = shift;
1176		1380
1177	my @alloc = map [$_->size_request], @{$self->{children}};	1381	$class->SUPER::new (
1178		1382	vertical => 0,
1179	(	1383	@_,
1180	(List::Util::sum map $_->[0], @alloc),
1181	(List::Util::max map $_->[1], @alloc),
1182	)	1384	)
1183	}	1385	}
1184		1386
1185	sub size_allocate {
1186	my ($self, $w, $h) = @_;
1187
1188	($h, $w) = ($w, $h);
1189
1190	my $children = $self->{children};
1191
1192	my @h = map $_->{req_w}, @$children;
1193
1194	my $req_h = List::Util::sum @h;
1195
1196	if ($req_h > $h) {
1197	# ah well, not enough space
1198	$_ *= $h / $req_h for @h;
1199	} else {
1200	my $exp = List::Util::sum map $_->{expand}, @$children;
1201	$exp ||= 1;
1202
1203	for (0 .. $#$children) {
1204	my $child = $children->[$_];
1205
1206	my $alloc_h = $h[$_];
1207	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1208	$h[$_] = $alloc_h;
1209	}
1210	}
1211
1212	CFClient::UI::harmonize \@h;
1213
1214	my $y = 0;
1215	for (0 .. $#$children) {
1216	my $child = $children->[$_];
1217	my $h = $h[$_];
1218	$child->configure ($y, 0, $h, $w);
1219
1220	$y += $h;
1221	}
1222
1223	1
1224	}
1225
1226	#############################################################################	1387	#############################################################################
1227		1388
1228	package CFClient::UI::VBox;	1389	package CFClient::UI::VBox;
1229		1390
1230	# TODO: wrap into common Box base class
1231
1232	our @ISA = CFClient::UI::Container::;	1391	our @ISA = CFClient::UI::Box::;
1233		1392
1234	sub size_request {	1393	sub new {
1235	my ($self) = @_;	1394	my $class = shift;
1236		1395
1237	my @alloc = map [$_->size_request], @{$self->{children}};	1396	$class->SUPER::new (
1238		1397	vertical => 1,
1239	(	1398	@_,
1240	(List::Util::max map $_->[0], @alloc),
1241	(List::Util::sum map $_->[1], @alloc),
1242	)	1399	)
1243	}
1244
1245	sub size_allocate {
1246	my ($self, $w, $h) = @_;
1247
1248	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1249
1250	my $children = $self->{children};
1251
1252	my @h = map $_->{req_h}, @$children;
1253
1254	my $req_h = List::Util::sum @h;
1255
1256	if ($req_h > $h) {
1257	# ah well, not enough space
1258	$_ *= $h / $req_h for @h;
1259	} else {
1260	my $exp = List::Util::sum map $_->{expand}, @$children;
1261	$exp ||= 1;
1262
1263	for (0 .. $#$children) {
1264	my $child = $children->[$_];
1265
1266	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1267	}
1268	}
1269
1270	CFClient::UI::harmonize \@h;
1271
1272	my $y = 0;
1273	for (0 .. $#$children) {
1274	my $child = $children->[$_];
1275	my $h = $h[$_];
1276	$child->configure (0, $y, $w, $h);
1277
1278	$y += $h;
1279	}
1280
1281	1
1282	}	1400	}
1283		1401
1284	#############################################################################	1402	#############################################################################
1285		1403
1286	package CFClient::UI::Label;	1404	package CFClient::UI::Label;
…		…
1297	#bg => none	1415	#bg => none
1298	#active_bg => none	1416	#active_bg => none
1299	#font => default_font	1417	#font => default_font
1300	#text => initial text	1418	#text => initial text
1301	#markup => initial narkup	1419	#markup => initial narkup
		1420	#max_w => maximum pixel width
		1421	ellipsise => 3, # end
1302	layout => (new CFClient::Layout),	1422	layout => (new CFClient::Layout),
1303	fontsize => 1,	1423	fontsize => 1,
1304	align => -1,	1424	align => -1,
1305	valign => -1,	1425	valign => -1,
1306	padding => 2,	1426	padding => 2,
…		…
1347	$self->{text} = "T$text";	1467	$self->{text} = "T$text";
1348		1468
1349	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1469	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1350	$self->{layout}->set_text ($text);	1470	$self->{layout}->set_text ($text);
1351		1471
		1472	$self->realloc;
1352	$self->update;	1473	$self->update;
1353	$self->check_size;
1354	}	1474	}
1355		1475
1356	sub set_markup {	1476	sub set_markup {
1357	my ($self, $markup) = @_;	1477	my ($self, $markup) = @_;
1358		1478
…		…
1362	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1482	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1363		1483
1364	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;	1484	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1365	$self->{layout}->set_markup ($markup);	1485	$self->{layout}->set_markup ($markup);
1366		1486
		1487	$self->realloc;
1367	$self->update;	1488	$self->update;
1368	$self->check_size;
1369	}	1489	}
1370		1490
1371	sub size_request {	1491	sub size_request {
1372	my ($self) = @_;	1492	my ($self) = @_;
1373		1493
1374	$self->{layout}->set_font ($self->{font}) if $self->{font};	1494	$self->{layout}->set_font ($self->{font}) if $self->{font};
1375	$self->{layout}->set_width ($self->{max_w} || -1);	1495	$self->{layout}->set_width ($self->{max_w} || -1);
		1496	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1497	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1376	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1498	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1377		1499
1378	my ($w, $h) = $self->{layout}->size;	1500	my ($w, $h) = $self->{layout}->size;
1379		1501
1380	if (exists $self->{template}) {	1502	if (exists $self->{template}) {
…		…
1392	$h + $self->{padding} * 2,	1514	$h + $self->{padding} * 2,
1393	)	1515	)
1394	}	1516	}
1395		1517
1396	sub size_allocate {	1518	sub size_allocate {
1397	my ($self, $w, $h) = @_;	1519	my ($self, $w, $h, $changed) = @_;
1398		1520
1399	delete $self->{texture};	1521	delete $self->{texture}
		1522	if $changed;
1400	}	1523	}
1401		1524
1402	sub set_fontsize {	1525	sub set_fontsize {
1403	my ($self, $fontsize) = @_;	1526	my ($self, $fontsize) = @_;
1404		1527
1405	$self->{fontsize} = $fontsize;	1528	$self->{fontsize} = $fontsize;
1406	delete $self->{texture};	1529	delete $self->{texture};
1407		1530
1408	$self->update;	1531	$self->realloc;
1409	$self->check_size;
1410	}	1532	}
1411		1533
1412	sub _draw {	1534	sub _draw {
1413	my ($self) = @_;	1535	my ($self) = @_;
1414		1536
…		…
1416		1538
1417	my $tex = $self->{texture} ||= do {	1539	my $tex = $self->{texture} ||= do {
1418	$self->{layout}->set_foreground (@{$self->{fg}});	1540	$self->{layout}->set_foreground (@{$self->{fg}});
1419	$self->{layout}->set_font ($self->{font}) if $self->{font};	1541	$self->{layout}->set_font ($self->{font}) if $self->{font};
1420	$self->{layout}->set_width ($self->{w});	1542	$self->{layout}->set_width ($self->{w});
		1543	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1544	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1421	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);	1545	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1422		1546
1423	my $tex = new_from_layout CFClient::Texture $self->{layout};	1547	my $tex = new_from_layout CFClient::Texture $self->{layout};
1424		1548
1425	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}	1549	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1426	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1550	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
…		…
1464	active_fg => [0, 0, 0],	1588	active_fg => [0, 0, 0],
1465	can_hover => 1,	1589	can_hover => 1,
1466	can_focus => 1,	1590	can_focus => 1,
1467	valign => 0,	1591	valign => 0,
1468	can_events => 1,	1592	can_events => 1,
		1593	#text => ...
1469	@_	1594	@_
1470	)	1595	)
1471	}	1596	}
1472		1597
1473	sub _set_text {	1598	sub _set_text {
…		…
1483	$self->{text} = $text;	1608	$self->{text} = $text;
1484		1609
1485	$text =~ s/./*/g if $self->{hidden};	1610	$text =~ s/./*/g if $self->{hidden};
1486	$self->{layout}->set_text ("$text ");	1611	$self->{layout}->set_text ("$text ");
1487		1612
1488	$self->emit (changed => $self->{text});	1613	$self->_emit (changed => $self->{text});
1489	}	1614	}
1490		1615
1491	sub set_text {	1616	sub set_text {
1492	my ($self, $text) = @_;	1617	my ($self, $text) = @_;
1493		1618
1494	$self->{cursor} = length $text;	1619	$self->{cursor} = length $text;
1495	$self->_set_text ($text);	1620	$self->_set_text ($text);
1496	$self->update;	1621
1497	$self->check_size;	1622	$self->realloc;
1498	}	1623	}
1499		1624
1500	sub get_text {	1625	sub get_text {
1501	$_[0]{text}	1626	$_[0]{text}
1502	}	1627	}
…		…
1505	my ($self) = @_;	1630	my ($self) = @_;
1506		1631
1507	my ($w, $h) = $self->SUPER::size_request;	1632	my ($w, $h) = $self->SUPER::size_request;
1508		1633
1509	($w + 1, $h) # add 1 for cursor	1634	($w + 1, $h) # add 1 for cursor
1510	}
1511
1512	sub size_allocate {
1513	my ($self, $w, $h) = @_;
1514
1515	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1516	}	1635	}
1517		1636
1518	sub key_down {	1637	sub key_down {
1519	my ($self, $ev) = @_;	1638	my ($self, $ev) = @_;
1520		1639
…		…
1535	} elsif ($sym == CFClient::SDLK_HOME) {	1654	} elsif ($sym == CFClient::SDLK_HOME) {
1536	$self->{cursor} = 0;	1655	$self->{cursor} = 0;
1537	} elsif ($sym == CFClient::SDLK_END) {	1656	} elsif ($sym == CFClient::SDLK_END) {
1538	$self->{cursor} = length $text;	1657	$self->{cursor} = length $text;
1539	} elsif ($uni == 27) {	1658	} elsif ($uni == 27) {
1540	$self->emit ('escape');	1659	$self->_emit ('escape');
1541	} elsif ($uni) {	1660	} elsif ($uni) {
1542	substr $text, $self->{cursor}++, 0, chr $uni;	1661	substr $text, $self->{cursor}++, 0, chr $uni;
1543	}	1662	}
1544		1663
1545	$self->_set_text ($text);	1664	$self->_set_text ($text);
1546	$self->update;	1665
1547	$self->check_size;	1666	$self->realloc;
1548	}	1667	}
1549		1668
1550	sub focus_in {	1669	sub focus_in {
1551	my ($self) = @_;	1670	my ($self) = @_;
1552		1671
…		…
1632	if ($sym == 13) {	1751	if ($sym == 13) {
1633	unshift @{$self->{history}},	1752	unshift @{$self->{history}},
1634	my $txt = $self->get_text;	1753	my $txt = $self->get_text;
1635	$self->{history_pointer} = -1;	1754	$self->{history_pointer} = -1;
1636	$self->{history_saveback} = '';	1755	$self->{history_saveback} = '';
1637	$self->emit (activate => $txt);	1756	$self->_emit (activate => $txt);
1638	$self->update;	1757	$self->update;
1639		1758
1640	} elsif ($sym == CFClient::SDLK_UP) {	1759	} elsif ($sym == CFClient::SDLK_UP) {
1641	if ($self->{history_pointer} < 0) {	1760	if ($self->{history_pointer} < 0) {
1642	$self->{history_saveback} = $self->get_text;	1761	$self->{history_saveback} = $self->get_text;
…		…
1690	can_events => 1,	1809	can_events => 1,
1691	@_	1810	@_
1692	)	1811	)
1693	}	1812	}
1694		1813
		1814	sub activate { }
		1815
1695	sub button_up {	1816	sub button_up {
1696	my ($self, $ev, $x, $y) = @_;	1817	my ($self, $ev, $x, $y) = @_;
1697		1818
		1819	$self->emit ("activate")
1698	if ($x >= 0 && $x < $self->{w}	1820	if $x >= 0 && $x < $self->{w}
1699	&& $y >= 0 && $y < $self->{h}) {	1821	&& $y >= 0 && $y < $self->{h};
1700	$self->emit ("activate");
1701	}
1702	}	1822	}
1703		1823
1704	sub _draw {	1824	sub _draw {
1705	my ($self) = @_;	1825	my ($self) = @_;
1706		1826
…		…
1758	my ($self, $ev, $x, $y) = @_;	1878	my ($self, $ev, $x, $y) = @_;
1759		1879
1760	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1880	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1761	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1881	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1762	$self->{state} = !$self->{state};	1882	$self->{state} = !$self->{state};
1763	$self->emit (changed => $self->{state});	1883	$self->_emit (changed => $self->{state});
1764	}	1884	}
1765	}	1885	}
1766		1886
1767	sub _draw {	1887	sub _draw {
1768	my ($self) = @_;	1888	my ($self) = @_;
…		…
2043	my $self = $class->SUPER::new (	2163	my $self = $class->SUPER::new (
2044	fg => [1, 1, 1],	2164	fg => [1, 1, 1],
2045	active_fg => [0, 0, 0],	2165	active_fg => [0, 0, 0],
2046	bg => [0, 0, 0, 0.2],	2166	bg => [0, 0, 0, 0.2],
2047	active_bg => [1, 1, 1, 0.5],	2167	active_bg => [1, 1, 1, 0.5],
2048	range => [0, 0, 100, 10],	2168	range => [0, 0, 100, 10, 0],
2049	req_w => $::WIDTH / 80,	2169	req_w => $::WIDTH / 80,
2050	req_h => $::WIDTH / 80,	2170	req_h => $::WIDTH / 80,
2051	vertical => 0,	2171	vertical => 0,
2052	can_hover => 1,	2172	can_hover => 1,
2053	inner_pad => .05,	2173	inner_pad => 0.02,
2054	@_	2174	@_
2055	);	2175	);
2056		2176
2057	$self->set_value ($self->{range}[0]);	2177	$self->set_value ($self->{range}[0]);
2058	$self->update;	2178	$self->update;
2059		2179
2060	$self	2180	$self
2061	}	2181	}
2062		2182
		2183	sub changed { }
		2184
		2185	sub set_range {
		2186	my ($self, $range) = @_;
		2187
		2188	($range, $self->{range}) = ($self->{range}, $range);
		2189
		2190	$self->update
		2191	if "@$range" ne "@{$self->{range}}";
		2192	}
		2193
2063	sub set_value {	2194	sub set_value {
2064	my ($self, $value) = @_;	2195	my ($self, $value) = @_;
2065		2196
2066	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};	2197	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2067		2198
2068	$hi = $lo + 1 if $hi <= $lo;	2199	$hi = $lo + 1 if $hi <= $lo;
2069		2200
		2201	$page = $hi - $lo if $page > $hi - $lo;
		2202
2070	$value = $lo if $value < $lo;	2203	$value = $lo if $value < $lo;
2071	$value = $hi if $value > $hi;	2204	$value = $hi - $page if $value > $hi - $page;
2072		2205
2073	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit	2206	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2074	if $unit;	2207	if $unit;
2075		2208
2076	$page = $hi - $lo if $page > $hi - $lo;
2077
2078	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	2209	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2079		2210
2080	if ($value != $old_value) {	2211	if ($value != $old_value) {
2081	$self->emit (changed => $value);	2212	$self->_emit (changed => $value);
2082	$self->update;	2213	$self->update;
2083	}	2214	}
2084	}	2215	}
2085		2216
2086	sub size_request {	2217	sub size_request {
…		…
2094		2225
2095	sub button_down {	2226	sub button_down {
2096	my ($self, $ev, $x, $y) = @_;	2227	my ($self, $ev, $x, $y) = @_;
2097		2228
2098	$self->SUPER::button_down ($ev, $x, $y);	2229	$self->SUPER::button_down ($ev, $x, $y);
		2230
		2231	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
		2232
2099	$self->mouse_motion ($ev, $x, $y);	2233	$self->mouse_motion ($ev, $x, $y);
2100	}	2234	}
2101		2235
2102	sub mouse_motion {	2236	sub mouse_motion {
2103	my ($self, $ev, $x, $y) = @_;	2237	my ($self, $ev, $x, $y) = @_;
…		…
2105	if ($GRAB == $self) {	2239	if ($GRAB == $self) {
2106	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2240	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2107		2241
2108	my (undef, $lo, $hi, $page) = @{$self->{range}};	2242	my (undef, $lo, $hi, $page) = @{$self->{range}};
2109		2243
2110	$x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};	2244	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2111		2245
2112	$self->set_value ($x * ($hi - $lo) + $lo);	2246	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2113	}	2247	}
2114	}	2248	}
2115		2249
2116	sub update {	2250	sub update {
2117	my ($self) = @_;	2251	my ($self) = @_;
2118		2252
2119	$CFClient::UI::ROOT->on_post_alloc ($self => sub {	2253	$CFClient::UI::ROOT->on_post_alloc ($self => sub {
2120	$self->set_value ($self->{range}[0]);	2254	$self->set_value ($self->{range}[0]);
2121		2255
2122	my ($value, $lo, $hi, $page) = @{$self->{range}};	2256	my ($value, $lo, $hi, $page) = @{$self->{range}};
		2257	my $range = ($hi - $page - $lo) || 1e-100;
2123		2258
2124	my $inner_w = 1 - 2 * $self->{inner_pad};	2259	my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2125		2260
2126	$self->{scale} = ($inner_w / ($hi - $lo)) || 1;	2261	$self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
		2262	$self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2127		2263
2128	$page = $self->{scale} * $page || 10 / ($self->{w} || 1);	2264	$value = ($value - $lo) / $range;
2129	$value = $self->{scale} * ($value - $lo);	2265	$value = $value * $self->{scale} + $self->{offset};
2130		2266
2131	$value = $self->{inner_pad} + ($value - $page * 0.5);
2132
2133	$value = 0 if $value < 0;
2134	$page = 1 - $value if $value + $page > 1;
2135
2136	$self->{knob_x} = $value;	2267	$self->{knob_x} = $value - $knob_w * 0.5;
2137	$self->{knob_w} = $page;	2268	$self->{knob_w} = $knob_w;
2138	});	2269	});
2139		2270
2140	$self->SUPER::update;	2271	$self->SUPER::update;
2141	}	2272	}
2142		2273
…		…
2148	glScale $self->{w}, $self->{h};	2279	glScale $self->{w}, $self->{h};
2149		2280
2150	if ($self->{vertical}) {	2281	if ($self->{vertical}) {
2151	# draw a vertical slider like a rotated horizontal slider	2282	# draw a vertical slider like a rotated horizontal slider
2152		2283
		2284	glTranslate 1, 0, 0;
2153	glRotate 90, 0, 0, 1;	2285	glRotate 90, 0, 0, 1;
2154	glTranslate 0, 1, 0;
2155	}	2286	}
2156		2287
2157	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	2288	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2158	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	2289	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2159		2290
…		…
2166	# draw handle	2297	# draw handle
2167	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);	2298	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2168		2299
2169	glDisable GL_TEXTURE_2D;	2300	glDisable GL_TEXTURE_2D;
2170	}	2301	}
		2302
		2303	#############################################################################
		2304
		2305	package CFClient::UI::ValSlider;
		2306
		2307	our @ISA = CFClient::UI::HBox::;
		2308
		2309	sub new {
		2310	my ($class, %arg) = @_;
		2311
		2312	my $range = delete $arg{range};
		2313
		2314	my $self = $class->SUPER::new (
		2315	slider => (new CFClient::UI::Slider expand => 1, range => $range),
		2316	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
		2317	to_value => sub { shift },
		2318	from_value => sub { shift },
		2319	%arg,
		2320	);
		2321
		2322	$self->{slider}->connect (changed => sub {
		2323	my ($self, $value) = @_;
		2324	$self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
		2325	$self->{parent}->emit (changed => $value);
		2326	});
		2327
		2328	# $self->{entry}->connect (changed => sub {
		2329	# my ($self, $value) = @_;
		2330	# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
		2331	# $self->{parent}->emit (changed => $value);
		2332	# });
		2333
		2334	$self->add ($self->{slider}, $self->{entry});
		2335
		2336	$self->{slider}->emit (changed => $self->{slider}{range}[0]);
		2337
		2338	$self
		2339	}
		2340
		2341	sub set_range { shift->{slider}->set_range (@_) }
		2342	sub set_value { shift->{slider}->set_value (@_) }
2171		2343
2172	#############################################################################	2344	#############################################################################
2173		2345
2174	package CFClient::UI::TextView;	2346	package CFClient::UI::TextView;
2175		2347
…		…
2205		2377
2206	$self->{fontsize} = $fontsize;	2378	$self->{fontsize} = $fontsize;
2207	$self->reflow;	2379	$self->reflow;
2208	}	2380	}
2209		2381
2210	sub text_height {
2211	my ($self, $text) = @_;
2212
2213	my $layout = $self->{layout};
2214
2215	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2216	$layout->set_width ($self->{children}[0]{w});
2217	$layout->set_markup ($text);
2218
2219	($layout->size)[1]
2220	}
2221
2222	sub reflow {
2223	my ($self) = @_;
2224
2225	$self->{need_reflow}++;
2226	$self->update;
2227	}
2228
2229	sub size_allocate {	2382	sub size_allocate {
2230	my ($self, $w, $h) = @_;	2383	my ($self, $w, $h, $changed) = @_;
2231		2384
2232	$self->SUPER::size_allocate ($w, $h);	2385	$self->SUPER::size_allocate ($w, $h, $changed);
		2386
		2387	return unless $changed;
2233		2388
2234	$self->{layout}->set_font ($self->{font}) if $self->{font};	2389	$self->{layout}->set_font ($self->{font}) if $self->{font};
2235	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2390	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2236	$self->{layout}->set_width ($self->{children}[0]{w});	2391	$self->{layout}->set_width ($self->{children}[0]{w});
2237		2392
2238	$self->reflow;	2393	$self->reflow;
2239	}	2394	}
2240		2395
		2396	sub text_size {
		2397	my ($self, $text, $indent) = @_;
		2398
		2399	my $layout = $self->{layout};
		2400
		2401	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2402	$layout->set_width ($self->{children}[0]{w} - $indent);
		2403	$layout->set_markup ($text);
		2404
		2405	$layout->size
		2406	}
		2407
		2408	sub reflow {
		2409	my ($self) = @_;
		2410
		2411	$self->{need_reflow}++;
		2412	$self->update;
		2413	}
		2414
		2415	sub set_offset {
		2416	my ($self, $offset) = @_;
		2417
		2418	# todo: base offset on lines or so, not on pixels
		2419	$self->{children}[1]->set_value ($offset);
		2420	}
		2421
		2422	sub clear {
		2423	my ($self) = @_;
		2424
		2425	$self->{par} = [];
		2426	$self->{height} = 0;
		2427	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
		2428	}
		2429
2241	sub add_paragraph {	2430	sub add_paragraph {
2242	my ($self, $color, $text) = @_;	2431	my ($self, $color, $text, $indent) = @_;
2243		2432
2244	#TODO: intelligently "reformat" paragraph	2433	for my $line (split /\n/, $text) {
2245		2434	my ($w, $h) = $self->text_size ($line);
2246	my $height = $self->text_height ($text);
2247
2248	$self->{height} += $height;	2435	$self->{height} += $h;
		2436	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
		2437	}
2249		2438
2250	push @{$self->{par}}, [$height, $color, $text];
2251
2252	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];	2439	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2253	$self->{children}[1]->update;
2254	}	2440	}
2255		2441
2256	sub update {	2442	sub update {
2257	my ($self) = @_;	2443	my ($self) = @_;
2258		2444
…		…
2261	return unless $self->{h} > 0;	2447	return unless $self->{h} > 0;
2262		2448
2263	delete $self->{texture};	2449	delete $self->{texture};
2264		2450
2265	$ROOT->on_post_alloc ($self, sub {	2451	$ROOT->on_post_alloc ($self, sub {
		2452	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2453
2266	if (delete $self->{need_reflow}) {	2454	if (delete $self->{need_reflow}) {
2267	my $height = 0;	2455	my $height = 0;
2268		2456
2269	$height += $_->[0] = $self->text_height ($_->[2])	2457	my $layout = $self->{layout};
		2458
		2459	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2460
2270	for @{$self->{par}};	2461	for (@{$self->{par}}) {
		2462	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
		2463	$layout->set_width ($W - $_->[3]);
		2464	$layout->set_markup ($_->[4]);
		2465	my ($w, $h) = $layout->size;
		2466	$_->[0] = $w + $_->[3];
		2467	$_->[1] = $h;
		2468	}
		2469
		2470	$height += $_->[1];
		2471	}
2271		2472
2272	$self->{height} = $height;	2473	$self->{height} = $height;
2273		2474
2274	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2475	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2275		2476
2276	delete $self->{texture};	2477	delete $self->{texture};
2277	}	2478	}
2278		2479
2279	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {	2480	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2280	glClearColor 0, 0, 0, 0;	2481	glClearColor 0.5, 0.5, 0.5, 0;
2281	glClear GL_COLOR_BUFFER_BIT;	2482	glClear GL_COLOR_BUFFER_BIT;
2282		2483
2283	glEnable GL_TEXTURE_2D;
2284	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2285
2286	my $top = int $self->{children}[1]{range}[0];	2484	my $top = int $self->{children}[1]{range}[0];
2287		2485
2288	my $y0 = $top;	2486	my $y0 = $top;
2289	my $y1 = $top + $self->{h};	2487	my $y1 = $top + $H;
2290		2488
2291	my $y = 0;	2489	my $y = 0;
2292		2490
2293	my $layout = $self->{layout};	2491	my $layout = $self->{layout};
2294		2492
2295	$layout->set_font ($self->{font}) if $self->{font};	2493	$layout->set_font ($self->{font}) if $self->{font};
2296		2494
		2495	glEnable GL_BLEND;
		2496	#TODO# not correct in windows where rgba is forced off
		2497	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		2498
2297	for my $par (@{$self->{par}}) {	2499	for my $par (@{$self->{par}}) {
2298	my $h = $par->[0];	2500	my $h = $par->[1];
2299		2501
2300	if ($y0 < $y + $h && $y < $y1) {	2502	if ($y0 < $y + $h && $y < $y1) {
2301	$layout->set_foreground (@{ $par->[1] });	2503	$layout->set_foreground (@{ $par->[2] });
		2504	$layout->set_width ($W - $par->[3]);
2302	$layout->set_markup ($par->[2]);	2505	$layout->set_markup ($par->[4]);
2303		2506
2304	my ($W, $H) = $layout->size;	2507	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2305	CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);	2508
		2509	glRasterPos $par->[3], $y - $y0;
		2510	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2306	}	2511	}
2307		2512
2308	$y += $h;	2513	$y += $h;
2309	}	2514	}
2310		2515
2311	glDisable GL_TEXTURE_2D;	2516	glDisable GL_BLEND;
2312	};	2517	};
2313	});	2518	});
2314	}	2519	}
2315		2520
2316	sub _draw {	2521	sub _draw {
2317	my ($self) = @_;	2522	my ($self) = @_;
2318		2523
2319	glEnable GL_TEXTURE_2D;	2524	glEnable GL_TEXTURE_2D;
2320	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2525	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2321	glColor 1, 1, 1, 1;	2526	glColor 1, 1, 1, 1;
2322	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2527	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2323	glDisable GL_TEXTURE_2D;	2528	glDisable GL_TEXTURE_2D;
2324		2529
2325	$self->{children}[1]->draw;	2530	$self->{children}[1]->draw;
2326		2531
2327	}	2532	}
…		…
2376		2581
2377	sub new {	2582	sub new {
2378	my $class = shift;	2583	my $class = shift;
2379		2584
2380	my $self = $class->SUPER::new (	2585	my $self = $class->SUPER::new (
2381	state => 0,	2586	state => 0,
2382	connect_activate => \&toggle_flopper,	2587	on_activate => \&toggle_flopper,
2383	@_	2588	@_
2384	);	2589	);
2385		2590
2386	if ($self->{state}) {
2387	$self->{state} = 0;
2388	$self->toggle_flopper;
2389	}
2390
2391	$self	2591	$self
2392	}	2592	}
2393		2593
2394	sub toggle_flopper {	2594	sub toggle_flopper {
2395	my ($self) = @_;	2595	my ($self) = @_;
2396		2596
2397	# TODO: use animation	2597	$self->{other}->toggle_visibility;
2398	if ($self->{state} = !$self->{state}) {
2399	$CFClient::UI::ROOT->add ($self->{other});
2400	$self->{other}->move ($self->coord2global (0, $self->{h}));
2401	$self->emit ("open");
2402	} else {
2403	$CFClient::UI::ROOT->remove ($self->{other});
2404	$self->emit ("close");
2405	}
2406
2407	$self->emit (changed => $self->{state});
2408	}	2598	}
2409		2599
2410	#############################################################################	2600	#############################################################################
2411		2601
2412	package CFClient::UI::Tooltip;	2602	package CFClient::UI::Tooltip;
…		…
2426		2616
2427	sub set_tooltip_from {	2617	sub set_tooltip_from {
2428	my ($self, $widget) = @_;	2618	my ($self, $widget) = @_;
2429		2619
2430	$self->add (new CFClient::UI::Label	2620	$self->add (new CFClient::UI::Label
2431	markup => $widget->{tooltip},	2621	markup => $widget->{tooltip},
2432	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2622	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2433	fontsize => 0.8,	2623	fontsize => 0.8,
2434	fg => [0, 0, 0, 1],	2624	fg => [0, 0, 0, 1],
		2625	ellipsise => 0,
2435	font => ($widget->{tooltip_font} || $::FONT_PROP),	2626	font => ($widget->{tooltip_font} || $::FONT_PROP),
2436	);	2627	);
2437	}	2628	}
2438		2629
2439	sub size_request {	2630	sub size_request {
2440	my ($self) = @_;	2631	my ($self) = @_;
…		…
2443		2634
2444	($w + 4, $h + 4)	2635	($w + 4, $h + 4)
2445	}	2636	}
2446		2637
2447	sub size_allocate {	2638	sub size_allocate {
2448	my ($self, $w, $h) = @_;	2639	my ($self, $w, $h, $changed) = @_;
2449		2640
		2641	return unless $changed;
		2642
2450	$self->SUPER::size_allocate ($w - 4, $h - 4);	2643	$self->SUPER::size_allocate ($w - 4, $h - 4, $changed);
2451	}	2644	}
2452		2645
2453	sub _draw {	2646	sub _draw {
2454	my ($self) = @_;	2647	my ($self) = @_;
2455		2648
…		…
2472	glVertex $w, $h;	2665	glVertex $w, $h;
2473	glVertex $w, 0;	2666	glVertex $w, 0;
2474	glEnd;	2667	glEnd;
2475		2668
2476	glTranslate 2 - 0.375, 2 - 0.375;	2669	glTranslate 2 - 0.375, 2 - 0.375;
		2670
2477	$self->SUPER::_draw;	2671	$self->SUPER::_draw;
2478	}	2672	}
2479		2673
2480	#############################################################################	2674	#############################################################################
2481		2675
…		…
2486	use CFClient::OpenGL;	2680	use CFClient::OpenGL;
2487		2681
2488	sub new {	2682	sub new {
2489	my $class = shift;	2683	my $class = shift;
2490		2684
2491	$class->SUPER::new (	2685	my $self = $class->SUPER::new (
2492	aspect => 1,	2686	aspect => 1,
		2687	can_events => 0,
2493	@_,	2688	@_,
2494	)	2689	);
		2690
		2691	if ($self->{anim} && $self->{animspeed}) {
		2692	Scalar::Util::weaken (my $widget = $self);
		2693
		2694	$self->{timer} = Event->timer (
		2695	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
		2696	hard => 1,
		2697	interval => $self->{animspeed},
		2698	cb => sub {
		2699	++$widget->{frame};
		2700	$widget->update;
		2701	},
		2702	);
		2703	}
		2704
		2705	$self
2495	}	2706	}
2496		2707
2497	sub size_request {	2708	sub size_request {
2498	(32, 8)	2709	(32, 8)
2499	}	2710	}
2500		2711
		2712	sub update {
		2713	my ($self) = @_;
		2714
		2715	return unless $self->{visible};
		2716
		2717	$self->SUPER::update;
		2718	}
		2719
2501	sub _draw {	2720	sub _draw {
2502	my ($self) = @_;	2721	my ($self) = @_;
2503		2722
2504	return unless $::CONN;#d# manage and cache textures differently	2723	return unless $::CONN;
		2724
		2725	my $face;
		2726
		2727	if ($self->{frame}) {
		2728	my $anim = $::CONN->{anim}[$self->{anim}];
		2729
		2730	$face = $anim->[ $self->{frame} % @$anim ]
		2731	if $anim && @$anim;
		2732	}
		2733
2505	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	2734	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2506		2735
2507	# TODO animation
2508	if ($tex) {	2736	if ($tex) {
2509	glEnable GL_TEXTURE_2D;	2737	glEnable GL_TEXTURE_2D;
2510	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2738	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2511	glColor 1, 1, 1, 1;	2739	glColor 1, 1, 1, 1;
2512	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2740	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2513	glDisable GL_TEXTURE_2D;	2741	glDisable GL_TEXTURE_2D;
2514	}	2742	}
2515	}	2743	}
2516		2744
2517	#############################################################################	2745	sub DESTROY {
		2746	my ($self) = @_;
2518		2747
		2748	$self->{timer}->cancel
		2749	if $self->{timer};
		2750
		2751	$self->SUPER::DESTROY;
		2752	}
		2753
		2754	#############################################################################
		2755
2519	package CFClient::UI::InventoryItem;	2756	package CFClient::UI::Inventory;
2520		2757
2521	our @ISA = CFClient::UI::HBox::;	2758	our @ISA = CFClient::UI::ScrolledWindow::;
2522		2759
2523	sub new {	2760	sub new {
2524	my $class = shift;	2761	my $class = shift;
2525		2762
2526	my %args = @_;
2527
2528	my $item = delete $args{item};
2529
2530	my $desc = $item->{nrof} < 2
2531	? $item->{name}
2532	: "$item->{nrof} $item->{name_pl}";
2533
2534	$item->{flags} & Crossfire::Protocol::F_OPEN
2535	and $desc .= " (open)";
2536	$item->{flags} & Crossfire::Protocol::F_APPLIED
2537	and $desc .= " (applied)";
2538	$item->{flags} & Crossfire::Protocol::F_UNPAID
2539	and $desc .= " (unpaid)";
2540	$item->{flags} & Crossfire::Protocol::F_MAGIC
2541	and $desc .= " (magic)";
2542	$item->{flags} & Crossfire::Protocol::F_CURSED
2543	and $desc .= " (cursed)";
2544	$item->{flags} & Crossfire::Protocol::F_DAMNED
2545	and $desc .= " (damned)";
2546	$item->{flags} & Crossfire::Protocol::F_LOCKED
2547	and $desc .= " *";
2548
2549	my $self = $class->SUPER::new (	2763	my $self = $class->SUPER::new (
2550	can_hover => 1,	2764	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2551	can_events => 1,
2552	tooltip => ((CFClient::UI::Label::escape $desc)
2553	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2554	connect_button_down => sub {
2555	my ($self, $ev, $x, $y) = @_;
2556
2557	# todo: maybe put examine on 1? but should just be a tooltip :(
2558	if ($ev->{button} == 1) {
2559	my $targ = $::CONN->{player}{tag};
2560
2561	if ($item->{container} == $::CONN->{player}{tag}) {
2562	$targ = $main::OPENCONT;
2563	}
2564
2565	$::CONN->send ("move $targ $item->{tag} 0");
2566	} elsif ($ev->{button} == 2) {
2567	$::CONN->send ("apply $item->{tag}");
2568	} elsif ($ev->{button} == 3) {
2569	my @menu_items = (
2570	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2571	["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2572	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2573	["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2574	[
2575	$item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2576	sub { $::CONN->send ("lock $item->{tag}") },
2577	],
2578	);
2579
2580	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2581	}
2582
2583	1
2584	},
2585	%args
2586	);
2587
2588	$self->add (new CFClient::UI::Face
2589	can_events => 0,
2590	face => $item->{face},
2591	anim => $item->{anim},
2592	animspeed => $item->{animspeed},
2593	);
2594
2595	$self->add (new CFClient::UI::Label
2596	can_events => 0,
2597	text => $desc,
2598	);
2599
2600	$self
2601	}
2602
2603	#############################################################################
2604
2605	package CFClient::UI::Inventory;
2606
2607	our @ISA = CFClient::UI::ScrolledWindow::;
2608
2609	sub new {
2610	my $class = shift;
2611
2612	my $self = $class->SUPER::new (
2613	scrolled => (new CFClient::UI::VBox),
2614	@_,	2765	@_,
2615	);	2766	);
2616		2767
2617	$self	2768	$self
2618	}	2769	}
…		…
2628	or ($a->{name} cmp $b->{name})	2779	or ($a->{name} cmp $b->{name})
2629	} @$items;	2780	} @$items;
2630		2781
2631	$self->{real_items} = \@items;	2782	$self->{real_items} = \@items;
2632		2783
		2784	my $row = 0;
2633	for my $item (@items) {	2785	for my $item (@items) {
2634	my $desc = $item->{nrof} < 2	2786	CFClient::Item::update_widgets $item;
2635	? $item->{name}
2636	: "$item->{nrof} $item->{name_pl}";
2637		2787
2638	$item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;	2788	$self->{scrolled}->add (0, $row, $item->{face_widget});
2639	}	2789	$self->{scrolled}->add (1, $row, $item->{desc_widget});
		2790	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2640		2791
2641	$self->{scrolled}->add (@items);	2792	$row++;
2642		2793	}
2643	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2644	}
2645
2646	sub size_request {
2647	my ($self) = @_;
2648	($self->{req_w}, $self->{req_h});
2649	}	2794	}
2650		2795
2651	#############################################################################	2796	#############################################################################
2652		2797
2653	package CFClient::UI::Menu;	2798	package CFClient::UI::Menu;
…		…
2688		2833
2689	# popup given the event (must be a mouse button down event currently)	2834	# popup given the event (must be a mouse button down event currently)
2690	sub popup {	2835	sub popup {
2691	my ($self, $ev) = @_;	2836	my ($self, $ev) = @_;
2692		2837
2693	$self->emit ("popdown");	2838	$self->_emit ("popdown");
2694		2839
2695	# maybe save $GRAB? must be careful about events...	2840	# maybe save $GRAB? must be careful about events...
2696	$GRAB = $self;	2841	$GRAB = $self;
2697	$self->{button} = $ev->{button};	2842	$self->{button} = $ev->{button};
2698		2843
…		…
2713		2858
2714	if ($ev->{button} == $self->{button}) {	2859	if ($ev->{button} == $self->{button}) {
2715	undef $GRAB;	2860	undef $GRAB;
2716	$self->hide;	2861	$self->hide;
2717		2862
2718	$self->emit ("popdown");	2863	$self->_emit ("popdown");
2719	$self->{hover}[1]->() if $self->{hover};	2864	$self->{hover}[1]->() if $self->{hover};
2720	}	2865	}
2721	}	2866	}
2722		2867
2723	#############################################################################	2868	#############################################################################
…		…
2758	# TODO: doesn't handle markup well (read as: at all)	2903	# TODO: doesn't handle markup well (read as: at all)
2759	my $short = $item->{count} > 1	2904	my $short = $item->{count} > 1
2760	? "<b>$item->{count} ×</b> $item->{text}"	2905	? "<b>$item->{count} ×</b> $item->{text}"
2761	: $item->{text};	2906	: $item->{text};
2762		2907
2763	my $fontsize = $item->{fontsize} || $self->{fontsize};
2764
2765	for ($short) {	2908	for ($short) {
2766	s/^\s+//;	2909	s/^\s+//;
2767	s/\s+/ /g;	2910	s/\s+/ /g;
2768	my $len = int 40 / $fontsize;
2769	substr $_, $len, length, "…" if $len < length;
2770	}	2911	}
2771		2912
2772	new CFClient::UI::Label	2913	new CFClient::UI::Label
2773	markup => $short,	2914	markup => $short,
2774	tooltip => $item->{tooltip},	2915	tooltip => $item->{tooltip},
2775	tooltip_font => $::FONT_PROP,	2916	tooltip_font => $::FONT_PROP,
2776	tooltip_width => 0.67,	2917	tooltip_width => 0.67,
2777	fontsize => $fontsize,	2918	fontsize => $item->{fontsize} || $self->{fontsize},
		2919	max_w => $::WIDTH * 0.44,
2778	fg => $item->{fg},	2920	fg => $item->{fg},
2779	can_events => 1,	2921	can_events => 1,
2780	can_hover => 1	2922	can_hover => 1
2781	};	2923	};
2782	}	2924	}
…		…
2788	sub add {	2930	sub add {
2789	my ($self, $text, %arg) = @_;	2931	my ($self, $text, %arg) = @_;
2790		2932
2791	$text =~ s/^\s+//;	2933	$text =~ s/^\s+//;
2792	$text =~ s/\s+$//;	2934	$text =~ s/\s+$//;
		2935
		2936	return unless $text;
2793		2937
2794	my $timeout = time + ((delete $arg{timeout}) || 60);	2938	my $timeout = time + ((delete $arg{timeout}) || 60);
2795		2939
2796	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	2940	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2797		2941
…		…
2819	}	2963	}
2820		2964
2821	$self->reorder;	2965	$self->reorder;
2822	}	2966	}
2823		2967
		2968	sub reconfigure {
		2969	my ($self) = @_;
		2970
		2971	delete $_->{label}
		2972	for values %{ $self->{item} || {} };
		2973
		2974	$self->reorder;
		2975	$self->SUPER::reconfigure;
		2976	}
		2977
2824	#############################################################################	2978	#############################################################################
2825		2979
2826	package CFClient::UI::Root;	2980	package CFClient::UI::Root;
2827		2981
2828	our @ISA = CFClient::UI::Container::;	2982	our @ISA = CFClient::UI::Container::;
…		…
2830	use CFClient::OpenGL;	2984	use CFClient::OpenGL;
2831		2985
2832	sub new {	2986	sub new {
2833	my $class = shift;	2987	my $class = shift;
2834		2988
2835	$class->SUPER::new (	2989	my $self = $class->SUPER::new (
		2990	visible => 1,
2836	@_,	2991	@_,
2837	)	2992	);
		2993
		2994	Scalar::Util::weaken ($self->{root} = $self);
		2995
		2996	$self
2838	}	2997	}
2839		2998
2840	sub configure {	2999	sub configure {
2841	my ($self, $x, $y, $w, $h) = @_;	3000	my ($self, $x, $y, $w, $h) = @_;
2842		3001
2843	$self->{w} = $w;	3002	$self->{w} = $w;
2844	$self->{h} = $h;	3003	$self->{h} = $h;
2845	}	3004	}
2846		3005
2847	sub check_size {	3006	sub reconfigure {
2848	my ($self) = @_;	3007	my ($self) = @_;
2849		3008
		3009	$self->SUPER::reconfigure;
		3010
2850	$self->size_allocate ($self->{w}, $self->{h})	3011	$self->size_allocate ($self->{w}, $self->{h}, 1)
2851	if $self->{w};	3012	if $self->{w};
2852	}	3013	}
2853		3014
2854	sub size_request {	3015	sub size_request {
2855	my ($self) = @_;	3016	my ($self) = @_;
2856		3017
2857	($self->{w}, $self->{h})	3018	($self->{w}, $self->{h})
2858	}	3019	}
2859		3020
2860	sub size_allocate {	3021	sub size_allocate {
2861	my ($self, $w, $h) = @_;	3022	my ($self, $w, $h, $changed) = @_;
2862
2863	my $old_w = $self->{old_w}; $self->{old_w} = $w;
2864	my $old_h = $self->{old_h}; $self->{old_h} = $h;
2865
2866	CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2867	if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2868		3023
2869	for my $child ($self->children) {	3024	for my $child ($self->children) {
2870	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3025	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2871		3026
2872	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3027	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2873	if exists $child->{req_x};	3028	if exists $child->{req_x};
2874		3029
2875	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3030	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
2876	if exists $child->{req_y};	3031	if exists $child->{req_y};
2877		3032
		3033	#delete @$child{qw(req_x req_y)};#d# def_x, def_y
		3034
2878	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;	3035	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2879	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;	3036	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2880		3037
2881	$child->configure ($X, $Y, $W, $H);	3038	$child->configure ($X, $Y, $W, $H);
2882	}	3039	}
…		…
2895	}	3052	}
2896		3053
2897	sub update {	3054	sub update {
2898	my ($self) = @_;	3055	my ($self) = @_;
2899		3056
2900	$self->check_size;
2901	$::WANT_REFRESH++;	3057	$::WANT_REFRESH++;
2902	}	3058	}
2903		3059
2904	sub add {	3060	sub add {
2905	my ($self, @children) = @_;	3061	my ($self, @children) = @_;
2906		3062
2907	for my $child (@children) {	3063	for my $child (@children) {
2908	$child->{toplevel} = 1;	3064	$child->{is_toplevel} = 1;
2909		3065
2910	# integerise window positions	3066	# integerise window positions
2911	$child->{x} = int $child->{x};	3067	$child->{x} = int $child->{x};
2912	$child->{y} = int $child->{y};	3068	$child->{y} = int $child->{y};
2913	}	3069	}
2914		3070
2915	$self->SUPER::add (@children);	3071	$self->SUPER::add (@children);
2916	}	3072	}
2917		3073
		3074	sub remove {
		3075	my ($self, @children) = @_;
		3076
		3077	$self->SUPER::remove (@children);
		3078
		3079	while (@children) {
		3080	my $w = pop @children;
		3081	push @children, $w->children;
		3082	$w->set_invisible;
		3083	}
		3084	}
		3085
2918	sub on_refresh {	3086	sub on_refresh {
2919	my ($self, $id, $cb) = @_;	3087	my ($self, $id, $cb) = @_;
2920		3088
2921	$self->{refresh_hook}{$id} = $cb;	3089	$self->{refresh_hook}{$id} = $cb;
2922	}	3090	}
…		…
2933	while ($self->{refresh_hook}) {	3101	while ($self->{refresh_hook}) {
2934	$_->()	3102	$_->()
2935	for values %{delete $self->{refresh_hook}};	3103	for values %{delete $self->{refresh_hook}};
2936	}	3104	}
2937		3105
2938	if ($self->{check_size}) {	3106	if ($self->{realloc}) {
2939	my @queue = ([], []);	3107	my @queue;
2940		3108
2941	for (;;) {	3109	while () {
2942	if ($self->{check_size}) {	3110	if ($self->{realloc}) {
2943	# heuristic: check containers last	3111	#TODO use array-of-depth approach
2944	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_	3112
2945	for values %{delete $self->{check_size}}	3113	@queue = sort { $a->{visible} <=> $b->{visible} }
		3114	@queue, values %{delete $self->{realloc}};
2946	}	3115	}
2947		3116
2948	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;	3117	my $widget = pop @queue || last;
2949		3118
		3119	$widget->{visible} or last; # do not resize invisible widgets
		3120
2950	my ($w, $h) = $widget->{user_w} && $widget->{user_h}	3121	my ($w, $h) = $widget->{def_w} && $widget->{def_h}
2951	? @$widget{qw(user_w user_h)}	3122	? @$widget{qw(def_w def_h)}
2952	: $widget->size_request;	3123	: $widget->size_request;
2953		3124
2954	if (delete $widget->{force_alloc}
2955	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2956	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#	3125	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2957		3126
2958	$widget->{req_w} = $w;	3127	$widget->{req_w} = $w;
2959	$widget->{req_h} = $h;	3128	$widget->{req_h} = $h;
2960		3129
2961	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];	3130	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
2962		3131
2963	$widget->{parent}->check_size	3132	push @queue, $widget->{parent}
2964	if $widget->{parent};	3133	if $widget->{parent};
2965	}
2966	}	3134	}
2967	}	3135	}
2968		3136
2969	while ($self->{size_alloc}) {	3137	while (my $size_alloc = delete $self->{size_alloc}) {
2970	for (values %{delete $self->{size_alloc}}) {	3138	my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
2971	my ($widget, $w, $h) = @$_;	3139	values %$size_alloc;
		3140
		3141	while () {
		3142	my ($widget, $w, $h) = @{ pop @queue or last };
2972		3143
2973	$w = 0 if $w < 0;	3144	$w = 0 if $w < 0;
2974	$h = 0 if $h < 0;	3145	$h = 0 if $h < 0;
2975		3146
		3147	my $changed = $widget->{w} != $w || $widget->{h} != $h;
		3148
2976	$widget->{w} = $w;	3149	$widget->{w} = $w;
2977	$widget->{h} = $h;	3150	$widget->{h} = $h;
2978	$widget->size_allocate ($w, $h);	3151
2979	$widget->emit (size_allocate => $w, $h);	3152	$widget->emit (size_allocate => $w, $h, $changed);
2980	}	3153	}
2981	}	3154	}
2982		3155
2983	while ($self->{post_alloc_hook}) {	3156	while ($self->{post_alloc_hook}) {
2984	$_->()	3157	$_->()
…		…
2989	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3162	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2990	glClear GL_COLOR_BUFFER_BIT;	3163	glClear GL_COLOR_BUFFER_BIT;
2991		3164
2992	glMatrixMode GL_PROJECTION;	3165	glMatrixMode GL_PROJECTION;
2993	glLoadIdentity;	3166	glLoadIdentity;
2994	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;	3167	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2995	glMatrixMode GL_MODELVIEW;	3168	glMatrixMode GL_MODELVIEW;
2996	glLoadIdentity;	3169	glLoadIdentity;
2997		3170
2998	$self->_draw;	3171	$self->_draw;
2999	}	3172	}
…		…
3001	#############################################################################	3174	#############################################################################
3002		3175
3003	package CFClient::UI;	3176	package CFClient::UI;
3004		3177
3005	$ROOT = new CFClient::UI::Root;	3178	$ROOT = new CFClient::UI::Root;
3006	$TOOLTIP = new CFClient::UI::Tooltip;	3179	$TOOLTIP = new CFClient::UI::Tooltip z => 900;
3007		3180
3008	1	3181	1
3009		3182

Diff Legend

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