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.250 by root, Sun May 28 02:31:03 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
166	}	224	}
167		225
168	sub destroy {	226	sub destroy {
169	my ($self) = @_;	227	my ($self) = @_;
…		…
178	return if $self->{parent};	236	return if $self->{parent};
179		237
180	$CFClient::UI::ROOT->add ($self);	238	$CFClient::UI::ROOT->add ($self);
181	}	239	}
182		240
183	sub hide {	241	sub center {
184	my ($self) = @_;	242	my ($self) = @_;
		243
		244	$CFClient::UI::ROOT->on_post_alloc (
		245	"center_$self" => sub {
		246	$self->move (($self->{parent}{w} - $self->{w}) * 0.5, ($self->{parent}{h} - $self->{h}) * 0.5);
		247	},
		248	);
		249
		250	$self->update;
		251	}
		252
		253	sub set_visible {
		254	my ($self) = @_;
		255
		256	return if $self->{visible};
		257
		258	$self->{root} = $self->{parent}{root};
		259	$self->{visible} = $self->{parent}{visible} + 1;
		260
		261	$self->emit (visibility_change => 1);
		262	}
		263
		264	sub set_invisible {
		265	my ($self) = @_;
		266
		267	return unless $self->{visible};
		268
		269	# broken show/hide model
		270
		271	delete $self->{root};
		272	delete $self->{visible};
185		273
186	undef $GRAB if $GRAB == $self;	274	undef $GRAB if $GRAB == $self;
187	undef $HOVER if $HOVER == $self;	275	undef $HOVER if $HOVER == $self;
		276
		277	CFClient::UI::check_tooltip
		278	if $CFClient::UI::TOOLTIP->{owner} == $self;
		279
		280	$self->focus_out;
		281
		282	$self->emit (visibility_change => 0);
		283	}
		284
		285	sub set_visibility {
		286	my ($self, $visible) = @_;
		287
		288	return if $self->{visible} == $visible;
		289
		290	$visible ? $self->hide
		291	: $self->show;
		292	}
		293
		294	sub toggle_visibility {
		295	my ($self) = @_;
		296
		297	$self->{visible}
		298	? $self->hide
		299	: $self->show;
		300	}
		301
		302	sub hide {
		303	my ($self) = @_;
		304
		305	$self->set_invisible;
188		306
189	$self->{parent}->remove ($self)	307	$self->{parent}->remove ($self)
190	if $self->{parent};	308	if $self->{parent};
191	}	309	}
192		310
…		…
201	}	319	}
202		320
203	sub set_size {	321	sub set_size {
204	my ($self, $w, $h) = @_;	322	my ($self, $w, $h) = @_;
205		323
206	$self->{user_w} = $w;	324	$self->{def_w} = $w;
207	$self->{user_h} = $h;	325	$self->{def_h} = $h;
208		326
209	$self->check_size;	327	$self->check_size;
210	}	328	}
211		329
212	sub size_request {	330	sub size_request {
…		…
234	$self->{y} = $y;	352	$self->{y} = $y;
235	$self->update;	353	$self->update;
236	}	354	}
237		355
238	if ($self->{w} != $w || $self->{h} != $h) {	356	if ($self->{w} != $w || $self->{h} != $h) {
239	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];	357	$CFClient::UI::ROOT->{size_alloc}{$self+0} = [$self, $w, $h];
240	}	358	}
241	}	359	}
242		360
243	sub size_allocate {	361	sub size_allocate {
244	# nothing to be done	362	# nothing to be done
245	}	363	}
246		364
		365	sub reconfigure {
		366	my ($self) = @_;
		367
		368	$self->check_size (1);
		369	$self->update;
		370	}
		371
247	sub children {	372	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	}	373	}
261		374
262	sub set_max_size {	375	sub set_max_size {
263	my ($self, $w, $h) = @_;	376	my ($self, $w, $h) = @_;
264		377
265	delete $self->{max_w}; $self->{max_w} = $w if $w;	378	delete $self->{max_w}; $self->{max_w} = $w if $w;
266	delete $self->{max_h}; $self->{max_h} = $h if $h;	379	delete $self->{max_h}; $self->{max_h} = $h if $h;
		380	}
		381
		382	sub set_tooltip {
		383	my ($self, $tooltip) = @_;
		384
		385	$tooltip =~ s/^\s+//;
		386	$tooltip =~ s/\s+$//;
		387
		388	return if $self->{tooltip} eq $tooltip;
		389
		390	$self->{tooltip} = $tooltip;
		391
		392	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
		393	delete $CFClient::UI::TOOLTIP->{owner};
		394	CFClient::UI::check_tooltip;
		395	}
267	}	396	}
268		397
269	# translate global coordinates to local coordinate system	398	# translate global coordinates to local coordinate system
270	sub coord2local {	399	sub coord2local {
271	my ($self, $x, $y) = @_;	400	my ($self, $x, $y) = @_;
…		…
286	return if $FOCUS == $self;	415	return if $FOCUS == $self;
287	return unless $self->{can_focus};	416	return unless $self->{can_focus};
288		417
289	my $focus = $FOCUS; $FOCUS = $self;	418	my $focus = $FOCUS; $FOCUS = $self;
290		419
291	$self->emit (focus_in => $focus);	420	$self->_emit (focus_in => $focus);
292		421
293	$focus->update if $focus;	422	$focus->update if $focus;
294	$FOCUS->update;	423	$FOCUS->update;
295	}	424	}
296		425
…		…
299		428
300	return unless $FOCUS == $self;	429	return unless $FOCUS == $self;
301		430
302	my $focus = $FOCUS; undef $FOCUS;	431	my $focus = $FOCUS; undef $FOCUS;
303		432
304	$self->emit (focus_out => $focus);	433	$self->_emit (focus_out => $focus);
305		434
306	$focus->update if $focus; #?	435	$focus->update if $focus; #?
		436
		437	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
		438	unless $FOCUS;
307	}	439	}
308		440
309	sub mouse_motion { }	441	sub mouse_motion { }
310	sub button_up { }	442	sub button_up { }
311	sub key_down { }	443	sub key_down { }
312	sub key_up { }	444	sub key_up { }
313		445
314	sub button_down {	446	sub button_down {
315	my ($self, $ev, $x, $y) = @_;	447	my ($self, $ev, $x, $y) = @_;
316		448
317	$self->focus_in;	449	$self->focus_in;
…		…
351	if ($ENV{PCLIENT_DEBUG}) {	483	if ($ENV{PCLIENT_DEBUG}) {
352	glPushMatrix;	484	glPushMatrix;
353	glColor 1, 1, 0, 1;	485	glColor 1, 1, 0, 1;
354	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	486	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
355	glBegin GL_LINE_LOOP;	487	glBegin GL_LINE_LOOP;
356	glVertex 0 , 0;	488	glVertex 0 , 0;
357	glVertex $self->{w}, 0;	489	glVertex $self->{w} - 1, 0;
358	glVertex $self->{w}, $self->{h};	490	glVertex $self->{w} - 1, $self->{h} - 1;
359	glVertex 0 , $self->{h};	491	glVertex 0 , $self->{h} - 1;
360	glEnd;	492	glEnd;
361	glPopMatrix;	493	glPopMatrix;
362	CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	494	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
363	}	495	}
364	}	496	}
365		497
366	sub _draw {	498	sub _draw {
367	my ($self) = @_;	499	my ($self) = @_;
…		…
384	sub set_parent {	516	sub set_parent {
385	my ($self, $parent) = @_;	517	my ($self, $parent) = @_;
386		518
387	Scalar::Util::weaken ($self->{parent} = $parent);	519	Scalar::Util::weaken ($self->{parent} = $parent);
388		520
		521	$self->set_visible; #TODO why breakssssss borked damn if $parent->{visible};
		522
389	$self->check_size	523	$self->check_size;
390	unless exists $self->{req_w};
391	}	524	}
392		525
393	sub check_size {	526	sub check_size {
394	my ($self, $forced) = @_;	527	my ($self, $forced) = @_;
395		528
…		…
408	my ($self, $signal, $cb) = @_;	541	my ($self, $signal, $cb) = @_;
409		542
410	push @{ $self->{signal_cb}{$signal} }, $cb;	543	push @{ $self->{signal_cb}{$signal} }, $cb;
411	}	544	}
412		545
		546	sub _emit {
		547	my ($self, $signal, @args) = @_;
		548
		549	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
		550	}
		551
413	sub emit {	552	sub emit {
414	my ($self, $signal, @args) = @_;	553	my ($self, $signal, @args) = @_;
415		554
416	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}	555	$self->_emit ($signal, @args)
		556	|| $self->$signal (@args);
		557	}
		558
		559	sub visibility_change {
		560	#my ($self, $visible) = @_;
417	}	561	}
418		562
419	sub DESTROY {	563	sub DESTROY {
420	my ($self) = @_;	564	my ($self) = @_;
421		565
		566	delete $WIDGET{$self+0};
422	#$self->deactivate;	567	#$self->deactivate;
423	}	568	}
424		569
425	#############################################################################	570	#############################################################################
426		571
…		…
435	my $class = shift;	580	my $class = shift;
436		581
437	# range [value, low, high, page]	582	# range [value, low, high, page]
438		583
439	$class->SUPER::new (	584	$class->SUPER::new (
440	bg => [0, 0, 0, 0.2],	585	#bg => [0, 0, 0, 0.2],
441	active_bg => [1, 1, 1, 0.5],	586	#active_bg => [1, 1, 1, 0.5],
442	@_	587	@_
443	)	588	)
444	}	589	}
445		590
446	sub _draw {	591	sub _draw {
447	my ($self) = @_;	592	my ($self) = @_;
448		593
		594	my $color = $FOCUS == $self && $self->{active_bg}
		595	? $self->{active_bg}
		596	: $self->{bg};
		597
		598	if ($color && (@$color < 4 || $color->[3])) {
449	my ($w, $h) = @$self{qw(w h)};	599	my ($w, $h) = @$self{qw(w h)};
450		600
451	glEnable GL_BLEND;	601	glEnable GL_BLEND;
452	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	602	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
453	glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };	603	glColor @$color;
454		604
455	glBegin GL_QUADS;	605	glBegin GL_QUADS;
456	glVertex 0 , 0;	606	glVertex 0 , 0;
457	glVertex 0 , $h;	607	glVertex 0 , $h;
458	glVertex $w, $h;	608	glVertex $w, $h;
459	glVertex $w, 0;	609	glVertex $w, 0;
460	glEnd;	610	glEnd;
461		611
462	glDisable GL_BLEND;	612	glDisable GL_BLEND;
		613	}
463	}	614	}
464		615
465	#############################################################################	616	#############################################################################
466		617
467	package CFClient::UI::Empty;	618	package CFClient::UI::Empty;
…		…
527	delete $child->{parent};	678	delete $child->{parent};
528	$child->hide;	679	$child->hide;
529		680
530	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	681	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
531		682
532	$self->check_size;	683	$self->check_size (1);
533	$self->update;	684	$self->update;
534	}	685	}
535		686
536	sub clear {	687	sub clear {
537	my ($self) = @_;	688	my ($self) = @_;
…		…
628	}	779	}
629		780
630	sub update {	781	sub update {
631	my ($self) = @_;	782	my ($self) = @_;
632		783
633	$ROOT->on_refresh ($self => sub { $self->render_child });	784	$ROOT->on_post_alloc ($self => sub { $self->render_child });
634	$self->SUPER::update;	785	$self->SUPER::update;
635	}	786	}
636		787
637	sub size_allocate {	788	sub size_allocate {
638	my ($self, $w, $h) = @_;	789	my ($self, $w, $h) = @_;
…		…
651	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	802	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
652	glClearColor 0, 0, 0, 0;	803	glClearColor 0, 0, 0, 0;
653	glClear GL_COLOR_BUFFER_BIT;	804	glClear GL_COLOR_BUFFER_BIT;
654		805
655	$self->_render;	806	$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	};	807	};
664	}	808	}
665		809
666	sub _draw {	810	sub _draw {
667	my ($self) = @_;	811	my ($self) = @_;
…		…
671	my $tex = $self->{texture}	815	my $tex = $self->{texture}
672	or return;	816	or return;
673		817
674	glEnable GL_TEXTURE_2D;	818	glEnable GL_TEXTURE_2D;
675	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	819	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
676	glColor 0, 0, 0, 1;	820	glColor 1, 1, 1, 1;
677		821
678	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	822	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
679		823
680	glDisable GL_TEXTURE_2D;	824	glDisable GL_TEXTURE_2D;
681	}	825	}
…		…
684		828
685	package CFClient::UI::ViewPort;	829	package CFClient::UI::ViewPort;
686		830
687	our @ISA = CFClient::UI::Window::;	831	our @ISA = CFClient::UI::Window::;
688		832
		833	sub new {
		834	my $class = shift;
		835
		836	$class->SUPER::new (
		837	scroll_x => 0,
		838	scroll_y => 1,
		839	@_,
		840	)
		841	}
		842
689	sub size_request {	843	sub size_request {
690	my ($self) = @_;	844	my ($self) = @_;
691		845
692	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	846	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		847
695	@$self{qw(child_w child_h)}	848	$w = 10 if $self->{scroll_x};
		849	$h = 10 if $self->{scroll_y};
		850
		851	($w, $h)
696	}	852	}
697		853
698	sub size_allocate {	854	sub size_allocate {
699	my ($self, $w, $h) = @_;	855	my ($self, $w, $h) = @_;
700		856
		857	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
		858	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
		859
		860	$self->child->configure (0, 0, $w, $h);
701	$self->update;	861	$self->update;
702	}	862	}
703		863
704	sub set_offset {	864	sub set_offset {
705	my ($self, $x, $y) = @_;	865	my ($self, $x, $y) = @_;
…		…
756	my $class = shift;	916	my $class = shift;
757		917
758	my $self;	918	my $self;
759		919
760	my $slider = new CFClient::UI::Slider	920	my $slider = new CFClient::UI::Slider
761	vertical => 1,	921	vertical => 1,
762	range => [0, 0, 1, 0.01], # HACK fix	922	range => [0, 0, 1, 0.01], # HACK fix
763	connect_changed => sub {	923	on_changed => sub {
764	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));	924	$self->{vp}->set_offset (0, $_[1]);
765	},	925	},
766	;	926	;
767		927
768	$self = $class->SUPER::new (	928	$self = $class->SUPER::new (
769	vp => (new CFClient::UI::ViewPort),	929	vp => (new CFClient::UI::ViewPort expand => 1),
770	slider => $slider,	930	slider => $slider,
771	@_,	931	@_,
772	);	932	);
773		933
774	$self->{vp}->add ($self->{scrolled});	934	$self->{vp}->add ($self->{scrolled});
…		…
776	$self->add ($self->{slider});	936	$self->add ($self->{slider});
777		937
778	$self	938	$self
779	}	939	}
780		940
		941	sub update {
		942	my ($self) = @_;
		943
		944	$self->SUPER::update;
		945
		946	# todo: overwrite size_allocate of child
		947	my $child = $self->{vp}->child;
		948	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
		949	}
		950
		951	sub size_allocate {
		952	my ($self, $w, $h) = @_;
		953
		954	$self->SUPER::size_allocate ($w, $h);
		955
		956	my $child = $self->{vp}->child;
		957	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
		958	}
		959
781	#TODO# update range on size_allocate depeneing on child	960	#TODO# update range on size_allocate depending on child
782	# update viewport offset on scroll	961	# update viewport offset on scroll
783		962
784	#############################################################################	963	#############################################################################
785		964
786	package CFClient::UI::Frame;	965	package CFClient::UI::Frame;
787		966
788	our @ISA = CFClient::UI::Bin::;	967	our @ISA = CFClient::UI::Bin::;
789		968
790	use CFClient::OpenGL;	969	use CFClient::OpenGL;
		970
		971	sub new {
		972	my $class = shift;
		973
		974	$class->SUPER::new (
		975	bg => undef,
		976	@_,
		977	)
		978	}
		979
		980	sub _draw {
		981	my ($self) = @_;
		982
		983	if ($self->{bg}) {
		984	my ($w, $h) = @$self{qw(w h)};
		985
		986	glEnable GL_BLEND;
		987	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		988	glColor @{ $self->{bg} };
		989
		990	glBegin GL_QUADS;
		991	glVertex 0 , 0;
		992	glVertex 0 , $h;
		993	glVertex $w, $h;
		994	glVertex $w, 0;
		995	glEnd;
		996
		997	glDisable GL_BLEND;
		998	}
		999
		1000	$self->SUPER::_draw;
		1001	}
791		1002
792	#############################################################################	1003	#############################################################################
793		1004
794	package CFClient::UI::FancyFrame;	1005	package CFClient::UI::FancyFrame;
795		1006
…		…
802	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1013	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
803		1014
804	sub new {	1015	sub new {
805	my $class = shift;	1016	my $class = shift;
806		1017
807	# TODO: user_x, user_y, overwrite moveto?
808
809	my $self = $class->SUPER::new (	1018	my $self = $class->SUPER::new (
810	bg => [1, 1, 1, 1],	1019	bg => [1, 1, 1, 1],
811	border_bg => [1, 1, 1, 1],	1020	border_bg => [1, 1, 1, 1],
812	border => 0.6,	1021	border => 0.6,
		1022	is_toplevel => 1,
813	can_events => 1,	1023	can_events => 1,
814	@_	1024	@_
815	);	1025	);
816		1026
817	$self->{title} &&= new CFClient::UI::Label	1027	$self->{title} &&= new CFClient::UI::Label
818	align => 0,	1028	align => 0,
…		…
842	my ($self, $w, $h) = @_;	1052	my ($self, $w, $h) = @_;
843		1053
844	$h -= List::Util::max 0, $self->border * 2;	1054	$h -= List::Util::max 0, $self->border * 2;
845	$w -= List::Util::max 0, $self->border * 2;	1055	$w -= List::Util::max 0, $self->border * 2;
846		1056
847	$self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)	1057	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
848	if $self->{title};	1058	if $self->{title};
849		1059
850	$self->child->configure ($self->border, $self->border, $w, $h);	1060	$self->child->configure ($self->border, $self->border, $w, $h);
851	}	1061	}
852		1062
…		…
871	my ($ev, $x, $y) = @_;	1081	my ($ev, $x, $y) = @_;
872		1082
873	my $dx = $ev->{x} - $ox;	1083	my $dx = $ev->{x} - $ox;
874	my $dy = $ev->{y} - $oy;	1084	my $dy = $ev->{y} - $oy;
875		1085
		1086	$self->{user_x} = $wx + $dx * $mx;
		1087	$self->{user_y} = $wy + $dy * $my;
876	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1088	$self->{def_w} = $bw + $dx * ($mx ? -1 : 1);
877	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1089	$self->{def_h} = $bh + $dy * ($my ? -1 : 1);
878	$self->move ($wx + $dx * $mx, $wy + $dy * $my);	1090	$self->move ($self->{user_x}, $self->{user_y});
879	$self->check_size;	1091	$self->check_size;
880	};	1092	};
881		1093
882	} elsif ($lr ^ $td) {	1094	} elsif ($lr ^ $td) {
883	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1095	my ($ox, $oy) = ($ev->{x}, $ev->{y});
…		…
886	$self->{motion} = sub {	1098	$self->{motion} = sub {
887	my ($ev, $x, $y) = @_;	1099	my ($ev, $x, $y) = @_;
888		1100
889	($x, $y) = ($ev->{x}, $ev->{y});	1101	($x, $y) = ($ev->{x}, $ev->{y});
890		1102
891	$self->move ($bx + $x - $ox, $by + $y - $oy);	1103	$self->{user_x} = $bx + $x - $ox;
		1104	$self->{user_y} = $by + $y - $oy;
		1105
		1106	$self->move ($self->{user_x}, $self->{user_y});
892	$self->update;	1107	$self->update;
893	};	1108	};
894	}	1109	}
895	}	1110	}
896		1111
…		…
958	sub new {	1173	sub new {
959	my $class = shift;	1174	my $class = shift;
960		1175
961	$class->SUPER::new (	1176	$class->SUPER::new (
962	col_expand => [],	1177	col_expand => [],
963	@_	1178	@_,
964	)	1179	)
		1180	}
		1181
		1182	sub children {
		1183	grep $_, map @$_, grep $_, @{ $_[0]{children} }
965	}	1184	}
966		1185
967	sub add {	1186	sub add {
968	my ($self, $x, $y, $child) = @_;	1187	my ($self, $x, $y, $child) = @_;
969		1188
970	$child->set_parent ($self);	1189	$child->set_parent ($self);
971	$self->{children}[$y][$x] = $child;	1190	$self->{children}[$y][$x] = $child;
972		1191
973	$child->check_size;	1192	$self->check_size (1);
974	}	1193	}
975		1194
976	sub children {
977	grep $_, map @$_, grep $_, @{ $_[0]{children} }
978	}
979
980	# TODO: move to container class maybe? send childs a signal on removal?	1195	# TODO: move to container class maybe? send children a signal on removal?
981	sub clear {	1196	sub clear {
982	my ($self) = @_;	1197	my ($self) = @_;
983		1198
984	my @children = $self->children;	1199	my @children = $self->children;
985	delete $self->{children};	1200	delete $self->{children};
…		…
987	for (@children) {	1202	for (@children) {
988	delete $_->{parent};	1203	delete $_->{parent};
989	$_->hide;	1204	$_->hide;
990	}	1205	}
991		1206
		1207	$self->check_size (1);
992	$self->update;	1208	$self->update;
993	}	1209	}
994		1210
995	sub get_wh {	1211	sub get_wh {
996	my ($self) = @_;	1212	my ($self) = @_;
…		…
1028	sub size_allocate {	1244	sub size_allocate {
1029	my ($self, $w, $h) = @_;	1245	my ($self, $w, $h) = @_;
1030		1246
1031	my ($ws, $hs) = $self->get_wh;	1247	my ($ws, $hs) = $self->get_wh;
1032		1248
1033	my $req_w = sum @$ws;	1249	my $req_w = (sum @$ws) || 1;
1034	my $req_h = sum @$hs;	1250	my $req_h = (sum @$hs) || 1;
1035		1251
1036	# TODO: nicer code && do row_expand	1252	# TODO: nicer code && do row_expand
1037	my @col_expand = @{$self->{col_expand}};	1253	my @col_expand = @{$self->{col_expand}};
1038	@col_expand = (1) x @$ws unless @col_expand;	1254	@col_expand = (1) x @$ws unless @col_expand;
1039	my $col_expand = (sum @col_expand) || 1;	1255	my $col_expand = (sum @col_expand) || 1;
…		…
1093	}	1309	}
1094	}	1310	}
1095		1311
1096	#############################################################################	1312	#############################################################################
1097		1313
1098	package CFClient::UI::HBox;	1314	package CFClient::UI::Box;
1099
1100	# TODO: wrap into common Box base class
1101		1315
1102	our @ISA = CFClient::UI::Container::;	1316	our @ISA = CFClient::UI::Container::;
1103		1317
1104	sub size_request {	1318	sub size_request {
1105	my ($self) = @_;	1319	my ($self) = @_;
1106		1320
1107	my @alloc = map [$_->size_request], @{$self->{children}};	1321	$self->{vertical}
1108		1322	? (
1109	(	1323	(List::Util::max map $_->{req_w}, @{$self->{children}}),
1110	(List::Util::sum map $_->[0], @alloc),	1324	(List::Util::sum map $_->{req_h}, @{$self->{children}}),
1111	(List::Util::max map $_->[1], @alloc),	1325	)
1112	)	1326	: (
		1327	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
		1328	(List::Util::max map $_->{req_h}, @{$self->{children}}),
		1329	)
1113	}	1330	}
1114		1331
1115	sub size_allocate {	1332	sub size_allocate {
1116	my ($self, $w, $h) = @_;	1333	my ($self, $w, $h) = @_;
1117		1334
1118	($h, $w) = ($w, $h);	1335	my $space = $self->{vertical} ? $h : $w;
1119
1120	my $children = $self->{children};	1336	my $children = $self->{children};
1121		1337
1122	my @h = map $_->{req_w}, @$children;	1338	my @req;
1123		1339
1124	my $req_h = List::Util::sum @h;	1340	if ($self->{homogeneous}) {
1125		1341	@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 {	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 {
1130	my $exp = List::Util::sum map $_->{expand}, @$children;	1350	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1131	$exp ||= 1;
1132		1351
		1352	$space = ($space - $req) / $expand; # remaining space to give away
		1353
		1354	$req[$_] += $space * $children->[$_]{expand}
1133	for (0 .. $#$children) {	1355	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	}	1356	}
1140	}	1357	}
1141		1358
1142	CFClient::UI::harmonize \@h;	1359	CFClient::UI::harmonize \@req;
1143		1360
1144	my $y = 0;	1361	my $pos = 0;
1145	for (0 .. $#$children) {	1362	for (0 .. $#$children) {
1146	my $child = $children->[$_];
1147	my $h = $h[$_];	1363	my $alloc = $req[$_];
1148	$child->configure ($y, 0, $h, $w);	1364	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1149		1365
1150	$y += $h;	1366	$pos += $alloc;
1151	}	1367	}
1152		1368
1153	1	1369	1
1154	}	1370	}
1155		1371
1156	#############################################################################	1372	#############################################################################
1157		1373
		1374	package CFClient::UI::HBox;
		1375
		1376	our @ISA = CFClient::UI::Box::;
		1377
		1378	sub new {
		1379	my $class = shift;
		1380
		1381	$class->SUPER::new (
		1382	vertical => 0,
		1383	@_,
		1384	)
		1385	}
		1386
		1387	#############################################################################
		1388
1158	package CFClient::UI::VBox;	1389	package CFClient::UI::VBox;
1159		1390
1160	# TODO: wrap into common Box base class
1161
1162	our @ISA = CFClient::UI::Container::;	1391	our @ISA = CFClient::UI::Box::;
1163		1392
1164	sub size_request {	1393	sub new {
1165	my ($self) = @_;	1394	my $class = shift;
1166		1395
1167	my @alloc = map [$_->size_request], @{$self->{children}};	1396	$class->SUPER::new (
1168		1397	vertical => 1,
1169	(	1398	@_,
1170	(List::Util::max map $_->[0], @alloc),
1171	(List::Util::sum map $_->[1], @alloc),
1172	)	1399	)
1173	}	1400	}
1174		1401
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	#############################################################################	1402	#############################################################################
1215		1403
1216	package CFClient::UI::Label;	1404	package CFClient::UI::Label;
1217		1405
1218	our @ISA = CFClient::UI::Base::;	1406	our @ISA = CFClient::UI::DrawBG::;
1219		1407
1220	use CFClient::OpenGL;	1408	use CFClient::OpenGL;
1221		1409
1222	sub new {	1410	sub new {
1223	my ($class, %arg) = @_;	1411	my ($class, %arg) = @_;
1224		1412
1225	my $self = $class->SUPER::new (	1413	my $self = $class->SUPER::new (
1226	fg => [1, 1, 1],	1414	fg => [1, 1, 1],
		1415	#bg => none
		1416	#active_bg => none
1227	#font => default_font	1417	#font => default_font
1228	#text => initial text	1418	#text => initial text
1229	#markup => initial narkup	1419	#markup => initial narkup
		1420	#max_w => maximum pixel width
		1421	ellipsise => 3, # end
1230	layout => (new CFClient::Layout),	1422	layout => (new CFClient::Layout),
1231	fontsize => 1,	1423	fontsize => 1,
1232	align => -1,	1424	align => -1,
1233	valign => -1,	1425	valign => -1,
1234	padding => 2,	1426	padding => 2,
…		…
1249	}	1441	}
1250		1442
1251	$self	1443	$self
1252	}	1444	}
1253		1445
1254	sub escape {	1446	sub escape($) {
1255	local $_ = $_[1];	1447	local $_ = $_[0];
1256		1448
1257	s/&/&amp;/g;	1449	s/&/&amp;/g;
1258	s/>/&gt;/g;	1450	s/>/&gt;/g;
1259	s/</&lt;/g;	1451	s/</&lt;/g;
1260		1452
1261	$_[1]	1453	$_
1262	}	1454	}
1263		1455
1264	sub update {	1456	sub update {
1265	my ($self) = @_;	1457	my ($self) = @_;
1266		1458
…		…
1299	sub size_request {	1491	sub size_request {
1300	my ($self) = @_;	1492	my ($self) = @_;
1301		1493
1302	$self->{layout}->set_font ($self->{font}) if $self->{font};	1494	$self->{layout}->set_font ($self->{font}) if $self->{font};
1303	$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});
1304	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1498	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1305		1499
1306	my ($w, $h) = $self->{layout}->size;	1500	my ($w, $h) = $self->{layout}->size;
1307		1501
1308	if (exists $self->{template}) {	1502	if (exists $self->{template}) {
…		…
1338	}	1532	}
1339		1533
1340	sub _draw {	1534	sub _draw {
1341	my ($self) = @_;	1535	my ($self) = @_;
1342		1536
		1537	$self->SUPER::_draw; # draw background, if applicable
		1538
1343	my $tex = $self->{texture} ||= do {	1539	my $tex = $self->{texture} ||= do {
1344	$self->{layout}->set_foreground (@{$self->{fg}});	1540	$self->{layout}->set_foreground (@{$self->{fg}});
1345	$self->{layout}->set_font ($self->{font}) if $self->{font};	1541	$self->{layout}->set_font ($self->{font}) if $self->{font};
1346	$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});
1347	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);	1545	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1348		1546
1349	my $tex = new_from_layout CFClient::Texture $self->{layout};	1547	my $tex = new_from_layout CFClient::Texture $self->{layout};
1350		1548
1351	$self->{ox} = int $self->{align} < 0 ? $self->{padding}	1549	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1352	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1550	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1353	: ($self->{w} - $tex->{w}) * 0.5;	1551	: ($self->{w} - $tex->{w}) * 0.5);
1354		1552
1355	$self->{oy} = int $self->{valign} < 0 ? $self->{padding}	1553	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1356	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1554	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1357	: ($self->{h} - $tex->{h}) * 0.5;	1555	: ($self->{h} - $tex->{h}) * 0.5);
1358		1556
1359	$tex	1557	$tex
1360	};	1558	};
1361		1559
1362	glEnable GL_TEXTURE_2D;	1560	glEnable GL_TEXTURE_2D;
…		…
1390	active_fg => [0, 0, 0],	1588	active_fg => [0, 0, 0],
1391	can_hover => 1,	1589	can_hover => 1,
1392	can_focus => 1,	1590	can_focus => 1,
1393	valign => 0,	1591	valign => 0,
1394	can_events => 1,	1592	can_events => 1,
		1593	#text => ...
1395	@_	1594	@_
1396	)	1595	)
1397	}	1596	}
1398		1597
1399	sub _set_text {	1598	sub _set_text {
…		…
1409	$self->{text} = $text;	1608	$self->{text} = $text;
1410		1609
1411	$text =~ s/./*/g if $self->{hidden};	1610	$text =~ s/./*/g if $self->{hidden};
1412	$self->{layout}->set_text ("$text ");	1611	$self->{layout}->set_text ("$text ");
1413		1612
1414	$self->emit (changed => $self->{text});	1613	$self->_emit (changed => $self->{text});
1415	}	1614	}
1416		1615
1417	sub set_text {	1616	sub set_text {
1418	my ($self, $text) = @_;	1617	my ($self, $text) = @_;
1419		1618
1420	$self->{cursor} = length $text;	1619	$self->{cursor} = length $text;
1421	$self->_set_text ($text);	1620	$self->_set_text ($text);
		1621	$self->update;
1422	$self->check_size;	1622	$self->check_size;
1423	$self->update;
1424	}	1623	}
1425		1624
1426	sub get_text {	1625	sub get_text {
1427	$_[0]{text}	1626	$_[0]{text}
1428	}	1627	}
…		…
1431	my ($self) = @_;	1630	my ($self) = @_;
1432		1631
1433	my ($w, $h) = $self->SUPER::size_request;	1632	my ($w, $h) = $self->SUPER::size_request;
1434		1633
1435	($w + 1, $h) # add 1 for cursor	1634	($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	}	1635	}
1443		1636
1444	sub key_down {	1637	sub key_down {
1445	my ($self, $ev) = @_;	1638	my ($self, $ev) = @_;
1446		1639
…		…
1448	my $sym = $ev->{sym};	1641	my $sym = $ev->{sym};
1449	my $uni = $ev->{unicode};	1642	my $uni = $ev->{unicode};
1450		1643
1451	my $text = $self->get_text;	1644	my $text = $self->get_text;
1452		1645
1453	if ($sym == 8) {	1646	if ($uni == 8) {
1454	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1647	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1455	} elsif ($sym == 127) {	1648	} elsif ($uni == 127) {
1456	substr $text, $self->{cursor}, 1, "";	1649	substr $text, $self->{cursor}, 1, "";
1457	} elsif ($sym == CFClient::SDLK_LEFT) {	1650	} elsif ($sym == CFClient::SDLK_LEFT) {
1458	--$self->{cursor} if $self->{cursor};	1651	--$self->{cursor} if $self->{cursor};
1459	} elsif ($sym == CFClient::SDLK_RIGHT) {	1652	} elsif ($sym == CFClient::SDLK_RIGHT) {
1460	++$self->{cursor} if $self->{cursor} < length $self->{text};	1653	++$self->{cursor} if $self->{cursor} < length $self->{text};
1461	} elsif ($sym == CFClient::SDLK_HOME) {	1654	} elsif ($sym == CFClient::SDLK_HOME) {
1462	$self->{cursor} = 0;	1655	$self->{cursor} = 0;
1463	} elsif ($sym == CFClient::SDLK_END) {	1656	} elsif ($sym == CFClient::SDLK_END) {
1464	$self->{cursor} = length $text;	1657	$self->{cursor} = length $text;
1465	} elsif ($sym == 27) {	1658	} elsif ($uni == 27) {
1466	$self->emit ('escape');	1659	$self->_emit ('escape');
1467	} elsif ($uni) {	1660	} elsif ($uni) {
1468	substr $text, $self->{cursor}++, 0, chr $uni;	1661	substr $text, $self->{cursor}++, 0, chr $uni;
1469	}	1662	}
1470		1663
1471	$self->_set_text ($text);	1664	$self->_set_text ($text);
1472	$self->update;	1665	$self->update;
		1666	$self->check_size;
1473	}	1667	}
1474		1668
1475	sub focus_in {	1669	sub focus_in {
1476	my ($self) = @_;	1670	my ($self) = @_;
1477		1671
…		…
1557	if ($sym == 13) {	1751	if ($sym == 13) {
1558	unshift @{$self->{history}},	1752	unshift @{$self->{history}},
1559	my $txt = $self->get_text;	1753	my $txt = $self->get_text;
1560	$self->{history_pointer} = -1;	1754	$self->{history_pointer} = -1;
1561	$self->{history_saveback} = '';	1755	$self->{history_saveback} = '';
1562	$self->emit (activate => $txt);	1756	$self->_emit (activate => $txt);
1563	$self->update;	1757	$self->update;
1564		1758
1565	} elsif ($sym == CFClient::SDLK_UP) {	1759	} elsif ($sym == CFClient::SDLK_UP) {
1566	if ($self->{history_pointer} < 0) {	1760	if ($self->{history_pointer} < 0) {
1567	$self->{history_saveback} = $self->get_text;	1761	$self->{history_saveback} = $self->get_text;
…		…
1606	my $class = shift;	1800	my $class = shift;
1607		1801
1608	$class->SUPER::new (	1802	$class->SUPER::new (
1609	padding => 4,	1803	padding => 4,
1610	fg => [1, 1, 1],	1804	fg => [1, 1, 1],
1611	bg => [1, 1, 1, 0.2],
1612	active_fg => [0, 0, 1],	1805	active_fg => [0, 0, 1],
1613	can_hover => 1,	1806	can_hover => 1,
1614	align => 0,	1807	align => 0,
1615	valign => 0,	1808	valign => 0,
1616	can_events => 1,	1809	can_events => 1,
1617	@_	1810	@_
1618	)	1811	)
1619	}	1812	}
1620		1813
		1814	sub activate { }
		1815
1621	sub button_up {	1816	sub button_up {
1622	my ($self, $ev, $x, $y) = @_;	1817	my ($self, $ev, $x, $y) = @_;
1623		1818
		1819	$self->emit ("activate")
1624	if ($x >= 0 && $x < $self->{w}	1820	if $x >= 0 && $x < $self->{w}
1625	&& $y >= 0 && $y < $self->{h}) {	1821	&& $y >= 0 && $y < $self->{h};
1626	$self->emit ("activate");
1627	}
1628	}	1822	}
1629		1823
1630	sub _draw {	1824	sub _draw {
1631	my ($self) = @_;	1825	my ($self) = @_;
1632		1826
…		…
1664		1858
1665	$class->SUPER::new (	1859	$class->SUPER::new (
1666	padding => 2,	1860	padding => 2,
1667	fg => [1, 1, 1],	1861	fg => [1, 1, 1],
1668	active_fg => [1, 1, 0],	1862	active_fg => [1, 1, 0],
		1863	bg => [0, 0, 0, 0.2],
		1864	active_bg => [1, 1, 1, 0.5],
1669	state => 0,	1865	state => 0,
1670	can_hover => 1,	1866	can_hover => 1,
1671	@_	1867	@_
1672	)	1868	)
1673	}	1869	}
…		…
1682	my ($self, $ev, $x, $y) = @_;	1878	my ($self, $ev, $x, $y) = @_;
1683		1879
1684	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1880	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1685	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1881	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1686	$self->{state} = !$self->{state};	1882	$self->{state} = !$self->{state};
1687	$self->emit (changed => $self->{state});	1883	$self->_emit (changed => $self->{state});
1688	}	1884	}
1689	}	1885	}
1690		1886
1691	sub _draw {	1887	sub _draw {
1692	my ($self) = @_;	1888	my ($self) = @_;
…		…
1957	qw(s1_slider.png s1_slider_bg.png);	2153	qw(s1_slider.png s1_slider_bg.png);
1958		2154
1959	sub new {	2155	sub new {
1960	my $class = shift;	2156	my $class = shift;
1961		2157
1962	# range [value, low, high, page]	2158	# range [value, low, high, page, unit]
1963		2159
1964	# TODO: 0-width page	2160	# TODO: 0-width page
1965	# TODO: req_w/h are wrong with vertical	2161	# TODO: req_w/h are wrong with vertical
1966	# TODO: calculations are off	2162	# TODO: calculations are off
1967	my $self = $class->SUPER::new (	2163	my $self = $class->SUPER::new (
1968	fg => [1, 1, 1],	2164	fg => [1, 1, 1],
1969	active_fg => [0, 0, 0],	2165	active_fg => [0, 0, 0],
		2166	bg => [0, 0, 0, 0.2],
		2167	active_bg => [1, 1, 1, 0.5],
1970	range => [0, 0, 100, 10],	2168	range => [0, 0, 100, 10, 0],
1971	req_w => $::WIDTH / 80,	2169	req_w => $::WIDTH / 80,
1972	req_h => $::WIDTH / 80,	2170	req_h => $::WIDTH / 80,
1973	vertical => 0,	2171	vertical => 0,
1974	can_hover => 1,	2172	can_hover => 1,
1975	inner_pad => 5,	2173	inner_pad => 0.02,
1976	@_	2174	@_
1977	);	2175	);
1978		2176
		2177	$self->set_value ($self->{range}[0]);
		2178	$self->update;
		2179
1979	$self	2180	$self
		2181	}
		2182
		2183	sub set_range {
		2184	my ($self, $range) = @_;
		2185
		2186	($range, $self->{range}) = ($self->{range}, $range);
		2187
		2188	$self->update
		2189	if "@$range" ne "@{$self->{range}}";
		2190	}
		2191
		2192	sub set_value {
		2193	my ($self, $value) = @_;
		2194
		2195	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
		2196
		2197	$hi = $lo + 1 if $hi <= $lo;
		2198
		2199	$page = $hi - $lo if $page > $hi - $lo;
		2200
		2201	$value = $lo if $value < $lo;
		2202	$value = $hi - $page if $value > $hi - $page;
		2203
		2204	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
		2205	if $unit;
		2206
		2207	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
		2208
		2209	if ($value != $old_value) {
		2210	$self->_emit (changed => $value);
		2211	$self->update;
		2212	}
1980	}	2213	}
1981		2214
1982	sub size_request {	2215	sub size_request {
1983	my ($self) = @_;	2216	my ($self) = @_;
1984		2217
…		…
1990		2223
1991	sub button_down {	2224	sub button_down {
1992	my ($self, $ev, $x, $y) = @_;	2225	my ($self, $ev, $x, $y) = @_;
1993		2226
1994	$self->SUPER::button_down ($ev, $x, $y);	2227	$self->SUPER::button_down ($ev, $x, $y);
		2228
		2229	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
		2230
1995	$self->mouse_motion ($ev, $x, $y);	2231	$self->mouse_motion ($ev, $x, $y);
1996	}	2232	}
1997		2233
1998	sub mouse_motion {	2234	sub mouse_motion {
1999	my ($self, $ev, $x, $y) = @_;	2235	my ($self, $ev, $x, $y) = @_;
2000		2236
2001	if ($GRAB == $self) {	2237	if ($GRAB == $self) {
		2238	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
		2239
		2240	my (undef, $lo, $hi, $page) = @{$self->{range}};
		2241
		2242	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
		2243
		2244	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2245	}
		2246	}
		2247
		2248	sub update {
		2249	my ($self) = @_;
		2250
		2251	$CFClient::UI::ROOT->on_post_alloc ($self => sub {
		2252	$self->set_value ($self->{range}[0]);
		2253
2002	my ($value, $lo, $hi, $page) = @{$self->{range}};	2254	my ($value, $lo, $hi, $page) = @{$self->{range}};
		2255	my $range = ($hi - $page - $lo) || 1e-100;
2003		2256
2004	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2257	my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2005		2258
2006	my $inner_pad_px = $self->_calc_inner_pad_px ($w);	2259	$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	2260	$self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2008		2261
2009	$x -= $inner_pad_px; # substract the padding	2262	$value = ($value - $lo) / $range;
2010	$x = $x * ($hi - $lo) / $inner_w + $lo;	2263	$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		2264
2015	$self->emit (changed => $x);	2265	$self->{knob_x} = $value - $knob_w * 0.5;
2016	$self->update;	2266	$self->{knob_w} = $knob_w;
2017	}	2267	});
2018	}
2019		2268
2020	# the inner_* stuff is for generating a padding for the slider handle,	2269	$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	}	2270	}
2027		2271
2028	sub _draw {	2272	sub _draw {
2029	my ($self) = @_;	2273	my ($self) = @_;
2030		2274
2031	$self->SUPER::_draw ();	2275	$self->SUPER::_draw ();
2032		2276
2033	my ($w, $h) = @$self{qw(w h)};	2277	glScale $self->{w}, $self->{h};
2034		2278
2035	if ($self->{vertical}) {	2279	if ($self->{vertical}) {
2036	# draw a vertical slider like a rotated horizontal slider	2280	# draw a vertical slider like a rotated horizontal slider
2037		2281
		2282	glTranslate 1, 0, 0;
2038	glRotate 90, 0, 0, 1;	2283	glRotate 90, 0, 0, 1;
2039	glTranslate 0, -$self->{w}, 0;
2040
2041	($w, $h) = ($h, $w);
2042	}	2284	}
2043		2285
2044	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	2286	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2045	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	2287	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2046		2288
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;	2289	glEnable GL_TEXTURE_2D;
2066	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2290	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2067		2291
2068	# draw background	2292	# draw background
2069	$tex[1]->draw_quad_alpha (0, 0, $w, $h);	2293	$tex[1]->draw_quad_alpha (0, 0, 1, 1);
2070		2294
2071	# draw handle	2295	# draw handle
2072	$tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h);	2296	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2073		2297
2074	glDisable GL_TEXTURE_2D;	2298	glDisable GL_TEXTURE_2D;
2075	}	2299	}
		2300
		2301	#############################################################################
		2302
		2303	package CFClient::UI::ValSlider;
		2304
		2305	our @ISA = CFClient::UI::HBox::;
		2306
		2307	sub new {
		2308	my ($class, %arg) = @_;
		2309
		2310	my $range = delete $arg{range};
		2311
		2312	my $self = $class->SUPER::new (
		2313	slider => (new CFClient::UI::Slider expand => 1, range => $range),
		2314	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
		2315	to_value => sub { shift },
		2316	from_value => sub { shift },
		2317	%arg,
		2318	);
		2319
		2320	$self->{slider}->connect (changed => sub {
		2321	my ($self, $value) = @_;
		2322	$self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
		2323	$self->{parent}->emit (changed => $value);
		2324	});
		2325
		2326	# $self->{entry}->connect (changed => sub {
		2327	# my ($self, $value) = @_;
		2328	# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
		2329	# $self->{parent}->emit (changed => $value);
		2330	# });
		2331
		2332	$self->add ($self->{slider}, $self->{entry});
		2333
		2334	$self->{slider}->emit (changed => $self->{slider}{range}[0]);
		2335
		2336	$self
		2337	}
		2338
		2339	sub set_range { shift->{slider}->set_range (@_) }
		2340	sub set_value { shift->{slider}->set_value (@_) }
2076		2341
2077	#############################################################################	2342	#############################################################################
2078		2343
2079	package CFClient::UI::TextView;	2344	package CFClient::UI::TextView;
2080		2345
…		…
2110		2375
2111	$self->{fontsize} = $fontsize;	2376	$self->{fontsize} = $fontsize;
2112	$self->reflow;	2377	$self->reflow;
2113	}	2378	}
2114		2379
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 {	2380	sub size_allocate {
2135	my ($self, $w, $h) = @_;	2381	my ($self, $w, $h) = @_;
2136		2382
2137	$self->SUPER::size_allocate ($w, $h);	2383	$self->SUPER::size_allocate ($w, $h);
2138		2384
…		…
2141	$self->{layout}->set_width ($self->{children}[0]{w});	2387	$self->{layout}->set_width ($self->{children}[0]{w});
2142		2388
2143	$self->reflow;	2389	$self->reflow;
2144	}	2390	}
2145		2391
		2392	sub text_size {
		2393	my ($self, $text, $indent) = @_;
		2394
		2395	my $layout = $self->{layout};
		2396
		2397	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2398	$layout->set_width ($self->{children}[0]{w} - $indent);
		2399	$layout->set_markup ($text);
		2400
		2401	$layout->size
		2402	}
		2403
		2404	sub reflow {
		2405	my ($self) = @_;
		2406
		2407	$self->{need_reflow}++;
		2408	$self->update;
		2409	}
		2410
		2411	sub set_offset {
		2412	my ($self, $offset) = @_;
		2413
		2414	# todo: base offset on lines or so, not on pixels
		2415	$self->{children}[1]->set_value ($offset);
		2416	}
		2417
		2418	sub clear {
		2419	my ($self) = @_;
		2420
		2421	$self->{par} = [];
		2422	$self->{height} = 0;
		2423	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
		2424	}
		2425
2146	sub add_paragraph {	2426	sub add_paragraph {
2147	my ($self, $color, $text) = @_;	2427	my ($self, $color, $text, $indent) = @_;
2148		2428
2149	#TODO: intelligently "reformat" paragraph	2429	for my $line (split /\n/, $text) {
2150		2430	my ($w, $h) = $self->text_size ($line);
2151	my $height = $self->text_height ($text);
2152
2153	$self->{height} += $height;	2431	$self->{height} += $h;
		2432	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
		2433	}
2154		2434
2155	push @{$self->{par}}, [$height, $color, $text];
2156
2157	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];	2435	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2158	$self->{children}[1]->update;
2159	}	2436	}
2160		2437
2161	sub update {	2438	sub update {
2162	my ($self) = @_;	2439	my ($self) = @_;
2163		2440
…		…
2165		2442
2166	return unless $self->{h} > 0;	2443	return unless $self->{h} > 0;
2167		2444
2168	delete $self->{texture};	2445	delete $self->{texture};
2169		2446
2170	$ROOT->on_refresh ($self, sub {	2447	$ROOT->on_post_alloc ($self, sub {
		2448	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2449
2171	if (delete $self->{need_reflow}) {	2450	if (delete $self->{need_reflow}) {
2172	my $height = 0;	2451	my $height = 0;
2173		2452
2174	$height += $_->[0] = $self->text_height ($_->[2])	2453	my $layout = $self->{layout};
		2454
		2455	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2456
2175	for @{$self->{par}};	2457	for (@{$self->{par}}) {
		2458	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
		2459	$layout->set_width ($W - $_->[3]);
		2460	$layout->set_markup ($_->[4]);
		2461	my ($w, $h) = $layout->size;
		2462	$_->[0] = $w + $_->[3];
		2463	$_->[1] = $h;
		2464	}
		2465
		2466	$height += $_->[1];
		2467	}
2176		2468
2177	$self->{height} = $height;	2469	$self->{height} = $height;
2178		2470
2179	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2471	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2180		2472
2181	delete $self->{texture};	2473	delete $self->{texture};
2182	}	2474	}
2183		2475
2184	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {	2476	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2185	glClearColor 0, 0, 0, 0;	2477	glClearColor 0.5, 0.5, 0.5, 0;
2186	glClear GL_COLOR_BUFFER_BIT;	2478	glClear GL_COLOR_BUFFER_BIT;
2187		2479
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];	2480	my $top = int $self->{children}[1]{range}[0];
2192		2481
2193	my $y0 = $top;	2482	my $y0 = $top;
2194	my $y1 = $top + $self->{h};	2483	my $y1 = $top + $H;
2195		2484
2196	my $y = 0;	2485	my $y = 0;
2197		2486
2198	my $layout = $self->{layout};	2487	my $layout = $self->{layout};
2199		2488
2200	$layout->set_font ($self->{font}) if $self->{font};	2489	$layout->set_font ($self->{font}) if $self->{font};
2201		2490
		2491	glEnable GL_BLEND;
		2492	#TODO# not correct in windows where rgba is forced off
		2493	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		2494
2202	for my $par (@{$self->{par}}) {	2495	for my $par (@{$self->{par}}) {
2203	my $h = $par->[0];	2496	my $h = $par->[1];
2204		2497
2205	if ($y0 < $y + $h && $y < $y1) {	2498	if ($y0 < $y + $h && $y < $y1) {
2206	$layout->set_foreground (@{ $par->[1] });	2499	$layout->set_foreground (@{ $par->[2] });
		2500	$layout->set_width ($W - $par->[3]);
2207	$layout->set_markup ($par->[2]);	2501	$layout->set_markup ($par->[4]);
2208		2502
2209	my ($W, $H) = $layout->size;	2503	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2210	CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);	2504
		2505	glRasterPos $par->[3], $y - $y0;
		2506	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2211	}	2507	}
2212		2508
2213	$y += $h;	2509	$y += $h;
2214	}	2510	}
2215		2511
2216	glDisable GL_TEXTURE_2D;	2512	glDisable GL_BLEND;
2217	};	2513	};
2218	});	2514	});
2219	}	2515	}
2220		2516
2221	sub _draw {	2517	sub _draw {
2222	my ($self) = @_;	2518	my ($self) = @_;
2223		2519
2224	glEnable GL_TEXTURE_2D;	2520	glEnable GL_TEXTURE_2D;
2225	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2521	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2226	glColor 1, 1, 1, 1;	2522	glColor 1, 1, 1, 1;
2227	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2523	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2228	glDisable GL_TEXTURE_2D;	2524	glDisable GL_TEXTURE_2D;
2229		2525
2230	$self->{children}[1]->draw;	2526	$self->{children}[1]->draw;
2231		2527
2232	}	2528	}
…		…
2281		2577
2282	sub new {	2578	sub new {
2283	my $class = shift;	2579	my $class = shift;
2284		2580
2285	my $self = $class->SUPER::new (	2581	my $self = $class->SUPER::new (
2286	state => 0,	2582	state => 0,
2287	connect_activate => \&toggle_flopper,	2583	on_activate => \&toggle_flopper,
2288	@_	2584	@_
2289	);	2585	);
2290		2586
2291	if ($self->{state}) {
2292	$self->{state} = 0;
2293	$self->toggle_flopper;
2294	}
2295
2296	$self	2587	$self
2297	}	2588	}
2298		2589
2299	sub toggle_flopper {	2590	sub toggle_flopper {
2300	my ($self) = @_;	2591	my ($self) = @_;
2301		2592
2302	# TODO: use animation	2593	$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	}	2594	}
2314		2595
2315	#############################################################################	2596	#############################################################################
2316		2597
2317	package CFClient::UI::Tooltip;	2598	package CFClient::UI::Tooltip;
…		…
2331		2612
2332	sub set_tooltip_from {	2613	sub set_tooltip_from {
2333	my ($self, $widget) = @_;	2614	my ($self, $widget) = @_;
2334		2615
2335	$self->add (new CFClient::UI::Label	2616	$self->add (new CFClient::UI::Label
2336	markup => $widget->{tooltip},	2617	markup => $widget->{tooltip},
2337	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2618	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2338	fontsize => 0.8,	2619	fontsize => 0.8,
2339	fg => [0, 0, 0, 1],	2620	fg => [0, 0, 0, 1],
		2621	ellipsise => 0,
2340	font => ($widget->{tooltip_font} || $::FONT_PROP),	2622	font => ($widget->{tooltip_font} || $::FONT_PROP),
2341	);	2623	);
2342	}	2624	}
2343		2625
2344	sub size_request {	2626	sub size_request {
2345	my ($self) = @_;	2627	my ($self) = @_;
…		…
2391	use CFClient::OpenGL;	2673	use CFClient::OpenGL;
2392		2674
2393	sub new {	2675	sub new {
2394	my $class = shift;	2676	my $class = shift;
2395		2677
2396	$class->SUPER::new (	2678	my $self = $class->SUPER::new (
2397	aspect => 1,	2679	aspect => 1,
		2680	can_events => 0,
2398	@_,	2681	@_,
2399	)	2682	);
		2683
		2684	if ($self->{anim} && $self->{animspeed}) {
		2685	Scalar::Util::weaken (my $widget = $self);
		2686
		2687	$self->{timer} = Event->timer (
		2688	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
		2689	hard => 1,
		2690	interval => $self->{animspeed},
		2691	cb => sub {
		2692	++$widget->{frame};
		2693	$widget->update;
		2694	},
		2695	);
		2696	}
		2697
		2698	$self
2400	}	2699	}
2401		2700
2402	sub size_request {	2701	sub size_request {
2403	(32, 8)	2702	(32, 8)
2404	}	2703	}
2405		2704
		2705	sub update {
		2706	my ($self) = @_;
		2707
		2708	return unless $self->{visible};
		2709
		2710	$self->SUPER::update;
		2711	}
		2712
2406	sub _draw {	2713	sub _draw {
2407	my ($self) = @_;	2714	my ($self) = @_;
2408		2715
2409	return unless $::CONN;#d# manage and cache textures differently	2716	return unless $::CONN;
		2717
		2718	my $face;
		2719
		2720	if ($self->{frame}) {
		2721	my $anim = $::CONN->{anim}[$self->{anim}];
		2722
		2723	$face = $anim->[ $self->{frame} % @$anim ]
		2724	if $anim && @$anim;
		2725	}
		2726
2410	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	2727	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2411		2728
2412	# TODO animation
2413	if ($tex) {	2729	if ($tex) {
2414	glEnable GL_TEXTURE_2D;	2730	glEnable GL_TEXTURE_2D;
2415	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2731	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2416	glColor 1, 1, 1, 1;	2732	glColor 1, 1, 1, 1;
2417	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2733	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2418	glDisable GL_TEXTURE_2D;	2734	glDisable GL_TEXTURE_2D;
2419	}	2735	}
2420	}	2736	}
2421		2737
2422	#############################################################################	2738	sub DESTROY {
		2739	my ($self) = @_;
2423		2740
		2741	$self->{timer}->cancel
		2742	if $self->{timer};
		2743
		2744	$self->SUPER::DESTROY;
		2745	}
		2746
		2747	#############################################################################
		2748
2424	package CFClient::UI::InventoryItem;	2749	package CFClient::UI::Inventory;
2425		2750
2426	our @ISA = CFClient::UI::HBox::;	2751	our @ISA = CFClient::UI::ScrolledWindow::;
2427		2752
2428	sub new {	2753	sub new {
2429	my $class = shift;	2754	my $class = shift;
2430		2755
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 (	2756	my $self = $class->SUPER::new (
2441	can_hover => 1,	2757	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	@_,	2758	@_,
2500	);	2759	);
2501		2760
2502	$self	2761	$self
2503	}	2762	}
…		…
2506	my ($self, $items) = @_;	2765	my ($self, $items) = @_;
2507		2766
2508	$self->{scrolled}->clear;	2767	$self->{scrolled}->clear;
2509	return unless $items;	2768	return unless $items;
2510		2769
2511	my @items = sort { $a->{type} <=> $b->{type} } @$items;	2770	my @items = sort {
		2771	($a->{type} <=> $b->{type})
		2772	or ($a->{name} cmp $b->{name})
		2773	} @$items;
2512		2774
2513	$self->{real_items} = \@items;	2775	$self->{real_items} = \@items;
2514		2776
		2777	my $row = 0;
2515	for my $item (@items) {	2778	for my $item (@items) {
2516	my $desc = $item->{nrof} < 2	2779	CFClient::Item::update_widgets $item;
2517	? $item->{name}
2518	: "$item->{nrof} $item->{name_pl}";
2519		2780
2520	$self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item);	2781	$self->{scrolled}->add (0, $row, $item->{face_widget});
2521	}	2782	$self->{scrolled}->add (1, $row, $item->{desc_widget});
		2783	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2522		2784
2523	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];	2785	$row++;
2524	}	2786	}
2525
2526	sub size_request {
2527	my ($self) = @_;
2528	($self->{req_w}, $self->{req_h});
2529	}	2787	}
2530		2788
2531	#############################################################################	2789	#############################################################################
2532		2790
2533	package CFClient::UI::Menu;	2791	package CFClient::UI::Menu;
…		…
2568		2826
2569	# popup given the event (must be a mouse button down event currently)	2827	# popup given the event (must be a mouse button down event currently)
2570	sub popup {	2828	sub popup {
2571	my ($self, $ev) = @_;	2829	my ($self, $ev) = @_;
2572		2830
2573	$self->emit ("popdown");	2831	$self->_emit ("popdown");
2574		2832
2575	# maybe save $GRAB? must be careful about events...	2833	# maybe save $GRAB? must be careful about events...
2576	$GRAB = $self;	2834	$GRAB = $self;
2577	$self->{button} = $ev->{button};	2835	$self->{button} = $ev->{button};
2578		2836
…		…
2593		2851
2594	if ($ev->{button} == $self->{button}) {	2852	if ($ev->{button} == $self->{button}) {
2595	undef $GRAB;	2853	undef $GRAB;
2596	$self->hide;	2854	$self->hide;
2597		2855
2598	$self->emit ("popdown");	2856	$self->_emit ("popdown");
2599	$self->{hover}[1]->() if $self->{hover};	2857	$self->{hover}[1]->() if $self->{hover};
2600	}	2858	}
2601	}	2859	}
2602		2860
2603	#############################################################################	2861	#############################################################################
2604		2862
2605	package CFClient::UI::Statusbox;	2863	package CFClient::UI::Statusbox;
2606		2864
2607	our @ISA = CFClient::UI::VBox::;	2865	our @ISA = CFClient::UI::VBox::;
		2866
		2867	sub new {
		2868	my $class = shift;
		2869
		2870	$class->SUPER::new (
		2871	fontsize => 0.8,
		2872	@_,
		2873	)
		2874	}
2608		2875
2609	sub reorder {	2876	sub reorder {
2610	my ($self) = @_;	2877	my ($self) = @_;
2611	my $NOW = time;	2878	my $NOW = time;
2612		2879
…		…
2631	? "<b>$item->{count} ×</b> $item->{text}"	2898	? "<b>$item->{count} ×</b> $item->{text}"
2632	: $item->{text};	2899	: $item->{text};
2633		2900
2634	for ($short) {	2901	for ($short) {
2635	s/^\s+//;	2902	s/^\s+//;
2636	s/\012.*/…/s;	2903	s/\s+/ /g;
2637	my $len = int 30 / $item->{fontsize};
2638	substr $_, $len, length, "…" if $len < length;
2639	}	2904	}
2640		2905
2641	new CFClient::UI::Label	2906	new CFClient::UI::Label
2642	markup => $short,	2907	markup => $short,
2643	tooltip => $item->{tooltip},	2908	tooltip => $item->{tooltip},
2644	tooltip_font => $::FONT_PROP,	2909	tooltip_font => $::FONT_PROP,
2645	tooltip_width => 0.67,	2910	tooltip_width => 0.67,
2646	fontsize => $item->{fontsize},	2911	fontsize => $item->{fontsize} || $self->{fontsize},
		2912	max_w => $::WIDTH * 0.44,
2647	color => $item->{color},	2913	fg => $item->{fg},
2648	can_events => 1,	2914	can_events => 1,
2649	can_hover => 1	2915	can_hover => 1
2650	};	2916	};
2651	}	2917	}
2652		2918
…		…
2654	$self->SUPER::add (reverse @widgets);	2920	$self->SUPER::add (reverse @widgets);
2655	}	2921	}
2656		2922
2657	sub add {	2923	sub add {
2658	my ($self, $text, %arg) = @_;	2924	my ($self, $text, %arg) = @_;
		2925
		2926	$text =~ s/^\s+//;
		2927	$text =~ s/\s+$//;
		2928
		2929	return unless $text;
2659		2930
2660	my $timeout = time + ((delete $arg{timeout}) || 60);	2931	my $timeout = time + ((delete $arg{timeout}) || 60);
2661		2932
2662	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	2933	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2663		2934
…		…
2666	$item->{count}++;	2937	$item->{count}++;
2667	} else {	2938	} else {
2668	$item->{count} = 1;	2939	$item->{count} = 1;
2669	$item->{text} = $item->{tooltip} = $text;	2940	$item->{text} = $item->{tooltip} = $text;
2670	}	2941	}
		2942	$item->{id} = ++$self->{id};
2671	$item->{timeout} = $timeout;	2943	$item->{timeout} = $timeout;
2672	delete $item->{label};	2944	delete $item->{label};
2673	} else {	2945	} else {
2674	$self->{item}{$group} = {	2946	$self->{item}{$group} = {
2675	id => ++$self->{id},	2947	id => ++$self->{id},
2676	text => $text,	2948	text => $text,
2677	timeout => $timeout,	2949	timeout => $timeout,
2678	tooltip => $text,	2950	tooltip => $text,
2679	fontsize => 0.8,
2680	color => [0.8, 0.8, 0.8, 0.8],	2951	fg => [0.8, 0.8, 0.8, 0.8],
2681	pri => 0,	2952	pri => 0,
2682	count => 1,	2953	count => 1,
2683	%arg,	2954	%arg,
2684	};	2955	};
2685	}	2956	}
2686		2957
2687	$self->reorder;	2958	$self->reorder;
2688	}	2959	}
2689		2960
		2961	sub reconfigure {
		2962	my ($self) = @_;
		2963
		2964	delete $_->{label}
		2965	for values %{ $self->{item} || {} };
		2966
		2967	$self->reorder;
		2968	$self->SUPER::reconfigure;
		2969	}
		2970
2690	#############################################################################	2971	#############################################################################
2691		2972
2692	package CFClient::UI::Root;	2973	package CFClient::UI::Root;
2693		2974
2694	our @ISA = CFClient::UI::Container::;	2975	our @ISA = CFClient::UI::Container::;
…		…
2697		2978
2698	sub new {	2979	sub new {
2699	my $class = shift;	2980	my $class = shift;
2700		2981
2701	$class->SUPER::new (	2982	$class->SUPER::new (
		2983	visible => 1,
2702	@_,	2984	@_,
2703	)	2985	)
2704	}	2986	}
2705		2987
2706	sub configure {	2988	sub configure {
…		…
2724	}	3006	}
2725		3007
2726	sub size_allocate {	3008	sub size_allocate {
2727	my ($self, $w, $h) = @_;	3009	my ($self, $w, $h) = @_;
2728		3010
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) {	3011	for my $child ($self->children) {
2746	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3012	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2747		3013
		3014	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
		3015	if exists $child->{req_x};
		3016
		3017	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
		3018	if exists $child->{req_y};
		3019
		3020	#delete @$child{qw(req_x req_y)};#d# def_x, def_y
		3021
2748	$X = List::Util::max 0, List::Util::min $w - $W, $X;	3022	$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;	3023	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
		3024
2750	$child->configure ($X, $Y, $W, $H);	3025	$child->configure ($X, $Y, $W, $H);
2751	}	3026	}
2752
2753	$self->{old_w} = $w;
2754	$self->{old_h} = $h;
2755	}	3027	}
2756		3028
2757	sub coord2local {	3029	sub coord2local {
2758	my ($self, $x, $y) = @_;	3030	my ($self, $x, $y) = @_;
2759		3031
…		…
2772	$self->check_size;	3044	$self->check_size;
2773	$::WANT_REFRESH++;	3045	$::WANT_REFRESH++;
2774	}	3046	}
2775		3047
2776	sub add {	3048	sub add {
2777	my ($self, $child) = @_;	3049	my ($self, @children) = @_;
2778		3050
		3051	for my $child (@children) {
		3052	$child->{is_toplevel} = 1;
		3053
2779	# integerise window positions	3054	# integerise window positions
2780	$child->{x} = int $child->{x};	3055	$child->{x} = int $child->{x};
2781	$child->{y} = int $child->{y};	3056	$child->{y} = int $child->{y};
		3057	}
2782		3058
2783	$self->SUPER::add ($child);	3059	$self->SUPER::add (@children);
		3060
		3061	for (my @widgets = @children; my $w = pop @widgets; ) {
		3062	push @widgets, $w->children;
		3063	$w->set_visible;
		3064	}
		3065
		3066	}
		3067
		3068	sub remove {
		3069	my ($self, @children) = @_;
		3070
		3071	$self->SUPER::remove (@children);
		3072
		3073	while (@children) {
		3074	my $w = pop @children;
		3075	push @children, $w->children;
		3076	$w->set_invisible;
		3077	}
2784	}	3078	}
2785		3079
2786	sub on_refresh {	3080	sub on_refresh {
2787	my ($self, $id, $cb) = @_;	3081	my ($self, $id, $cb) = @_;
2788		3082
2789	$self->{refresh_hook}{$id} = $cb;	3083	$self->{refresh_hook}{$id} = $cb;
2790	}	3084	}
2791		3085
		3086	sub on_post_alloc {
		3087	my ($self, $id, $cb) = @_;
		3088
		3089	$self->{post_alloc_hook}{$id} = $cb;
		3090	}
		3091
2792	sub draw {	3092	sub draw {
2793	my ($self) = @_;	3093	my ($self) = @_;
2794		3094
		3095	while ($self->{refresh_hook}) {
		3096	$_->()
		3097	for values %{delete $self->{refresh_hook}};
		3098	}
		3099
2795	if ($self->{check_size}) {	3100	if ($self->{check_size}) {
2796	my @queue = ([], []);	3101	my @queue;
2797		3102
2798	for (;;) {	3103	while () {
2799	if ($self->{check_size}) {	3104	if ($self->{check_size}) {
2800	# heuristic: check containers last	3105	#TODO use array-of-depth approach
2801	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_	3106
		3107	@queue = sort { $a->{visible} <=> $b->{visible} }
2802	for values %{delete $self->{check_size}}	3108	@queue, values %{delete $self->{check_size}};
2803	}	3109	}
2804		3110
2805	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;	3111	my $widget = pop @queue || last;
2806		3112
		3113	defined $widget->{visible} or last; # do not resize invisible widgets
		3114
2807	my ($w, $h) = $widget->{user_w} && $widget->{user_h}	3115	my ($w, $h) = $widget->{def_w} && $widget->{def_h}
2808	? @$widget{qw(user_w user_h)}	3116	? @$widget{qw(def_w def_h)}
2809	: $widget->size_request;	3117	: $widget->size_request;
2810		3118
2811	if (delete $widget->{force_alloc}	3119	if (delete $widget->{force_alloc}
2812	or $w != $widget->{req_w} or $h != $widget->{req_h}) {	3120	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2813	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#	3121	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
…		…
2821	if $widget->{parent};	3129	if $widget->{parent};
2822	}	3130	}
2823	}	3131	}
2824	}	3132	}
2825		3133
2826	while ($self->{size_alloc}) {	3134	while (my $size_alloc = delete $self->{size_alloc}) {
2827	for (values %{delete $self->{size_alloc}}) {	3135	my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
2828	my ($widget, $w, $h) = @$_;	3136	values %$size_alloc;
		3137
		3138	while () {
		3139	my ($widget, $w, $h) = @{ pop @queue or last };
2829		3140
2830	$w = 0 if $w < 0;	3141	$w = 0 if $w < 0;
2831	$h = 0 if $h < 0;	3142	$h = 0 if $h < 0;
2832		3143
2833	$widget->{w} = $w;	3144	$widget->{w} = $w;
2834	$widget->{h} = $h;	3145	$widget->{h} = $h;
2835	$widget->size_allocate ($w, $h);
2836	$widget->emit (size_allocate => $w, $h);	3146	$widget->emit (size_allocate => $w, $h);
2837	}	3147	}
2838	}	3148	}
2839		3149
2840	while ($self->{refresh_hook}) {	3150	while ($self->{post_alloc_hook}) {
2841	$_->()	3151	$_->()
2842	for values %{delete $self->{refresh_hook}};	3152	for values %{delete $self->{post_alloc_hook}};
2843	}	3153	}
2844		3154
2845	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3155	glViewport 0, 0, $::WIDTH, $::HEIGHT;
2846	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3156	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2847	glClear GL_COLOR_BUFFER_BIT;	3157	glClear GL_COLOR_BUFFER_BIT;
2848		3158
2849	glMatrixMode GL_PROJECTION;	3159	glMatrixMode GL_PROJECTION;
2850	glLoadIdentity;	3160	glLoadIdentity;
2851	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;	3161	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2852	glMatrixMode GL_MODELVIEW;	3162	glMatrixMode GL_MODELVIEW;
2853	glLoadIdentity;	3163	glLoadIdentity;
2854		3164
2855	$self->_draw;	3165	$self->_draw;
2856	}	3166	}
…		…
2858	#############################################################################	3168	#############################################################################
2859		3169
2860	package CFClient::UI;	3170	package CFClient::UI;
2861		3171
2862	$ROOT = new CFClient::UI::Root;	3172	$ROOT = new CFClient::UI::Root;
2863	$TOOLTIP = new CFClient::UI::Tooltip;	3173	$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2864		3174
2865	1	3175	1
2866		3176

Diff Legend

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